Merge pull request #10 from GitHubHubus/psr_style

nahid · web-flow · commit 1bd7cbb73bbf · 2018-05-15T23:52:42.000+06:00
Cleaning some code according to PSR and removing excess code for simplify perception
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
      *
@@ -254,7 +254,6 @@ protected function getData()
         return false;
     }
 
-
     /**
      * process AND and OR conditions
      *
@@ -286,7 +285,6 @@ protected function processConditions()
         return $result;
     }
 
-
     /**
      * make WHERE clause
      *
@@ -328,7 +326,6 @@ public function orWhere($key = null, $condition = null, $value = null)
         return $this->makeWhere($key, $condition, $value);
     }
 
-
     /**
      * generator for AND and OR where
      *
@@ -357,7 +354,6 @@ protected function makeWhere($key, $condition = null, $value = null)
         return $this;
     }
 
-
     /**
      * make WHERE IN clause
      *
@@ -372,7 +368,6 @@ public function whereIn($key = null, $value = [])
         return $this;
     }
 
-
     /**
      * make WHERE NOT IN clause
      *
@@ -386,7 +381,6 @@ public function whereNotIn($key = null, $value = [])
         return $this;
     }
 
-
     /**
      * make WHERE NULL clause
      *
@@ -482,8 +476,6 @@ public function macro($key, callable $fn)
         return $this;
     }
 
-
-
     // condition methods
 
     /**
@@ -495,10 +487,7 @@ public function macro($key, callable $fn)
      */
     protected function condEqual($key, $val)
     {
-        if ($key == $val) {
-            return true;
-        }
-        return false;
+        return $key == $val;
     }
 
     /**
@@ -510,10 +499,7 @@ protected function condEqual($key, $val)
      */
     protected function condExactEqual($key, $val)
     {
-        if ($key === $val) {
-            return true;
-        }
-        return false;
+        return $key === $val;
     }
 
     /**
@@ -525,10 +511,7 @@ protected function condExactEqual($key, $val)
      */
     protected function condNotEqual($key, $val)
     {
-        if ($key != $val) {
-            return true;
-        }
-        return false;
+        return $key != $val;
     }
 
     /**
@@ -540,10 +523,7 @@ protected function condNotEqual($key, $val)
      */
     protected function condNotExactEqual($key, $val)
     {
-        if ($key !== $val) {
-            return true;
-        }
-        return false;
+        return $key !== $val;
     }
 
     /**
@@ -555,10 +535,7 @@ protected function condNotExactEqual($key, $val)
      */
     protected function condGreater($key, $val)
     {
-        if ($key > $val) {
-            return true;
-        }
-        return false;
+        return $key > $val;
     }
 
     /**
@@ -570,10 +547,7 @@ protected function condGreater($key, $val)
      */
     protected function condLess($key, $val)
     {
-        if ($key < $val) {
-            return true;
-        }
-        return false;
+        return $key < $val;
     }
 
     /**
@@ -585,10 +559,7 @@ protected function condLess($key, $val)
      */
     protected function condGreaterEqual($key, $val)
     {
-        if ($key >= $val) {
-            return true;
-        }
-        return false;
+        return $key >= $val;
     }
 
     /**
@@ -600,10 +571,7 @@ protected function condGreaterEqual($key, $val)
      */
     protected function condLessEqual($key, $val)
     {
-        if ($key <= $val) {
-            return true;
-        }
-        return false;
+        return $key <= $val;
     }
 
     /**
@@ -615,12 +583,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));
     }
 
     /**
@@ -632,12 +595,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));
     }
 
     /**
@@ -649,10 +607,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);
     }
 
     /**
@@ -664,10 +619,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);
     }
 
     /**
@@ -679,8 +631,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;
         }
 
@@ -716,11 +667,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
      *
@@ -106,7 +104,6 @@ public function get($object = true)
         return $this->prepareResult($this->_map, $object);
     }
 
-
     /**
      * alias of get method
      *
@@ -119,8 +116,6 @@ public function fetch($object = true)
         return $this->get($object);
     }
 
-
-
     /**
      * check data exists in system
      *
@@ -131,15 +126,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
      *
@@ -157,7 +146,6 @@ public function reset($data = null)
         return $this;
     }
 
-
     /**
      * getting group data from specific column
      *
@@ -170,14 +158,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;
     }
 
@@ -484,7 +472,6 @@ public function pipe(callable $fn, $class = null)
         return $this;
     }
 
-
     /**
      * filtered each element of prepared data
      *
@@ -497,18 +484,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;
     }
 
     /**
@@ -559,7 +546,6 @@ public function collect($data)
         return $this;
     }
 
-
     /**
      * implode resulting data from desire key and delimeter
      *
@@ -681,7 +667,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`	`*`
`@@ -254,7 +254,6 @@ protected function getData()`
`254`	`254`	`return false;`
`255`	`255`	`}`
`256`	`256`
`257`		`-`
`258`	`257`	`/**`
`259`	`258`	`* process AND and OR conditions`
`260`	`259`	`*`
`@@ -286,7 +285,6 @@ protected function processConditions()`
`286`	`285`	`return $result;`
`287`	`286`	`}`
`288`	`287`
`289`		`-`
`290`	`288`	`/**`
`291`	`289`	`* make WHERE clause`
`292`	`290`	`*`
`@@ -328,7 +326,6 @@ public function orWhere($key = null, $condition = null, $value = null)`
`328`	`326`	`return $this->makeWhere($key, $condition, $value);`
`329`	`327`	`}`
`330`	`328`
`331`		`-`
`332`	`329`	`/**`
`333`	`330`	`* generator for AND and OR where`
`334`	`331`	`*`
`@@ -357,7 +354,6 @@ protected function makeWhere($key, $condition = null, $value = null)`
`357`	`354`	`return $this;`
`358`	`355`	`}`
`359`	`356`
`360`		`-`
`361`	`357`	`/**`
`362`	`358`	`* make WHERE IN clause`
`363`	`359`	`*`
`@@ -372,7 +368,6 @@ public function whereIn($key = null, $value = [])`
`372`	`368`	`return $this;`
`373`	`369`	`}`
`374`	`370`
`375`		`-`
`376`	`371`	`/**`
`377`	`372`	`* make WHERE NOT IN clause`
`378`	`373`	`*`
`@@ -386,7 +381,6 @@ public function whereNotIn($key = null, $value = [])`
`386`	`381`	`return $this;`
`387`	`382`	`}`
`388`	`383`
`389`		`-`
`390`	`384`	`/**`
`391`	`385`	`* make WHERE NULL clause`
`392`	`386`	`*`
`@@ -482,8 +476,6 @@ public function macro($key, callable $fn)`
`482`	`476`	`return $this;`
`483`	`477`	`}`
`484`	`478`
`485`		`-`
`486`		`-`
`487`	`479`	`// condition methods`
`488`	`480`
`489`	`481`	`/**`
`@@ -495,10 +487,7 @@ public function macro($key, callable $fn)`
`495`	`487`	`*/`
`496`	`488`	`protected function condEqual($key, $val)`
`497`	`489`	`{`
`498`		`- if ($key == $val) {`
`499`		`- return true;`
`500`		`- }`
`501`		`- return false;`
	`490`	`+ return $key == $val;`
`502`	`491`	`}`
`503`	`492`
`504`	`493`	`/**`
`@@ -510,10 +499,7 @@ protected function condEqual($key, $val)`
`510`	`499`	`*/`
`511`	`500`	`protected function condExactEqual($key, $val)`
`512`	`501`	`{`
`513`		`- if ($key === $val) {`
`514`		`- return true;`
`515`		`- }`
`516`		`- return false;`
	`502`	`+ return $key === $val;`
`517`	`503`	`}`
`518`	`504`
`519`	`505`	`/**`
`@@ -525,10 +511,7 @@ protected function condExactEqual($key, $val)`
`525`	`511`	`*/`
`526`	`512`	`protected function condNotEqual($key, $val)`
`527`	`513`	`{`
`528`		`- if ($key != $val) {`
`529`		`- return true;`
`530`		`- }`
`531`		`- return false;`
	`514`	`+ return $key != $val;`
`532`	`515`	`}`
`533`	`516`
`534`	`517`	`/**`
`@@ -540,10 +523,7 @@ protected function condNotEqual($key, $val)`
`540`	`523`	`*/`
`541`	`524`	`protected function condNotExactEqual($key, $val)`
`542`	`525`	`{`
`543`		`- if ($key !== $val) {`
`544`		`- return true;`
`545`		`- }`
`546`		`- return false;`
	`526`	`+ return $key !== $val;`
`547`	`527`	`}`
`548`	`528`
`549`	`529`	`/**`
`@@ -555,10 +535,7 @@ protected function condNotExactEqual($key, $val)`
`555`	`535`	`*/`
`556`	`536`	`protected function condGreater($key, $val)`
`557`	`537`	`{`
`558`		`- if ($key > $val) {`
`559`		`- return true;`
`560`		`- }`
`561`		`- return false;`
	`538`	`+ return $key > $val;`
`562`	`539`	`}`
`563`	`540`
`564`	`541`	`/**`
`@@ -570,10 +547,7 @@ protected function condGreater($key, $val)`
`570`	`547`	`*/`
`571`	`548`	`protected function condLess($key, $val)`
`572`	`549`	`{`
`573`		`- if ($key < $val) {`
`574`		`- return true;`
`575`		`- }`
`576`		`- return false;`
	`550`	`+ return $key < $val;`
`577`	`551`	`}`
`578`	`552`
`579`	`553`	`/**`
`@@ -585,10 +559,7 @@ protected function condLess($key, $val)`
`585`	`559`	`*/`
`586`	`560`	`protected function condGreaterEqual($key, $val)`
`587`	`561`	`{`
`588`		`- if ($key >= $val) {`
`589`		`- return true;`
`590`		`- }`
`591`		`- return false;`
	`562`	`+ return $key >= $val;`
`592`	`563`	`}`
`593`	`564`
`594`	`565`	`/**`
`@@ -600,10 +571,7 @@ protected function condGreaterEqual($key, $val)`
`600`	`571`	`*/`
`601`	`572`	`protected function condLessEqual($key, $val)`
`602`	`573`	`{`
`603`		`- if ($key <= $val) {`
`604`		`- return true;`
`605`		`- }`
`606`		`- return false;`
	`574`	`+ return $key <= $val;`
`607`	`575`	`}`
`608`	`576`
`609`	`577`	`/**`
`@@ -615,12 +583,7 @@ protected function condLessEqual($key, $val)`
`615`	`583`	`*/`
`616`	`584`	`protected function condIn($key, $val)`
`617`	`585`	`{`
`618`		`- if (is_array($val)) {`
`619`		`- if (in_array($key, $val)) {`
`620`		`- return true;`
`621`		`- }`
`622`		`- }`
`623`		`- return false;`
	`586`	`+ return (is_array($val) && in_array($key, $val));`
`624`	`587`	`}`
`625`	`588`
`626`	`589`	`/**`
`@@ -632,12 +595,7 @@ protected function condIn($key, $val)`
`632`	`595`	`*/`
`633`	`596`	`protected function condNotIn($key, $val)`
`634`	`597`	`{`
`635`		`- if (is_array($val)) {`
`636`		`- if (!in_array($key, $val)) {`
`637`		`- return true;`
`638`		`- }`
`639`		`- }`
`640`		`- return false;`
	`598`	`+ return (is_array($val) && !in_array($key, $val));`
`641`	`599`	`}`
`642`	`600`
`643`	`601`	`/**`
`@@ -649,10 +607,7 @@ protected function condNotIn($key, $val)`
`649`	`607`	`*/`
`650`	`608`	`protected function condNull($key, $val)`
`651`	`609`	`{`
`652`		`- if (is_null($key) \|\| $key == $val) {`
`653`		`- return true;`
`654`		`- }`
`655`		`- return false;`
	`610`	`+ return (is_null($key) \|\| $key == $val);`
`656`	`611`	`}`
`657`	`612`
`658`	`613`	`/**`
`@@ -664,10 +619,7 @@ protected function condNull($key, $val)`
`664`	`619`	`*/`
`665`	`620`	`protected function condNotNull($key, $val)`
`666`	`621`	`{`
`667`		`- if (!is_null($key) && $key !== $val) {`
`668`		`- return true;`
`669`		`- }`
`670`		`- return false;`
	`622`	`+ return (!is_null($key) && $key !== $val);`
`671`	`623`	`}`
`672`	`624`
`673`	`625`	`/**`
`@@ -679,8 +631,7 @@ protected function condNotNull($key, $val)`
`679`	`631`	`*/`
`680`	`632`	`protected function condStartsWith($key, $val)`
`681`	`633`	`{`
`682`		`- $pattern = '/^'.$val.'/';`
`683`		`- if (preg_match($pattern, $key)) {`
	`634`	`+ if (preg_match("/^$val/", $key)) {`
`684`	`635`	`return true;`
`685`	`636`	`}`
`686`	`637`
`@@ -716,11 +667,7 @@ protected function condMatch($key, $val)`
`716`	`667`	`*/`
`717`	`668`	`protected function condContains($key, $val)`
`718`	`669`	`{`
`719`		`- if (strpos($key, $val) !== false) {`
`720`		`- return true;`
`721`		`- }`
`722`		`-`
`723`		`- return false;`
	`670`	`+ return (strpos($key, $val) !== false);`
`724`	`671`	`}`
`725`	`672`
`726`	`673`	`/**`
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`	`*`
`@@ -106,7 +104,6 @@ public function get($object = true)`
`106`	`104`	`return $this->prepareResult($this->_map, $object);`
`107`	`105`	`}`
`108`	`106`
`109`		`-`
`110`	`107`	`/**`
`111`	`108`	`* alias of get method`
`112`	`109`	`*`
`@@ -119,8 +116,6 @@ public function fetch($object = true)`
`119`	`116`	`return $this->get($object);`
`120`	`117`	`}`
`121`	`118`
`122`		`-`
`123`		`-`
`124`	`119`	`/**`
`125`	`120`	`* check data exists in system`
`126`	`121`	`*`
`@@ -131,15 +126,9 @@ public function exists()`
`131`	`126`	`{`
`132`	`127`	`$this->prepare();`
`133`	`128`
`134`		`- if (!empty($this->_map) && !is_null($this->_map)) {`
`135`		`- return true;`
`136`		`- }`
`137`		`-`
`138`		`- return false;`
	`129`	`+ return (!empty($this->_map) && !is_null($this->_map));`
`139`	`130`	`}`
`140`	`131`
`141`		`-`
`142`		`-`
`143`	`132`	`/**`
`144`	`133`	`* reset given data to the $_map`
`145`	`134`	`*`
`@@ -157,7 +146,6 @@ public function reset($data = null)`
`157`	`146`	`return $this;`
`158`	`147`	`}`
`159`	`148`
`160`		`-`
`161`	`149`	`/**`
`162`	`150`	`* getting group data from specific column`
`163`	`151`	`*`
`@@ -170,14 +158,14 @@ public function groupBy($column)`
`170`	`158`	`{`
`171`	`159`	`$this->prepare();`
`172`	`160`
`173`		`- $new_data = [];`
	`161`	`+ $data = [];`
`174`	`162`	`foreach ($this->_map as $map) {`
`175`	`163`	`if (isset($map[$column])) {`
`176`		`- $new_data[$map[$column]][] = $map;`
	`164`	`+ $data[$map[$column]][] = $map;`
`177`	`165`	`}`
`178`	`166`	`}`
`179`	`167`
`180`		`- $this->_map = $new_data;`
	`168`	`+ $this->_map = $data;`
`181`	`169`	`return $this;`
`182`	`170`	`}`
`183`	`171`
`@@ -484,7 +472,6 @@ public function pipe(callable $fn, $class = null)`
`484`	`472`	`return $this;`
`485`	`473`	`}`
`486`	`474`
`487`		`-`
`488`	`475`	`/**`
`489`	`476`	`* filtered each element of prepared data`
`490`	`477`	`*`
`@@ -497,18 +484,18 @@ public function filter(callable $fn, $key = false)`
`497`	`484`	`{`
`498`	`485`	`$this->prepare();`
`499`	`486`
`500`		`- $new_data = [];`
	`487`	`+ $data = [];`
`501`	`488`	`foreach ($this->_map as $k => $val) {`
`502`	`489`	`if ($fn($val)) {`
`503`	`490`	`if ($key) {`
`504`		`- $new_data[$k] = $val;`
	`491`	`+ $data[$k] = $val;`
`505`	`492`	`} else {`
`506`		`- $new_data[] = $val;`
	`493`	`+ $data[] = $val;`
`507`	`494`	`}`
`508`	`495`	`}`
`509`	`496`	`}`
`510`	`497`
`511`		`- return $new_data;`
	`498`	`+ return $data;`
`512`	`499`	`}`
`513`	`500`
`514`	`501`	`/**`
`@@ -559,7 +546,6 @@ public function collect($data)`
`559`	`546`	`return $this;`
`560`	`547`	`}`
`561`	`548`
`562`		`-`
`563`	`549`	`/**`
`564`	`550`	`* implode resulting data from desire key and delimeter`
`565`	`551`	`*`
`@@ -681,7 +667,7 @@ public function chunk($amount, callable $fn = null)`
`681`	`667`	`$chunks[] = $return;`
`682`	`668`	`}`
`683`	`669`	`}`
`684`		`- return count($chunks)>0?$chunks:null;`
	`670`	`+ return count($chunks) > 0 ? $chunks : null;`
`685`	`671`	`}`
`686`	`672`
`687`	`673`	`return $chunk_value;`