Commit dde0171e authored by Bas de Nooijer's avatar Bas de Nooijer

small fixes

parent c37e459b
...@@ -407,7 +407,7 @@ class Client extends Configurable ...@@ -407,7 +407,7 @@ class Client extends Configurable
* If an adapter instance is passed it will replace the current adapter * If an adapter instance is passed it will replace the current adapter
* immediately, bypassing the lazy loading. * immediately, bypassing the lazy loading.
* *
* @param string|AdapterInterface $adapter * @param string|Adapter\AdapterInterface $adapter
* @return self Provides fluent interface * @return self Provides fluent interface
*/ */
public function setAdapter($adapter) public function setAdapter($adapter)
...@@ -415,7 +415,7 @@ class Client extends Configurable ...@@ -415,7 +415,7 @@ class Client extends Configurable
if (is_string($adapter)) { if (is_string($adapter)) {
$this->adapter = null; $this->adapter = null;
return $this->setOption('adapter', $adapter); return $this->setOption('adapter', $adapter);
} else if($adapter instanceof AdapterInterface) { } else if ($adapter instanceof AdapterInterface) {
// forward options // forward options
$adapter->setOptions($this->options); $adapter->setOptions($this->options);
// overwrite existing adapter // overwrite existing adapter
...@@ -460,7 +460,7 @@ class Client extends Configurable ...@@ -460,7 +460,7 @@ class Client extends Configurable
* calling {@see createAdapter()} * calling {@see createAdapter()}
* *
* @param boolean $autoload * @param boolean $autoload
* @return Adapter\Adapter * @return Adapter\AdapterInterface
*/ */
public function getAdapter($autoload = true) public function getAdapter($autoload = true)
{ {
...@@ -529,7 +529,7 @@ class Client extends Configurable ...@@ -529,7 +529,7 @@ class Client extends Configurable
* or a manual require. * or a manual require.
* *
* @param string $key * @param string $key
* @param string|Plugin $plugin * @param string|\Solarium\Core\Plugin $plugin
* @param array $options * @param array $options
* @return self Provides fluent interface * @return self Provides fluent interface
*/ */
...@@ -590,7 +590,7 @@ class Client extends Configurable ...@@ -590,7 +590,7 @@ class Client extends Configurable
* *
* @param string $key * @param string $key
* @param boolean $autocreate * @param boolean $autocreate
* @return Plugin|null * @return \Solarium\Core\Plugin|null
*/ */
public function getPlugin($key, $autocreate = true) public function getPlugin($key, $autocreate = true)
{ {
...@@ -613,7 +613,7 @@ class Client extends Configurable ...@@ -613,7 +613,7 @@ class Client extends Configurable
* *
* You can remove a plugin by passing the plugin key, or the plugin instance * You can remove a plugin by passing the plugin key, or the plugin instance
* *
* @param string|Plugin $plugin * @param string|\Solarium\Core\Plugin $plugin
* @return self Provides fluent interface * @return self Provides fluent interface
*/ */
public function removePlugin($plugin) public function removePlugin($plugin)
...@@ -792,9 +792,9 @@ class Client extends Configurable ...@@ -792,9 +792,9 @@ class Client extends Configurable
* @internal This is a convenience method that forwards the query to the * @internal This is a convenience method that forwards the query to the
* execute method, thus allowing for an easy to use and clean API. * execute method, thus allowing for an easy to use and clean API.
* *
* @param Solarium\Query\Ping\Query $query * @param \Solarium\Query\Ping\Query $query
* @param Endpoint|string|null * @param Endpoint|string|null
* @return Solarium\Query\Ping\Result * @return \Solarium\Query\Ping\Result
*/ */
public function ping(QueryInterface $query, $endpoint = null) public function ping(QueryInterface $query, $endpoint = null)
{ {
...@@ -818,9 +818,9 @@ class Client extends Configurable ...@@ -818,9 +818,9 @@ class Client extends Configurable
* @internal This is a convenience method that forwards the query to the * @internal This is a convenience method that forwards the query to the
* execute method, thus allowing for an easy to use and clean API. * execute method, thus allowing for an easy to use and clean API.
* *
* @param Solarium\Query\Update\Query $query * @param \Solarium\Query\Update\Query\Query $query
* @param Endpoint|string|null * @param Endpoint|string|null
* @return Solarium\Query\Update\Result * @return \Solarium\Query\Update\Result
*/ */
public function update(QueryInterface $query, $endpoint = null) public function update(QueryInterface $query, $endpoint = null)
{ {
...@@ -843,9 +843,9 @@ class Client extends Configurable ...@@ -843,9 +843,9 @@ class Client extends Configurable
* @internal This is a convenience method that forwards the query to the * @internal This is a convenience method that forwards the query to the
* execute method, thus allowing for an easy to use and clean API. * execute method, thus allowing for an easy to use and clean API.
* *
* @param Solarium\Query\Query\Select\Query $query * @param \Solarium\Query\Select\Query\Query $query
* @param Endpoint|string|null * @param Endpoint|string|null
* @return Solarium\Query\Result\Select\Result * @return \Solarium\Query\Select\Result\Result
*/ */
public function select(QueryInterface $query, $endpoint = null) public function select(QueryInterface $query, $endpoint = null)
{ {
...@@ -868,9 +868,9 @@ class Client extends Configurable ...@@ -868,9 +868,9 @@ class Client extends Configurable
* @internal This is a convenience method that forwards the query to the * @internal This is a convenience method that forwards the query to the
* execute method, thus allowing for an easy to use and clean API. * execute method, thus allowing for an easy to use and clean API.
* *
* @param Solarium\Query\MoreLikeThis\Query $query * @param \Solarium\Query\MoreLikeThis\Query $query
* @param Endpoint * @param Endpoint
* @return Solarium\Query\MoreLikeThis\Result * @return \Solarium\Query\MoreLikeThis\Result
*/ */
public function moreLikeThis(QueryInterface $query, $endpoint = null) public function moreLikeThis(QueryInterface $query, $endpoint = null)
{ {
...@@ -883,9 +883,9 @@ class Client extends Configurable ...@@ -883,9 +883,9 @@ class Client extends Configurable
* @internal This is a convenience method that forwards the query to the * @internal This is a convenience method that forwards the query to the
* execute method, thus allowing for an easy to use and clean API. * execute method, thus allowing for an easy to use and clean API.
* *
* @param Solarium\Query\Analysis\Query\Document|Solarium\Query\Analysis\Query\Field $query * @param \Solarium\Query\Analysis\Query\Document|\Solarium\Query\Analysis\Query\Field $query
* @param Endpoint * @param Endpoint
* @return Solarium\Query\Analysis\Result\Document|Solarium\Query\Analysis\Result\Field * @return \Solarium\Query\Analysis\Result\Document|\Solarium\Query\Analysis\Result\Field
*/ */
public function analyze(QueryInterface $query, $endpoint = null) public function analyze(QueryInterface $query, $endpoint = null)
{ {
...@@ -898,9 +898,9 @@ class Client extends Configurable ...@@ -898,9 +898,9 @@ class Client extends Configurable
* @internal This is a convenience method that forwards the query to the * @internal This is a convenience method that forwards the query to the
* execute method, thus allowing for an easy to use and clean API. * execute method, thus allowing for an easy to use and clean API.
* *
* @param Solarium\Query\Terms\Query $query * @param \Solarium\Query\Terms\Query $query
* @param Endpoint|string|null * @param Endpoint|string|null
* @return Solarium\Query\Terms\Result * @return \Solarium\Query\Terms\Result
*/ */
public function terms(QueryInterface $query, $endpoint = null) public function terms(QueryInterface $query, $endpoint = null)
{ {
...@@ -913,9 +913,9 @@ class Client extends Configurable ...@@ -913,9 +913,9 @@ class Client extends Configurable
* @internal This is a convenience method that forwards the query to the * @internal This is a convenience method that forwards the query to the
* execute method, thus allowing for an easy to use and clean API. * execute method, thus allowing for an easy to use and clean API.
* *
* @param Solarium\Query\Suggester\Query $query * @param \Solarium\Query\Suggester\Query $query
* @param Endpoint|string|null * @param Endpoint|string|null
* @return Solarium\Query\Suggester\Result * @return \Solarium\Query\Suggester\Result\Result
*/ */
public function suggester(QueryInterface $query, $endpoint = null) public function suggester(QueryInterface $query, $endpoint = null)
{ {
...@@ -927,7 +927,7 @@ class Client extends Configurable ...@@ -927,7 +927,7 @@ class Client extends Configurable
* *
* @param string $type * @param string $type
* @param array $options * @param array $options
* @return Solarium\Query * @return \Solarium\Core\Query\Query
*/ */
public function createQuery($type, $options = null) public function createQuery($type, $options = null)
{ {
...@@ -958,7 +958,7 @@ class Client extends Configurable ...@@ -958,7 +958,7 @@ class Client extends Configurable
* Create a select query instance * Create a select query instance
* *
* @param mixed $options * @param mixed $options
* @return Solarium\Query\Select\Query\Query * @return \Solarium\Query\Select\Query\Query
*/ */
public function createSelect($options = null) public function createSelect($options = null)
{ {
...@@ -969,7 +969,7 @@ class Client extends Configurable ...@@ -969,7 +969,7 @@ class Client extends Configurable
* Create a MoreLikeThis query instance * Create a MoreLikeThis query instance
* *
* @param mixed $options * @param mixed $options
* @return Solarium\Query\MorelikeThis\Query * @return \Solarium\Query\MorelikeThis\Query
*/ */
public function createMoreLikeThis($options = null) public function createMoreLikeThis($options = null)
{ {
...@@ -980,7 +980,7 @@ class Client extends Configurable ...@@ -980,7 +980,7 @@ class Client extends Configurable
* Create an update query instance * Create an update query instance
* *
* @param mixed $options * @param mixed $options
* @return Solarium\Query\Update\Query * @return \Solarium\Query\Update\Query\Query
*/ */
public function createUpdate($options = null) public function createUpdate($options = null)
{ {
...@@ -991,7 +991,7 @@ class Client extends Configurable ...@@ -991,7 +991,7 @@ class Client extends Configurable
* Create a ping query instance * Create a ping query instance
* *
* @param mixed $options * @param mixed $options
* @return Solarium\Query\Ping\Query * @return \Solarium\Query\Ping\Query
*/ */
public function createPing($options = null) public function createPing($options = null)
{ {
...@@ -1002,7 +1002,7 @@ class Client extends Configurable ...@@ -1002,7 +1002,7 @@ class Client extends Configurable
* Create an analysis field query instance * Create an analysis field query instance
* *
* @param mixed $options * @param mixed $options
* @return Solarium\Query\Analysis\Query\Field * @return \Solarium\Query\Analysis\Query\Field
*/ */
public function createAnalysisField($options = null) public function createAnalysisField($options = null)
{ {
...@@ -1013,7 +1013,7 @@ class Client extends Configurable ...@@ -1013,7 +1013,7 @@ class Client extends Configurable
* Create an analysis document query instance * Create an analysis document query instance
* *
* @param mixed $options * @param mixed $options
* @return Solarium\Query\Analysis\Query\Document * @return \Solarium\Query\Analysis\Query\Document
*/ */
public function createAnalysisDocument($options = null) public function createAnalysisDocument($options = null)
{ {
...@@ -1024,7 +1024,7 @@ class Client extends Configurable ...@@ -1024,7 +1024,7 @@ class Client extends Configurable
* Create a terms query instance * Create a terms query instance
* *
* @param mixed $options * @param mixed $options
* @return Solarium\Query\Terms\Query * @return \Solarium\Query\Terms\Query
*/ */
public function createTerms($options = null) public function createTerms($options = null)
{ {
...@@ -1035,7 +1035,7 @@ class Client extends Configurable ...@@ -1035,7 +1035,7 @@ class Client extends Configurable
* Create a suggester query instance * Create a suggester query instance
* *
* @param mixed $options * @param mixed $options
* @return Solarium\Query\Suggester\Query * @return \Solarium\Query\Suggester\Query
*/ */
public function createSuggester($options = null) public function createSuggester($options = null)
{ {
......
...@@ -314,7 +314,7 @@ class Helper ...@@ -314,7 +314,7 @@ class Helper
} }
$output = '{!'.$name; $output = '{!'.$name;
foreach ($params as $key=>$value) { foreach ($params as $key => $value) {
$output .= ' ' . $key . '=' . $value; $output .= ' ' . $key . '=' . $value;
} }
$output .= '}'; $output .= '}';
......
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