- fixed some component params

- fixed docblock errors
- fixed ping query (resultclass was missing)
- fixed a unittest

library/Solarium/Client/RequestBuilder/Select/Component/Highlighting.php

@@ -54,7 +54,7 @@ class Solarium_Client_RequestBuilder_Select_Component_Highlighting
     public function build($component, $request)
     {
         // enable highlighting
-        $request->addParam('hl', true);
+        $request->addParam('hl','true');
 
         $request->addParam('hl.fl', $component->getFields());
         $request->addParam('hl.snippets', $component->getSnippets());

library/Solarium/Client/RequestBuilder/Select/Component/MoreLikeThis.php

@@ -54,7 +54,7 @@ class Solarium_Client_RequestBuilder_Select_Component_MoreLikeThis
     public function build($component, $request)
     {
         // enable morelikethis
-        $request->addParam('mlt', true);
+        $request->addParam('mlt', 'true');
 
         $request->addParam('mlt.fl', $component->getFields());
         $request->addParam('mlt.mintf', $component->getMinimumTermFrequency());

library/Solarium/Query/Ping.php

@@ -64,6 +64,7 @@ class Solarium_Query_Ping extends Solarium_Query
      * @var array
      */
     protected $_options = array(
+        'resultclass' => 'Solarium_Result_Ping',
         'handler' => 'admin/ping',
     );
     

library/Solarium/Query/Select.php

@@ -194,7 +194,7 @@ class Solarium_Query_Select extends Solarium_Query
      * escaping of user input.
      *
      * @param string $query
-     * @return Solarium_Query Provides fluent interface
+     * @return Solarium_Query_Select Provides fluent interface
      */
     public function setQuery($query)
     {
@@ -215,7 +215,7 @@ class Solarium_Query_Select extends Solarium_Query
      * Set the start offset
      *
      * @param integer $start
-     * @return Solarium_Query Provides fluent interface
+     * @return Solarium_Query_Select Provides fluent interface
      */
     public function setStart($start)
     {
@@ -236,7 +236,7 @@ class Solarium_Query_Select extends Solarium_Query
      * Set a custom resultclass
      *
      * @param string $value classname
-     * @return Solarium_Query Provides fluent interface
+     * @return Solarium_Query_Select Provides fluent interface
      */
     public function setResultClass($value)
     {
@@ -282,7 +282,7 @@ class Solarium_Query_Select extends Solarium_Query
      * Set the number of rows to fetch
      *
      * @param integer $rows
-     * @return Solarium_Query Provides fluent interface
+     * @return Solarium_Query_Select Provides fluent interface
      */
     public function setRows($rows)
     {
@@ -303,7 +303,7 @@ class Solarium_Query_Select extends Solarium_Query
      * Specify a field to return in the resultset
      *
      * @param string $field
-     * @return Solarium_Query Provides fluent interface
+     * @return Solarium_Query_Select Provides fluent interface
      */
     public function addField($field)
     {
@@ -317,7 +317,7 @@ class Solarium_Query_Select extends Solarium_Query
      * @param string|array $fields can be an array or string with comma
      * separated fieldnames
      *
-     * @return Solarium_Query Provides fluent interface
+     * @return Solarium_Query_Select Provides fluent interface
      */
     public function addFields($fields)
     {
@@ -337,7 +337,7 @@ class Solarium_Query_Select extends Solarium_Query
      * Remove a field from the field list
      *
      * @param string $field
-     * @return Solarium_Query Provides fluent interface
+     * @return Solarium_Query_Select Provides fluent interface
      */
     public function removeField($field)
     {
@@ -351,7 +351,7 @@ class Solarium_Query_Select extends Solarium_Query
     /**
      * Remove all fields from the field list.
      *
-     * @return Solarium_Query Provides fluent interface
+     * @return Solarium_Query_Select Provides fluent interface
      */
     public function clearFields()
     {
@@ -375,7 +375,7 @@ class Solarium_Query_Select extends Solarium_Query
      * This overwrites any existing fields
      *
      * @param array $fields
-     * @return Solarium_Query Provides fluent interface
+     * @return Solarium_Query_Select Provides fluent interface
      */
     public function setFields($fields)
     {
@@ -390,7 +390,7 @@ class Solarium_Query_Select extends Solarium_Query
      *
      * @param string $sort
      * @param string $order
-     * @return Solarium_Query Provides fluent interface
+     * @return Solarium_Query_Select Provides fluent interface
      */
     public function addSort($sort, $order)
     {
@@ -405,7 +405,7 @@ class Solarium_Query_Select extends Solarium_Query
      * The input array must contain sort items as keys and the order as values.
      *
      * @param array $sorts
-     * @return Solarium_Query Provides fluent interface
+     * @return Solarium_Query_Select Provides fluent interface
      */
     public function addSorts(array $sorts)
     {
@@ -420,7 +420,7 @@ class Solarium_Query_Select extends Solarium_Query
      * Remove a sort
      *
      * @param string $sort
-     * @return Solarium_Query Provides fluent interface
+     * @return Solarium_Query_Select Provides fluent interface
      */
     public function removeSort($sort)
     {
@@ -434,7 +434,7 @@ class Solarium_Query_Select extends Solarium_Query
     /**
      * Remove all sorts
      *
-     * @return Solarium_Query Provides fluent interface
+     * @return Solarium_Query_Select Provides fluent interface
      */
     public function clearSorts()
     {
@@ -458,7 +458,7 @@ class Solarium_Query_Select extends Solarium_Query
      * This overwrites any existing sorts
      *
      * @param array $sorts
-     * @return Solarium_Query Provides fluent interface
+     * @return Solarium_Query_Select Provides fluent interface
      */
     public function setSorts($sorts)
     {
@@ -486,7 +486,7 @@ class Solarium_Query_Select extends Solarium_Query
      * filterquery instance wil be created based on the options.
      *
      * @param Solarium_Query_Select_FilterQuery|array $filterQuery
-     * @return Solarium_Query Provides fluent interface
+     * @return Solarium_Query_Select Provides fluent interface
      */
     public function addFilterQuery($filterQuery)
     {
@@ -513,7 +513,7 @@ class Solarium_Query_Select extends Solarium_Query
      * Add multiple filterqueries
      *
      * @param array $filterQueries
-     * @return Solarium_Query Provides fluent interface
+     * @return Solarium_Query_Select Provides fluent interface
      */
     public function addFilterQueries(array $filterQueries)
     {
@@ -559,7 +559,7 @@ class Solarium_Query_Select extends Solarium_Query
      * Remove a single filterquery by key
      *
      * @param string $key
-     * @return Solarium_Query Provides fluent interface
+     * @return Solarium_Query_Select Provides fluent interface
      */
     public function removeFilterQuery($key)
     {
@@ -573,7 +573,7 @@ class Solarium_Query_Select extends Solarium_Query
     /**
      * Remove all filterqueries
      *
-     * @return Solarium_Query Provides fluent interface
+     * @return Solarium_Query_Select Provides fluent interface
      */
     public function clearFilterQueries()
     {
@@ -611,7 +611,7 @@ class Solarium_Query_Select extends Solarium_Query
      * @param string $component
      * @param string $requestBuilder
      * @param string $responseParser
-     * @return Solarium_Query Provides fluent interface
+     * @return Solarium_Query_Select Provides fluent interface
      */
     public function registerComponentType($key, $component, $requestBuilder=null, $responseParser=null)
     {

library/Solarium/Query/Select/Component/DisMax.php

@@ -61,7 +61,7 @@ class Solarium_Query_Select_Component_DisMax extends Solarium_Query_Select_Compo
      * specified or blank.
      *
      * @param string $queryAlternative
-     * @return Solarium_Query_Component_DisMax Provides fluent interface
+     * @return Solarium_Query_Select_Component_DisMax Provides fluent interface
      */
     public function setQueryAlternative($queryAlternative)
     {
@@ -87,7 +87,7 @@ class Solarium_Query_Select_Component_DisMax extends Solarium_Query_Select_Compo
      * The format supported is "fieldOne^2.3 fieldTwo fieldThree^0.4"
      *
      * @param string $queryFields
-     * @return Solarium_Query_Component_DisMax Provides fluent interface
+     * @return Solarium_Query_Select_Component_DisMax Provides fluent interface
      */
     public function setQueryFields($queryFields)
     {
@@ -111,7 +111,7 @@ class Solarium_Query_Select_Component_DisMax extends Solarium_Query_Select_Compo
      * clauses must match. See Solr manual for details.
      *
      * @param string $minimumMatch
-     * @return Solarium_Query_Component_DisMax Provides fluent interface
+     * @return Solarium_Query_Select_Component_DisMax Provides fluent interface
      */
     public function setMinimumMatch($minimumMatch)
     {
@@ -137,7 +137,7 @@ class Solarium_Query_Select_Component_DisMax extends Solarium_Query_Select_Compo
      * Format is: "fieldA^1.0 fieldB^2.2"
      *
      * @param string $phraseFields
-     * @return Solarium_Query_Component_DisMax Provides fluent interface
+     * @return Solarium_Query_Select_Component_DisMax Provides fluent interface
      */
     public function setPhraseFields($phraseFields)
     {
@@ -161,7 +161,7 @@ class Solarium_Query_Select_Component_DisMax extends Solarium_Query_Select_Compo
      * (affects boosting)
      *
      * @param string $phraseSlop
-     * @return Solarium_Query_Component_DisMax Provides fluent interface
+     * @return Solarium_Query_Select_Component_DisMax Provides fluent interface
      */
     public function setPhraseSlop($phraseSlop)
     {
@@ -185,7 +185,7 @@ class Solarium_Query_Select_Component_DisMax extends Solarium_Query_Select_Compo
      * query string (in qf fields; affects matching)
      *
      * @param string $queryPhraseSlop
-     * @return Solarium_Query_Component_DisMax Provides fluent interface
+     * @return Solarium_Query_Select_Component_DisMax Provides fluent interface
      */
     public function setQueryPhraseSlop($queryPhraseSlop)
     {
@@ -208,7 +208,7 @@ class Solarium_Query_Select_Component_DisMax extends Solarium_Query_Select_Compo
      * Float value to use as tiebreaker in DisjunctionMaxQueries
      *
      * @param float $tie
-     * @return Solarium_Query_Component_DisMax Provides fluent interface
+     * @return Solarium_Query_Select_Component_DisMax Provides fluent interface
      */
     public function setTie($tie)
     {
@@ -232,7 +232,7 @@ class Solarium_Query_Select_Component_DisMax extends Solarium_Query_Select_Compo
      * with the user's query to influence the score.
      *
      * @param string $boostQuery
-     * @return Solarium_Query_Component_DisMax Provides fluent interface
+     * @return Solarium_Query_Select_Component_DisMax Provides fluent interface
      */
     public function setBoostQuery($boostQuery)
     {
@@ -258,7 +258,7 @@ class Solarium_Query_Select_Component_DisMax extends Solarium_Query_Select_Compo
      * Format is: "funcA(arg1,arg2)^1.2 funcB(arg3,arg4)^2.2"
      *
      * @param string $boostFunctions
-     * @return Solarium_Query_Component_DisMax Provides fluent interface
+     * @return Solarium_Query_Select_Component_DisMax Provides fluent interface
      */
     public function setBoostFunctions($boostFunctions)
     {

library/Solarium/Query/Select/Component/Highlighting.php

@@ -66,7 +66,7 @@ class Solarium_Query_Select_Component_Highlighting extends Solarium_Query_Select
      * Separate multiple fields with commas.
      *
      * @param string $fields
-     * @return Solarium_Query_Component_Highlighting Provides fluent interface
+     * @return Solarium_Query_Select_Component_Highlighting Provides fluent interface
      */
     public function setFields($fields)
     {
@@ -89,7 +89,7 @@ class Solarium_Query_Select_Component_Highlighting extends Solarium_Query_Select
      * Maximum number of snippets per field
      *
      * @param int $maximum
-     * @return Solarium_Query_Component_Highlighting Provides fluent interface
+     * @return Solarium_Query_Select_Component_Highlighting Provides fluent interface
      */
     public function setSnippets($maximum)
     {
@@ -112,7 +112,7 @@ class Solarium_Query_Select_Component_Highlighting extends Solarium_Query_Select
      * The size, in characters, of fragments to consider for highlighting
      *
      * @param int $size
-     * @return Solarium_Query_Component_Highlighting Provides fluent interface
+     * @return Solarium_Query_Select_Component_Highlighting Provides fluent interface
      */
     public function setFragSize($size)
     {
@@ -135,7 +135,7 @@ class Solarium_Query_Select_Component_Highlighting extends Solarium_Query_Select
      * Collapse contiguous fragments into a single fragment
      *
      * @param boolean $merge
-     * @return Solarium_Query_Component_Highlighting Provides fluent interface
+     * @return Solarium_Query_Select_Component_Highlighting Provides fluent interface
      */
     public function setMergeContiguous($merge)
     {
@@ -156,7 +156,7 @@ class Solarium_Query_Select_Component_Highlighting extends Solarium_Query_Select
      * Set requireFieldMatch option
      *
      * @param boolean $require
-     * @return Solarium_Query_Component_Highlighting Provides fluent interface
+     * @return Solarium_Query_Select_Component_Highlighting Provides fluent interface
      */
     public function setRequireFieldMatch($require)
     {
@@ -179,7 +179,7 @@ class Solarium_Query_Select_Component_Highlighting extends Solarium_Query_Select
      * How many characters into a document to look for suitable snippets
      *
      * @param int $chars
-     * @return Solarium_Query_Component_Highlighting Provides fluent interface
+     * @return Solarium_Query_Select_Component_Highlighting Provides fluent interface
      */
     public function setMaxAnalyzedChars($chars)
     {
@@ -200,7 +200,7 @@ class Solarium_Query_Select_Component_Highlighting extends Solarium_Query_Select
      * Set alternatefield option
      *
      * @param string $field
-     * @return Solarium_Query_Component_Highlighting Provides fluent interface
+     * @return Solarium_Query_Select_Component_Highlighting Provides fluent interface
      */
     public function setAlternateField($field)
     {
@@ -221,7 +221,7 @@ class Solarium_Query_Select_Component_Highlighting extends Solarium_Query_Select
      * Set maxAlternateFieldLength option
      *
      * @param int $length
-     * @return Solarium_Query_Component_Highlighting Provides fluent interface
+     * @return Solarium_Query_Select_Component_Highlighting Provides fluent interface
      */
     public function setMaxAlternateFieldLength($length)
     {
@@ -242,7 +242,7 @@ class Solarium_Query_Select_Component_Highlighting extends Solarium_Query_Select
      * Set formatter option
      *
      * @param string $formatter
-     * @return Solarium_Query_Component_Highlighting Provides fluent interface
+     * @return Solarium_Query_Select_Component_Highlighting Provides fluent interface
      */
     public function setFormatter($formatter = 'simple')
     {
@@ -265,7 +265,7 @@ class Solarium_Query_Select_Component_Highlighting extends Solarium_Query_Select
      * Solr option h1.simple.pre
      *
      * @param string $prefix
-     * @return Solarium_Query_Component_Highlighting Provides fluent interface
+     * @return Solarium_Query_Select_Component_Highlighting Provides fluent interface
      */
     public function setSimplePrefix($prefix)
     {
@@ -290,7 +290,7 @@ class Solarium_Query_Select_Component_Highlighting extends Solarium_Query_Select
      * Solr option h1.simple.post
      *
      * @param string $postfix
-     * @return Solarium_Query_Component_Highlighting Provides fluent interface
+     * @return Solarium_Query_Select_Component_Highlighting Provides fluent interface
      */
     public function setSimplePostfix($postfix)
     {
@@ -315,7 +315,7 @@ class Solarium_Query_Select_Component_Highlighting extends Solarium_Query_Select
      * Use one of the constants as value.
      *
      * @param string $fragmenter
-     * @return Solarium_Query_Component_Highlighting Provides fluent interface
+     * @return Solarium_Query_Select_Component_Highlighting Provides fluent interface
      */
     public function setFragmenter($fragmenter)
     {
@@ -336,7 +336,7 @@ class Solarium_Query_Select_Component_Highlighting extends Solarium_Query_Select
      * Set fraglistbuilder option
      *
      * @param string $builder
-     * @return Solarium_Query_Component_Highlighting Provides fluent interface
+     * @return Solarium_Query_Select_Component_Highlighting Provides fluent interface
      */
     public function setFragListBuilder($builder)
     {
@@ -357,7 +357,7 @@ class Solarium_Query_Select_Component_Highlighting extends Solarium_Query_Select
      * Set fragmentsbuilder option
      *
      * @param string $builder
-     * @return Solarium_Query_Component_Highlighting Provides fluent interface
+     * @return Solarium_Query_Select_Component_Highlighting Provides fluent interface
      */
     public function setFragmentsBuilder($builder)
     {
@@ -378,7 +378,7 @@ class Solarium_Query_Select_Component_Highlighting extends Solarium_Query_Select
      * Set useFastVectorHighlighter option
      *
      * @param boolean $use
-     * @return Solarium_Query_Component_Highlighting Provides fluent interface
+     * @return Solarium_Query_Select_Component_Highlighting Provides fluent interface
      */
     public function setUseFastVectorHighlighter($use)
     {
@@ -399,7 +399,7 @@ class Solarium_Query_Select_Component_Highlighting extends Solarium_Query_Select
      * Set usePhraseHighlighter option
      *
      * @param boolean $use
-     * @return Solarium_Query_Component_Highlighting Provides fluent interface
+     * @return Solarium_Query_Select_Component_Highlighting Provides fluent interface
      */
     public function setUsePhraseHighlighter($use)
     {
@@ -420,7 +420,7 @@ class Solarium_Query_Select_Component_Highlighting extends Solarium_Query_Select
      * Set HighlightMultiTerm option
      *
      * @param boolean $highlight
-     * @return Solarium_Query_Component_Highlighting Provides fluent interface
+     * @return Solarium_Query_Select_Component_Highlighting Provides fluent interface
      */
     public function setHighlightMultiTerm($highlight)
     {
@@ -441,7 +441,7 @@ class Solarium_Query_Select_Component_Highlighting extends Solarium_Query_Select
      * Set RegexSlop option
      *
      * @param float $slop
-     * @return Solarium_Query_Component_Highlighting Provides fluent interface
+     * @return Solarium_Query_Select_Component_Highlighting Provides fluent interface
      */
     public function setRegexSlop($slop)
     {
@@ -462,7 +462,7 @@ class Solarium_Query_Select_Component_Highlighting extends Solarium_Query_Select
      * Set RegexPattern option
      *
      * @param string $pattern
-     * @return Solarium_Query_Component_Highlighting Provides fluent interface
+     * @return Solarium_Query_Select_Component_Highlighting Provides fluent interface
      */
     public function setRegexPattern($pattern)
     {
@@ -483,7 +483,7 @@ class Solarium_Query_Select_Component_Highlighting extends Solarium_Query_Select
      * Set RegexMaxAnalyzedChars option
      *
      * @param int $chars
-     * @return Solarium_Query_Component_Highlighting Provides fluent interface
+     * @return Solarium_Query_Select_Component_Highlighting Provides fluent interface
      */
     public function setRegexMaxAnalyzedChars($chars)
     {

library/Solarium/Query/Select/Component/MoreLikeThis.php

@@ -62,7 +62,7 @@ class Solarium_Query_Select_Component_MoreLikeThis extends Solarium_Query_Select
      * Separate multiple fields with commas.
      *
      * @param string $fields
-     * @return Solarium_Query_Component_MoreLikeThis Provides fluent interface
+     * @return Solarium_Query_Select_Component_MoreLikeThis Provides fluent interface
      */
     public function setFields($fields)
     {
@@ -86,7 +86,7 @@ class Solarium_Query_Select_Component_MoreLikeThis extends Solarium_Query_Select
      * in the source doc.
      *
      * @param int $minimum
-     * @return Solarium_Query_Component_MoreLikeThis Provides fluent interface
+     * @return Solarium_Query_Select_Component_MoreLikeThis Provides fluent interface
      */
     public function setMinimumTermFrequency($minimum)
     {
@@ -110,7 +110,7 @@ class Solarium_Query_Select_Component_MoreLikeThis extends Solarium_Query_Select
      * ignored which do not occur in at least this many docs.
      *
      * @param int $minimum
-     * @return Solarium_Query_Component_MoreLikeThis Provides fluent interface
+     * @return Solarium_Query_Select_Component_MoreLikeThis Provides fluent interface
      */
     public function setMinimumDocumentFrequency($minimum)
     {
@@ -133,7 +133,7 @@ class Solarium_Query_Select_Component_MoreLikeThis extends Solarium_Query_Select
      * Minimum word length below which words will be ignored.
      *
      * @param int $minimum
-     * @return Solarium_Query_Component_MoreLikeThis Provides fluent interface
+     * @return Solarium_Query_Select_Component_MoreLikeThis Provides fluent interface
      */
     public function setMinimumWordLength($minimum)
     {
@@ -156,7 +156,7 @@ class Solarium_Query_Select_Component_MoreLikeThis extends Solarium_Query_Select
      * Maximum word length above which words will be ignored.
      *
      * @param int $maximum
-     * @return Solarium_Query_Component_MoreLikeThis Provides fluent interface
+     * @return Solarium_Query_Select_Component_MoreLikeThis Provides fluent interface
      */
     public function setMaximumWordLength($maximum)
     {
@@ -180,7 +180,7 @@ class Solarium_Query_Select_Component_MoreLikeThis extends Solarium_Query_Select
      * query.
      *
      * @param int $maximum
-     * @return Solarium_Query_Component_MoreLikeThis Provides fluent interface
+     * @return Solarium_Query_Select_Component_MoreLikeThis Provides fluent interface
      */
     public function setMaximumQueryTerms($maximum)
     {
@@ -204,7 +204,7 @@ class Solarium_Query_Select_Component_MoreLikeThis extends Solarium_Query_Select
      * stored with TermVector support.
      *
      * @param int $maximum
-     * @return Solarium_Query_Component_MoreLikeThis Provides fluent interface
+     * @return Solarium_Query_Select_Component_MoreLikeThis Provides fluent interface
      */
     public function setMaximumNumberOfTokens($maximum)
     {
@@ -227,7 +227,7 @@ class Solarium_Query_Select_Component_MoreLikeThis extends Solarium_Query_Select
      * If true the query will be boosted by the interesting term relevance.
      *
      * @param boolean $boost
-     * @return Solarium_Query_Component_MoreLikeThis Provides fluent interface
+     * @return Solarium_Query_Select_Component_MoreLikeThis Provides fluent interface
      */
     public function setBoost($boost)
     {
@@ -253,7 +253,7 @@ class Solarium_Query_Select_Component_MoreLikeThis extends Solarium_Query_Select
      * Separate multiple fields with commas.
      *
      * @param string $queryFields
-     * @return Solarium_Query_Component_MoreLikeThis Provides fluent interface
+     * @return Solarium_Query_Select_Component_MoreLikeThis Provides fluent interface
      */
     public function setQueryFields($queryFields)
     {
@@ -276,7 +276,7 @@ class Solarium_Query_Select_Component_MoreLikeThis extends Solarium_Query_Select
      * The number of similar documents to return for each result
      *
      * @param int $count
-     * @return Solarium_Query_Component_MoreLikeThis Provides fluent interface
+     * @return Solarium_Query_Select_Component_MoreLikeThis Provides fluent interface
      */
     public function setCount($count)
     {

library/Solarium/Result/Ping.php

+<?php
+/**
+ * Copyright 2011 Bas de Nooijer. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this listof conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation are
+ * those of the authors and should not be interpreted as representing official
+ * policies, either expressed or implied, of the copyright holder.
+ *
+ * @copyright Copyright 2011 Bas de Nooijer <solarium@raspberry.nl>
+ * @license http://github.com/basdenooijer/solarium/raw/master/COPYING
+ *
+ * @package Solarium
+ * @subpackage Result
+ */
+
+/**
+ * Ping query result
+ *
+ * A ping query has no useful result (other than being succesful) so this class has no api
+ *
+ * @package Solarium
+ * @subpackage Result
+ */
+class Solarium_Result_Ping
+{
+
+}
\ No newline at end of file

library/Solarium/Result/Select.php

@@ -214,7 +214,7 @@ class Solarium_Result_Select extends Solarium_Result_QueryType
      *
      * This is a convenience method that maps presets to getComponent
      *
-     * @return Solarium_Result_Select_Component_MoreLikeThis
+     * @return Solarium_Result_Select_MoreLikeThis
      */
     public function getMoreLikeThis()
     {
@@ -226,7 +226,7 @@ class Solarium_Result_Select extends Solarium_Result_QueryType
      *
      * This is a convenience method that maps presets to getComponent
      *
-     * @return Solarium_Result_Select_Component_Highlighting
+     * @return Solarium_Result_Select_Highlighting
      */
     public function getHighlighting()
     {
@@ -238,7 +238,7 @@ class Solarium_Result_Select extends Solarium_Result_QueryType
      *
      * This is a convenience method that maps presets to getComponent
      *
-     * @return Solarium_Result_Select_Component_FacetSet
+     * @return Solarium_Result_Select_FacetSet
      */
     public function getFacetSet()
     {

tests/Solarium/Client/Adapter/HttpTest.php

@@ -59,11 +59,21 @@ class Solarium_Client_Adapter_HttpTest extends PHPUnit_Framework_TestCase
 
     public function testExecuteErrorResponse()
     {
+        $data = 'test123';
+
         $request = new Solarium_Client_Request();
 
-        $this->setExpectedException('Solarium_Client_HttpException');
-        $this->_adapter->execute($request);
+        $mock = $this->getMock('Solarium_Client_Adapter_Http', array('_getData','check'));
+        $mock->expects($this->once())
+             ->method('_getData')
+             ->with($this->equalTo('http://127.0.0.1:8983/solr/?'), $this->isType('resource'))
+             ->will($this->returnValue(array($data, array('HTTP 1.1 200 OK'))));
+        $mock->expects($this->once())
+             ->method('check')
+             ->will($this->throwException(new Solarium_Client_HttpException("HTTP request failed")));
 
+        $this->setExpectedException('Solarium_Client_HttpException');
+        $mock->execute($request);
     }
 
     public function testCheckError()