cleaning some code according PSR

GitHubHubus · GitHubHubus · commit ca5b43e51bc8 · 2018-05-14T17:43:03.000+03:00
diff --git a/src/JsonQueriable.php b/src/JsonQueriable.php
@@ -12,13 +12,13 @@ trait JsonQueriable
      * @var string
      */
     protected $_node = '';
+
     /**
      * contain prepared data for process
      * @var mixed
      */
     protected $_map;
 
-
     /**
      * Stores base contents.
      *
@@ -33,7 +33,9 @@ trait JsonQueriable
      */
     protected $_conditions = [];
 
-
+    /**
+     * @var bool 
+     */
     protected $_isProcessed = false;
 
     /**
@@ -139,8 +141,6 @@ protected function objectToArray($obj)
         return array_map([$this, 'objectToArray'], $obj);
     }
 
-
-
     /**
      * check given value is multidimensional array
      *
@@ -252,7 +252,6 @@ protected function getData()
         return false;
     }
 
-
     /**
      * process AND and OR conditions
      *
@@ -284,7 +283,6 @@ protected function processConditions()
         return $result;
     }
 
-
     /**
      * make WHERE clause
      *
@@ -326,7 +324,6 @@ public function orWhere($key = null, $condition = null, $value = null)
         return $this->makeWhere($key, $condition, $value);
     }
 
-
     /**
      * generator for AND and OR where
      *
@@ -355,7 +352,6 @@ protected function makeWhere($key, $condition = null, $value = null)
         return $this;
     }
 
-
     /**
      * make WHERE IN clause
      *
@@ -370,7 +366,6 @@ public function whereIn($key = null, $value = [])
         return $this;
     }
 
-
     /**
      * make WHERE NOT IN clause
      *
@@ -384,7 +379,6 @@ public function whereNotIn($key = null, $value = [])
         return $this;
     }
 
-
     /**
      * make WHERE NULL clause
      *
@@ -480,8 +474,6 @@ public function macro($key, callable $fn)
         return $this;
     }
 
-
-
     // condition methods
 
     /**
@@ -493,10 +485,7 @@ public function macro($key, callable $fn)
      */
     protected function condEqual($key, $val)
     {
-        if ($key == $val) {
-            return true;
-        }
-        return false;
+        return $key == $val;
     }
 
     /**
@@ -508,10 +497,7 @@ protected function condEqual($key, $val)
      */
     protected function condExactEqual($key, $val)
     {
-        if ($key === $val) {
-            return true;
-        }
-        return false;
+        return $key === $val;
     }
 
     /**
@@ -523,10 +509,7 @@ protected function condExactEqual($key, $val)
      */
     protected function condNotEqual($key, $val)
     {
-        if ($key != $val) {
-            return true;
-        }
-        return false;
+        return $key != $val;
     }
 
     /**
@@ -538,10 +521,7 @@ protected function condNotEqual($key, $val)
      */
     protected function condNotExactEqual($key, $val)
     {
-        if ($key !== $val) {
-            return true;
-        }
-        return false;
+        return $key !== $val;
     }
 
     /**
@@ -553,10 +533,7 @@ protected function condNotExactEqual($key, $val)
      */
     protected function condGreater($key, $val)
     {
-        if ($key > $val) {
-            return true;
-        }
-        return false;
+        return $key > $val;
     }
 
     /**
@@ -568,10 +545,7 @@ protected function condGreater($key, $val)
      */
     protected function condLess($key, $val)
     {
-        if ($key < $val) {
-            return true;
-        }
-        return false;
+        return $key < $val;
     }
 
     /**
@@ -583,10 +557,7 @@ protected function condLess($key, $val)
      */
     protected function condGreaterEqual($key, $val)
     {
-        if ($key >= $val) {
-            return true;
-        }
-        return false;
+        return $key >= $val;
     }
 
     /**
@@ -598,10 +569,7 @@ protected function condGreaterEqual($key, $val)
      */
     protected function condLessEqual($key, $val)
     {
-        if ($key <= $val) {
-            return true;
-        }
-        return false;
+        return $key <= $val;
     }
 
     /**
@@ -613,12 +581,7 @@ protected function condLessEqual($key, $val)
      */
     protected function condIn($key, $val)
     {
-        if (is_array($val)) {
-            if (in_array($key, $val)) {
-                return true;
-            }
-        }
-        return false;
+        return (is_array($val) && in_array($key, $val));
     }
 
     /**
@@ -630,12 +593,7 @@ protected function condIn($key, $val)
      */
     protected function condNotIn($key, $val)
     {
-        if (is_array($val)) {
-            if (!in_array($key, $val)) {
-                return true;
-            }
-        }
-        return false;
+        return (is_array($val) && !in_array($key, $val));
     }
 
     /**
@@ -647,10 +605,7 @@ protected function condNotIn($key, $val)
      */
     protected function condNull($key, $val)
     {
-        if (is_null($key) || $key == $val) {
-            return true;
-        }
-        return false;
+        return (is_null($key) || $key == $val);
     }
 
     /**
@@ -662,10 +617,7 @@ protected function condNull($key, $val)
      */
     protected function condNotNull($key, $val)
     {
-        if (!is_null($key) && $key !== $val) {
-            return true;
-        }
-        return false;
+        return (!is_null($key) && $key !== $val);
     }
 
     /**
@@ -677,8 +629,7 @@ protected function condNotNull($key, $val)
      */
     protected function condStartsWith($key, $val)
     {
-        $pattern = '/^'.$val.'/';
-        if (preg_match($pattern, $key)) {
+        if (preg_match("/^$val/", $key)) {
             return true;
         }
 
@@ -714,11 +665,7 @@ protected function condMatch($key, $val)
      */
     protected function condContains($key, $val)
     {
-        if (strpos($key, $val) !== false) {
-            return true;
-        }
-
-        return false;
+        return (strpos($key, $val) !== false);
     }
 
     /**
diff --git a/src/Jsonq.php b/src/Jsonq.php
@@ -11,10 +11,8 @@ class Jsonq
 {
     use JsonQueriable;
 
-
-
     /**
-     * Jthis constructor set main json file path
+     * this constructor set main json file path
      * otherwise create it and read file contents
      * and decode as an array and store it in $this->_data
      *
@@ -107,7 +105,6 @@ public function get($object = true)
         return $this->prepareResult($this->_map, $object);
     }
 
-
     /**
      * alias of get method
      *
@@ -120,8 +117,6 @@ public function fetch($object = true)
         return $this->get($object);
     }
 
-
-
     /**
      * check data exists in system
      *
@@ -132,15 +127,9 @@ public function exists()
     {
         $this->prepare();
 
-        if (!empty($this->_map) && !is_null($this->_map)) {
-            return true;
-        }
-
-        return false;
+        return (!empty($this->_map) && !is_null($this->_map));
     }
 
-
-
     /**
      * reset given data to the $_map
      *
@@ -158,7 +147,6 @@ public function reset($data = null)
         return $this;
     }
 
-
     /**
      * getting group data from specific column
      *
@@ -171,14 +159,14 @@ public function groupBy($column)
     {
         $this->prepare();
 
-        $new_data = [];
+        $data = [];
         foreach ($this->_map as $map) {
             if (isset($map[$column])) {
-                $new_data[$map[$column]][] = $map;
+                $data[$map[$column]][] = $map;
             }
         }
 
-        $this->_map = $new_data;
+        $this->_map = $data;
         return $this;
     }
 
@@ -485,7 +473,6 @@ public function pipe(callable $fn, $class = null)
         return $this;
     }
 
-
     /**
      * filtered each element of prepared data
      *
@@ -498,18 +485,18 @@ public function filter(callable $fn, $key = false)
     {
         $this->prepare();
 
-        $new_data = [];
+        $data = [];
         foreach ($this->_map as $k => $val) {
             if ($fn($val)) {
                 if ($key) {
-                    $new_data[$k] = $val;
+                    $data[$k] = $val;
                 } else {
-                    $new_data[] = $val;
+                    $data[] = $val;
                 }
             }
         }
 
-        return $new_data;
+        return $data;
     }
 
     /**
@@ -560,7 +547,6 @@ public function collect($data)
         return $this;
     }
 
-
     /**
      * implode resulting data from desire key and delimeter
      *
@@ -682,7 +668,7 @@ public function chunk($amount, callable $fn = null)
                     $chunks[] = $return;
                 }
             }
-            return count($chunks)>0?$chunks:null;
+            return count($chunks) > 0 ? $chunks : null;
         }
 
         return $chunk_value;

Original file line number	Diff line number	Diff line change
`@@ -12,13 +12,13 @@ trait JsonQueriable`
`12`	`12`	`* @var string`
`13`	`13`	`*/`
`14`	`14`	`protected $_node = '';`
	`15`	`+`
`15`	`16`	`/**`
`16`	`17`	`* contain prepared data for process`
`17`	`18`	`* @var mixed`
`18`	`19`	`*/`
`19`	`20`	`protected $_map;`
`20`	`21`
`21`		`-`
`22`	`22`	`/**`
`23`	`23`	`* Stores base contents.`
`24`	`24`	`*`
`@@ -33,7 +33,9 @@ trait JsonQueriable`
`33`	`33`	`*/`
`34`	`34`	`protected $_conditions = [];`
`35`	`35`
`36`		`-`
	`36`	`+ /**`
	`37`	`+ * @var bool`
	`38`	`+ */`
`37`	`39`	`protected $_isProcessed = false;`
`38`	`40`
`39`	`41`	`/**`
`@@ -139,8 +141,6 @@ protected function objectToArray($obj)`
`139`	`141`	`return array_map([$this, 'objectToArray'], $obj);`
`140`	`142`	`}`
`141`	`143`
`142`		`-`
`143`		`-`
`144`	`144`	`/**`
`145`	`145`	`* check given value is multidimensional array`
`146`	`146`	`*`
`@@ -252,7 +252,6 @@ protected function getData()`
`252`	`252`	`return false;`
`253`	`253`	`}`
`254`	`254`
`255`		`-`
`256`	`255`	`/**`
`257`	`256`	`* process AND and OR conditions`
`258`	`257`	`*`
`@@ -284,7 +283,6 @@ protected function processConditions()`
`284`	`283`	`return $result;`
`285`	`284`	`}`
`286`	`285`
`287`		`-`
`288`	`286`	`/**`
`289`	`287`	`* make WHERE clause`
`290`	`288`	`*`
`@@ -326,7 +324,6 @@ public function orWhere($key = null, $condition = null, $value = null)`
`326`	`324`	`return $this->makeWhere($key, $condition, $value);`
`327`	`325`	`}`
`328`	`326`
`329`		`-`
`330`	`327`	`/**`
`331`	`328`	`* generator for AND and OR where`
`332`	`329`	`*`
`@@ -355,7 +352,6 @@ protected function makeWhere($key, $condition = null, $value = null)`
`355`	`352`	`return $this;`
`356`	`353`	`}`
`357`	`354`
`358`		`-`
`359`	`355`	`/**`
`360`	`356`	`* make WHERE IN clause`
`361`	`357`	`*`
`@@ -370,7 +366,6 @@ public function whereIn($key = null, $value = [])`
`370`	`366`	`return $this;`
`371`	`367`	`}`
`372`	`368`
`373`		`-`
`374`	`369`	`/**`
`375`	`370`	`* make WHERE NOT IN clause`
`376`	`371`	`*`
`@@ -384,7 +379,6 @@ public function whereNotIn($key = null, $value = [])`
`384`	`379`	`return $this;`
`385`	`380`	`}`
`386`	`381`
`387`		`-`
`388`	`382`	`/**`
`389`	`383`	`* make WHERE NULL clause`
`390`	`384`	`*`
`@@ -480,8 +474,6 @@ public function macro($key, callable $fn)`
`480`	`474`	`return $this;`
`481`	`475`	`}`
`482`	`476`
`483`		`-`
`484`		`-`
`485`	`477`	`// condition methods`
`486`	`478`
`487`	`479`	`/**`
`@@ -493,10 +485,7 @@ public function macro($key, callable $fn)`
`493`	`485`	`*/`
`494`	`486`	`protected function condEqual($key, $val)`
`495`	`487`	`{`
`496`		`- if ($key == $val) {`
`497`		`- return true;`
`498`		`- }`
`499`		`- return false;`
	`488`	`+ return $key == $val;`
`500`	`489`	`}`
`501`	`490`
`502`	`491`	`/**`
`@@ -508,10 +497,7 @@ protected function condEqual($key, $val)`
`508`	`497`	`*/`
`509`	`498`	`protected function condExactEqual($key, $val)`
`510`	`499`	`{`
`511`		`- if ($key === $val) {`
`512`		`- return true;`
`513`		`- }`
`514`		`- return false;`
	`500`	`+ return $key === $val;`
`515`	`501`	`}`
`516`	`502`
`517`	`503`	`/**`
`@@ -523,10 +509,7 @@ protected function condExactEqual($key, $val)`
`523`	`509`	`*/`
`524`	`510`	`protected function condNotEqual($key, $val)`
`525`	`511`	`{`
`526`		`- if ($key != $val) {`
`527`		`- return true;`
`528`		`- }`
`529`		`- return false;`
	`512`	`+ return $key != $val;`
`530`	`513`	`}`
`531`	`514`
`532`	`515`	`/**`
`@@ -538,10 +521,7 @@ protected function condNotEqual($key, $val)`
`538`	`521`	`*/`
`539`	`522`	`protected function condNotExactEqual($key, $val)`
`540`	`523`	`{`
`541`		`- if ($key !== $val) {`
`542`		`- return true;`
`543`		`- }`
`544`		`- return false;`
	`524`	`+ return $key !== $val;`
`545`	`525`	`}`
`546`	`526`
`547`	`527`	`/**`
`@@ -553,10 +533,7 @@ protected function condNotExactEqual($key, $val)`
`553`	`533`	`*/`
`554`	`534`	`protected function condGreater($key, $val)`
`555`	`535`	`{`
`556`		`- if ($key > $val) {`
`557`		`- return true;`
`558`		`- }`
`559`		`- return false;`
	`536`	`+ return $key > $val;`
`560`	`537`	`}`
`561`	`538`
`562`	`539`	`/**`
`@@ -568,10 +545,7 @@ protected function condGreater($key, $val)`
`568`	`545`	`*/`
`569`	`546`	`protected function condLess($key, $val)`
`570`	`547`	`{`
`571`		`- if ($key < $val) {`
`572`		`- return true;`
`573`		`- }`
`574`		`- return false;`
	`548`	`+ return $key < $val;`
`575`	`549`	`}`
`576`	`550`
`577`	`551`	`/**`
`@@ -583,10 +557,7 @@ protected function condLess($key, $val)`
`583`	`557`	`*/`
`584`	`558`	`protected function condGreaterEqual($key, $val)`
`585`	`559`	`{`
`586`		`- if ($key >= $val) {`
`587`		`- return true;`
`588`		`- }`
`589`		`- return false;`
	`560`	`+ return $key >= $val;`
`590`	`561`	`}`
`591`	`562`
`592`	`563`	`/**`
`@@ -598,10 +569,7 @@ protected function condGreaterEqual($key, $val)`
`598`	`569`	`*/`
`599`	`570`	`protected function condLessEqual($key, $val)`
`600`	`571`	`{`
`601`		`- if ($key <= $val) {`
`602`		`- return true;`
`603`		`- }`
`604`		`- return false;`
	`572`	`+ return $key <= $val;`
`605`	`573`	`}`
`606`	`574`
`607`	`575`	`/**`
`@@ -613,12 +581,7 @@ protected function condLessEqual($key, $val)`
`613`	`581`	`*/`
`614`	`582`	`protected function condIn($key, $val)`
`615`	`583`	`{`
`616`		`- if (is_array($val)) {`
`617`		`- if (in_array($key, $val)) {`
`618`		`- return true;`
`619`		`- }`
`620`		`- }`
`621`		`- return false;`
	`584`	`+ return (is_array($val) && in_array($key, $val));`
`622`	`585`	`}`
`623`	`586`
`624`	`587`	`/**`
`@@ -630,12 +593,7 @@ protected function condIn($key, $val)`
`630`	`593`	`*/`
`631`	`594`	`protected function condNotIn($key, $val)`
`632`	`595`	`{`
`633`		`- if (is_array($val)) {`
`634`		`- if (!in_array($key, $val)) {`
`635`		`- return true;`
`636`		`- }`
`637`		`- }`
`638`		`- return false;`
	`596`	`+ return (is_array($val) && !in_array($key, $val));`
`639`	`597`	`}`
`640`	`598`
`641`	`599`	`/**`
`@@ -647,10 +605,7 @@ protected function condNotIn($key, $val)`
`647`	`605`	`*/`
`648`	`606`	`protected function condNull($key, $val)`
`649`	`607`	`{`
`650`		`- if (is_null($key) \|\| $key == $val) {`
`651`		`- return true;`
`652`		`- }`
`653`		`- return false;`
	`608`	`+ return (is_null($key) \|\| $key == $val);`
`654`	`609`	`}`
`655`	`610`
`656`	`611`	`/**`
`@@ -662,10 +617,7 @@ protected function condNull($key, $val)`
`662`	`617`	`*/`
`663`	`618`	`protected function condNotNull($key, $val)`
`664`	`619`	`{`
`665`		`- if (!is_null($key) && $key !== $val) {`
`666`		`- return true;`
`667`		`- }`
`668`		`- return false;`
	`620`	`+ return (!is_null($key) && $key !== $val);`
`669`	`621`	`}`
`670`	`622`
`671`	`623`	`/**`
`@@ -677,8 +629,7 @@ protected function condNotNull($key, $val)`
`677`	`629`	`*/`
`678`	`630`	`protected function condStartsWith($key, $val)`
`679`	`631`	`{`
`680`		`- $pattern = '/^'.$val.'/';`
`681`		`- if (preg_match($pattern, $key)) {`
	`632`	`+ if (preg_match("/^$val/", $key)) {`
`682`	`633`	`return true;`
`683`	`634`	`}`
`684`	`635`
`@@ -714,11 +665,7 @@ protected function condMatch($key, $val)`
`714`	`665`	`*/`
`715`	`666`	`protected function condContains($key, $val)`
`716`	`667`	`{`
`717`		`- if (strpos($key, $val) !== false) {`
`718`		`- return true;`
`719`		`- }`
`720`		`-`
`721`		`- return false;`
	`668`	`+ return (strpos($key, $val) !== false);`
`722`	`669`	`}`
`723`	`670`
`724`	`671`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -11,10 +11,8 @@ class Jsonq`
`11`	`11`	`{`
`12`	`12`	`use JsonQueriable;`
`13`	`13`
`14`		`-`
`15`		`-`
`16`	`14`	`/**`
`17`		`- * Jthis constructor set main json file path`
	`15`	`+ * this constructor set main json file path`
`18`	`16`	`* otherwise create it and read file contents`
`19`	`17`	`* and decode as an array and store it in $this->_data`
`20`	`18`	`*`
`@@ -107,7 +105,6 @@ public function get($object = true)`
`107`	`105`	`return $this->prepareResult($this->_map, $object);`
`108`	`106`	`}`
`109`	`107`
`110`		`-`
`111`	`108`	`/**`
`112`	`109`	`* alias of get method`
`113`	`110`	`*`
`@@ -120,8 +117,6 @@ public function fetch($object = true)`
`120`	`117`	`return $this->get($object);`
`121`	`118`	`}`
`122`	`119`
`123`		`-`
`124`		`-`
`125`	`120`	`/**`
`126`	`121`	`* check data exists in system`
`127`	`122`	`*`
`@@ -132,15 +127,9 @@ public function exists()`
`132`	`127`	`{`
`133`	`128`	`$this->prepare();`
`134`	`129`
`135`		`- if (!empty($this->_map) && !is_null($this->_map)) {`
`136`		`- return true;`
`137`		`- }`
`138`		`-`
`139`		`- return false;`
	`130`	`+ return (!empty($this->_map) && !is_null($this->_map));`
`140`	`131`	`}`
`141`	`132`
`142`		`-`
`143`		`-`
`144`	`133`	`/**`
`145`	`134`	`* reset given data to the $_map`
`146`	`135`	`*`
`@@ -158,7 +147,6 @@ public function reset($data = null)`
`158`	`147`	`return $this;`
`159`	`148`	`}`
`160`	`149`
`161`		`-`
`162`	`150`	`/**`
`163`	`151`	`* getting group data from specific column`
`164`	`152`	`*`
`@@ -171,14 +159,14 @@ public function groupBy($column)`
`171`	`159`	`{`
`172`	`160`	`$this->prepare();`
`173`	`161`
`174`		`- $new_data = [];`
	`162`	`+ $data = [];`
`175`	`163`	`foreach ($this->_map as $map) {`
`176`	`164`	`if (isset($map[$column])) {`
`177`		`- $new_data[$map[$column]][] = $map;`
	`165`	`+ $data[$map[$column]][] = $map;`
`178`	`166`	`}`
`179`	`167`	`}`
`180`	`168`
`181`		`- $this->_map = $new_data;`
	`169`	`+ $this->_map = $data;`
`182`	`170`	`return $this;`
`183`	`171`	`}`
`184`	`172`
`@@ -485,7 +473,6 @@ public function pipe(callable $fn, $class = null)`
`485`	`473`	`return $this;`
`486`	`474`	`}`
`487`	`475`
`488`		`-`
`489`	`476`	`/**`
`490`	`477`	`* filtered each element of prepared data`
`491`	`478`	`*`
`@@ -498,18 +485,18 @@ public function filter(callable $fn, $key = false)`
`498`	`485`	`{`
`499`	`486`	`$this->prepare();`
`500`	`487`
`501`		`- $new_data = [];`
	`488`	`+ $data = [];`
`502`	`489`	`foreach ($this->_map as $k => $val) {`
`503`	`490`	`if ($fn($val)) {`
`504`	`491`	`if ($key) {`
`505`		`- $new_data[$k] = $val;`
	`492`	`+ $data[$k] = $val;`
`506`	`493`	`} else {`
`507`		`- $new_data[] = $val;`
	`494`	`+ $data[] = $val;`
`508`	`495`	`}`
`509`	`496`	`}`
`510`	`497`	`}`
`511`	`498`
`512`		`- return $new_data;`
	`499`	`+ return $data;`
`513`	`500`	`}`
`514`	`501`
`515`	`502`	`/**`
`@@ -560,7 +547,6 @@ public function collect($data)`
`560`	`547`	`return $this;`
`561`	`548`	`}`
`562`	`549`
`563`		`-`
`564`	`550`	`/**`
`565`	`551`	`* implode resulting data from desire key and delimeter`
`566`	`552`	`*`
`@@ -682,7 +668,7 @@ public function chunk($amount, callable $fn = null)`
`682`	`668`	`$chunks[] = $return;`
`683`	`669`	`}`
`684`	`670`	`}`
`685`		`- return count($chunks)>0?$chunks:null;`
	`671`	`+ return count($chunks) > 0 ? $chunks : null;`
`686`	`672`	`}`
`687`	`673`
`688`	`674`	`return $chunk_value;`