fix code style

Author: igor-chepurnoi

.php_cs

@@ -0,0 +1,23 @@
+<?php
+
+$finder = Symfony\CS\Finder::create()
+    ->exclude('vendor')
+    ->in([__DIR__]);
+
+$config = Symfony\CS\Config::create()
+    ->fixers([
+        '-phpdoc_params',
+        '-phpdoc_short_description',
+        '-phpdoc_inline_tag',
+        '-pre_increment',
+        '-heredoc_to_nowdoc',
+        '-spaces_cast',
+        '-include',
+        '-phpdoc_no_package',
+        'concat_with_spaces',
+        'ordered_use',
+        'short_array_syntax',
+    ])
+    ->finder($finder);
+
+return $config;

.travis.yml

@@ -5,14 +5,6 @@ php:
   - 5.5
   - 5.6
   - 7.0
-  - hhvm
-
-# run build against hhvm but allow them to fail
-# http://docs.travis-ci.com/user/build-configuration/#Rows-That-are-Allowed-To-Fail
-matrix:
-  fast_finish: true
-  allow_failures:
-    - php: hhvm
 
 # faster builds on new travis setup not using sudo
 sudo: false
@@ -21,6 +13,7 @@ sudo: false
 cache:
   directories:
     - $HOME/.composer/cache
+    - vendor
 
 install:
   - travis_retry composer self-update && composer --version
@@ -29,4 +22,5 @@ install:
   - travis_retry composer install --prefer-dist --no-interaction
 
 script:
-  - phpunit --verbose $PHPUNIT_FLAGS
+  - vendor/friendsofphp/php-cs-fixer/php-cs-fixer fix --dry-run --diff
+  - phpunit --verbose $PHPUNIT_FLAGS

ArrayQuery.php

@@ -8,19 +8,20 @@
 
 /**
  * Class ArrayQuery
+ *
  * @package yii2mod\query
  */
 class ArrayQuery extends Component
 {
     use QueryTrait;
 
     /**
-     * @var string name of the data key, which should be used as row unique id - primary key.
+     * @var string name of the data key, which should be used as row unique id - primary key
      */
     public $primaryKeyName = 'id';
 
     /**
-     * @var array the data to search, filter.
+     * @var array the data to search, filter
      */
     public $from;
 
@@ -39,9 +40,9 @@ class ArrayQuery extends Component
      */
     public function init()
     {
-        $this->_queryProcessor = Yii::createObject($this->queryProcessorClass);
-
         parent::init();
+
+        $this->_queryProcessor = Yii::createObject($this->queryProcessorClass);
     }
 
     /**
@@ -96,6 +97,7 @@ public function exists()
      * Sets data to be selected from.
      *
      * @param array $data
+     *
      * @return $this
      */
     public function from(array $data)
@@ -119,6 +121,7 @@ protected function fetchData()
      * Converts the raw query results into the format as specified by this query.
      *
      * @param $rows
+     *
      * @return array
      */
     public function populate($rows)
@@ -140,4 +143,4 @@ public function populate($rows)
 
         return $result;
     }
-}
+}

QueryProcessor.php

@@ -1,6 +1,7 @@
 <?php
 /**
  * @link https://github.com/yii2tech
+ *
  * @copyright Copyright (c) 2015 Yii2tech
  * @license [New BSD License](http://www.opensource.org/licenses/bsd-license.php)
  */
@@ -19,6 +20,7 @@
  *
  * @author Paul Klimov <[email protected]>
  * @author Igor Chepurnoy <[email protected]>
+ *
  * @since 1.0
  */
 class QueryProcessor extends Component
@@ -65,10 +67,10 @@ public function process($query)
     /**
      * Applies sort for given data.
      *
-     * @param array $data raw data.
-     * @param array|null $orderBy order by.
+     * @param array $data raw data
+     * @param array|null $orderBy order by
      *
-     * @return array sorted data.
+     * @return array sorted data
      */
     protected function applyOrderBy(array $data, $orderBy)
     {
@@ -82,11 +84,11 @@ protected function applyOrderBy(array $data, $orderBy)
     /**
      * Applies limit and offset for given data.
      *
-     * @param array $data raw data.
-     * @param integer|null $limit limit value.
-     * @param integer|null $offset offset value.
+     * @param array $data raw data
+     * @param int|null $limit limit value
+     * @param int|null $offset offset value
      *
-     * @return array data.
+     * @return array data
      */
     protected function applyLimit(array $data, $limit, $offset)
     {
@@ -108,10 +110,10 @@ protected function applyLimit(array $data, $limit, $offset)
     /**
      * Applies where conditions.
      *
-     * @param array $data raw data.
-     * @param array|null $where where conditions.
+     * @param array $data raw data
+     * @param array|null $where where conditions
      *
-     * @return array data.
+     * @return array data
      */
     protected function applyWhere(array $data, $where)
     {
@@ -121,10 +123,10 @@ protected function applyWhere(array $data, $where)
     /**
      * Applies filter conditions.
      *
-     * @param array $data data to be filtered.
-     * @param array $condition filter condition.
+     * @param array $data data to be filtered
+     * @param array $condition filter condition
      *
-     * @return array filtered data.
+     * @return array filtered data
      *
      * @throws InvalidParamException
      */
@@ -146,6 +148,7 @@ protected function filterCondition(array $data, $condition)
                 throw new InvalidParamException("Invalid condition filter '{$operator}'");
             }
             array_shift($condition);
+
             return $this->$method($data, $operator, $condition);
         } else {
             return $this->filterHashCondition($data, $condition);
@@ -156,7 +159,7 @@ protected function filterCondition(array $data, $condition)
      * Applies a condition based on column-value pairs.
      *
      * @param array $data data to be filtered
-     * @param array $condition the condition specification.
+     * @param array $condition the condition specification
      *
      * @return array filtered data
      */
@@ -167,7 +170,7 @@ protected function filterHashCondition(array $data, $condition)
                 $data = $this->filterInCondition($data, 'IN', [$column, $value]);
             } else {
                 $data = array_filter($data, function ($row) use ($column, $value) {
-                    return ($row[$column] == $value);
+                    return $row[$column] == $value;
                 });
             }
         }
@@ -179,8 +182,8 @@ protected function filterHashCondition(array $data, $condition)
      * Applies 2 or more conditions using 'AND' logic.
      *
      * @param array $data data to be filtered
-     * @param string $operator operator.
-     * @param array $operands conditions to be united.
+     * @param string $operator operator
+     * @param array $operands conditions to be united
      *
      * @return array filtered data
      */
@@ -198,9 +201,9 @@ protected function filterAndCondition(array $data, $operator, $operands)
     /**
      * Applies 2 or more conditions using 'OR' logic.
      *
-     * @param array $data data to be filtered.
-     * @param string $operator operator.
-     * @param array $operands conditions to be united.
+     * @param array $data data to be filtered
+     * @param string $operator operator
+     * @param array $operands conditions to be united
      *
      * @return array filtered data
      */
@@ -231,13 +234,13 @@ protected function filterOrCondition(array $data, $operator, $operands)
     /**
      * Inverts a filter condition.
      *
-     * @param array $data data to be filtered.
-     * @param string $operator operator.
-     * @param array $operands operands to be inverted.
+     * @param array $data data to be filtered
+     * @param string $operator operator
+     * @param array $operands operands to be inverted
      *
-     * @return array filtered data.
+     * @return array filtered data
      *
-     * @throws InvalidParamException if wrong number of operands have been given.
+     * @throws InvalidParamException if wrong number of operands have been given
      */
     protected function filterNotCondition(array $data, $operator, $operands)
     {
@@ -268,14 +271,14 @@ protected function filterNotCondition(array $data, $operator, $operands)
     /**
      * Applies `BETWEEN` condition.
      *
-     * @param array $data data to be filtered.
-     * @param string $operator operator.
+     * @param array $data data to be filtered
+     * @param string $operator operator
      * @param array $operands the first operand is the column name. The second and third operands
-     * describe the interval that column value should be in.
+     * describe the interval that column value should be in
      *
-     * @return array filtered data.
+     * @return array filtered data
      *
-     * @throws InvalidParamException if wrong number of operands have been given.
+     * @throws InvalidParamException if wrong number of operands have been given
      */
     protected function filterBetweenCondition(array $data, $operator, $operands)
     {
@@ -287,26 +290,26 @@ protected function filterBetweenCondition(array $data, $operator, $operands)
 
         if (strncmp('NOT', $operator, 3) === 0) {
             return array_filter($data, function ($row) use ($column, $value1, $value2) {
-                return ($row[$column] < $value1 || $row[$column] > $value2);
+                return $row[$column] < $value1 || $row[$column] > $value2;
             });
         }
 
         return array_filter($data, function ($row) use ($column, $value1, $value2) {
-            return ($row[$column] >= $value1 && $row[$column] <= $value2);
+            return $row[$column] >= $value1 && $row[$column] <= $value2;
         });
     }
 
     /**
      * Applies 'IN' condition.
      *
-     * @param array $data data to be filtered.
-     * @param string $operator operator.
+     * @param array $data data to be filtered
+     * @param string $operator operator
      * @param array $operands the first operand is the column name.
-     * The second operand is an array of values that column value should be among.
+     * The second operand is an array of values that column value should be among
      *
-     * @return array filtered data.
+     * @return array filtered data
      *
-     * @throws InvalidParamException if wrong number of operands have been given.
+     * @throws InvalidParamException if wrong number of operands have been given
      */
     protected function filterInCondition(array $data, $operator, $operands)
     {
@@ -350,14 +353,14 @@ protected function filterInCondition(array $data, $operator, $operands)
     /**
      * Applies 'LIKE' condition.
      *
-     * @param array $data data to be filtered.
-     * @param string $operator operator.
+     * @param array $data data to be filtered
+     * @param string $operator operator
      * @param array $operands the first operand is the column name. The second operand is a single value
-     * or an array of values that column value should be compared with.
+     * or an array of values that column value should be compared with
      *
-     * @return array filtered data.
+     * @return array filtered data
      *
-     * @throws InvalidParamException if wrong number of operands have been given.
+     * @throws InvalidParamException if wrong number of operands have been given
      */
     protected function filterLikeCondition(array $data, $operator, $operands)
     {
@@ -386,6 +389,7 @@ protected function filterLikeCondition(array $data, $operator, $operands)
                             return true;
                         }
                     }
+
                     return false;
                 });
             }
@@ -396,6 +400,7 @@ protected function filterLikeCondition(array $data, $operator, $operands)
                         return false;
                     }
                 }
+
                 return true;
             });
         }
@@ -411,6 +416,7 @@ protected function filterLikeCondition(array $data, $operator, $operands)
                         return true;
                     }
                 }
+
                 return false;
             });
         }
@@ -421,7 +427,8 @@ protected function filterLikeCondition(array $data, $operator, $operands)
                     return false;
                 }
             }
+
             return true;
         });
     }
-}
+}

composer.json

@@ -17,9 +17,12 @@
     "require": {
         "yiisoft/yii2": "*"
     },
+    "require-dev": {
+        "friendsofphp/php-cs-fixer": "~1.7"
+    },
     "autoload": {
         "psr-4": {
             "yii2mod\\query\\": ""
         }
     }
-}
+}