merge of develop to feature/nextgen

examples/4.3-extending-usage.php

@@ -27,7 +27,7 @@ class ProductQuery extends Select{
 
 }
 
-// This query inherits all of the query params of it's parent (using parent::_init) and adds some more
+// This query inherits all of the query params of its parent (using parent::_init) and adds some more
 // Ofcourse it could also alter or remove settings
 class ProductPriceLimitedQuery extends ProductQuery{
 

examples/7.1-plugin-loadbalancer.php

@@ -26,8 +26,9 @@ for($i=1; $i<=8; $i++) {
     echo 'Server: ' . $loadbalancer->getLastEndpoint() .'<hr/>';
 }
 
-// force a server for a query (normally solr 3 is extremely unlikely based on it's weight)
+// force a server for a query (normally solr 3 is extremely unlikely based on its weight)
 $loadbalancer->setForcedEndpointForNextQuery('local3');
+
 $resultset = $client->select($query);
 echo 'Query execution with server forced to local3<br/>';
 echo 'NumFound: ' . $resultset->getNumFound(). '<br/>';
@@ -45,4 +46,4 @@ $client->ping($query);
 echo 'Non-loadbalanced ping query, should not display a loadbalancing server:<br/>';
 echo 'Ping server: ' . $loadbalancer->getLastEndpoint() .'<hr/>';
 
-htmlFooter();
+htmlFooter();
\ No newline at end of file

library/Solarium/Core/Configurable.php

@@ -80,8 +80,8 @@ class Configurable implements ConfigurableInterface
     /**
      * Set options
      *
-     * If $options is an object it will be converted into an array by called
-     * it's toArray method. This is compatible with the Zend_Config classes in
+     * If $options is an object, it will be converted into an array by calling
+     * its toArray method. This is compatible with the Zend_Config classes in
      * Zend Framework, but can also easily be implemented in any other object.
      *
      * @throws Exception

library/Solarium/Plugin/CustomizeRequest/CustomizeRequest.php

@@ -187,7 +187,7 @@ class CustomizeRequest extends Plugin
     /**
      * Remove a single Customization
      *
-     * You can remove a Customization by passing it's key, or by passing the Customization instance
+     * You can remove a Customization by passing its key, or by passing the Customization instance.
      *
      * @param  string|Customization $customization
      * @return CustomizeRequest     Provides fluent interface

library/Solarium/QueryType/Select/Query/Component/Facet/MultiQuery.php

@@ -196,7 +196,7 @@ class MultiQuery extends Facet
     /**
      * Remove a single facetquery
      *
-     * You can remove a facetquery by passing it's key or the facetquery instance
+     * You can remove a facetquery by passing its key or the facetquery instance.
      *
      * @param  string|Query $query
      * @return self         Provides fluent interface

library/Solarium/QueryType/Select/Query/Component/FacetSet.php

@@ -352,7 +352,7 @@ class FacetSet extends Component
     /**
      * Remove a single facet
      *
-     * You can remove a facet by passing it's key or the facet instance
+     * You can remove a facet by passing its key or the facet instance
      *
      * @param  string|Facet\Facet $facet
      * @return self               Provides fluent interface

library/Solarium/QueryType/Select/Query/Component/Stats/Stats.php

@@ -227,7 +227,7 @@ class Stats extends Component
     /**
      * Remove a single field
      *
-     * You can remove a field by passing it's key, or by passing the field instance
+     * You can remove a field by passing its key, or by passing the field instance
      *
      * @param  string|Field $field
      * @return self         Provides fluent interface

library/Solarium/QueryType/Select/Query/Query.php

@@ -371,6 +371,8 @@ class Query extends BaseQuery
     /**
      * Set a custom document class
      *
+     * This class should implement the document interface
+     *
      * @param  string $value classname
      * @return self   Provides fluent interface
      */
@@ -694,7 +696,7 @@ class Query extends BaseQuery
     /**
      * Remove a single filterquery
      *
-     * You can remove a filterquery by passing it's key, or by passing the filterquery instance
+     * You can remove a filterquery by passing its key, or by passing the filterquery instance
      *
      * @param  string|FilterQuery $filterQuery
      * @return self               Provides fluent interface
@@ -824,7 +826,7 @@ class Query extends BaseQuery
     /**
      * Remove a component instance
      *
-     * You can remove a component by passing it's key or the component instance
+     * You can remove a component by passing its key or the component instance.
      *
      * @param  string|Component\Component $component
      * @return self                       Provides fluent interface

library/Solarium/QueryType/Select/Result/Facet/Field.php

@@ -42,7 +42,7 @@ namespace Solarium\QueryType\Select\Result\Facet;
  * Select field facet result
  *
  * A field facet will usually return a dataset of multiple rows, in each row a
- * value and it's count. You can access the values as an array using
+ * value and its count. You can access the values as an array using
  * {@link getValues()} or iterate this object.
  */
 class Field implements \IteratorAggregate, \Countable

library/Solarium/QueryType/Select/Result/Facet/MultiQuery.php

@@ -42,7 +42,7 @@ namespace Solarium\QueryType\Select\Result\Facet;
  * Select multiquery facet result
  *
  * A multiquery facet will usually return a dataset of multiple rows, in each
- * row a query key and it's count. You can access the values as an array using
+ * row a query key and its count. You can access the values as an array using
  * {@link getValues()} or iterate this object.
  */
 class MultiQuery extends Field

library/Solarium/QueryType/Select/Result/Facet/Range.php

@@ -42,7 +42,7 @@ namespace Solarium\QueryType\Select\Result\Facet;
  * Select range facet result
  *
  * A multiquery facet will usually return a dataset of multiple count, in each
- * row a range as key and it's count. You can access the values as an array using
+ * row a range as key and its count. You can access the values as an array using
  * {@link getValues()} or iterate this object.
  *
  * The extra counts 'before', 'between' and 'after' are only available if the

library/Solarium/QueryType/Update/Query/Query.php

@@ -224,7 +224,7 @@ class Query extends BaseQuery
     /**
      * Remove a command
      *
-     * You can remove a command by passing it's key or by passing the command instance
+     * You can remove a command by passing its key or by passing the command instance.
      *
      * @param  string|Command\Command $command
      * @return self                   Provides fluent interface
@@ -439,8 +439,7 @@ class Query extends BaseQuery
    /**
     * Set a custom document class for use in the createDocument method
     *
-    * This class should extend the Document class or
-    * at least be compatible with it's interface
+    * This class should implement the document interface
     *
     * @param string $value classname
     * @return self Provides fluent interface