Commit 260818e4 authored by Simon Mönch's avatar Simon Mönch

PSR-2 fixes

parent 6123e8d2
...@@ -40,7 +40,6 @@ namespace Solarium\Core\Plugin; ...@@ -40,7 +40,6 @@ namespace Solarium\Core\Plugin;
use Solarium\Core\Client\Client; use Solarium\Core\Client\Client;
use Solarium\Core\Configurable; use Solarium\Core\Configurable;
use Solarium\Core\Query\Query;
/** /**
* Base class for plugins * Base class for plugins
......
...@@ -40,7 +40,6 @@ namespace Solarium\Core\Plugin; ...@@ -40,7 +40,6 @@ namespace Solarium\Core\Plugin;
use Solarium\Core\ConfigurableInterface; use Solarium\Core\ConfigurableInterface;
use Solarium\Core\Client\Client; use Solarium\Core\Client\Client;
use Solarium\Core\Query\Query;
/** /**
* Interface for plugins * Interface for plugins
......
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
*/ */
namespace Solarium\Core\Query; namespace Solarium\Core\Query;
use Solarium\Core\Query\Query;
use Solarium\Exception\InvalidArgumentException; use Solarium\Exception\InvalidArgumentException;
/** /**
...@@ -346,6 +345,7 @@ class Helper ...@@ -346,6 +345,7 @@ class Helper
foreach ($params as $key => $value) { foreach ($params as $key => $value) {
$this->query->addParam($key, $value); $this->query->addParam($key, $value);
} }
return $name . '()'; return $name . '()';
} else { } else {
return $name . '(' . implode($params, ',') . ')'; return $name . '(' . implode($params, ',') . ')';
......
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
*/ */
namespace Solarium\Core\Query; namespace Solarium\Core\Query;
use Solarium\Core\Query\Helper;
use Solarium\Core\Configurable; use Solarium\Core\Configurable;
/** /**
......
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
*/ */
namespace Solarium\Core\Query; namespace Solarium\Core\Query;
use Solarium\Core\Query\Helper;
use Solarium\Core\ConfigurableInterface; use Solarium\Core\ConfigurableInterface;
/** /**
......
...@@ -38,9 +38,7 @@ ...@@ -38,9 +38,7 @@
*/ */
namespace Solarium\Core\Query; namespace Solarium\Core\Query;
use Solarium\Core\Query\Query;
use Solarium\Core\Client\Request; use Solarium\Core\Client\Request;
use Solarium\Core\Query\QueryInterface;
/** /**
* Class for building Solarium client requests * Class for building Solarium client requests
......
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
*/ */
namespace Solarium\Core\Query; namespace Solarium\Core\Query;
use Solarium\Core\Query\QueryInterface;
use Solarium\Core\Client\Request; use Solarium\Core\Client\Request;
/** /**
......
...@@ -111,6 +111,7 @@ class BufferedAdd extends Plugin ...@@ -111,6 +111,7 @@ class BufferedAdd extends Plugin
public function setEndpoint($endpoint) public function setEndpoint($endpoint)
{ {
$this->endpoint = $endpoint; $this->endpoint = $endpoint;
return $this; return $this;
} }
......
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
namespace Solarium\QueryType\Analysis\Result; namespace Solarium\QueryType\Analysis\Result;
use Solarium\Core\Query\Result\QueryType as BaseResult; use Solarium\Core\Query\Result\QueryType as BaseResult;
use Solarium\QueryType\Analysis\Result\ResultList;
/** /**
* Analysis document query result * Analysis document query result
......
...@@ -42,7 +42,6 @@ namespace Solarium\QueryType\MoreLikeThis; ...@@ -42,7 +42,6 @@ namespace Solarium\QueryType\MoreLikeThis;
use Solarium\QueryType\Select\Result\Document as ReadOnlyDocument; use Solarium\QueryType\Select\Result\Document as ReadOnlyDocument;
use Solarium\QueryType\Select\Result\Result as SelectResult; use Solarium\QueryType\Select\Result\Result as SelectResult;
use Solarium\Exception\UnexpectedValueException; use Solarium\Exception\UnexpectedValueException;
use Solarium\QueryType\MoreLikeThis\Query;
/** /**
* MoreLikeThis query result * MoreLikeThis query result
......
...@@ -56,6 +56,7 @@ class Result extends BaseResult implements \IteratorAggregate, \Countable ...@@ -56,6 +56,7 @@ class Result extends BaseResult implements \IteratorAggregate, \Countable
public function getDocument() public function getDocument()
{ {
$docs = $this->getDocuments(); $docs = $this->getDocuments();
return reset($docs); return reset($docs);
} }
} }
...@@ -97,7 +97,6 @@ class Pivot extends Facet ...@@ -97,7 +97,6 @@ class Pivot extends Facet
return $this->getOption('mincount'); return $this->getOption('mincount');
} }
/** /**
* Specify a field to return in the resultset * Specify a field to return in the resultset
* *
......
...@@ -373,7 +373,6 @@ class Spellcheck extends Component ...@@ -373,7 +373,6 @@ class Spellcheck extends Component
return $this->getOption('accuracy'); return $this->getOption('accuracy');
} }
/** /**
* Set a collation param * Set a collation param
* @param string $param * @param string $param
...@@ -383,6 +382,7 @@ class Spellcheck extends Component ...@@ -383,6 +382,7 @@ class Spellcheck extends Component
public function setCollateParam($param, $value) public function setCollateParam($param, $value)
{ {
$this->collateParams[$param] = $value; $this->collateParams[$param] = $value;
return $this; return $this;
} }
......
...@@ -38,8 +38,6 @@ ...@@ -38,8 +38,6 @@
*/ */
namespace Solarium\QueryType\Select\Result\Highlighting; namespace Solarium\QueryType\Select\Result\Highlighting;
use Solarium\QueryType\Select\Result\Highlighting\Result;
/** /**
* Select component highlighting result * Select component highlighting result
*/ */
......
...@@ -38,8 +38,6 @@ ...@@ -38,8 +38,6 @@
*/ */
namespace Solarium\QueryType\Select\Result\MoreLikeThis; namespace Solarium\QueryType\Select\Result\MoreLikeThis;
use Solarium\QueryType\Select\Result\MoreLikeThis\Result;
/** /**
* Select component morelikethis result * Select component morelikethis result
*/ */
......
...@@ -40,7 +40,6 @@ namespace Solarium\QueryType\Select\Result; ...@@ -40,7 +40,6 @@ namespace Solarium\QueryType\Select\Result;
use Solarium\QueryType\Select\Query\Query as SelectQuery; use Solarium\QueryType\Select\Query\Query as SelectQuery;
use Solarium\Core\Query\Result\QueryType as BaseResult; use Solarium\Core\Query\Result\QueryType as BaseResult;
use Solarium\QueryType\Select\Result\DocumentInterface;
/** /**
* Select query result * Select query result
......
...@@ -38,9 +38,6 @@ ...@@ -38,9 +38,6 @@
*/ */
namespace Solarium\QueryType\Select\Result\Spellcheck; namespace Solarium\QueryType\Select\Result\Spellcheck;
use Solarium\QueryType\Select\Result\Spellcheck\Collation;
use Solarium\QueryType\Select\Result\Spellcheck\Suggestion;
/** /**
* Select component spellcheck result * Select component spellcheck result
*/ */
......
...@@ -38,8 +38,6 @@ ...@@ -38,8 +38,6 @@
*/ */
namespace Solarium\QueryType\Select\Result\Stats; namespace Solarium\QueryType\Select\Result\Stats;
use Solarium\QueryType\Select\Result\Stats\Result;
/** /**
* Select component stats result * Select component stats result
*/ */
......
...@@ -40,8 +40,6 @@ namespace Solarium\QueryType\Suggester; ...@@ -40,8 +40,6 @@ namespace Solarium\QueryType\Suggester;
use Solarium\Core\Query\Query as BaseQuery; use Solarium\Core\Query\Query as BaseQuery;
use Solarium\Core\Client\Client; use Solarium\Core\Client\Client;
use Solarium\QueryType\Suggester\RequestBuilder;
use Solarium\QueryType\Suggester\ResponseParser;
/** /**
* Suggester Query * Suggester Query
......
...@@ -40,8 +40,6 @@ namespace Solarium\QueryType\Terms; ...@@ -40,8 +40,6 @@ namespace Solarium\QueryType\Terms;
use Solarium\Core\Client\Client; use Solarium\Core\Client\Client;
use Solarium\Core\Query\Query as BaseQuery; use Solarium\Core\Query\Query as BaseQuery;
use Solarium\QueryType\Terms\RequestBuilder;
use Solarium\QueryType\Terms\ResponseParser;
/** /**
* Terms query * Terms query
......
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
*/ */
namespace Solarium\QueryType\Terms; namespace Solarium\QueryType\Terms;
use Solarium\QueryType\Terms\Query;
use Solarium\Core\Query\ResponseParser as ResponseParserAbstract; use Solarium\Core\Query\ResponseParser as ResponseParserAbstract;
use Solarium\Core\Query\ResponseParserInterface as ResponseParserInterface; use Solarium\Core\Query\ResponseParserInterface as ResponseParserInterface;
......
...@@ -356,6 +356,7 @@ class Document extends AbstractDocument implements DocumentInterface ...@@ -356,6 +356,7 @@ class Document extends AbstractDocument implements DocumentInterface
if ($value !== null) { if ($value !== null) {
$this->addField($key, $value); $this->addField($key, $value);
} }
return $this; return $this;
} }
...@@ -373,6 +374,7 @@ class Document extends AbstractDocument implements DocumentInterface ...@@ -373,6 +374,7 @@ class Document extends AbstractDocument implements DocumentInterface
throw new RuntimeException('Attempt to set an atomic update modifier that is not supported'); throw new RuntimeException('Attempt to set an atomic update modifier that is not supported');
} }
$this->modifiers[$key] = $modifier; $this->modifiers[$key] = $modifier;
return $this; return $this;
} }
...@@ -415,6 +417,7 @@ class Document extends AbstractDocument implements DocumentInterface ...@@ -415,6 +417,7 @@ class Document extends AbstractDocument implements DocumentInterface
public function setVersion($version) public function setVersion($version)
{ {
$this->version = $version; $this->version = $version;
return $this; return $this;
} }
......
...@@ -488,6 +488,7 @@ class Query extends BaseQuery ...@@ -488,6 +488,7 @@ class Query extends BaseQuery
public function createDocument($fields = array(), $boosts = array(), $modifiers = array()) public function createDocument($fields = array(), $boosts = array(), $modifiers = array())
{ {
$class = $this->getDocumentClass(); $class = $this->getDocumentClass();
return new $class($fields, $boosts, $modifiers); return new $class($fields, $boosts, $modifiers);
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment