leandrogehlen / yii2-querybuilder

OptionTrait.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
         {
             $key = (strpos($prop, "on") !== 0) ? Inflector::underscore($prop) : $prop;
 
-            if ($value instanceof Optionable){
+            if ($value instanceof Optionable) {
                 $value = $value->toOptions();
             } elseif (is_array($value)) {
                 foreach ($value as $k => $v) {

tests/unit/TranslatorTest.php

Spacing +25 added lines, -25 removed lines

@@ -13,82 +13,82 @@
         return [
             [
                 ['condition' => "and", 'rules' => [
-                    [ 'field' => 'name', 'type' => 'string', 'operator' => 'equal', 'value' => 'joe'],
-                    [ 'field' => 'name', 'type' => 'string', 'operator' => 'not_equal', 'value' => 'bruce']
+                    ['field' => 'name', 'type' => 'string', 'operator' => 'equal', 'value' => 'joe'],
+                    ['field' => 'name', 'type' => 'string', 'operator' => 'not_equal', 'value' => 'bruce']
                 ]],
                 ['(name = :p0 and name <> :p1)', [':p0' => 'joe', ':p1' => 'bruce']]
             ],
             [
                 ['condition' => "and", 'rules' => [
-                    [ 'field' => 'id', 'type' => 'integer', 'operator' => 'in', 'value' => [1,2,3]],
-                    [ 'field' => 'id', 'type' => 'integer', 'operator' => 'not_in', 'value' => [4,5]]
+                    ['field' => 'id', 'type' => 'integer', 'operator' => 'in', 'value' => [1, 2, 3]],
+                    ['field' => 'id', 'type' => 'integer', 'operator' => 'not_in', 'value' => [4, 5]]
                 ]],
                 ['(id IN (:p0, :p1, :p2) and id NOT IN (:p3, :p4))', [':p0'=>1, ':p1'=>2, ':p2'=>3, ':p3'=>4, ':p4'=>5]]
             ],
             [
                 ['condition' => "and", 'rules' => [
-                    [ 'field' => 'id', 'type' => 'integer', 'operator' => 'less', 'value' => 100],
-                    [ 'field' => 'id', 'type' => 'integer', 'operator' => 'less_or_equal', 'value' => 50],
+                    ['field' => 'id', 'type' => 'integer', 'operator' => 'less', 'value' => 100],
+                    ['field' => 'id', 'type' => 'integer', 'operator' => 'less_or_equal', 'value' => 50],
                 ]],
                 ['(id < :p0 and id <= :p1)', [':p0'=>100, ':p1'=>50]]
             ],
             [
                 ['condition' => "and", 'rules' => [
-                    [ 'field' => 'id', 'type' => 'integer', 'operator' => 'greater', 'value' => 10],
-                    [ 'field' => 'id', 'type' => 'integer', 'operator' => 'greater_or_equal', 'value' => 20],
+                    ['field' => 'id', 'type' => 'integer', 'operator' => 'greater', 'value' => 10],
+                    ['field' => 'id', 'type' => 'integer', 'operator' => 'greater_or_equal', 'value' => 20],
                 ]],
                 ['(id > :p0 and id >= :p1)', [':p0'=>10, ':p1'=>20]]
             ],
             [
                 ['condition' => "and", 'rules' => [
-                    [ 'field' => 'date', 'type' => 'date', 'operator' => 'between', 'value' => ['2015-01-01','2015-01-30']],
+                    ['field' => 'date', 'type' => 'date', 'operator' => 'between', 'value' => ['2015-01-01', '2015-01-30']],
                 ]],
                 ['(date BETWEEN :p0 AND :p1)', [':p0'=>'2015-01-01', ':p1'=>'2015-01-30']]
             ],
             [
                 ['condition' => "and", 'rules' => [
-                    [ 'field' => 'name', 'type' => 'string', 'operator' => 'begins_with', 'value' => 'joe'],
-                    [ 'field' => 'name', 'type' => 'string', 'operator' => 'not_begins_with', 'value' => 'bruce'],
+                    ['field' => 'name', 'type' => 'string', 'operator' => 'begins_with', 'value' => 'joe'],
+                    ['field' => 'name', 'type' => 'string', 'operator' => 'not_begins_with', 'value' => 'bruce'],
                 ]],
                 ['(name LIKE :p0 and name NOT LIKE :p1)', [':p0'=>'joe%', ':p1'=> 'bruce%']]
             ],
             [
                 ['condition' => "and", 'rules' => [
-                    [ 'field' => 'name', 'type' => 'string', 'operator' => 'contains', 'value' => 'thomas'],
-                    [ 'field' => 'name', 'type' => 'string', 'operator' => 'not_contains', 'value' => 'paul'],
+                    ['field' => 'name', 'type' => 'string', 'operator' => 'contains', 'value' => 'thomas'],
+                    ['field' => 'name', 'type' => 'string', 'operator' => 'not_contains', 'value' => 'paul'],
                 ]],
                 ['(name LIKE :p0 and name NOT LIKE :p1)', [':p0'=>'%thomas%', ':p1'=> '%paul%']]
             ],
             [
                 ['condition' => "and", 'rules' => [
-                    [ 'field' => 'name', 'type' => 'string', 'operator' => 'ends_with', 'value' => 'brian'],
-                    [ 'field' => 'name', 'type' => 'string', 'operator' => 'not_ends_with', 'value' => 'david'],
+                    ['field' => 'name', 'type' => 'string', 'operator' => 'ends_with', 'value' => 'brian'],
+                    ['field' => 'name', 'type' => 'string', 'operator' => 'not_ends_with', 'value' => 'david'],
                 ]],
                 ['(name LIKE :p0 and name NOT LIKE :p1)', [':p0'=>'%brian', ':p1'=> '%david']]
             ],
             [
                 ['condition' => "or", 'rules' => [
-                    [ 'field' => 'name', 'type' => 'string', 'operator' => 'is_empty'],
-                    [ 'field' => 'name', 'type' => 'string', 'operator' => 'is_not_empty'],
-                    [ 'field' => 'name', 'type' => 'string', 'operator' => 'is_null'],
-                    [ 'field' => 'name', 'type' => 'string', 'operator' => 'is_not_null'],
+                    ['field' => 'name', 'type' => 'string', 'operator' => 'is_empty'],
+                    ['field' => 'name', 'type' => 'string', 'operator' => 'is_not_empty'],
+                    ['field' => 'name', 'type' => 'string', 'operator' => 'is_null'],
+                    ['field' => 'name', 'type' => 'string', 'operator' => 'is_not_null'],
                 ]],
                 ['(name = "" or name <> "" or name IS NULL or name IS NOT NULL)', []]
             ],
             [
                 ['condition' => "and", 'rules' => [
-                    [ 'field' => 'name', 'type' => 'string', 'operator' => 'begins_with', 'value' => 'kurt'],
-                    [ 'field' => 'name', 'type' => 'string', 'operator' => 'ends_with', 'value' => 'cobain'],
+                    ['field' => 'name', 'type' => 'string', 'operator' => 'begins_with', 'value' => 'kurt'],
+                    ['field' => 'name', 'type' => 'string', 'operator' => 'ends_with', 'value' => 'cobain'],
                     ['condition' => 'or', 'rules'=>[
-                        [ 'field' => 'name', 'type' => 'string', 'operator' => 'equal', 'value' => 'joe'],
-                        [ 'field' => 'name', 'type' => 'string', 'operator' => 'equal', 'value' => 'paul'],
+                        ['field' => 'name', 'type' => 'string', 'operator' => 'equal', 'value' => 'joe'],
+                        ['field' => 'name', 'type' => 'string', 'operator' => 'equal', 'value' => 'paul'],
                         ['condition' => 'and', 'rules'=>[
-                            [ 'field' => 'id', 'type' => 'integer', 'operator' => 'equal', 'value' => 10],
+                            ['field' => 'id', 'type' => 'integer', 'operator' => 'equal', 'value' => 10],
                         ]]
                     ]]
                 ]],
                 ['(name LIKE :p0 and name LIKE :p1 and (name = :p2 or name = :p3 or (id = :p4)))', [
-                    ':p0'=>'kurt%',':p1' =>'%cobain', ':p2' => 'joe', ':p3' => 'paul', ':p4' => 10
+                    ':p0'=>'kurt%', ':p1' =>'%cobain', ':p2' => 'joe', ':p3' => 'paul', ':p4' => 10
                 ]]
             ]
 

Translator.php

Indentation +4 added lines, -4 removed lines

@@ -191,10 +191,10 @@
     }    
 
    /**
-     * 
-     * @param array $currentParams
-     * @return \leandrogehlen\querybuilder\Translator
-     */
+    * 
+    * @param array $currentParams
+    * @return \leandrogehlen\querybuilder\Translator
+    */
     public function setCurrentParams($currentParams) {
         $this->currentParams = $currentParams;
     }

Spacing +17 added lines, -17 removed lines

@@ -51,7 +51,7 @@ 
      */
     public function __construct($data, $config = [])
     {
-        if(isset($config['currentParams'])){
+        if (isset($config['currentParams'])) {
             $this->setCurrentParams($config['currentParams']);
                     
         }
@@ -67,19 +67,19 @@ 
         $this->_operators = [
             'equal' =>            '= ?',
             'not_equal' =>        '<> ?',
-            'in' =>               ['op' => 'IN (?)',     'list' => true, 'sep' => ', ' ],
+            'in' =>               ['op' => 'IN (?)', 'list' => true, 'sep' => ', '],
             'not_in' =>           ['op' => 'NOT IN (?)', 'list' => true, 'sep' => ', '],
             'less' =>             '< ?',
             'less_or_equal' =>    '<= ?',
             'greater' =>          '> ?',
             'greater_or_equal' => '>= ?',
-            'between' =>          ['op' => 'BETWEEN ?',   'list' => true, 'sep' => ' AND '],
-            'begins_with' =>      ['op' => 'LIKE ?',     'fn' => function($value){ return "$value%"; } ],
-            'not_begins_with' =>  ['op' => 'NOT LIKE ?', 'fn' => function($value){ return "$value%"; } ],
-            'contains' =>         ['op' => 'LIKE ?',     'fn' => function($value){ return "%$value%"; } ],
-            'not_contains' =>     ['op' => 'NOT LIKE ?', 'fn' => function($value){ return "%$value%"; } ],
-            'ends_with' =>        ['op' => 'LIKE ?',     'fn' => function($value){ return "%$value"; } ],
-            'not_ends_with' =>    ['op' => 'NOT LIKE ?', 'fn' => function($value){ return "%$value"; } ],
+            'between' =>          ['op' => 'BETWEEN ?', 'list' => true, 'sep' => ' AND '],
+            'begins_with' =>      ['op' => 'LIKE ?', 'fn' => function($value) { return "$value%"; }],
+            'not_begins_with' =>  ['op' => 'NOT LIKE ?', 'fn' => function($value) { return "$value%"; }],
+            'contains' =>         ['op' => 'LIKE ?', 'fn' => function($value) { return "%$value%"; }],
+            'not_contains' =>     ['op' => 'NOT LIKE ?', 'fn' => function($value) { return "%$value%"; }],
+            'ends_with' =>        ['op' => 'LIKE ?', 'fn' => function($value) { return "%$value"; }],
+            'not_ends_with' =>    ['op' => 'NOT LIKE ?', 'fn' => function($value) { return "%$value"; }],
             'is_empty' =>         '= ""',
             'is_not_empty' =>     '<> ""',
             'is_null' =>          'IS NULL',
@@ -105,7 +105,7 @@ 
         } else {
             $op = ArrayHelper::getValue($pattern, 'op');
             $list = ArrayHelper::getValue($pattern, 'list');
-            if ($list){
+            if ($list) {
                 $sep = ArrayHelper::getValue($pattern, 'sep');
                 $replacement = implode($sep, $keys);
             } else {
@@ -117,7 +117,7 @@ 
         }
 
         $this->_params = array_merge($this->_params, $params);
-        return $field . " " . ($replacement ? str_replace("?", $replacement, $pattern) : $pattern);
+        return $field." ".($replacement ? str_replace("?", $replacement, $pattern) : $pattern);
     }
 
     /**
@@ -131,7 +131,7 @@ 
         }
 
         $where = [];
-        $condition = " " . $data['condition'] . " ";
+        $condition = " ".$data['condition']." ";
 
         foreach ($data['rules'] as $rule) {
             if (isset($rule['condition'])) {
@@ -155,7 +155,7 @@ 
                 $where[] = $this->encodeRule($field, $operator, $params);
             }
         }
-        return "(" . implode($condition, $where) . ")";
+        return "(".implode($condition, $where).")";
     }
 
     /**
@@ -180,11 +180,11 @@ 
      * Get a param name that should not conflict with any params already set
      * @return string
      */
-    private function getNewParamName(){
+    private function getNewParamName() {
         $paramPrefix = 'p';
-        if(!empty($this->currentParams) && $this->paramsCount < count($this->currentParams) ){
-            $this->paramsCount = count($this->currentParams) +1;
-        }else{
+        if (!empty($this->currentParams) && $this->paramsCount < count($this->currentParams)) {
+            $this->paramsCount = count($this->currentParams) + 1;
+        } else {
             $this->paramsCount = $this->paramsCount + 1;
         }
         return $paramPrefix.$this->paramsCount;

Braces +1 added lines, -1 removed lines

@@ -184,7 +184,7 @@
         $paramPrefix = 'p';
         if(!empty($this->currentParams) && $this->paramsCount < count($this->currentParams) ){
             $this->paramsCount = count($this->currentParams) +1;
-        }else{
+        } else{
             $this->paramsCount = $this->paramsCount + 1;
         }
         return $paramPrefix.$this->paramsCount;

tests/unit/bootstrap.php

Spacing +5 added lines, -5 removed lines

@@ -5,12 +5,12 @@
 
 define('YII_ENABLE_ERROR_HANDLER', false);
 define('YII_DEBUG', true);
-$_SERVER['SCRIPT_NAME'] = '/' . __DIR__;
+$_SERVER['SCRIPT_NAME'] = '/'.__DIR__;
 $_SERVER['SCRIPT_FILENAME'] = __FILE__;
 
 // require composer autoloader if available
-$vendor = __DIR__ . '/../../vendor';
+$vendor = __DIR__.'/../../vendor';
 
-require_once($vendor . '/autoload.php');
-require_once($vendor . '/yiisoft/yii2/Yii.php');
-require_once(__DIR__ . '/TestCase.php');
+require_once($vendor.'/autoload.php');
+require_once($vendor.'/yiisoft/yii2/Yii.php');
+require_once(__DIR__.'/TestCase.php');

tests/unit/TestCase.php

Spacing +4 added lines, -4 removed lines

@@ -17,14 +17,14 @@ 
      */
     public static function setUpBeforeClass()
     {
-        $vendorDir = __DIR__ . '/../../vendor';
-        $vendorAutoload = $vendorDir . '/autoload.php';
+        $vendorDir = __DIR__.'/../../vendor';
+        $vendorAutoload = $vendorDir.'/autoload.php';
         if (file_exists($vendorAutoload)) {
             require_once($vendorAutoload);
         } else {
             throw new NotSupportedException("Vendor autoload file '{$vendorAutoload}' is missing.");
         }
-        require_once($vendorDir . '/yiisoft/yii2/Yii.php');
+        require_once($vendorDir.'/yiisoft/yii2/Yii.php');
         Yii::setAlias('@vendor', $vendorDir);
     }
 
@@ -37,7 +37,7 @@ 
             'id' => 'querybuilder-test',
             'basePath' => __DIR__,
         ];
-        $config['vendorPath'] = dirname(dirname(__DIR__)) . '/vendor';
+        $config['vendorPath'] = dirname(dirname(__DIR__)).'/vendor';
         new \yii\console\Application($config);
     }