FramyFramework / Framy

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

Spacing +8 added lines, -8 removed lines

@@ -34,29 +34,29 @@
 
             $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->isNull)
+            if ($Column->isNull)
                 $query .= " NOT NULL";
 
-            if($Column->isAutoIncrement)
+            if ($Column->isAutoIncrement)
                 $query .= " AUTO_INCREMENT";
 
-            if($Column->isPrimaryKey)
+            if ($Column->isPrimaryKey)
                 $query .= " PRIMARY KEY";
 
-            if(count($table->getColumns())-1 != $key)
+            if (count($table->getColumns()) - 1 != $key)
                 $query .= ", ";
         }
         $query .= ");";

Braces +21 added lines, -14 removed lines

@@ -34,30 +34,37 @@
 
             $query .= $Column->type;
 
-            if(isset($Column->length))
-                $query .= "(".$Column->length;
+            if(isset($Column->length)) {
+                            $query .= "(".$Column->length;
+            }
 
             if(isset($Column->scale) && isset($Column->length)) {
                 $query .= ", ".$Column->scale.")";
             } else {
-                if(isset($Column->length))
-                    $query .= ")";
+                if(isset($Column->length)) {
+                                    $query .= ")";
+                }
             }
 
-            if($Column->isUnsigned)
-                $query .= " UNSIGNED";
+            if($Column->isUnsigned) {
+                            $query .= " UNSIGNED";
+            }
 
-            if($Column->isNull)
-                $query .= " NOT NULL";
+            if($Column->isNull) {
+                            $query .= " NOT NULL";
+            }
 
-            if($Column->isAutoIncrement)
-                $query .= " AUTO_INCREMENT";
+            if($Column->isAutoIncrement) {
+                            $query .= " AUTO_INCREMENT";
+            }
 
-            if($Column->isPrimaryKey)
-                $query .= " PRIMARY KEY";
+            if($Column->isPrimaryKey) {
+                            $query .= " PRIMARY KEY";
+            }
 
-            if(count($table->getColumns())-1 != $key)
-                $query .= ", ";
+            if(count($table->getColumns())-1 != $key) {
+                            $query .= ", ";
+            }
         }
         $query .= ");";
 

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

Spacing +20 added lines, -20 removed lines

@@ -113,14 +113,14 @@ 
      * @param  array|mixed  $columns
      * @return $this
      */
-    public function select($columns = ['*'])
+    public function select($columns = [ '*' ])
     {
         $this->columns = is_array($columns) ? $columns : func_get_args();
 
         return $this;
     }
 
-    public function selectRaw(string $query, array $bindings = [])
+    public function selectRaw(string $query, array $bindings = [ ])
     {
         return $this->connection->select($query, $bindings);
     }
@@ -131,8 +131,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
@@ -141,18 +141,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;
             }
         }
 
@@ -166,17 +166,17 @@ 
         return $this->connection->insert($sql);
     }
 
-    public function insertRaw(string $query, array $bindings = [])
+    public function insertRaw(string $query, array $bindings = [ ])
     {
         return $this->connection->insert($query, $bindings);
     }
 
-    public function updateRaw(string $query, array $bindings = [])
+    public function updateRaw(string $query, array $bindings = [ ])
     {
         return $this->connection->update($query, $bindings);
     }
 
-    public function deleteRaw(string $query, array $bindings = [])
+    public function deleteRaw(string $query, array $bindings = [ ])
     {
         return $this->connection->delete($query, $bindings);
     }
@@ -206,12 +206,12 @@ 
     public function where($column, $operator = "=", $value = null, $bool = 'and')
     {
         // check if operator is valid
-        if(!$this->isOperatorValid($operator)) {
+        if (!$this->isOperatorValid($operator)) {
             handle(new \Exception("Where operator not valid: '".$operator."'"));
         }
 
         // Add prepared data to where array
-        $this->wheres[] = [
+        $this->wheres[ ] = [
             $column,
             $operator,
             $value,
@@ -230,7 +230,7 @@ 
      */
     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."'"));
 
         $this->orders = [
@@ -263,7 +263,7 @@ 
     private function isOperatorValid($operatorToCheck)
     {
         foreach ($this->operators as $operator) {
-            if($operatorToCheck === $operator)
+            if ($operatorToCheck === $operator)
                 return true;
         }
 
@@ -288,8 +288,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;
         }));
     }
 
@@ -303,13 +303,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'"));
             }

Braces +6 added lines, -4 removed lines

@@ -230,8 +230,9 @@ 
      */
     public function orderBy($column, $direction = 'asc')
     {
-        if(!($direction == 'asc' or $direction == 'desc'))
-            handle(new \Exception("Order by direction invalid: '".$direction."'"));
+        if(!($direction == 'asc' or $direction == 'desc')) {
+                    handle(new \Exception("Order by direction invalid: '".$direction."'"));
+        }
 
         $this->orders = [
             $column,
@@ -263,8 +264,9 @@ 
     private function isOperatorValid($operatorToCheck)
     {
         foreach ($this->operators as $operator) {
-            if($operatorToCheck === $operator)
-                return true;
+            if($operatorToCheck === $operator) {
+                            return true;
+            }
         }
 
         return false;

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

Spacing +32 added lines, -32 removed lines

@@ -55,7 +55,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
@@ -81,8 +81,8 @@ 
     {
         $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)));
@@ -90,7 +90,7 @@ 
         // 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 = arr($values)->map(function ($record) {
+        $parameters = arr($values)->map(function($record) {
             return '('.$this->parameterize($record).')';
         })->implode(', ');
 
@@ -105,16 +105,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);
             }
         }
 
@@ -139,7 +139,7 @@ 
 
         $select = $query->distinct ? 'select distinct ' : 'select ';
 
-        return $select . $this->columnize($columns);
+        return $select.$this->columnize($columns);
     }
 
     /**
@@ -151,7 +151,7 @@ 
      */
     protected function compileFrom(Builder $query, $table)
     {
-        return 'from ' . $this->wrapTable($table);
+        return 'from '.$this->wrapTable($table);
     }
 
     /**
@@ -182,29 +182,29 @@ 
     {
         $sql = "ORDER BY ";
 
-        if(is_array($orders[0])) {
+        if (is_array($orders[ 0 ])) {
             $i = 1;
-            $count = count($orders[0]);
-            foreach ($orders[0] as $column) {
+            $count = count($orders[ 0 ]);
+            foreach ($orders[ 0 ] as $column) {
                 $append = $count > $i ? ", " : "";
                 $sql .= "`".$column."`".$append;
                 $i++;
             }
         } else {
-            $sql .= $orders[0];
+            $sql .= $orders[ 0 ];
         }
 
-        $sql .= " ".$orders[1];
+        $sql .= " ".$orders[ 1 ];
 
         return $sql;
     }
 
     protected function concatenateWhereClauses(Builder $query, $wheres)
     {
-        $sql = "WHERE " . $wheres[0] . $wheres[1] . "'" . $wheres[2] . "'";
+        $sql = "WHERE ".$wheres[ 0 ].$wheres[ 1 ]."'".$wheres[ 2 ]."'";
 
-        if(count($query->wheres) > 1) {
-            $sql .= $wheres[3];
+        if (count($query->wheres) > 1) {
+            $sql .= $wheres[ 3 ];
         }
 
         return $sql;
@@ -218,8 +218,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 !== '';
         }));
     }
 
@@ -231,7 +231,7 @@ 
      */
     public function columnize(array $columns)
     {
-        return implode(', ', array_map([$this, 'wrap'], $columns));
+        return implode(', ', array_map([ $this, 'wrap' ], $columns));
     }
 
     /**
@@ -242,7 +242,7 @@ 
      */
     public function parameterize(array $values)
     {
-        return implode(', ', array_map([$this, 'parameter'], $values));
+        return implode(', ', array_map([ $this, 'parameter' ], $values));
     }
 
     /**
@@ -265,7 +265,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'";
     }
@@ -280,7 +280,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);
@@ -306,13 +306,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);
 
@@ -321,9 +321,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);
             }
         }
 
@@ -345,11 +345,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 ]
             );
     }
 
@@ -361,7 +361,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);
@@ -377,7 +377,7 @@ 
     protected function wrapValue($value)
     {
         if ($value !== '*') {
-            return '`' . str_replace('"', '""', $value) . '`';
+            return '`'.str_replace('"', '""', $value).'`';
         }
 
         return $value;

Braces +3 added lines, -2 removed lines

@@ -264,8 +264,9 @@
      */
     public function quoteString($value)
     {
-        if (is_array($value))
-            return implode(', ', array_map([$this, __FUNCTION__], $value));
+        if (is_array($value)) {
+                    return implode(', ', array_map([$this, __FUNCTION__], $value));
+        }
 
         return "'$value'";
     }

app/framework/Component/Database/DB.php

Spacing +4 added lines, -4 removed lines

@@ -23,23 +23,23 @@
      * @param array $bindings
      * @return array
      */
-    static function select(string $query, array $bindings = [])
+    static function select(string $query, array $bindings = [ ])
     {
         return (new Manager)->selectRaw($query, $bindings);
     }
 
-    static function insert(string $query, array $bindings = [])
+    static function insert(string $query, array $bindings = [ ])
     {
         return (new Manager)->insertRaw($query, $bindings);
     }
 
-    static function update(string $query, array $bindings = [])
+    static function update(string $query, array $bindings = [ ])
     {
         return (new Manager)->updateRaw($query, $bindings);
     }
 
 
-    static function delete(string $query, array $bindings = [])
+    static function delete(string $query, array $bindings = [ ])
     {
         return (new Manager)->deleteRaw($query, $bindings);
     }

app/framework/Component/ClassLoader/ClassLoader.php

Spacing +3 added lines, -3 removed lines

@@ -10,8 +10,8 @@ 
 
 use app\framework\Component\ClassLoader\Loader;
 
-require_once __DIR__ . "/Loader/Psr0.php";
-require_once __DIR__ . "/Loader/Psr4.php";
+require_once __DIR__."/Loader/Psr0.php";
+require_once __DIR__."/Loader/Psr4.php";
 
 class ClassLoader
 {
@@ -22,7 +22,7 @@ 
 
     public function getClass($class)
     {
-        if($file = $this->loadClass($class)){
+        if ($file = $this->loadClass($class)) {
             require($file);
 
             return true;

app/framework/Component/ClassLoader/Loader/Psr0.php

Spacing +4 added lines, -4 removed lines

@@ -8,7 +8,7 @@ 
 
 namespace app\framework\Component\ClassLoader\Loader;
 
-require __DIR__ . "/AbstractLoader.php";
+require __DIR__."/AbstractLoader.php";
 
 /**
  * Psr0 autoloader
@@ -25,11 +25,11 @@ 
         if ($lastNsPos = strrpos($className, '\\')) {
             $namespace = substr($className, 0, $lastNsPos);
             $className = substr($className, $lastNsPos + 1);
-            $fileName  = str_replace('\\', DIRECTORY_SEPARATOR, $namespace) . DIRECTORY_SEPARATOR;
+            $fileName  = str_replace('\\', DIRECTORY_SEPARATOR, $namespace).DIRECTORY_SEPARATOR;
         }
-        $fileName .= str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php';
+        $fileName .= str_replace('_', DIRECTORY_SEPARATOR, $className).'.php';
 
-        if(file_exists(ROOT_PATH.DIRECTORY_SEPARATOR.$fileName))
+        if (file_exists(ROOT_PATH.DIRECTORY_SEPARATOR.$fileName))
             return ROOT_PATH.DIRECTORY_SEPARATOR.$fileName;
 
         return false;

Braces +3 added lines, -2 removed lines

@@ -29,8 +29,9 @@
         }
         $fileName .= str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php';
 
-        if(file_exists(ROOT_PATH.DIRECTORY_SEPARATOR.$fileName))
-            return ROOT_PATH.DIRECTORY_SEPARATOR.$fileName;
+        if(file_exists(ROOT_PATH.DIRECTORY_SEPARATOR.$fileName)) {
+                    return ROOT_PATH.DIRECTORY_SEPARATOR.$fileName;
+        }
 
         return false;
     }

app/framework/Component/Encryption/Encrypter.php

Spacing +9 added lines, -9 removed lines

@@ -29,7 +29,7 @@ 
 
     public function __construct($key, $cipher = Ciphers::AES_128_CBC)
     {
-        $key = (string)$key;
+        $key = (string) $key;
 
         if (static::supported($key, $cipher)) {
             $this->key    = $key;
@@ -121,13 +121,13 @@ 
     {
         $payload = $this->getJsonPayload($payload);
 
-        $iv = base64_decode($payload['iv']);
+        $iv = base64_decode($payload[ 'iv' ]);
 
         // Here we will decrypt the value. If we are able to successfully decrypt it
         // we will then unserialize it and return it out to the caller. If we are
         // unable to decrypt this value we will throw out an exception message.
         $decrypted = \openssl_decrypt(
-            $payload['value'], $this->cipher, $this->key, 0, $iv
+            $payload[ 'value' ], $this->cipher, $this->key, 0, $iv
         );
 
         if ($decrypted === false) {
@@ -169,11 +169,11 @@ 
         // If the payload is not valid JSON or does not have the proper keys set we will
         // assume it is invalid and bail out of the routine since we will not be able
         // to decrypt the given value. We'll also check the MAC for this encryption.
-        if (! $this->validPayload($payload)) {
+        if (!$this->validPayload($payload)) {
             throw new DecryptException('The payload is invalid.');
         }
 
-        if (! $this->validMac($payload)) {
+        if (!$this->validMac($payload)) {
             throw new DecryptException('The MAC is invalid.');
         }
 
@@ -188,8 +188,8 @@ 
      */
     protected function validPayload($payload)
     {
-        return is_array($payload) && isset($payload['iv'], $payload['value'], $payload['mac']) &&
-            strlen(base64_decode($payload['iv'], true)) === openssl_cipher_iv_length($this->cipher);
+        return is_array($payload) && isset($payload[ 'iv' ], $payload[ 'value' ], $payload[ 'mac' ]) &&
+            strlen(base64_decode($payload[ 'iv' ], true)) === openssl_cipher_iv_length($this->cipher);
     }
 
     /**
@@ -204,7 +204,7 @@ 
         $calculated = $this->calculateMac($payload, $bytes = random_bytes(16));
 
         return hash_equals(
-            hash_hmac('sha256', $payload['mac'], $bytes, true), $calculated
+            hash_hmac('sha256', $payload[ 'mac' ], $bytes, true), $calculated
         );
     }
 
@@ -218,7 +218,7 @@ 
     protected function calculateMac($payload, $bytes)
     {
         return hash_hmac(
-            'sha256', $this->hash($payload['iv'], $payload['value']), $bytes, true
+            'sha256', $this->hash($payload[ 'iv' ], $payload[ 'value' ]), $bytes, true
         );
     }
 

app/framework/Component/EventManager/EventManager.php

Spacing +6 added lines, -6 removed lines

@@ -59,8 +59,8 @@ 
             $eventListener = new EventListener();
         }
 
-        $eventListeners = $this->events->key($eventName, [], true);
-        $eventListeners[] = $eventListener;
+        $eventListeners = $this->events->key($eventName, [ ], true);
+        $eventListeners[ ] = $eventListener;
         $this->events->key($eventName, $eventListeners);
 
         return $eventListener;
@@ -104,7 +104,7 @@ 
         $eventListeners = $this->events->key($eventName);
 
         // to prevent error on empty listeners
-        $eventListeners = $eventListeners ?: [];
+        $eventListeners = $eventListeners ?: [ ];
 
         if (!$this->isInstanceOf($data, '\app\framework\EventManager\Event')) {
             $data = new Event($data);
@@ -150,7 +150,7 @@ 
      */
     public function getEventListeners($eventName)
     {
-        return $this->events->key($eventName, [], true);
+        return $this->events->key($eventName, [ ], true);
     }
 
     /**
@@ -177,10 +177,10 @@ 
         // get event prefix
         $eventPrefix = $this->str($eventName)->subString(0, -1)->val();
         // Find events starting with the prefix
-        $events = [];
+        $events = [ ];
         foreach ($this->events as $eventName => $eventListeners) {
             if ($this->str($eventName)->startsWith($eventPrefix)) {
-                $events[$eventName] = $eventListeners;
+                $events[ $eventName ] = $eventListeners;
             }
         }
 

app/framework/Component/EventManager/Event.php

Spacing +5 added lines, -5 removed lines

@@ -30,7 +30,7 @@ 
             if (!$this->isArray($eventData) && !$this->isArrayObject($eventData)) {
                 handle(new EventManagerException(
                     EventManagerException::MSG_INVALID_ARG,
-                    ['$eventData', 'array|ArrayObject'])
+                    [ '$eventData', 'array|ArrayObject' ])
                 );
             }
             $this->eventData = $this->arr($eventData);
@@ -66,9 +66,9 @@ 
         }
 
         if ($this->isNull($name)) {
-            $this->eventData[] = $value;
+            $this->eventData[ ] = $value;
         } else {
-            $this->eventData[$name] = $value;
+            $this->eventData[ $name ] = $value;
         }
     }
 
@@ -229,9 +229,9 @@ 
      */
     public function toArray()
     {
-        $data = [];
+        $data = [ ];
         foreach ($this->eventData as $k => $v) {
-            $data[$k] = $v;
+            $data[ $k ] = $v;
         }
 
         return $data;