Merge branch 'psr-2-fixes' of github.com:smoench/solarium into develop

Conflicts:
	library/Solarium/Plugin/BufferedAdd/BufferedAdd.php

library/Solarium/Core/Plugin/Plugin.php

@@ -40,7 +40,6 @@ namespace Solarium\Core\Plugin;
 
 use Solarium\Core\Client\Client;
 use Solarium\Core\Configurable;
-use Solarium\Core\Query\Query;
 
 /**
  * Base class for plugins

library/Solarium/Core/Plugin/PluginInterface.php

@@ -40,7 +40,6 @@ namespace Solarium\Core\Plugin;
 
 use Solarium\Core\ConfigurableInterface;
 use Solarium\Core\Client\Client;
-use Solarium\Core\Query\Query;
 
 /**
  * Interface for plugins

library/Solarium/Core/Query/Helper.php

@@ -38,7 +38,6 @@
  */
 namespace Solarium\Core\Query;
 
-use Solarium\Core\Query\Query;
 use Solarium\Exception\InvalidArgumentException;
 
 /**
@@ -358,6 +357,7 @@ class Helper
             foreach ($params as $key => $value) {
                 $this->query->addParam($key, $value);
             }
+
             return $name . '()';
         } else {
             return $name . '(' . implode($params, ',') . ')';

library/Solarium/Core/Query/Query.php

@@ -38,7 +38,6 @@
  */
 namespace Solarium\Core\Query;
 
-use Solarium\Core\Query\Helper;
 use Solarium\Core\Configurable;
 
 /**

library/Solarium/Core/Query/QueryInterface.php

@@ -38,7 +38,6 @@
  */
 namespace Solarium\Core\Query;
 
-use Solarium\Core\Query\Helper;
 use Solarium\Core\ConfigurableInterface;
 
 /**

library/Solarium/Core/Query/RequestBuilder.php

@@ -38,9 +38,7 @@
  */
 namespace Solarium\Core\Query;
 
-use Solarium\Core\Query\Query;
 use Solarium\Core\Client\Request;
-use Solarium\Core\Query\QueryInterface;
 
 /**
  * Class for building Solarium client requests

library/Solarium/Core/Query/RequestBuilderInterface.php

@@ -38,7 +38,6 @@
  */
 namespace Solarium\Core\Query;
 
-use Solarium\Core\Query\QueryInterface;
 use Solarium\Core\Client\Request;
 
 /**

library/Solarium/QueryType/Analysis/Result/Document.php

@@ -39,7 +39,6 @@
 namespace Solarium\QueryType\Analysis\Result;
 
 use Solarium\Core\Query\Result\QueryType as BaseResult;
-use Solarium\QueryType\Analysis\Result\ResultList;
 
 /**
  * Analysis document query result

library/Solarium/QueryType/MoreLikeThis/Result.php

@@ -42,7 +42,6 @@ namespace Solarium\QueryType\MoreLikeThis;
 use Solarium\QueryType\Select\Result\Document as ReadOnlyDocument;
 use Solarium\QueryType\Select\Result\Result as SelectResult;
 use Solarium\Exception\UnexpectedValueException;
-use Solarium\QueryType\MoreLikeThis\Query;
 
 /**
  * MoreLikeThis query result

library/Solarium/QueryType/RealtimeGet/Result.php

@@ -56,6 +56,7 @@ class Result extends BaseResult implements \IteratorAggregate, \Countable
     public function getDocument()
     {
         $docs = $this->getDocuments();
+
         return reset($docs);
     }
 }

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

@@ -97,7 +97,6 @@ class Pivot extends Facet
         return $this->getOption('mincount');
     }
 
-
     /**
      * Specify a field to return in the resultset
      *

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

@@ -373,7 +373,6 @@ class Spellcheck extends Component
         return $this->getOption('accuracy');
     }
 
-
     /**
      * Set a collation param
      * @param  string $param
@@ -383,6 +382,7 @@ class Spellcheck extends Component
     public function setCollateParam($param, $value)
     {
         $this->collateParams[$param] = $value;
+
         return $this;
     }
 

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

@@ -52,13 +52,6 @@ class Field extends Configurable
      */
     protected $facets = array();
 
-    /**
-     * Exclude tags for this stat
-     *
-     * @var array
-     */
-    protected $excludes = array();
-
     /**
      * Initialize options
      *
@@ -74,13 +67,6 @@ class Field extends Configurable
                 case 'facet':
                     $this->setFacets($value);
                     break;
-                case 'exclude':
-                    if (!is_array($value)) {
-                        $value = array($value);
-                    }
-                    $this->setExcludes($value);
-                    unset($this->options['exclude']);
-                    break;
             }
         }
     }
@@ -193,83 +179,4 @@ class Field extends Configurable
 
         return $this;
     }
-
-
-    /**
-     * Add an exclude tag
-     *
-     * @param  string $tag
-     * @return self   Provides fluent interface
-     */
-    public function addExclude($tag)
-    {
-        $this->excludes[$tag] = true;
-
-        return $this;
-    }
-
-    /**
-     * Add multiple exclude tags
-     *
-     * @param  array $excludes
-     * @return self  Provides fluent interface
-     */
-    public function addExcludes(array $excludes)
-    {
-        foreach ($excludes as $exclude) {
-            $this->addExclude($exclude);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get all excludes
-     *
-     * @return array
-     */
-    public function getExcludes()
-    {
-        return array_keys($this->excludes);
-    }
-
-    /**
-     * Remove a single exclude tag
-     *
-     * @param  string $exclude
-     * @return self   Provides fluent interface
-     */
-    public function removeExclude($exclude)
-    {
-        if (isset($this->excludes[$exclude])) {
-            unset($this->excludes[$exclude]);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Remove all excludes
-     *
-     * @return self Provides fluent interface
-     */
-    public function clearExcludes()
-    {
-        $this->excludes = array();
-
-        return $this;
-    }
-
-    /**
-     * Set multiple excludes
-     *
-     * This overwrites any existing excludes
-     *
-     * @param array $excludes
-     */
-    public function setExcludes($excludes)
-    {
-        $this->clearExcludes();
-        $this->addExcludes($excludes);
-    }
 }

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

@@ -40,12 +40,11 @@ namespace Solarium\QueryType\Select\RequestBuilder\Component;
 
 use Solarium\QueryType\Select\Query\Component\Stats\Stats as StatsComponent;
 use Solarium\Core\Client\Request;
-use Solarium\Core\Query\RequestBuilder;
 
 /**
  * Add select component stats to the request
  */
-class Stats extends RequestBuilder
+class Stats implements ComponentRequestBuilderInterface
 {
     /**
      * Add request settings for the stats component
@@ -62,12 +61,7 @@ class Stats extends RequestBuilder
         // add fields
         foreach ($component->getFields() as $field) {
 
-            $value = $this->renderLocalParams(
-                $field->getKey(),
-                array('ex' => $field->getExcludes())
-            );
-
-            $request->addParam('stats.field', $value);
+            $request->addParam('stats.field', $field->getKey());
 
             // add field specific facet stats
             foreach ($field->getFacets() as $facet) {

library/Solarium/QueryType/Select/Result/Highlighting/Highlighting.php

@@ -38,8 +38,6 @@
  */
 namespace Solarium\QueryType\Select\Result\Highlighting;
 
-use Solarium\QueryType\Select\Result\Highlighting\Result;
-
 /**
  * Select component highlighting result
  */

library/Solarium/QueryType/Select/Result/MoreLikeThis/MoreLikeThis.php

@@ -38,8 +38,6 @@
  */
 namespace Solarium\QueryType\Select\Result\MoreLikeThis;
 
-use Solarium\QueryType\Select\Result\MoreLikeThis\Result;
-
 /**
  * Select component morelikethis result
  */

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

@@ -40,7 +40,6 @@ namespace Solarium\QueryType\Select\Result;
 
 use Solarium\QueryType\Select\Query\Query as SelectQuery;
 use Solarium\Core\Query\Result\QueryType as BaseResult;
-use Solarium\QueryType\Select\Result\DocumentInterface;
 
 /**
  * Select query result

library/Solarium/QueryType/Select/Result/Spellcheck/Result.php

@@ -38,9 +38,6 @@
  */
 namespace Solarium\QueryType\Select\Result\Spellcheck;
 
-use Solarium\QueryType\Select\Result\Spellcheck\Collation;
-use Solarium\QueryType\Select\Result\Spellcheck\Suggestion;
-
 /**
  * Select component spellcheck result
  */

library/Solarium/QueryType/Select/Result/Stats/Stats.php

@@ -38,8 +38,6 @@
  */
 namespace Solarium\QueryType\Select\Result\Stats;
 
-use Solarium\QueryType\Select\Result\Stats\Result;
-
 /**
  * Select component stats result
  */

library/Solarium/QueryType/Suggester/Query.php

@@ -40,8 +40,6 @@ namespace Solarium\QueryType\Suggester;
 
 use Solarium\Core\Query\Query as BaseQuery;
 use Solarium\Core\Client\Client;
-use Solarium\QueryType\Suggester\RequestBuilder;
-use Solarium\QueryType\Suggester\ResponseParser;
 
 /**
  * Suggester Query

library/Solarium/QueryType/Terms/Query.php

@@ -40,8 +40,6 @@ namespace Solarium\QueryType\Terms;
 
 use Solarium\Core\Client\Client;
 use Solarium\Core\Query\Query as BaseQuery;
-use Solarium\QueryType\Terms\RequestBuilder;
-use Solarium\QueryType\Terms\ResponseParser;
 
 /**
  * Terms query

library/Solarium/QueryType/Terms/ResponseParser.php

@@ -39,7 +39,6 @@
  */
 namespace Solarium\QueryType\Terms;
 
-use Solarium\QueryType\Terms\Query;
 use Solarium\Core\Query\ResponseParser as ResponseParserAbstract;
 use Solarium\Core\Query\ResponseParserInterface as ResponseParserInterface;
 

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

@@ -381,6 +381,7 @@ class Document extends AbstractDocument implements DocumentInterface
         if ($value !== null) {
             $this->addField($key, $value);
         }
+
         return $this;
     }
 
@@ -398,6 +399,7 @@ class Document extends AbstractDocument implements DocumentInterface
             throw new RuntimeException('Attempt to set an atomic update modifier that is not supported');
         }
         $this->modifiers[$key] = $modifier;
+
         return $this;
     }
 
@@ -440,6 +442,7 @@ class Document extends AbstractDocument implements DocumentInterface
     public function setVersion($version)
     {
         $this->version = $version;
+
         return $this;
     }
 

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

@@ -488,6 +488,7 @@ class Query extends BaseQuery
     public function createDocument($fields = array(), $boosts = array(), $modifiers = array())
     {
         $class = $this->getDocumentClass();
+
         return new $class($fields, $boosts, $modifiers);
     }
 }

tests/Solarium/Tests/QueryType/Select/Query/Component/Stats/FieldTest.php

@@ -107,37 +107,4 @@ class FieldTest extends \PHPUnit_Framework_TestCase
         $this->field->setFacets(array('facet3', 'facet4'));
         $this->assertEquals(array('facet3', 'facet4'), $this->field->getFacets());
     }
-
-    public function testAddExclude()
-    {
-        $this->field->addExclude('e1');
-        $this->assertEquals(array('e1'), $this->field->getExcludes());
-    }
-
-    public function testAddExcludes()
-    {
-        $this->field->addExcludes(array('e1', 'e2'));
-        $this->assertEquals(array('e1', 'e2'), $this->field->getExcludes());
-    }
-
-    public function testRemoveExclude()
-    {
-        $this->field->addExcludes(array('e1', 'e2'));
-        $this->field->removeExclude('e1');
-        $this->assertEquals(array('e2'), $this->field->getExcludes());
-    }
-
-    public function testClearExcludes()
-    {
-        $this->field->addExcludes(array('e1', 'e2'));
-        $this->field->clearExcludes();
-        $this->assertEquals(array(), $this->field->getExcludes());
-    }
-
-    public function testSetExcludes()
-    {
-        $this->field->addExcludes(array('e1', 'e2'));
-        $this->field->setExcludes(array('e3', 'e4'));
-        $this->assertEquals(array('e3', 'e4'), $this->field->getExcludes());
-    }
 }