minerva-framework / minerva-frontql

src/FrontQL/Adapter/Where/WhereAdapter.php

Spacing +5 added lines, -5 removed lines

@@ -54,17 +54,17 @@
     public function fromArray(array $jWhere)
     {
         $where = new Where();
-        foreach($jWhere as $item){
-            if(is_array($item)){
-                if(!in_array($item[0], $this->allowed)) {
+        foreach ($jWhere as $item) {
+            if (is_array($item)) {
+                if (!in_array($item[0], $this->allowed)) {
                     throw new InvalidCommandException();
                 }
                 $method = $item[0];
                 unset($item[0]);
                 call_user_func_array([$where, $method], $item);
             }
-            if(is_string($item)){
-                if(in_array($item, $this->allowed))
+            if (is_string($item)) {
+                if (in_array($item, $this->allowed))
                     call_user_func([$where, $item]);
             }
         }

Braces +3 added lines, -2 removed lines

@@ -64,8 +64,9 @@
                 call_user_func_array([$where, $method], $item);
             }
             if(is_string($item)){
-                if(in_array($item, $this->allowed))
-                    call_user_func([$where, $item]);
+                if(in_array($item, $this->allowed)) {
+                                    call_user_func([$where, $item]);
+                }
             }
         }
         return $where;

src/FrontQL/Adapter/Select/SelectPayload.php

Spacing +11 added lines, -11 removed lines

@@ -38,21 +38,21 @@ 
     public function getColumns()
     {
         // Se nenhuma coluna foi definida todas serão retornadas
-        if(!isset($this->payload['columns']) || !is_array($this->payload['columns']))
+        if (!isset($this->payload['columns']) || !is_array($this->payload['columns']))
             return ['*'];
 
         $regex = '/^[a-zA-Z_][a-zA-Z0-9_]*$/';
         $columns = array();
 
-        foreach ($this->payload['columns'] as $column){
+        foreach ($this->payload['columns'] as $column) {
             // Valida o nome da coluna
-            if(!is_string($column) || !preg_match($regex, $column))
+            if (!is_string($column) || !preg_match($regex, $column))
                 throw new InvalidColumnNameException();
 
             $columns[] = $column;
         }
 
-        if(count($columns) == 0)
+        if (count($columns) == 0)
             return ['*'];
 
         return $columns;
@@ -65,10 +65,10 @@ 
      */
     public function getLimit()
     {
-        if(!isset($this->payload['limit']))
+        if (!isset($this->payload['limit']))
             return null;
 
-        if(!is_int($this->payload['limit']))
+        if (!is_int($this->payload['limit']))
             return null;
 
         return $this->payload['limit'];
@@ -81,10 +81,10 @@ 
      */
     public function getOffset()
     {
-        if(!isset($this->payload['offset']))
+        if (!isset($this->payload['offset']))
             return null;
 
-        if(!is_int($this->payload['offset']))
+        if (!is_int($this->payload['offset']))
             return null;
 
         return $this->payload['offset'];
@@ -99,12 +99,12 @@ 
     {
         $allowed = ['ASC', 'DESC'];
 
-        if(!isset($this->payload['order']) || !is_array($this->payload['order']))
+        if (!isset($this->payload['order']) || !is_array($this->payload['order']))
             return '';
 
         $orders = array();
 
-        foreach ($this->payload['order'] as $order){
+        foreach ($this->payload['order'] as $order) {
             $columns  = implode(', ', $order[0]);
             $command  = in_array($order[1], $allowed) ? $order[1] : 'ASC';
             $orders[] = "{$columns}, {$command}";
@@ -120,7 +120,7 @@ 
      */
     public function getWhere()
     {
-        if(!is_array($this->payload['where']))
+        if (!is_array($this->payload['where']))
             return [];
 
         $adapter = new WhereAdapter();

Braces +27 added lines, -18 removed lines

@@ -38,22 +38,25 @@ 
     public function getColumns()
     {
         // Se nenhuma coluna foi definida todas serão retornadas
-        if(!isset($this->payload['columns']) || !is_array($this->payload['columns']))
-            return ['*'];
+        if(!isset($this->payload['columns']) || !is_array($this->payload['columns'])) {
+                    return ['*'];
+        }
 
         $regex = '/^[a-zA-Z_][a-zA-Z0-9_]*$/';
         $columns = array();
 
         foreach ($this->payload['columns'] as $column){
             // Valida o nome da coluna
-            if(!is_string($column) || !preg_match($regex, $column))
-                throw new InvalidColumnNameException();
+            if(!is_string($column) || !preg_match($regex, $column)) {
+                            throw new InvalidColumnNameException();
+            }
 
             $columns[] = $column;
         }
 
-        if(count($columns) == 0)
-            return ['*'];
+        if(count($columns) == 0) {
+                    return ['*'];
+        }
 
         return $columns;
     }
@@ -65,11 +68,13 @@ 
      */
     public function getLimit()
     {
-        if(!isset($this->payload['limit']))
-            return null;
+        if(!isset($this->payload['limit'])) {
+                    return null;
+        }
 
-        if(!is_int($this->payload['limit']))
-            return null;
+        if(!is_int($this->payload['limit'])) {
+                    return null;
+        }
 
         return $this->payload['limit'];
     }
@@ -81,11 +86,13 @@ 
      */
     public function getOffset()
     {
-        if(!isset($this->payload['offset']))
-            return null;
+        if(!isset($this->payload['offset'])) {
+                    return null;
+        }
 
-        if(!is_int($this->payload['offset']))
-            return null;
+        if(!is_int($this->payload['offset'])) {
+                    return null;
+        }
 
         return $this->payload['offset'];
     }
@@ -99,8 +106,9 @@ 
     {
         $allowed = ['ASC', 'DESC'];
 
-        if(!isset($this->payload['order']) || !is_array($this->payload['order']))
-            return '';
+        if(!isset($this->payload['order']) || !is_array($this->payload['order'])) {
+                    return '';
+        }
 
         $orders = array();
 
@@ -120,8 +128,9 @@ 
      */
     public function getWhere()
     {
-        if(!is_array($this->payload['where']))
-            return [];
+        if(!is_array($this->payload['where'])) {
+                    return [];
+        }
 
         $adapter = new WhereAdapter();
         $where = $adapter->fromArray($this->payload['where']);

src/FrontQL/Adapter/Select/SelectAdapter.php

Spacing +2 added lines, -2 removed lines

@@ -52,7 +52,7 @@ 
      */
     public function getProtectedColumns()
     {
-        if(is_null($this->protectedColumns))
+        if (is_null($this->protectedColumns))
             $this->protectedColumns = [];
 
         return $this->protectedColumns;
@@ -80,7 +80,7 @@ 
         // Adapta o payload ao padrão do zend
         $select = new Select();
 
-        if(!is_null($this->getSelectPayload()->getOrder()))
+        if (!is_null($this->getSelectPayload()->getOrder()))
             $select->order($this->getSelectPayload()->getOrder());
 
         $select->columns($columns);

Braces +6 added lines, -4 removed lines

@@ -52,8 +52,9 @@ 
      */
     public function getProtectedColumns()
     {
-        if(is_null($this->protectedColumns))
-            $this->protectedColumns = [];
+        if(is_null($this->protectedColumns)) {
+                    $this->protectedColumns = [];
+        }
 
         return $this->protectedColumns;
     }
@@ -80,8 +81,9 @@ 
         // Adapta o payload ao padrão do zend
         $select = new Select();
 
-        if(!is_null($this->getSelectPayload()->getOrder()))
-            $select->order($this->getSelectPayload()->getOrder());
+        if(!is_null($this->getSelectPayload()->getOrder())) {
+                    $select->order($this->getSelectPayload()->getOrder());
+        }
 
         $select->columns($columns);
         $select->where($this->getSelectPayload()->getWhere());