Merge pull request #764 from im-denisenko/housekeeping-part-two

Housekeeping part two
ruflin · Jan 30, 2015 · 38c441f · 38c441f
2 parents 302d023 + 6fc066a
commit 38c441f
Show file tree

Hide file tree

Showing 158 changed files with 1,263 additions and 1,322 deletions.
diff --git a/.php_cs b/.php_cs
@@ -0,0 +1,19 @@
+<?php
+
+$finder = Symfony\CS\Finder\DefaultFinder::create()
+    ->in(['lib', 'test']);
+
+$config = Symfony\CS\Config\Config::create()
+    ->setUsingCache(true)
+    ->level(Symfony\CS\FixerInterface::SYMFONY_LEVEL)
+    ->fixers([
+        // [contrib] Multi-line whitespace before closing semicolon are prohibited.
+        'multiline_spaces_before_semicolon',
+        // [contrib] There should be no blank lines before a namespace declaration.
+        'no_blank_lines_before_namespace',
+        // [contrib] Ordering use statements.
+        'ordered_use',
+    ])
+    ->finder($finder);
+
+return $config;
diff --git a/composer.json b/composer.json
@@ -18,7 +18,8 @@
     "require-dev": {
         "munkie/elasticsearch-thrift-php": "1.4.*",
         "phpunit/phpunit": "4.1.*",
-        "guzzlehttp/guzzle": "4.2.*"
+        "guzzlehttp/guzzle": "4.2.*",
+        "fabpot/php-cs-fixer": "~1.4"
     },
     "suggest": {
         "munkie/elasticsearch-thrift-php": "Allow using thrift transport",

diff --git a/lib/Elastica/Aggregation/AbstractAggregation.php b/lib/Elastica/Aggregation/AbstractAggregation.php
@@ -2,8 +2,8 @@
 
 namespace Elastica\Aggregation;
 
-use Elastica\Param;
 use Elastica\Exception\InvalidException;
+use Elastica\Param;
 
 abstract class AbstractAggregation extends Param
 {

diff --git a/lib/Elastica/Bulk.php b/lib/Elastica/Bulk.php
@@ -2,13 +2,13 @@
 
 namespace Elastica;
 
-use Elastica\Exception\Bulk\ResponseException as BulkResponseException;
-use Elastica\Exception\Bulk\UdpException;
-use Elastica\Exception\InvalidException;
 use Elastica\Bulk\Action;
 use Elastica\Bulk\Action\AbstractDocument as AbstractDocumentAction;
-use Elastica\Bulk\ResponseSet;
 use Elastica\Bulk\Response as BulkResponse;
+use Elastica\Bulk\ResponseSet;
+use Elastica\Exception\Bulk\ResponseException as BulkResponseException;
+use Elastica\Exception\Bulk\UdpException;
+use Elastica\Exception\InvalidException;
 
 class Bulk
 {

diff --git a/lib/Elastica/Bulk/Action.php b/lib/Elastica/Bulk/Action.php
@@ -3,8 +3,8 @@
 namespace Elastica\Bulk;
 
 use Elastica\Bulk;
-use Elastica\JSON;
 use Elastica\Index;
+use Elastica\JSON;
 use Elastica\Type;
 
 class Action

diff --git a/lib/Elastica/Connection/ConnectionPool.php b/lib/Elastica/Connection/ConnectionPool.php
@@ -24,7 +24,7 @@ class ConnectionPool
     /**
      * Strategy for connection
      *
-     * @var  \Elastica\Connection\Strategy\StrategyInterface
+     * @var \Elastica\Connection\Strategy\StrategyInterface
      */
     protected $_strategy;
 

diff --git a/lib/Elastica/Document.php b/lib/Elastica/Document.php
@@ -2,10 +2,10 @@
 
 namespace Elastica;
 
-use Elastica\Exception\InvalidException;
 use Elastica\Bulk\Action;
-use Elastica\Filter\Bool;
+use Elastica\Exception\InvalidException;
 use Elastica\Exception\NotImplementedException;
+use Elastica\Filter\Bool;
 
 /**
  * Single document stored in elastic search

diff --git a/lib/Elastica/Exception/Bulk/Response/ActionException.php b/lib/Elastica/Exception/Bulk/Response/ActionException.php
@@ -2,9 +2,9 @@
 
 namespace Elastica\Exception\Bulk\Response;
 
-use Elastica\Exception\BulkException;
 use Elastica\Bulk\Action;
 use Elastica\Bulk\Response;
+use Elastica\Exception\BulkException;
 
 class ActionException extends BulkException
 {

diff --git a/lib/Elastica/Facet/AbstractFacet.php b/lib/Elastica/Facet/AbstractFacet.php
@@ -2,9 +2,9 @@
 
 namespace Elastica\Facet;
 
-use Elastica\Param;
-use Elastica\Filter\AbstractFilter;
 use Elastica\Exception\InvalidException;
+use Elastica\Filter\AbstractFilter;
+use Elastica\Param;
 
 /**
  * Abstract facet object. Should be extended by all facet types

diff --git a/lib/Elastica/Filter/GeoPolygon.php b/lib/Elastica/Filter/GeoPolygon.php
@@ -2,7 +2,6 @@
 
 namespace Elastica\Filter;
 
-
 /**
  * Geo polygon filter
  *

diff --git a/lib/Elastica/Index/Settings.php b/lib/Elastica/Index/Settings.php
@@ -72,7 +72,7 @@ public function get($setting = '')
 
         if (empty($data['settings']) || empty($data['settings']['index'])) {
             // should not append, the request should throw a ResponseException
-            throw new NotFoundException('Index ' . $this->getIndex()->getName() . ' not found');
+            throw new NotFoundException('Index '.$this->getIndex()->getName().' not found');
         }
         $settings = $data['settings']['index'];
 
@@ -91,12 +91,14 @@ public function get($setting = '')
                     if (isset($settings[$key])) {
                         $settings = $settings[$key];
                     } else {
-                        return null;
+                        return;
                     }
                 }
+
                 return $settings;
             }
-            return null;
+
+            return;
         }
     }
 

diff --git a/lib/Elastica/Index/Status.php b/lib/Elastica/Index/Status.php
@@ -92,6 +92,7 @@ public function getAliases()
         if (!empty($data['aliases'])) {
             return array_keys($data['aliases']);
         }
+
         return [];
     }
 

diff --git a/lib/Elastica/Multi/ResultSet.php b/lib/Elastica/Multi/ResultSet.php
@@ -4,8 +4,8 @@
 
 use Elastica\Exception\InvalidException;
 use Elastica\Response;
-use Elastica\Search as BaseSearch;
 use Elastica\ResultSet as BaseResultSet;
+use Elastica\Search as BaseSearch;
 
 /**
  * Elastica multi search result set

diff --git a/lib/Elastica/Percolator.php b/lib/Elastica/Percolator.php
@@ -83,20 +83,20 @@ public function unregisterQuery($name)
     /**
      * Match a document to percolator queries
      *
-     * @param  \Elastica\Document $doc
-     * @param  string|\Elastica\Query|\Elastica\Query\AbstractQuery $query Query to filter the percolator queries which
-     *                                                                     are executed.
-     * @param  string $type
-     * @param  array  $params Supports setting additional request body options to the percolate request.
-     *                        [ Percolator::EXTRA_FILTER,
-     *                          Percolator::EXTRA_QUERY,
-     *                          Percolator::EXTRA_SIZE,
-     *                          Percolator::EXTRA_TRACK_SCORES,
-     *                          Percolator::EXTRA_SORT,
-     *                          Percolator::EXTRA_FACETS,
-     *                          Percolator::EXTRA_AGGS,
-     *                          Percolator::EXTRA_HIGHLIGHT ]
-     * @return array With matching registered queries.
+     * @param  \Elastica\Document                                   $doc
+     * @param  string|\Elastica\Query|\Elastica\Query\AbstractQuery $query  Query to filter the percolator queries which
+     *                                                                      are executed.
+     * @param  string                                               $type
+     * @param  array                                                $params Supports setting additional request body options to the percolate request.
+     *                                                                      [ Percolator::EXTRA_FILTER,
+     *                                                                      Percolator::EXTRA_QUERY,
+     *                                                                      Percolator::EXTRA_SIZE,
+     *                                                                      Percolator::EXTRA_TRACK_SCORES,
+     *                                                                      Percolator::EXTRA_SORT,
+     *                                                                      Percolator::EXTRA_FACETS,
+     *                                                                      Percolator::EXTRA_AGGS,
+     *                                                                      Percolator::EXTRA_HIGHLIGHT ]
+     * @return array                                                With matching registered queries.
      */
     public function matchDoc(Document $doc, $query = null, $type = 'type', $params = array())
     {
@@ -111,20 +111,20 @@ public function matchDoc(Document $doc, $query = null, $type = 'type', $params =
     /**
      * Percolating an existing document
      *
-     * @param  string $id
-     * @param  string $type
-     * @param  string|\Elastica\Query|\Elastica\Query\AbstractQuery $query Query to filter the percolator queries which
-     *                                                                     are executed.
-     * @param  array  $params Supports setting additional request body options to the percolate request.
-     *                        [ Percolator::EXTRA_FILTER,
-     *                          Percolator::EXTRA_QUERY,
-     *                          Percolator::EXTRA_SIZE,
-     *                          Percolator::EXTRA_TRACK_SCORES,
-     *                          Percolator::EXTRA_SORT,
-     *                          Percolator::EXTRA_FACETS,
-     *                          Percolator::EXTRA_AGGS,
-     *                          Percolator::EXTRA_HIGHLIGHT ]
-     * @return array With matching registered queries.
+     * @param  string                                               $id
+     * @param  string                                               $type
+     * @param  string|\Elastica\Query|\Elastica\Query\AbstractQuery $query  Query to filter the percolator queries which
+     *                                                                      are executed.
+     * @param  array                                                $params Supports setting additional request body options to the percolate request.
+     *                                                                      [ Percolator::EXTRA_FILTER,
+     *                                                                      Percolator::EXTRA_QUERY,
+     *                                                                      Percolator::EXTRA_SIZE,
+     *                                                                      Percolator::EXTRA_TRACK_SCORES,
+     *                                                                      Percolator::EXTRA_SORT,
+     *                                                                      Percolator::EXTRA_FACETS,
+     *                                                                      Percolator::EXTRA_AGGS,
+     *                                                                      Percolator::EXTRA_HIGHLIGHT ]
+     * @return array                                                With matching registered queries.
      */
     public function matchExistingDoc($id, $type, $query = null, $params = array())
     {
@@ -139,7 +139,7 @@ public function matchExistingDoc($id, $type, $query = null, $params = array())
 
     /**
      * Process the provided parameters and apply them to the data array.
-     * 
+     *
      * @param &$params
      * @param &$data
      */

diff --git a/lib/Elastica/Query/Filtered.php b/lib/Elastica/Query/Filtered.php
@@ -2,8 +2,8 @@
 
 namespace Elastica\Query;
 
-use Elastica\Filter\AbstractFilter;
 use Elastica\Exception\InvalidException;
+use Elastica\Filter\AbstractFilter;
 
 /**
  * Filtered query. Needs a query and a filter

diff --git a/lib/Elastica/Query/FunctionScore.php b/lib/Elastica/Query/FunctionScore.php
@@ -72,6 +72,7 @@ public function addFunction($functionType, $functionParams, AbstractFilter $filt
         }
 
         $this->_functions[] = $function;
+
         return $this;
     }
 
@@ -141,8 +142,8 @@ public function addBoostFactorFunction($boostFactor, AbstractFilter $filter = nu
     }
 
     /**
-     * @param float          $weight      the weight of the function
-     * @param AbstractFilter $filter      a filter associated with this function
+     * @param float          $weight the weight of the function
+     * @param AbstractFilter $filter a filter associated with this function
      *
      * @return void
      */

diff --git a/lib/Elastica/Query/Regexp.php b/lib/Elastica/Query/Regexp.php
@@ -29,9 +29,9 @@ public function __construct($key = '', $value = null, $boost = 1.0)
     /**
      * Sets the query expression for a key with its boost value
      *
-     * @param  string                   $key
-     * @param  string                   $value
-     * @param  float                    $boost
+     * @param  string                 $key
+     * @param  string                 $value
+     * @param  float                  $boost
      * @return \Elastica\Query\Regexp
      */
     public function setValue($key, $value, $boost = 1.0)

diff --git a/lib/Elastica/QueryBuilder/DSL/Aggregation.php b/lib/Elastica/QueryBuilder/DSL/Aggregation.php
@@ -181,7 +181,7 @@ public function geo_bounds($name)
      * top hits aggregation
      *
      * @link http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-aggregations-metrics-top-hits-aggregation.html
-     * @param string $name
+     * @param  string  $name
      * @return TopHits
      */
     public function top_hits($name)

diff --git a/lib/Elastica/QueryBuilder/DSL/Query.php b/lib/Elastica/QueryBuilder/DSL/Query.php
@@ -4,7 +4,6 @@
 
 use Elastica\Exception\NotImplementedException;
 use Elastica\Filter\AbstractFilter;
-use Elastica\Query\HasChild;
 use Elastica\Query\AbstractQuery;
 use Elastica\Query\Bool;
 use Elastica\Query\Boosting;
@@ -15,6 +14,7 @@
 use Elastica\Query\FunctionScore;
 use Elastica\Query\Fuzzy;
 use Elastica\Query\FuzzyLikeThis;
+use Elastica\Query\HasChild;
 use Elastica\Query\HasParent;
 use Elastica\Query\Ids;
 use Elastica\Query\Match;
@@ -389,10 +389,10 @@ public function range($fieldName, array $args)
 
     /**
      * regexp query
-	 * @param string $fieldName
-	 * @param string $value
-	 * @param float $boost
-	 * @return Regexp
+     * @param  string $fieldName
+     * @param  string $value
+     * @param  float  $boost
+     * @return Regexp
      *
      * @link http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-regexp-query.html
      */

diff --git a/lib/Elastica/QueryBuilder/Version.php b/lib/Elastica/QueryBuilder/Version.php
@@ -2,7 +2,6 @@
 
 namespace Elastica\QueryBuilder;
 
-
 /**
  * Abstract Version class
  *

diff --git a/lib/Elastica/QueryBuilder/Version/Version140.php b/lib/Elastica/QueryBuilder/Version/Version140.php
@@ -2,7 +2,6 @@
 
 namespace Elastica\QueryBuilder\Version;
 
-
 /**
  * elasticsearch 1.4 DSL
  *

diff --git a/lib/Elastica/Transport/AbstractTransport.php b/lib/Elastica/Transport/AbstractTransport.php
@@ -3,9 +3,9 @@
 namespace Elastica\Transport;
 
 use Elastica\Connection;
-use Elastica\Request;
 use Elastica\Exception\InvalidException;
 use Elastica\Param;
+use Elastica\Request;
 
 /**
  * Elastica Abstract Transport object

diff --git a/lib/Elastica/Transport/Guzzle.php b/lib/Elastica/Transport/Guzzle.php
@@ -2,17 +2,16 @@
 
 namespace Elastica\Transport;
 
-use Elastica\Exception\Connection\HttpException;
+use Elastica\Connection;
 use Elastica\Exception\Connection\GuzzleException;
+use Elastica\Exception\Connection\HttpException;
 use Elastica\Exception\PartialShardFailureException;
 use Elastica\Exception\ResponseException;
-use Elastica\Connection;
+use Elastica\JSON;
 use Elastica\Request;
 use Elastica\Response;
-use Elastica\JSON;
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\TransferException;
-use GuzzleHttp\Exception\ClientException;
 use GuzzleHttp\Stream\Stream;
 
 /**

diff --git a/lib/Elastica/Transport/HttpAdapter.php b/lib/Elastica/Transport/HttpAdapter.php
@@ -9,9 +9,9 @@
 use Elastica\Request as ElasticaRequest;
 use Elastica\Response as ElasticaResponse;
 use Ivory\HttpAdapter\HttpAdapterInterface;
-use Ivory\HttpAdapter\Message\Stream\StringStream;
 use Ivory\HttpAdapter\Message\Request as HttpAdapterRequest;
 use Ivory\HttpAdapter\Message\Response as HttpAdapterResponse;
+use Ivory\HttpAdapter\Message\Stream\StringStream;
 
 class HttpAdapter extends AbstractTransport
 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,6 @@ @@
     namespace Elastica\Filter;
     /**
      * Geo polygon filter
      *
@@ Expand Down @@