minerva-framework / minerva-frontql

src/FrontQL/Adapter/Where/WhereAdapter.php

Indentation +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
                     if($item == 'and')
                         $where = $where->and;
                     else if ($item == 'or')
-                       $where = $where->or;
+                        $where = $where->or;
                     else if ($item == 'nest')
                         $where = $where->nest();
                     else if ($item == 'unnest')

Spacing +6 added lines, -6 removed lines

@@ -59,18 +59,18 @@
     {
         $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]);
                 $where = call_user_func_array([$where, $method], $item);
             }
-            if(is_string($item)){
-                if(in_array($item, $this->allowed))
-                    if($item == 'and')
+            if (is_string($item)) {
+                if (in_array($item, $this->allowed))
+                    if ($item == 'and')
                         $where = $where->and;
                     else if ($item == 'or')
                        $where = $where->or;

Braces +9 added lines, -8 removed lines

@@ -69,15 +69,16 @@
                 $where = call_user_func_array([$where, $method], $item);
             }
             if(is_string($item)){
-                if(in_array($item, $this->allowed))
-                    if($item == 'and')
+                if(in_array($item, $this->allowed)) {
+                                    if($item == 'and')
                         $where = $where->and;
-                    else if ($item == 'or')
-                       $where = $where->or;
-                    else if ($item == 'nest')
-                        $where = $where->nest();
-                    else if ($item == 'unnest')
-                        $where = $where->unnest();
+                } else if ($item == 'or') {
+                                           $where = $where->or;
+                    } else if ($item == 'nest') {
+                                            $where = $where->nest();
+                    } else if ($item == 'unnest') {
+                                            $where = $where->unnest();
+                    }
             }
         }
         return $where;

src/FrontQL/Adapter/Select/SelectAdapter.php

Indentation +2 added lines, -2 removed lines

@@ -88,11 +88,11 @@
         
         $limit = $this->getSelectPayload()->getLimit();
         if(!empty($limit))
-          $select->limit($this->getSelectPayload()->getLimit());
+            $select->limit($this->getSelectPayload()->getLimit());
         
         $offset = $this->getSelectPayload()->getOffset();
         if(!empty($offset))
-           $select->offset($this->getSelectPayload()->getOffset());
+            $select->offset($this->getSelectPayload()->getOffset());
 
         return $select;
     }

Spacing +4 added lines, -4 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,18 +80,18 @@ 
         // 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);
         $select->where($this->getSelectPayload()->getWhere());
         
         $limit = $this->getSelectPayload()->getLimit();
-        if(!empty($limit))
+        if (!empty($limit))
           $select->limit($this->getSelectPayload()->getLimit());
         
         $offset = $this->getSelectPayload()->getOffset();
-        if(!empty($offset))
+        if (!empty($offset))
            $select->offset($this->getSelectPayload()->getOffset());
 
         return $select;

Braces +12 added lines, -8 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,19 +81,22 @@ 
         // 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());
         
         $limit = $this->getSelectPayload()->getLimit();
-        if(!empty($limit))
-          $select->limit($this->getSelectPayload()->getLimit());
+        if(!empty($limit)) {
+                  $select->limit($this->getSelectPayload()->getLimit());
+        }
         
         $offset = $this->getSelectPayload()->getOffset();
-        if(!empty($offset))
-           $select->offset($this->getSelectPayload()->getOffset());
+        if(!empty($offset)) {
+                   $select->offset($this->getSelectPayload()->getOffset());
+        }
 
         return $select;
     }

src/FrontQL/Adapter/Select/SelectPayload.php

Spacing +10 added lines, -10 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 500;
 
-        if(!is_numeric($this->payload['limit']))
+        if (!is_numeric($this->payload['limit']))
             return 500;
 
         return (int) $this->payload['limit'];
@@ -81,10 +81,10 @@ 
      */
     public function getOffset()
     {
-        if(!isset($this->payload['offset']))
+        if (!isset($this->payload['offset']))
             return null;
 
-        if(!is_numeric($this->payload['offset']))
+        if (!is_numeric($this->payload['offset']))
             return null;
 
         return (int) $this->payload['offset'];
@@ -99,7 +99,7 @@ 
     {
         $allowed = ['ASC', 'DESC'];
 
-        if(!isset($this->payload['order']) || !is_array($this->payload['order']))
+        if (!isset($this->payload['order']) || !is_array($this->payload['order']))
             return null;
 
         $orders = array();
@@ -121,7 +121,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 500;
+        if(!isset($this->payload['limit'])) {
+                    return 500;
+        }
 
-        if(!is_numeric($this->payload['limit']))
-            return 500;
+        if(!is_numeric($this->payload['limit'])) {
+                    return 500;
+        }
 
         return (int) $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_numeric($this->payload['offset']))
-            return null;
+        if(!is_numeric($this->payload['offset'])) {
+                    return null;
+        }
 
         return (int) $this->payload['offset'];
     }
@@ -99,8 +106,9 @@ 
     {
         $allowed = ['ASC', 'DESC'];
 
-        if(!isset($this->payload['order']) || !is_array($this->payload['order']))
-            return null;
+        if(!isset($this->payload['order']) || !is_array($this->payload['order'])) {
+                    return null;
+        }
 
         $orders = array();
 
@@ -121,8 +129,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']);