FramyFramework / Framy

app/framework/Component/Database/Schema/Builder.php

Spacing +11 added lines, -11 removed lines

@@ -34,43 +34,43 @@ 
 
             $query .= $Column->type;
 
-            if(isset($Column->length)) {
+            if (isset($Column->length)) {
                 $query .= "(".$Column->length;
             }
 
-            if(isset($Column->scale) && isset($Column->length)) {
+            if (isset($Column->scale) && isset($Column->length)) {
                 $query .= ", ".$Column->scale.")";
             } else {
-                if(isset($Column->length)) {
+                if (isset($Column->length)) {
                     $query .= ")";
                 }
             }
 
-            if($Column->isUnsigned) {
+            if ($Column->isUnsigned) {
                 $query .= " UNSIGNED";
             }
 
-            if($Column->notNull) {
+            if ($Column->notNull) {
                 $query .= " NOT NULL";
             }
 
-            if($Column->isAutoIncrement) {
+            if ($Column->isAutoIncrement) {
                 $query .= " AUTO_INCREMENT";
             }
 
-            if($Column->primaryKey) {
+            if ($Column->primaryKey) {
                 $query .= " PRIMARY KEY";
             }
 
-            if($Column->foreignKey) {
+            if ($Column->foreignKey) {
                 $query .= " FOREIGN KEY";
             }
 
-            if($Column->unique) {
+            if ($Column->unique) {
                 $query .= " UNIQUE";
             }
 
-            if($Column->default != null) {
+            if ($Column->default != null) {
                 $default = $Column->default;
                 if (is_string($default)) {
                     if (str($default)->startsWith("%"))
@@ -82,7 +82,7 @@ 
                 $query .= " DEFAULT ".$default;
             }
 
-            if(count($table->getColumns())-1 != $key)
+            if (count($table->getColumns()) - 1 != $key)
                 $query .= ", ";
         }
         $query .= ");";

Braces +8 added lines, -6 removed lines

@@ -73,17 +73,19 @@
             if($Column->default != null) {
                 $default = $Column->default;
                 if (is_string($default)) {
-                    if (str($default)->startsWith("%"))
-                        $default = str($default)->explode("%")->last();
-                    else
-                        $default = "'".$default."'";
+                    if (str($default)->startsWith("%")) {
+                                            $default = str($default)->explode("%")->last();
+                    } else {
+                                            $default = "'".$default."'";
+                    }
                 }
 
                 $query .= " DEFAULT ".$default;
             }
 
-            if(count($table->getColumns())-1 != $key)
-                $query .= ", ";
+            if(count($table->getColumns())-1 != $key) {
+                            $query .= ", ";
+            }
         }
         $query .= ");";
 

app/framework/Component/Database/Query/Grammars/Grammar.php

Spacing +50 added lines, -50 removed lines

@@ -54,7 +54,7 @@ 
         $original = $query->columns;
 
         if (is_null($query->columns)) {
-            $query->columns = ['*'];
+            $query->columns = [ '*' ];
         }
 
         // To compile the query, we'll spin through each component of the query and
@@ -95,8 +95,8 @@ 
         // basic routine regardless of an amount of records given to us to insert.
         $table = $this->wrapTable($query->from);
 
-        if (! is_array(reset($values))) {
-            $values = [$values];
+        if (!is_array(reset($values))) {
+            $values = [ $values ];
         }
 
         $columns = $this->columnize(array_keys(reset($values)));
@@ -104,10 +104,10 @@ 
         // We need to build a list of parameter place-holders of values that are bound
         // to the query. Each insert should have the exact same amount of parameter
         // bindings so we will loop through the record and parameterize them all.
-        $parameters = [];
+        $parameters = [ ];
 
         foreach ($values as $record) {
-            $parameters[] = '('.$this->parameterize($record).')';
+            $parameters[ ] = '('.$this->parameterize($record).')';
         }
 
         $parameters = implode(', ', $parameters);
@@ -129,13 +129,13 @@ 
         // Each one of the columns in the update statements needs to be wrapped in the
         // keyword identifiers, also a place-holder needs to be created for each of
         // the values in the list of bindings so we can make the sets statements.
-        $columns = [];
+        $columns = [ ];
 
         foreach ($values as $key => $value) {
             $param = $this->parameter($value);
             $param = is_string($param) ? "'".$param."'" : $param;
 
-            $columns[] = $this->wrap($key)." = ".$param;
+            $columns[ ] = $this->wrap($key)." = ".$param;
         }
 
         $columns = implode(', ', $columns);
@@ -171,7 +171,7 @@ 
      */
     public function compileTruncate(Builder $query)
     {
-        return ['truncate '.$this->wrapTable($query->from) => []];
+        return [ 'truncate '.$this->wrapTable($query->from) => [ ] ];
     }
 
     /**
@@ -182,16 +182,16 @@ 
      */
     protected function compileComponents(Builder $query)
     {
-        $sql = [];
+        $sql = [ ];
 
         foreach ($this->selectComponents as $component) {
             // To compile the query, we'll spin through each component of the query and
             // see if that component exists. If it does we'll just call the compiler
             // function for the component which is responsible for making the SQL.
             if (!is_null($query->$component)) {
-                $method = 'compile' . ucfirst($component);
+                $method = 'compile'.ucfirst($component);
 
-                $sql[$component] = $this->$method($query, $query->$component);
+                $sql[ $component ] = $this->$method($query, $query->$component);
             }
         }
 
@@ -216,7 +216,7 @@ 
 
         $select = $query->distinct ? 'select distinct ' : 'select ';
 
-        return $select . $this->columnize($columns);
+        return $select.$this->columnize($columns);
     }
 
     /**
@@ -228,7 +228,7 @@ 
      */
     protected function compileFrom(Builder $query, $table)
     {
-        return 'from ' . $this->wrapTable($table);
+        return 'from '.$this->wrapTable($table);
     }
 
     /**
@@ -239,7 +239,7 @@ 
      */
     protected function compileWheres(Builder $query)
     {
-        $sql = [];
+        $sql = [ ];
 
         if (is_null($query->wheres)) {
             return '';
@@ -249,9 +249,9 @@ 
         // for actually creating the where clauses SQL. This helps keep the code nice
         // and maintainable since each clause has a very small method that it uses.
         foreach ($query->wheres as $where) {
-            $method = "where{$where['type']}";
+            $method = "where{$where[ 'type' ]}";
 
-            $sql[] = $where['boolean'].' '.$this->$method($query, $where);
+            $sql[ ] = $where[ 'boolean' ].' '.$this->$method($query, $where);
         }
 
         // If we actually have some where clauses, we will strip off the first boolean
@@ -275,7 +275,7 @@ 
      */
     protected function compileOrders(Builder $query, $orders)
     {
-        return 'order by '.implode(', ', $orders[0])." ".$orders[1];
+        return 'order by '.implode(', ', $orders[ 0 ])." ".$orders[ 1 ];
     }
 
     /**
@@ -299,7 +299,7 @@ 
      */
     protected function compileAggregate(Builder $query, $aggregate)
     {
-        $column = $this->columnize($aggregate['columns']);
+        $column = $this->columnize($aggregate[ 'columns' ]);
 
         // If the query has a "distinct" constraint and we're not asking for all columns
         // we need to prepend "distinct" onto the column name so that the query takes
@@ -308,7 +308,7 @@ 
             $column = 'distinct '.$column;
         }
 
-        return 'select '.$aggregate['function'].'('.$column.') as aggregate';
+        return 'select '.$aggregate[ 'function' ].'('.$column.') as aggregate';
     }
 
     /**
@@ -340,7 +340,7 @@ 
     protected function whereBasic(Builder $query, $where)
     {
 //        $value = $this->parameter($where['value']);
-        return $this->wrap($where['column']).' '.$where['operator'].' ?'; //.$value;
+        return $this->wrap($where[ 'column' ]).' '.$where[ 'operator' ].' ?'; //.$value;
     }
 
     /**
@@ -352,9 +352,9 @@ 
      */
     protected function whereBetween(Builder $query, $where)
     {
-        $between = $where['not'] ? 'not between' : 'between';
+        $between = $where[ 'not' ] ? 'not between' : 'between';
 
-        return $this->wrap($where['column']).' '.$between.' ? and ?';
+        return $this->wrap($where[ 'column' ]).' '.$between.' ? and ?';
     }
 
     /**
@@ -366,18 +366,18 @@ 
      */
     protected function whereIn(Builder $query, $where)
     {
-        $in = $where['not'] ? 'not in' : 'in';
+        $in = $where[ 'not' ] ? 'not in' : 'in';
 
         $values = " (";
 
         $count = count($query->getBindings());
         for ($i = 1; $i <= $count; $i++) {
-            $append = ($count >  $i) ? "," : "";
-            $values .= "?" . $append;
+            $append = ($count > $i) ? "," : "";
+            $values .= "?".$append;
         }
         $values .= ")";
 
-        return $this->wrap($where['column']). ' '.$in.$values;
+        return $this->wrap($where[ 'column' ]).' '.$in.$values;
     }
 
     /**
@@ -389,9 +389,9 @@ 
      */
     protected function whereNull(Builder $query, $where)
     {
-        $null = $where['not'] ? 'is not null' : 'is null';
+        $null = $where[ 'not' ] ? 'is not null' : 'is null';
 
-        return $this->wrap($where['column']). ' '.$null;
+        return $this->wrap($where[ 'column' ]).' '.$null;
     }
 
     /**
@@ -403,7 +403,7 @@ 
      */
     protected function whereDate(Builder $builder, $where)
     {
-        return $this->wrap($where['column']).$where['operator'].$where['value'];
+        return $this->wrap($where[ 'column' ]).$where[ 'operator' ].$where[ 'value' ];
     }
 
     /**
@@ -415,7 +415,7 @@ 
      */
     protected function whereYear(Builder $builder, $where)
     {
-        return "year(".$this->wrap($where['column']).")".$where['operator'].$where['value'];
+        return "year(".$this->wrap($where[ 'column' ]).")".$where[ 'operator' ].$where[ 'value' ];
     }
 
     /**
@@ -427,7 +427,7 @@ 
      */
     protected function whereMonth(Builder $builder, $where)
     {
-        return "month(".$this->wrap($where['column']).")".$where['operator'].$where['value'];
+        return "month(".$this->wrap($where[ 'column' ]).")".$where[ 'operator' ].$where[ 'value' ];
     }
 
     /**
@@ -439,7 +439,7 @@ 
      */
     protected function whereDay(Builder $builder, $where)
     {
-        return "day(".$this->wrap($where['column']).")".$where['operator'].$where['value'];
+        return "day(".$this->wrap($where[ 'column' ]).")".$where[ 'operator' ].$where[ 'value' ];
     }
 
     /**
@@ -450,8 +450,8 @@ 
      */
     protected function concatenate($segments)
     {
-        return implode(' ', array_filter($segments, function ($value) {
-            return (string)$value !== '';
+        return implode(' ', array_filter($segments, function($value) {
+            return (string) $value !== '';
         }));
     }
 
@@ -463,7 +463,7 @@ 
      */
     public function columnize(array $columns)
     {
-        return implode(', ', array_map([$this, 'wrap'], $columns));
+        return implode(', ', array_map([ $this, 'wrap' ], $columns));
     }
 
     /**
@@ -474,10 +474,10 @@ 
      */
     public function parameterize(array $values)
     {
-        $val = array_map([$this, 'parameter'], $values);
+        $val = array_map([ $this, 'parameter' ], $values);
 
         foreach ($val as $key => $item) {
-            $val[$key] = $this->quoteString($item);
+            $val[ $key ] = $this->quoteString($item);
         }
 
         return implode(', ', $val);
@@ -485,11 +485,11 @@ 
 
     public function parameterizeForUpdate(array $columns, array $values)
     {
-        $queryValues = [];
+        $queryValues = [ ];
 
         $count = count($values);
         for ($i = 0; $i < $count; $i++) {
-            $queryValues[] = $columns[$i]."=".$this->quoteString(array_values($values)[$i]);
+            $queryValues[ ] = $columns[ $i ]."=".$this->quoteString(array_values($values)[ $i ]);
         }
 
         return implode(", ", $queryValues);
@@ -515,7 +515,7 @@ 
     public function quoteString($value)
     {
         if (is_array($value)) {
-            return implode(', ', array_map([$this, __FUNCTION__], $value));
+            return implode(', ', array_map([ $this, __FUNCTION__ ], $value));
         }
 
         return "'$value'";
@@ -530,7 +530,7 @@ 
     public function wrapTable($table)
     {
         if (!$this->isExpression($table)) {
-            return $this->wrap($this->tablePrefix . $table, true);
+            return $this->wrap($this->tablePrefix.$table, true);
         }
 
         return $this->getValue($table);
@@ -556,13 +556,13 @@ 
             $segments = explode(' ', $value);
 
             if ($prefixAlias) {
-                $segments[2] = $this->tablePrefix.$segments[2];
+                $segments[ 2 ] = $this->tablePrefix.$segments[ 2 ];
             }
 
-            return $this->wrap($segments[0]).' as '.$this->wrapValue($segments[2]);
+            return $this->wrap($segments[ 0 ]).' as '.$this->wrapValue($segments[ 2 ]);
         }
 
-        $wrapped = [];
+        $wrapped = [ ];
 
         $segments = explode('.', $value);
 
@@ -571,9 +571,9 @@ 
         // segments as if it was a table and the rest as just regular values.
         foreach ($segments as $key => $segment) {
             if ($key == 0 && count($segments) > 1) {
-                $wrapped[] = $this->wrapTable($segment);
+                $wrapped[ ] = $this->wrapTable($segment);
             } else {
-                $wrapped[] = $this->wrapValue($segment);
+                $wrapped[ ] = $this->wrapValue($segment);
             }
         }
 
@@ -595,11 +595,11 @@ 
         // as well in order to generate proper syntax. If this is a column of course
         // no prefix is necessary. The condition will be true when from wrapTable.
         if ($prefixAlias) {
-            $segments[1] = $this->tablePrefix . $segments[1];
+            $segments[ 1 ] = $this->tablePrefix.$segments[ 1 ];
         }
 
         return $this->wrap(
-                $segments[0]) . ' as ' . $this->wrapValue($segments[1]
+                $segments[ 0 ]).' as '.$this->wrapValue($segments[ 1 ]
             );
     }
 
@@ -611,7 +611,7 @@ 
      */
     protected function wrapSegments($segments)
     {
-        return arr($segments)->map(function ($segment, $key) use ($segments) {
+        return arr($segments)->map(function($segment, $key) use ($segments) {
             return $key == 0 && count($segments) > 1
                 ? $this->wrapTable($segment)
                 : $this->wrapValue($segment);
@@ -627,7 +627,7 @@ 
     protected function wrapValue($value)
     {
         if ($value !== '*') {
-            return '`' . str_replace('"', '""', $value) . '`';
+            return '`'.str_replace('"', '""', $value).'`';
         }
 
         return $value;

app/framework/Component/Database/Query/Builder.php

Spacing +62 added lines, -62 removed lines

@@ -49,12 +49,12 @@ 
      * @var array
      */
     protected $bindings = [
-        'select' => [],
-        'join'   => [],
-        'where'  => [],
-        'having' => [],
-        'order'  => [],
-        'union'  => [],
+        'select' => [ ],
+        'join'   => [ ],
+        'where'  => [ ],
+        'having' => [ ],
+        'order'  => [ ],
+        'union'  => [ ],
     ];
 
     /**
@@ -141,12 +141,12 @@ 
      */
     protected function addArrayOfWheres($column, string $boolean)
     {
-        return $this->whereNested(function ($query) use ($column) {
+        return $this->whereNested(function($query) use ($column) {
 
             /** @var Builder $query */
             foreach ($column as $key => $value) {
                 if (is_numeric($key) && is_array($value)) {
-                    call_user_func_array([$query, 'where'], $value);
+                    call_user_func_array([ $query, 'where' ], $value);
                 } else {
                     $query->where($key, '=', $value);
                 }
@@ -205,14 +205,14 @@ 
      */
     public function addBinding($value, $type = 'where')
     {
-        if (! array_key_exists($type, $this->bindings)) {
+        if (!array_key_exists($type, $this->bindings)) {
             throw new InvalidArgumentException("Invalid binding type: {$type}.");
         }
 
         if (is_array($value)) {
-            $this->bindings[$type] = array_values(array_merge($this->bindings[$type], $value));
+            $this->bindings[ $type ] = array_values(array_merge($this->bindings[ $type ], $value));
         } else {
-            $this->bindings[$type][] = $value;
+            $this->bindings[ $type ][ ] = $value;
         }
 
         return $this;
@@ -245,7 +245,7 @@ 
      * @param  array|mixed  $columns
      * @return $this
      */
-    public function select($columns = ['*'])
+    public function select($columns = [ '*' ])
     {
         $this->columns = is_array($columns) ? $columns : func_get_args();
 
@@ -257,7 +257,7 @@ 
      * @param array $bindings
      * @return mixed
      */
-    public function selectRaw(string $query, array $bindings = [])
+    public function selectRaw(string $query, array $bindings = [ ])
     {
         return $this->connection->select($query, $bindings);
     }
@@ -272,8 +272,8 @@ 
             return true;
         }
 
-        if (! is_array(reset($values))) {
-            $values = [$values];
+        if (!is_array(reset($values))) {
+            $values = [ $values ];
         }
 
         // Here, we will sort the insert keys for every record so that each insert is
@@ -282,18 +282,18 @@ 
         else {
             foreach ($values as $key => $value) {
                 ksort($value);
-                $values[$key] = $value;
+                $values[ $key ] = $value;
             }
         }
 
         // We'll treat every insert like a batch insert so we can easily insert each
         // of the records into the database consistently. This will make it much
         // easier on the grammars to just handle one type of record insertion.
-        $bindings = [];
+        $bindings = [ ];
 
         foreach ($values as $record) {
             foreach ($record as $value) {
-                $bindings[] = $value;
+                $bindings[ ] = $value;
             }
         }
 
@@ -348,7 +348,7 @@ 
     {
         $wrapped = $this->grammar->wrap($column);
 
-        $columns = array_merge([$column => $this->raw("$wrapped + $amount")]);
+        $columns = array_merge([ $column => $this->raw("$wrapped + $amount") ]);
 
         return $this->update($columns);
     }
@@ -364,7 +364,7 @@ 
     {
         $wrapped = $this->grammar->wrap($column);
 
-        $columns = array_merge([$column => $this->raw("$wrapped - $amount")]);
+        $columns = array_merge([ $column => $this->raw("$wrapped - $amount") ]);
 
         return $this->update($columns);
     }
@@ -380,7 +380,7 @@ 
         // If an ID is passed to the method, we will set the where clause to check
         // the ID to allow developers to simply and quickly remove a single row
         // from their database without manually specifying the where clauses.
-        if (! is_null($id)) {
+        if (!is_null($id)) {
             $this->where('id', '=', $id);
         }
 
@@ -406,7 +406,7 @@ 
      * @param array $bindings
      * @return bool
      */
-    public function insertRaw(string $query, array $bindings = [])
+    public function insertRaw(string $query, array $bindings = [ ])
     {
         return $this->connection->insert($query, $bindings);
     }
@@ -416,7 +416,7 @@ 
      * @param array $bindings
      * @return int
      */
-    public function updateRaw(string $query, array $bindings = [])
+    public function updateRaw(string $query, array $bindings = [ ])
     {
         return $this->connection->update($query, $bindings);
     }
@@ -426,7 +426,7 @@ 
      * @param array $bindings
      * @return int
      */
-    public function deleteRaw(string $query, array $bindings = [])
+    public function deleteRaw(string $query, array $bindings = [ ])
     {
         return $this->connection->delete($query, $bindings);
     }
@@ -466,7 +466,7 @@ 
         // passed to the method, we will assume that the operator is an equals sign
         // and keep going. Otherwise, we'll require the operator to be passed in.
         if (func_num_args() == 2) {
-            list($value, $operator) = [$operator, '='];
+            list($value, $operator) = [ $operator, '=' ];
         } elseif ($this->invalidOperatorAndValue($operator, $value)) {
             throw new InvalidArgumentException('Illegal operator and value combination.');
         }
@@ -474,8 +474,8 @@ 
         // If the given operator is not found in the list of valid operators we will
         // assume that the developer is just short-cutting the '=' operators and
         // we will set the operators to '=' and set the values appropriately.
-        if (! in_array(strtolower($operator), $this->operators, true)) {
-            list($value, $operator) = [$operator, '='];
+        if (!in_array(strtolower($operator), $this->operators, true)) {
+            list($value, $operator) = [ $operator, '=' ];
         }
 
         // If the value is a Closure, it means the developer is performing an entire
@@ -497,9 +497,9 @@ 
         // will be bound to each SQL statements when it is finally executed.
         $type = 'Basic';
 
-        $this->wheres[] = compact('type', 'column', 'operator', 'value', 'boolean');
+        $this->wheres[ ] = compact('type', 'column', 'operator', 'value', 'boolean');
 
-        if (! $value instanceof Expression) {
+        if (!$value instanceof Expression) {
             $this->addBinding($value, 'where');
         }
 
@@ -519,7 +519,7 @@ 
     {
         $type = 'in';
 
-        $this->wheres[] = compact('column', 'type', 'boolean', 'not');
+        $this->wheres[ ] = compact('column', 'type', 'boolean', 'not');
 
         $this->addBinding($values, 'where');
 
@@ -576,7 +576,7 @@ 
     {
         $type = 'between';
 
-        $this->wheres[] = compact('column', 'type', 'boolean', 'not');
+        $this->wheres[ ] = compact('column', 'type', 'boolean', 'not');
 
         $this->addBinding($values, 'where');
 
@@ -660,7 +660,7 @@ 
         if (count($query->wheres)) {
             $type = 'Nested';
 
-            $this->wheres[] = compact('type', 'query', 'boolean');
+            $this->wheres[ ] = compact('type', 'query', 'boolean');
 
             $this->addBinding($query->getBindings(), 'where');
         }
@@ -688,7 +688,7 @@ 
         // in the array of where clauses for the "main" parent query instance.
         call_user_func($callback, $query);
 
-        $this->wheres[] = compact('type', 'column', 'operator', 'query', 'boolean');
+        $this->wheres[ ] = compact('type', 'column', 'operator', 'query', 'boolean');
 
         $this->addBinding($query->getBindings(), 'where');
 
@@ -707,7 +707,7 @@ 
     {
         $type = 'Null';
 
-        $this->wheres[] = compact('type', 'column', 'boolean', 'not');
+        $this->wheres[ ] = compact('type', 'column', 'boolean', 'not');
 
         return $this;
     }
@@ -827,7 +827,7 @@ 
      */
     protected function addDateBasedWhere($type, $column, $operator, $value, $boolean = 'and')
     {
-        $this->wheres[] = compact('column', 'type', 'boolean', 'operator', 'value');
+        $this->wheres[ ] = compact('column', 'type', 'boolean', 'operator', 'value');
 
         $this->addBinding($value, 'where');
 
@@ -843,11 +843,11 @@ 
      */
     public function orderBy($column, $direction = 'asc')
     {
-        if(!($direction == 'asc' or $direction == 'desc')) {
+        if (!($direction == 'asc' or $direction == 'desc')) {
             handle(new Exception("Order by direction invalid: '".$direction."'"));
         }
 
-        $column = is_array($column) ? $column : [$column];
+        $column = is_array($column) ? $column : [ $column ];
 
         $this->orders = [
             $column,
@@ -891,7 +891,7 @@ 
      * @param array $columns
      * @return ArrayObject|null
      */
-    public function get(array $columns = ['*'], $executeSQLWithoutSeprateBindings = false)
+    public function get(array $columns = [ '*' ], $executeSQLWithoutSeprateBindings = false)
     {
         $this->columns = $columns;
 
@@ -960,11 +960,11 @@ 
      * @param array $columns
      * @return Model
      */
-    public function first(array $columns = ['*'])
+    public function first(array $columns = [ '*' ])
     {
         $this->limit(1);
 
-        return $this->get($columns)[0];
+        return $this->get($columns)[ 0 ];
     }
 
     /**
@@ -975,7 +975,7 @@ 
      */
     public function value(string $val)
     {
-        return $this->first([$val])->$val;
+        return $this->first([ $val ])->$val;
     }
 
     /**
@@ -986,8 +986,8 @@ 
      */
     public function count($columns = '*')
     {
-        if (! is_array($columns)) {
-            $columns = [$columns];
+        if (!is_array($columns)) {
+            $columns = [ $columns ];
         }
 
         return (int) $this->aggregate(__FUNCTION__, $columns);
@@ -1001,7 +1001,7 @@ 
      */
     public function min(string $column)
     {
-        return $this->aggregate(__FUNCTION__, [$column]);
+        return $this->aggregate(__FUNCTION__, [ $column ]);
     }
 
     /**
@@ -1012,7 +1012,7 @@ 
      */
     public function max($column)
     {
-        return $this->aggregate(__FUNCTION__, [$column]);
+        return $this->aggregate(__FUNCTION__, [ $column ]);
     }
 
     /**
@@ -1023,7 +1023,7 @@ 
      */
     public function sum($column)
     {
-        $result = $this->aggregate(__FUNCTION__, [$column]);
+        $result = $this->aggregate(__FUNCTION__, [ $column ]);
 
         return $result ?: 0;
     }
@@ -1036,7 +1036,7 @@ 
      */
     public function avg($column)
     {
-        return $this->aggregate(__FUNCTION__, [$column]);
+        return $this->aggregate(__FUNCTION__, [ $column ]);
     }
 
     /**
@@ -1071,10 +1071,10 @@ 
 
         $results = $this->connection->select($sql);
 
-        if (isset($results[0])) {
-            $results = (array) $results[0];
+        if (isset($results[ 0 ])) {
+            $results = (array) $results[ 0 ];
 
-            return (bool) $results['exists'];
+            return (bool) $results[ 'exists' ];
         }
 
         return false;
@@ -1087,7 +1087,7 @@ 
      */
     public function doesntExist()
     {
-        return ! $this->exists();
+        return !$this->exists();
     }
 
     /**
@@ -1097,7 +1097,7 @@ 
      * @param  array   $columns
      * @return float|int
      */
-    public function aggregate($function, $columns = ['*'])
+    public function aggregate($function, $columns = [ '*' ])
     {
         $this->aggregate = compact('function', 'columns');
 
@@ -1112,10 +1112,10 @@ 
 
         $this->columns = $previousColumns;
 
-        if (isset($results[0])) {
-            $result = array_change_key_case((array) $results[0]);
+        if (isset($results[ 0 ])) {
+            $result = array_change_key_case((array) $results[ 0 ]);
 
-            return $result['aggregate'];
+            return $result[ 'aggregate' ];
         }
     }
 
@@ -1130,7 +1130,7 @@ 
     private function isOperatorValid($operatorToCheck)
     {
         foreach ($this->operators as $operator) {
-            if($operatorToCheck === $operator) {
+            if ($operatorToCheck === $operator) {
                 return true;
             }
         }
@@ -1156,8 +1156,8 @@ 
      */
     protected function cleanBindings(array $bindings)
     {
-        return array_values(array_filter($bindings, function ($binding) {
-            return ! $binding instanceof Expression;
+        return array_values(array_filter($bindings, function($binding) {
+            return !$binding instanceof Expression;
         }));
     }
 
@@ -1171,13 +1171,13 @@ 
     protected function prepareRawQuery(string $query, array $bindings): string
     {
         // search for values in query
-        preg_match_all("/:([^ ]*)/", $query,$values);
+        preg_match_all("/:([^ ]*)/", $query, $values);
 
         // replace values with bindings
-        foreach ($values[1] as $value) {
+        foreach ($values[ 1 ] as $value) {
             // check if fitting binding exists
-            if(array_key_exists($value, $bindings)) {
-                $query = str_replace(":".$value, $bindings[$value], $query);
+            if (array_key_exists($value, $bindings)) {
+                $query = str_replace(":".$value, $bindings[ $value ], $query);
             } else {
                 handle(new Exception("Could not find fitting value '$value' in bindings for query: '$query'"));
             }

app/framework/Component/Routing/Router.php

Spacing +27 added lines, -27 removed lines

@@ -208,9 +208,9 @@ 
         AbstractRouteFactory $route_factory = null
     ) {
         // Instanciate and fall back to defaults
-        $this->service       = $service       ?: new ServiceProvider();
-        $this->app           = $app           ?: new App();
-        $this->routes        = $routes        ?: new RouteCollection();
+        $this->service       = $service ?: new ServiceProvider();
+        $this->app           = $app ?: new App();
+        $this->routes        = $routes ?: new RouteCollection();
         $this->route_factory = $route_factory ?: new RouteFactory();
 
         $this->error_callbacks = new SplStack();
@@ -404,7 +404,7 @@ 
         $capture = self::DISPATCH_NO_CAPTURE
     ) {
         // Set/Initialize our objects to be sent in each callback
-        $this->request  = $request  ?: Request::createFromGlobals();
+        $this->request  = $request ?: Request::createFromGlobals();
         $this->response = $response ?: new Response();
 
         // Bind our objects to our service
@@ -468,7 +468,7 @@ 
                     // Test for HEAD request (like GET)
                     if (strcasecmp($req_method, 'HEAD') === 0
                         && (strcasecmp($method, 'HEAD') === 0
-                            || strcasecmp($method, 'GET') === 0 )
+                            || strcasecmp($method, 'GET') === 0)
                     ) {
 
                         $method_match = true;
@@ -481,7 +481,7 @@ 
                 $possible_match = (null === $method_match) || $method_match;
 
                 // ! is used to negate a match
-                if (isset($path[0]) && $path[0] === '!') {
+                if (isset($path[ 0 ]) && $path[ 0 ] === '!') {
                     $negate = true;
                     $i = 1;
                 } else {
@@ -506,10 +506,10 @@ 
 
                     continue;
 
-                } elseif (isset($path[$i]) && $path[$i] === '@') {
+                } elseif (isset($path[ $i ]) && $path[ $i ] === '@') {
                     // @ is used to specify custom regex
 
-                    $match = preg_match('`' . substr($path, $i + 1) . '`', $uri, $params);
+                    $match = preg_match('`'.substr($path, $i + 1).'`', $uri, $params);
 
                 } else {
                     // Compiling and matching regular expressions is relatively
@@ -518,25 +518,25 @@ 
                     $expression = null;
                     $regex = false;
                     $j = 0;
-                    $n = isset($path[$i]) ? $path[$i] : null;
+                    $n = isset($path[ $i ]) ? $path[ $i ] : null;
 
                     // Find the longest non-regex substring and match it against the URI
                     while (true) {
-                        if (!isset($path[$i])) {
+                        if (!isset($path[ $i ])) {
                             break;
                         } elseif (false === $regex) {
                             $c = $n;
                             $regex = $c === '[' || $c === '(' || $c === '.';
-                            if (false === $regex && false !== isset($path[$i+1])) {
-                                $n = $path[$i + 1];
+                            if (false === $regex && false !== isset($path[ $i + 1 ])) {
+                                $n = $path[ $i + 1 ];
                                 $regex = $n === '?' || $n === '+' || $n === '*' || $n === '{';
                             }
-                            if (false === $regex && $c !== '/' && (!isset($uri[$j]) || $c !== $uri[$j])) {
+                            if (false === $regex && $c !== '/' && (!isset($uri[ $j ]) || $c !== $uri[ $j ])) {
                                 continue 2;
                             }
                             $j++;
                         }
-                        $expression .= $path[$i++];
+                        $expression .= $path[ $i++ ];
                     }
 
                     try {
@@ -644,7 +644,7 @@ 
 
             } else {
                 // Output capturing behavior
-                switch($capture) {
+                switch ($capture) {
                     case self::DISPATCH_CAPTURE_AND_RETURN:
                         $buffed_content = null;
                         while (ob_get_level() >= $this->output_buffer_level) {
@@ -706,7 +706,7 @@ 
     protected function doMiddleware(Route $route)
     {
         /** @var MiddlewareInterface $middleware */
-        foreach($route->getMiddleware() as $middleware) {
+        foreach ($route->getMiddleware() as $middleware) {
             $middleware->handle($this->request());
         }
     }
@@ -722,8 +722,8 @@ 
         // First escape all of the non-named param (non [block]s) for regex-chars
         $route = preg_replace_callback(
             static::ROUTE_ESCAPE_REGEX,
-            function ($match) {
-                return preg_quote($match[0]);
+            function($match) {
+                return preg_quote($match[ 0 ]);
             },
             $route
         );
@@ -734,11 +734,11 @@ 
         // Now let's actually compile the path
         $route = preg_replace_callback(
             static::ROUTE_COMPILE_REGEX,
-            function ($match) use ($match_types) {
+            function($match) use ($match_types) {
                 list(, $pre, $type, $param, $optional) = $match;
 
-                if (isset($match_types[$type])) {
-                    $type = $match_types[$type];
+                if (isset($match_types[ $type ])) {
+                    $type = $match_types[ $type ];
                 }
 
                 // Older versions of PCRE require the 'P' in (?P<named>)
@@ -779,7 +779,7 @@ 
 
         // Set an error handler temporarily
         set_error_handler(
-            function ($errno, $errstr) use (&$error_string) {
+            function($errno, $errstr) use (&$error_string) {
                 $error_string = $errstr;
             },
             E_NOTICE | E_WARNING
@@ -832,7 +832,7 @@ 
 
         // Make sure we are getting a valid route
         if (null === $route) {
-            throw new OutOfBoundsException('No such route with name: '. $route_name);
+            throw new OutOfBoundsException('No such route with name: '.$route_name);
         }
 
         $path = $route->getPath();
@@ -840,11 +840,11 @@ 
         // Use our compilation regex to reverse the path's compilation from its definition
         $reversed_path = preg_replace_callback(
             static::ROUTE_COMPILE_REGEX,
-            function ($match) use ($params) {
-                list($block, $pre, , $param, $optional) = $match;
+            function($match) use ($params) {
+                list($block, $pre,, $param, $optional) = $match;
 
-                if (isset($params[$param])) {
-                    return $pre. $params[$param];
+                if (isset($params[ $param ])) {
+                    return $pre.$params[ $param ];
                 } elseif ($optional) {
                     return '';
                 }

app/framework/Component/Routing/Route.php

Spacing +8 added lines, -8 removed lines

@@ -85,7 +85,7 @@ 
      *
      * @var array
      */
-    protected $middleware = [];
+    protected $middleware = [ ];
 
     /**
      * Methods
@@ -132,7 +132,7 @@ 
         if (!is_string($callback)) {
             if (!is_callable($callback)) {
                 throw new InvalidArgumentException(
-                    'Expected a callable or string. Got an uncallable or not string'. gettype($callback)
+                    'Expected a callable or string. Got an uncallable or not string'.gettype($callback)
                 );
             }
         }
@@ -186,7 +186,7 @@ 
     {
         // Allow null, otherwise expect an array or a string
         if (null !== $method && !is_array($method) && !is_string($method)) {
-            throw new InvalidArgumentException('Expected an array or string. Got a '. gettype($method));
+            throw new InvalidArgumentException('Expected an array or string. Got a '.gettype($method));
         }
 
         $this->method = $method;
@@ -266,13 +266,13 @@ 
      */
     public function middleware(string $name)
     {
-        $obj = $this->getFromConfig("middleware")[$name];
+        $obj = $this->getFromConfig("middleware")[ $name ];
 
         if (is_null($obj)) {
-            $obj = $this->getFromConfig("groups")[$name];
+            $obj = $this->getFromConfig("groups")[ $name ];
         }
 
-        $this->middleware[$name] = $obj;
+        $this->middleware[ $name ] = $obj;
     }
 
     /**
@@ -300,11 +300,11 @@ 
     {
         foreach ($middleware as $name => $class) {
             if (class_exists($class)) {
-                $this->middleware[$name] = new $class;
+                $this->middleware[ $name ] = new $class;
             } else {
                 // if $class is object we dont throw an
                 // exception because middleware was already created.
-                if (! is_object($class)) {
+                if (!is_object($class)) {
                     throw new MiddlewareNotFoundException("Middleware `%s` not found", $name);
                 }
             }

routes/web.php

Spacing +2 added lines, -2 removed lines

@@ -10,8 +10,8 @@
 */
 use app\framework\Component\Routing\Router;
 
-Router::get("/",  function() {
-    view("welcome", ["version" => version()]);
+Router::get("/", function() {
+    view("welcome", [ "version" => version() ]);
 });
 
 Router::get("/home", function() {

bootstrap/helper.php

Spacing +25 added lines, -25 removed lines

@@ -1,15 +1,15 @@ 
 <?php
-if(! function_exists("dd")) {
+if (!function_exists("dd")) {
     /**
      * Little helper called dump and die
      * @param $val
      */
     function dd($val) {
-        \app\framework\Component\VarDumper\VarDumper::dump($val);die;
+        \app\framework\Component\VarDumper\VarDumper::dump($val); die;
     }
 }
 
-if(! function_exists("pathTo")) {
+if (!function_exists("pathTo")) {
     /**
      * Easy function to get the path to the project + if you want an directory in it.
      *
@@ -21,7 +21,7 @@ 
     }
 }
 
-if(! function_exists("view")) {
+if (!function_exists("view")) {
     /**
      * Get the evaluated view contents for the given view.
      *
@@ -29,14 +29,14 @@ 
      * @param  array   $data        Data to set values in template file
      * @return \app\framework\Component\View\View|string
      */
-    function view($view = null, $data = []) {
-        $data['auth'] = new \app\framework\Component\Auth\Auth;
+    function view($view = null, $data = [ ]) {
+        $data[ 'auth' ] = new \app\framework\Component\Auth\Auth;
         $View = new \app\framework\Component\View\View($view, $data);
         return $View->render();
     }
 }
 
-if(! function_exists("app")) {
+if (!function_exists("app")) {
     /**
      * Used to easily call Methods from classes without manually set
      * locally Instances of them.
@@ -45,12 +45,12 @@ 
      * @param array $param To declare what parameter shall be passed to the method
      * @return mixed
      */
-    function app($classMethod, $param = []) {
-        return $GLOBALS["App"]->call($classMethod, $param);
+    function app($classMethod, $param = [ ]) {
+        return $GLOBALS[ "App" ]->call($classMethod, $param);
     }
 }
 
-if(! function_exists("url")) {
+if (!function_exists("url")) {
     /**
      * Basically completes just the the url
      * e.g. /test to yourexample.site/test
@@ -62,11 +62,11 @@ 
      * @return string
      */
     function url($path) {
-        return $_SERVER['HTTP_HOST'].$path;
+        return $_SERVER[ 'HTTP_HOST' ].$path;
     }
 }
 
-if(! function_exists("getStringBetween")) {
+if (!function_exists("getStringBetween")) {
     /**
      * This is a handy little function to strip out a string between
      * two specified pieces of text. This could be used to parse
@@ -78,7 +78,7 @@ 
      * @return bool|string
      */
     function getStringBetween($string, $start, $end) {
-        $string = ' ' . $string;
+        $string = ' '.$string;
         $ini = strpos($string, $start);
         if ($ini == 0) return '';
         $ini += strlen($start);
@@ -87,13 +87,13 @@ 
     }
 }
 
-if(! function_exists("handle")) {
-    function handle( $e) {
+if (!function_exists("handle")) {
+    function handle($e) {
         \app\framework\Component\Exception\Handler::getInstance()->handler($e);
     }
 }
 
-if(! function_exists("arr")) {
+if (!function_exists("arr")) {
     /**
      * Create an ArrayObject from array
      * @param array $arr
@@ -104,13 +104,13 @@ 
     }
 }
 
-if(! function_exists("str")) {
+if (!function_exists("str")) {
     function str($str) {
         return new \app\framework\Component\StdLib\StdObject\StringObject\StringObject($str);
     }
 }
 
-if(! function_exists("encrypt")) {
+if (!function_exists("encrypt")) {
     /**
      * Encrypt the given value.
      *
@@ -124,11 +124,11 @@ 
             \app\framework\Component\Config\Config::getInstance()->get("CrypKey")
         );
 
-        return $Encryptor->encrypt($value, $serialize );
+        return $Encryptor->encrypt($value, $serialize);
     }
 }
 
-if(! function_exists("decrypt")) {
+if (!function_exists("decrypt")) {
     /**
      * Decrypt the given value.
      *
@@ -142,11 +142,11 @@ 
             \app\framework\Component\Config\Config::getInstance()->get("CrypKey")
         );
 
-        return $Encryptor->decrypt($value, $unserialize );
+        return $Encryptor->decrypt($value, $unserialize);
     }
 }
 
-if(! function_exists("version")) {
+if (!function_exists("version")) {
     /**
      * @return string version as written in config/app.php
      */
@@ -155,13 +155,13 @@ 
     }
 }
 
-if(! function_exists("isDebug")) {
+if (!function_exists("isDebug")) {
     function isDebug() {
         return \app\framework\Component\Config\Config::getInstance()->get("debug", "app");
     }
 }
 
-if(! function_exists("class_basename")) {
+if (!function_exists("class_basename")) {
     /**
      * Get the class "basename" of the given object / class.
      *
@@ -175,7 +175,7 @@ 
     }
 }
 
-if (! function_exists("get_connection_log"))
+if (!function_exists("get_connection_log"))
 {
     /**
      * returns query log from Connection as array