small fixes

yooper · Apr 14, 2012 · dde0171 · dde0171
1 parent c37e459
commit dde0171
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 30 deletions.
diff --git a/library/Solarium/Core/Client/Client.php b/library/Solarium/Core/Client/Client.php
@@ -407,15 +407,15 @@ public function setDefaultEndpoint($endpoint)
      * If an adapter instance is passed it will replace the current adapter
      * immediately, bypassing the lazy loading.
      *
-     * @param string|AdapterInterface $adapter
+     * @param string|Adapter\AdapterInterface $adapter
      * @return self Provides fluent interface
      */
     public function setAdapter($adapter)
     {
         if (is_string($adapter)) {
             $this->adapter = null;
             return $this->setOption('adapter', $adapter);
-        } else if($adapter instanceof AdapterInterface) {
+        } else if ($adapter instanceof AdapterInterface) {
             // forward options
             $adapter->setOptions($this->options);
             // overwrite existing adapter
@@ -460,7 +460,7 @@ protected function createAdapter()
      * calling {@see createAdapter()}
      *
      * @param boolean $autoload
-     * @return Adapter\Adapter
+     * @return Adapter\AdapterInterface
      */
     public function getAdapter($autoload = true)
     {
@@ -529,7 +529,7 @@ public function getQueryTypes()
      * or a manual require.
      *
      * @param string $key
-     * @param string|Plugin $plugin
+     * @param string|\Solarium\Core\Plugin $plugin
      * @param array $options
      * @return self Provides fluent interface
      */
@@ -590,7 +590,7 @@ public function getPlugins()
      *
      * @param string $key
      * @param boolean $autocreate
-     * @return Plugin|null
+     * @return \Solarium\Core\Plugin|null
      */
     public function getPlugin($key, $autocreate = true)
     {
@@ -613,7 +613,7 @@ public function getPlugin($key, $autocreate = true)
      *
      * 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
      */
     public function removePlugin($plugin)
@@ -792,9 +792,9 @@ public function executeRequest($request, $endpoint = null)
      * @internal This is a convenience method that forwards the query to the
      *  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
-     * @return Solarium\Query\Ping\Result
+     * @return \Solarium\Query\Ping\Result
      */
     public function ping(QueryInterface $query, $endpoint = null)
     {
@@ -818,9 +818,9 @@ public function ping(QueryInterface $query, $endpoint = null)
      * @internal This is a convenience method that forwards the query to the
      *  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
-     * @return Solarium\Query\Update\Result
+     * @return \Solarium\Query\Update\Result
      */
     public function update(QueryInterface $query, $endpoint = null)
     {
@@ -843,9 +843,9 @@ public function update(QueryInterface $query, $endpoint = null)
      * @internal This is a convenience method that forwards the query to the
      *  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
-     * @return Solarium\Query\Result\Select\Result
+     * @return \Solarium\Query\Select\Result\Result
      */
     public function select(QueryInterface $query, $endpoint = null)
     {
@@ -868,9 +868,9 @@ public function select(QueryInterface $query, $endpoint = null)
      * @internal This is a convenience method that forwards the query to the
      *  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
-     * @return Solarium\Query\MoreLikeThis\Result
+     * @return \Solarium\Query\MoreLikeThis\Result
      */
     public function moreLikeThis(QueryInterface $query, $endpoint = null)
     {
@@ -883,9 +883,9 @@ public function moreLikeThis(QueryInterface $query, $endpoint = null)
      * @internal This is a convenience method that forwards the query to the
      *  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
-     * @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)
     {
@@ -898,9 +898,9 @@ public function analyze(QueryInterface $query, $endpoint = null)
      * @internal This is a convenience method that forwards the query to the
      *  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
-     * @return Solarium\Query\Terms\Result
+     * @return \Solarium\Query\Terms\Result
      */
     public function terms(QueryInterface $query, $endpoint = null)
     {
@@ -913,9 +913,9 @@ public function terms(QueryInterface $query, $endpoint = null)
      * @internal This is a convenience method that forwards the query to the
      *  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
-     * @return Solarium\Query\Suggester\Result
+     * @return \Solarium\Query\Suggester\Result\Result
      */
     public function suggester(QueryInterface $query, $endpoint = null)
     {
@@ -927,7 +927,7 @@ public function suggester(QueryInterface $query, $endpoint = null)
      *
      * @param string $type
      * @param array $options
-     * @return Solarium\Query
+     * @return \Solarium\Core\Query\Query
      */
     public function createQuery($type, $options = null)
     {
@@ -958,7 +958,7 @@ public function createQuery($type, $options = null)
      * Create a select query instance
      *
      * @param mixed $options
-     * @return Solarium\Query\Select\Query\Query
+     * @return \Solarium\Query\Select\Query\Query
      */
     public function createSelect($options = null)
     {
@@ -969,7 +969,7 @@ public function createSelect($options = null)
      * Create a MoreLikeThis query instance
      *
      * @param mixed $options
-     * @return Solarium\Query\MorelikeThis\Query
+     * @return \Solarium\Query\MorelikeThis\Query
      */
     public function createMoreLikeThis($options = null)
     {
@@ -980,7 +980,7 @@ public function createMoreLikeThis($options = null)
      * Create an update query instance
      *
      * @param mixed $options
-     * @return Solarium\Query\Update\Query
+     * @return \Solarium\Query\Update\Query\Query
      */
     public function createUpdate($options = null)
     {
@@ -991,7 +991,7 @@ public function createUpdate($options = null)
      * Create a ping query instance
      *
      * @param mixed $options
-     * @return Solarium\Query\Ping\Query
+     * @return \Solarium\Query\Ping\Query
      */
     public function createPing($options = null)
     {
@@ -1002,7 +1002,7 @@ public function createPing($options = null)
      * Create an analysis field query instance
      *
      * @param mixed $options
-     * @return Solarium\Query\Analysis\Query\Field
+     * @return \Solarium\Query\Analysis\Query\Field
      */
     public function createAnalysisField($options = null)
     {
@@ -1013,7 +1013,7 @@ public function createAnalysisField($options = null)
      * Create an analysis document query instance
      *
      * @param mixed $options
-     * @return Solarium\Query\Analysis\Query\Document
+     * @return \Solarium\Query\Analysis\Query\Document
      */
     public function createAnalysisDocument($options = null)
     {
@@ -1024,7 +1024,7 @@ public function createAnalysisDocument($options = null)
      * Create a terms query instance
      *
      * @param mixed $options
-     * @return Solarium\Query\Terms\Query
+     * @return \Solarium\Query\Terms\Query
      */
     public function createTerms($options = null)
     {
@@ -1035,7 +1035,7 @@ public function createTerms($options = null)
      * Create a suggester query instance
      *
      * @param mixed $options
-     * @return Solarium\Query\Suggester\Query
+     * @return \Solarium\Query\Suggester\Query
      */
     public function createSuggester($options = null)
     {

diff --git a/library/Solarium/Core/Query/Helper.php b/library/Solarium/Core/Query/Helper.php
@@ -314,7 +314,7 @@ public function qparser($name, $params = array(), $dereferenced = false)
         }
 
         $output = '{!'.$name;
-        foreach ($params as $key=>$value) {
+        foreach ($params as $key => $value) {
             $output .= ' ' . $key . '=' . $value;
         }
         $output .= '}';