FramyFramework / Framy

app/framework/Component/Database/Manager.php

Spacing +13 added lines, -13 removed lines

@@ -22,7 +22,7 @@ 
     /**
      * @var array Connection
      */
-    private $connections = [];
+    private $connections = [ ];
 
     /**
      * @var string $connectionToUse
@@ -41,7 +41,7 @@ 
     public function __construct()
     {
         // use default connection
-        if($this->connectionToUse == null) {
+        if ($this->connectionToUse == null) {
             $this->connection();
             $this->useConnection();
         }
@@ -57,7 +57,7 @@ 
     {
         $connection = ConnectionFactory::getInstance()->get($name);
 
-        $this->connections[$connection->getName()] = $connection;
+        $this->connections[ $connection->getName() ] = $connection;
 
         return $this;
     }
@@ -70,14 +70,14 @@ 
      */
     public function getConnection(string $name = null)
     {
-        if($name == null) {
+        if ($name == null) {
             reset($this->connections);
-            $Connection = $this->connections[key($this->connections)];
+            $Connection = $this->connections[ key($this->connections) ];
         } else {
-            $Connection = $this->connections[$name];
+            $Connection = $this->connections[ $name ];
         }
 
-        if(isset($Connection)) {
+        if (isset($Connection)) {
             return $Connection;
         } else {
             return false;
@@ -92,7 +92,7 @@ 
     public function useConnection(string $name = null): Manager
     {
         $this->connectionToUse = $this->getConnection($name)->getName();
-        $this->QueryBuilder    = new Builder($this->connections[$this->connectionToUse]);
+        $this->QueryBuilder    = new Builder($this->connections[ $this->connectionToUse ]);
 
         return $this;
     }
@@ -101,29 +101,29 @@ 
      * @param array $columns
      * @return Builder
      */
-    public function select($columns = ['*'])
+    public function select($columns = [ '*' ])
     {
         $this->QueryBuilder->select($columns);
 
         return $this->QueryBuilder;
     }
 
-    public function selectRaw(string $query, array $bindings = [])
+    public function selectRaw(string $query, array $bindings = [ ])
     {
         return $this->QueryBuilder->selectRaw($query, $bindings);
     }
 
-    public function insertRaw(string $query, array $bindings = [])
+    public function insertRaw(string $query, array $bindings = [ ])
     {
         return $this->QueryBuilder->insertRaw($query, $bindings);
     }
 
-    public function updateRaw(string $query, array $bindings = [])
+    public function updateRaw(string $query, array $bindings = [ ])
     {
         return $this->QueryBuilder->updateRaw($query, $bindings);
     }
 
-    public function deleteRaw(string $query, array $bindings = [])
+    public function deleteRaw(string $query, array $bindings = [ ])
     {
         return $this->QueryBuilder->deleteRaw($query, $bindings);
     }

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

Spacing +52 added lines, -52 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);
@@ -124,18 +124,18 @@ 
      */
     public function compileUpdate(Builder $query, array $values): string
     {
-        $table      = $this->wrapTable($query->from);
+        $table = $this->wrapTable($query->from);
 
         // 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';
     }
 
     /**
@@ -338,9 +338,9 @@ 
      */
     protected function whereBasic(Builder $query, $where)
     {
-        $value = $this->parameter($where['value']);
+        $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,10 +485,10 @@ 
 
     public function parameterizeForUpdate(array $columns, array $values)
     {
-        $queryValues = [];
+        $queryValues = [ ];
 
         for ($i = 0; $i < count($values); $i++) {
-            $queryValues[] = $columns[$i]."=".$this->quoteString(array_values($values)[$i]);
+            $queryValues[ ] = $columns[ $i ]."=".$this->quoteString(array_values($values)[ $i ]);
         }
 
         return implode(", ", $queryValues);
@@ -514,7 +514,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'";
@@ -529,7 +529,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);
@@ -555,13 +555,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);
 
@@ -570,9 +570,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);
             }
         }
 
@@ -594,11 +594,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 ]
             );
     }
 
@@ -610,7 +610,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);
@@ -626,7 +626,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

@@ -48,12 +48,12 @@ 
      * @var array
      */
     protected $bindings = [
-        'select' => [],
-        'join'   => [],
-        'where'  => [],
-        'having' => [],
-        'order'  => [],
-        'union'  => [],
+        'select' => [ ],
+        'join'   => [ ],
+        'where'  => [ ],
+        'having' => [ ],
+        'order'  => [ ],
+        'union'  => [ ],
     ];
 
     /**
@@ -140,12 +140,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);
                 }
@@ -204,14 +204,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;
@@ -244,7 +244,7 @@ 
      * @param  array|mixed  $columns
      * @return $this
      */
-    public function select($columns = ['*'])
+    public function select($columns = [ '*' ])
     {
         $this->columns = is_array($columns) ? $columns : func_get_args();
 
@@ -256,7 +256,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);
     }
@@ -271,8 +271,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
@@ -281,18 +281,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;
             }
         }
 
@@ -347,7 +347,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);
     }
@@ -363,7 +363,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);
     }
@@ -379,7 +379,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);
         }
 
@@ -405,7 +405,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);
     }
@@ -415,7 +415,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);
     }
@@ -425,7 +425,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);
     }
@@ -465,7 +465,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.');
         }
@@ -473,8 +473,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
@@ -496,9 +496,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');
         }
 
@@ -518,7 +518,7 @@ 
     {
         $type = 'in';
 
-        $this->wheres[] = compact('column', 'type', 'boolean', 'not');
+        $this->wheres[ ] = compact('column', 'type', 'boolean', 'not');
 
         $this->addBinding($values, 'where');
 
@@ -575,7 +575,7 @@ 
     {
         $type = 'between';
 
-        $this->wheres[] = compact('column', 'type', 'boolean', 'not');
+        $this->wheres[ ] = compact('column', 'type', 'boolean', 'not');
 
         $this->addBinding($values, 'where');
 
@@ -659,7 +659,7 @@ 
         if (count($query->wheres)) {
             $type = 'Nested';
 
-            $this->wheres[] = compact('type', 'query', 'boolean');
+            $this->wheres[ ] = compact('type', 'query', 'boolean');
 
             $this->addBinding($query->getBindings(), 'where');
         }
@@ -687,7 +687,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');
 
@@ -706,7 +706,7 @@ 
     {
         $type = 'Null';
 
-        $this->wheres[] = compact('type', 'column', 'boolean', 'not');
+        $this->wheres[ ] = compact('type', 'column', 'boolean', 'not');
 
         return $this;
     }
@@ -826,7 +826,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');
 
@@ -842,11 +842,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,
@@ -890,7 +890,7 @@ 
      * @param array $columns
      * @return array|null
      */
-    public function get(array $columns = ['*'])
+    public function get(array $columns = [ '*' ])
     {
         $this->columns = $columns;
 
@@ -955,11 +955,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 ];
     }
 
     /**
@@ -970,7 +970,7 @@ 
      */
     public function value(string $val)
     {
-        return $this->first([$val])->$val;
+        return $this->first([ $val ])->$val;
     }
 
     /**
@@ -981,8 +981,8 @@ 
      */
     public function count($columns = '*')
     {
-        if (! is_array($columns)) {
-            $columns = [$columns];
+        if (!is_array($columns)) {
+            $columns = [ $columns ];
         }
 
         return (int) $this->aggregate(__FUNCTION__, $columns);
@@ -996,7 +996,7 @@ 
      */
     public function min(string $column)
     {
-        return $this->aggregate(__FUNCTION__, [$column]);
+        return $this->aggregate(__FUNCTION__, [ $column ]);
     }
 
     /**
@@ -1007,7 +1007,7 @@ 
      */
     public function max($column)
     {
-        return $this->aggregate(__FUNCTION__, [$column]);
+        return $this->aggregate(__FUNCTION__, [ $column ]);
     }
 
     /**
@@ -1018,7 +1018,7 @@ 
      */
     public function sum($column)
     {
-        $result = $this->aggregate(__FUNCTION__, [$column]);
+        $result = $this->aggregate(__FUNCTION__, [ $column ]);
 
         return $result ?: 0;
     }
@@ -1031,7 +1031,7 @@ 
      */
     public function avg($column)
     {
-        return $this->aggregate(__FUNCTION__, [$column]);
+        return $this->aggregate(__FUNCTION__, [ $column ]);
     }
 
     /**
@@ -1066,10 +1066,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;
@@ -1082,7 +1082,7 @@ 
      */
     public function doesntExist()
     {
-        return ! $this->exists();
+        return !$this->exists();
     }
 
     /**
@@ -1092,7 +1092,7 @@ 
      * @param  array   $columns
      * @return float|int
      */
-    public function aggregate($function, $columns = ['*'])
+    public function aggregate($function, $columns = [ '*' ])
     {
         $this->aggregate = compact('function', 'columns');
 
@@ -1107,10 +1107,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' ];
         }
     }
 
@@ -1125,7 +1125,7 @@ 
     private function isOperatorValid($operatorToCheck)
     {
         foreach ($this->operators as $operator) {
-            if($operatorToCheck === $operator) {
+            if ($operatorToCheck === $operator) {
                 return true;
             }
         }
@@ -1151,8 +1151,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;
         }));
     }
 
@@ -1166,13 +1166,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/Storage/StorageTrait.php

Indentation +29 added lines, -29 removed lines

@@ -6,36 +6,36 @@
  * @Author Marco Bier <mrfibunacci@gmail.com>
  */
 
- namespace app\framework\Component\Storage;
+    namespace app\framework\Component\Storage;
 
- use app\framework\Component\Storage\Directory\Directory;
- use app\framework\Component\Storage\File\File;
+    use app\framework\Component\Storage\Directory\Directory;
+    use app\framework\Component\Storage\File\File;
 
- /**
-  * A library of Storage functions
-  *
-  * @package app\framework\Component\Storage
-  */
- trait StorageTrait
- {
-     /**
-      * Get storage
-      *
-      * @param $storageName
-      * @return Storage
-      */
-     protected static function storage($storageName)
-     {
-         return new Storage($storageName);
-     }
+    /**
+     * A library of Storage functions
+     *
+     * @package app\framework\Component\Storage
+     */
+    trait StorageTrait
+    {
+        /**
+         * Get storage
+         *
+         * @param $storageName
+         * @return Storage
+         */
+        protected static function storage($storageName)
+        {
+            return new Storage($storageName);
+        }
 
-     protected function file($key, $storageName)
-     {
-         return new File($key, self::storage($storageName));
-     }
+        protected function file($key, $storageName)
+        {
+            return new File($key, self::storage($storageName));
+        }
 
-     protected function directory($key, $storageName, $recursive = false, $filter = null)
-     {
-         return new Directory($key, self::storage($storageName), $recursive, $filter);
-     }
- }
+        protected function directory($key, $storageName, $recursive = false, $filter = null)
+        {
+            return new Directory($key, self::storage($storageName), $recursive, $filter);
+        }
+    }

app/framework/Component/Storage/Directory/Directory.php

Spacing +11 added lines, -11 removed lines

@@ -19,7 +19,7 @@ 
 
 class Directory implements DirectoryInterface, IteratorAggregate
 {
-    use StdLibTrait,EventManagerTrait;
+    use StdLibTrait, EventManagerTrait;
 
     /**
      * @var string
@@ -60,9 +60,9 @@ 
      */
     public function __construct($key, Storage $storage, $recursive = false, $filter = null)
     {
-        if (! $storage->supportsDirectories()) {
+        if (!$storage->supportsDirectories()) {
             $driver = get_class($storage->getDriver());
-            throw new StorageException(StorageException::DRIVER_CAN_NOT_WORK_WITH_DIRECTORIES, [$driver]);
+            throw new StorageException(StorageException::DRIVER_CAN_NOT_WORK_WITH_DIRECTORIES, [ $driver ]);
         }
 
         $this->key       = $key;
@@ -70,11 +70,11 @@ 
         $this->storage   = $storage;
 
         if (!$this->storage->keyExists($key)) {
-            throw new StorageException(StorageException::DIRECTORY_DOES_NOT_EXIST, [$key]);
+            throw new StorageException(StorageException::DIRECTORY_DOES_NOT_EXIST, [ $key ]);
         }
 
         if (!$this->storage->isDirectory($key)) {
-            throw new StorageException(StorageException::DIRECTORY_OBJECT_CAN_NOT_READ_FILE_PATHS, [$key]);
+            throw new StorageException(StorageException::DIRECTORY_OBJECT_CAN_NOT_READ_FILE_PATHS, [ $key ]);
         }
 
         $this->parseFilter($filter);
@@ -253,10 +253,10 @@ 
 
         if ($filter->startsWith('*')) {
             $filter->replace('.', '\.');
-            $this->regex = '/(\S+)' . $filter . '/';
+            $this->regex = '/(\S+)'.$filter.'/';
         } elseif ($filter->endsWith('*')) {
             $filter->replace('.', '\.');
-            $this->regex = '/' . $filter . '(\S+)/';
+            $this->regex = '/'.$filter.'(\S+)/';
         } else {
             $this->regex = $filter;
         }
@@ -274,18 +274,18 @@ 
             if ($this->regex) {
                 foreach ($keys as $k => $v) {
                     if (!preg_match($this->regex, $v)) {
-                        unset($keys[$k]);
+                        unset($keys[ $k ]);
                     }
                 }
             }
 
             // Instantiate files/directories
-            $this->items = [];
+            $this->items = [ ];
             foreach ($keys as $key) {
                 if ($this->storage->isDirectory($key)) {
-                    $this->items[$key] = new static($key, $this->storage);
+                    $this->items[ $key ] = new static($key, $this->storage);
                 } else {
-                    $this->items[$key] = new File($key, $this->storage);
+                    $this->items[ $key ] = new File($key, $this->storage);
                 }
             }
         }

app/framework/Component/Storage/Storage.php

Spacing +1 added lines, -1 removed lines

@@ -194,7 +194,7 @@
 
         throw new StorageException(
             StorageException::DRIVER_CAN_NOT_ACCESS_SIZE,
-            [get_class($this->getDriver())]
+            [ get_class($this->getDriver()) ]
         );
     }
 

app/framework/Component/Storage/File/File.php

Spacing +2 added lines, -2 removed lines

@@ -36,8 +36,8 @@
         $this->key     = $key;
 
         //make sure a file path is given
-        if (! $this->storage->keyExists($this->key)) {
-            throw new StorageException(StorageException::FILE_NOT_FOUND, [$key]);
+        if (!$this->storage->keyExists($this->key)) {
+            throw new StorageException(StorageException::FILE_NOT_FOUND, [ $key ]);
         }
     }
 

app/framework/Component/Storage/Driver/Local/LocalHelper.php

Spacing +9 added lines, -9 removed lines

@@ -49,7 +49,7 @@ 
         umask($umask);
 
         if (!$created) {
-            handle(new StorageException(StorageException::DIRECTORY_COULD_NOT_BE_CREATED, [$directory]));
+            handle(new StorageException(StorageException::DIRECTORY_COULD_NOT_BE_CREATED, [ $directory ]));
         }
     }
 
@@ -62,9 +62,9 @@ 
      */
     public function ensureDirectoryExists($directory, $create)
     {
-        if (! is_dir($directory)) {
-            if (! $create) {
-                throw new StorageException(StorageException::DIRECTORY_DOES_NOT_EXIST, [$directory]);
+        if (!is_dir($directory)) {
+            if (!$create) {
+                throw new StorageException(StorageException::DIRECTORY_DOES_NOT_EXIST, [ $directory ]);
             }
 
             $this->createDirectory($directory);
@@ -118,11 +118,11 @@ 
                     }
                     break;
                 default:
-                    $tokens[] = $part;
+                    $tokens[ ] = $part;
             }
         }
 
-        return $prefix . implode('/', $tokens);
+        return $prefix.implode('/', $tokens);
     }
 
     /**
@@ -136,11 +136,11 @@ 
     {
         preg_match('|^(?P<prefix>([a-zA-Z]:)?/)|', $path, $matches);
 
-        if (empty($matches['prefix'])) {
+        if (empty($matches[ 'prefix' ])) {
             return '';
         }
 
-        return strtolower($matches['prefix']);
+        return strtolower($matches[ 'prefix' ]);
     }
 
     /**
@@ -157,6 +157,6 @@ 
     {
         $this->ensureDirectoryExists($directory, $create);
 
-        return $this->normalizeDirectoryPath($directory . '/' . $key);
+        return $this->normalizeDirectoryPath($directory.'/'.$key);
     }
 }

app/framework/Component/Storage/Driver/Local/LocalStorageDriver.php

Spacing +14 added lines, -14 removed lines

@@ -27,7 +27,7 @@ 
  *
  * @package app\framework\Component\Storage\Driver\Local
  */
-class LocalStorageDriver implements SizeAwareInterface,DriverInterface,AbsolutePathInterface,TouchableInterface,DirectoryAwareInterface
+class LocalStorageDriver implements SizeAwareInterface, DriverInterface, AbsolutePathInterface, TouchableInterface, DirectoryAwareInterface
 {
     /**
      * @var string
@@ -62,11 +62,11 @@ 
      */
     function __construct($config)
     {
-        if(is_array($config)){
+        if (is_array($config)) {
             $config = new ArrayObject($config);
         }
 
-        if(!$config instanceof ArrayObject){
+        if (!$config instanceof ArrayObject) {
             handle(new StorageException('Storage driver config must be an array or ArrayObject!'));
         }
 
@@ -121,7 +121,7 @@ 
     {
         $this->recentKey = $key;
 
-        if($this->keyExists($key)){
+        if ($this->keyExists($key)) {
             return filesize($this->buildPath($key));
         }
 
@@ -140,7 +140,7 @@ 
     {
         $this->recentKey = $key;
 
-        if($this->keyExists($key)){
+        if ($this->keyExists($key)) {
             return file_get_contents($this->buildPath($key));
         }
 
@@ -162,7 +162,7 @@ 
     {
         $this->recentKey = $key;
 
-        if($this->keyExists($key)) {
+        if ($this->keyExists($key)) {
             return file_put_contents($this->buildPath($key), $contents);
         }
 
@@ -185,13 +185,13 @@ 
         if ($key != '') {
             $key = ltrim($key, DIRECTORY_SEPARATOR);
             $key = rtrim($key, DIRECTORY_SEPARATOR);
-            $path = $this->directory . DIRECTORY_SEPARATOR . $key;
+            $path = $this->directory.DIRECTORY_SEPARATOR.$key;
         } else {
             $path = $this->directory;
         }
 
         if (!is_dir($path)) {
-            return [];
+            return [ ];
         }
 
         if ($recursive) {
@@ -209,7 +209,7 @@ 
 
             $files = iterator_to_array($iterator);
         } else {
-            $files    = [];
+            $files    = [ ];
             $iterator = new DirectoryIterator($path);
 
             foreach ($iterator as $fileInfo) {
@@ -219,14 +219,14 @@ 
                     continue;
                 }
 
-                $files[] = $fileInfo->getPathname();
+                $files[ ] = $fileInfo->getPathname();
             }
         }
 
-        $keys = [];
+        $keys = [ ];
 
         foreach ($files as $file) {
-            $keys[] = $this->helper->getKey($file, $this->directory);
+            $keys[ ] = $this->helper->getKey($file, $this->directory);
         }
 
         sort($keys);
@@ -246,7 +246,7 @@ 
     {
         $this->recentKey = $key;
 
-        if($this->keyExists($key)){
+        if ($this->keyExists($key)) {
             return filectime($this->buildPath($key));
         }
 
@@ -317,7 +317,7 @@ 
     {
         $key = str_replace('\\', '/', $key);
 
-        return $this->publicUrl . '/' . ltrim($key, "/");
+        return $this->publicUrl.'/'.ltrim($key, "/");
     }
 
     /**