FramyFramework / Framy

app/framework/Component/Database/Connection/Driver.php

Spacing +30 added lines, -31 removed lines

@@ -25,16 +25,16 @@ 
 
         $attr = [
             'driver' => Driver::MySql,
-            'dbname' => $config['database']
+            'dbname' => $config[ 'database' ]
         ];
 
-        if (isset($config['socket'])) {
-            $attr['unix_socket'] = $config['socket'];
+        if (isset($config[ 'socket' ])) {
+            $attr[ 'unix_socket' ] = $config[ 'socket' ];
         } else {
-            $attr['host'] = $config['host'];
+            $attr[ 'host' ] = $config[ 'host' ];
 
-            if (isset($config["port"]))
-                $attr['port'] = $config["port"];
+            if (isset($config[ "port" ]))
+                $attr[ 'port' ] = $config[ "port" ];
         }
 
         self::parseDsn($dsn, $attr);
@@ -47,12 +47,12 @@ 
 
         $attr = [
             'driver' => Driver::PgSql,
-            'host' => $config['host'],
-            'dbname' => $config['database']
+            'host' => $config[ 'host' ],
+            'dbname' => $config[ 'database' ]
         ];
 
-        if (isset($config["port"]))
-            $attr['port'] = $config["port"];
+        if (isset($config[ "port" ]))
+            $attr[ 'port' ] = $config[ "port" ];
 
         self::parseDsn($dsn, $attr);
         return $dsn;
@@ -64,12 +64,12 @@ 
 
         $attr = [
             'driver' => Driver::DbLib,
-            'host' => $config['host'],
-            'dbname' => $config['database']
+            'host' => $config[ 'host' ],
+            'dbname' => $config[ 'database' ]
         ];
 
-        if (isset($config["port"]))
-            $attr['port'] = $config["port"];
+        if (isset($config[ "port" ]))
+            $attr[ 'port' ] = $config[ "port" ];
 
         self::parseDsn($dsn, $attr);
         return $dsn;
@@ -81,13 +81,12 @@ 
 
         $attr = [
             'driver' => 'oci',
-            'dbname' => $config['server'] ?
-                '//' . $config['server'] . (isset($config["port"]) ? ':' . $config["port"] : ':1521') . '/' . $config['database'] :
-                $config['database']
+            'dbname' => $config[ 'server' ] ?
+                '//'.$config[ 'server' ].(isset($config[ "port" ]) ? ':'.$config[ "port" ] : ':1521').'/'.$config[ 'database' ] : $config[ 'database' ]
         ];
 
-        if (isset($config['charset']))
-            $attr['charset'] = $config['charset'];
+        if (isset($config[ 'charset' ]))
+            $attr[ 'charset' ] = $config[ 'charset' ];
 
         self::parseDsn($dsn, $attr);
         return $dsn;
@@ -100,19 +99,19 @@ 
         if (strstr(PHP_OS, 'WIN')) {
             $attr = [
                 'driver' => 'sqlsrv',
-                'server' => $config['server'],
-                'database' => $config['database']
+                'server' => $config[ 'server' ],
+                'database' => $config[ 'database' ]
             ];
         } else {
             $attr = [
                 'driver' => 'dblib',
-                'host' => $config['host'],
-                'dbname' => $config['database']
+                'host' => $config[ 'host' ],
+                'dbname' => $config[ 'database' ]
             ];
         }
 
-        if (isset($config["port"]))
-            $attr['port'] = $config["port"];
+        if (isset($config[ "port" ]))
+            $attr[ 'port' ] = $config[ "port" ];
 
         self::parseDsn($dsn, $attr);
         return $dsn;
@@ -128,18 +127,18 @@ 
 
     private static function parseDsn(&$dsn, $attr)
     {
-        $driver = $attr['driver'];
-        unset($attr['driver']);
+        $driver = $attr[ 'driver' ];
+        unset($attr[ 'driver' ]);
 
-        $stack = [];
+        $stack = [ ];
 
         foreach ($attr as $key => $value) {
             if (is_int($key))
-                $stack[] = $value;
+                $stack[ ] = $value;
             else
-                $stack[] = $key . '=' . $value;
+                $stack[ ] = $key.'='.$value;
         }
 
-        $dsn = $driver . ':' . implode($stack, ';');
+        $dsn = $driver.':'.implode($stack, ';');
     }
 }

Braces +20 added lines, -14 removed lines

@@ -33,8 +33,9 @@ 
         } else {
             $attr['host'] = $config['host'];
 
-            if (isset($config["port"]))
-                $attr['port'] = $config["port"];
+            if (isset($config["port"])) {
+                            $attr['port'] = $config["port"];
+            }
         }
 
         self::parseDsn($dsn, $attr);
@@ -51,8 +52,9 @@ 
             'dbname' => $config['database']
         ];
 
-        if (isset($config["port"]))
-            $attr['port'] = $config["port"];
+        if (isset($config["port"])) {
+                    $attr['port'] = $config["port"];
+        }
 
         self::parseDsn($dsn, $attr);
         return $dsn;
@@ -68,8 +70,9 @@ 
             'dbname' => $config['database']
         ];
 
-        if (isset($config["port"]))
-            $attr['port'] = $config["port"];
+        if (isset($config["port"])) {
+                    $attr['port'] = $config["port"];
+        }
 
         self::parseDsn($dsn, $attr);
         return $dsn;
@@ -86,8 +89,9 @@ 
                 $config['database']
         ];
 
-        if (isset($config['charset']))
-            $attr['charset'] = $config['charset'];
+        if (isset($config['charset'])) {
+                    $attr['charset'] = $config['charset'];
+        }
 
         self::parseDsn($dsn, $attr);
         return $dsn;
@@ -111,8 +115,9 @@ 
             ];
         }
 
-        if (isset($config["port"]))
-            $attr['port'] = $config["port"];
+        if (isset($config["port"])) {
+                    $attr['port'] = $config["port"];
+        }
 
         self::parseDsn($dsn, $attr);
         return $dsn;
@@ -134,10 +139,11 @@ 
         $stack = [];
 
         foreach ($attr as $key => $value) {
-            if (is_int($key))
-                $stack[] = $value;
-            else
-                $stack[] = $key . '=' . $value;
+            if (is_int($key)) {
+                            $stack[] = $value;
+            } else {
+                            $stack[] = $key . '=' . $value;
+            }
         }
 
         $dsn = $driver . ':' . implode($stack, ';');

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

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
 */
     private static function init(string $connection = null)
     {
-        if(is_null(self::$Medoo))
+        if (is_null(self::$Medoo))
             self::$Medoo = new Medoo($connection);
     }
 }

Braces +3 added lines, -2 removed lines

@@ -67,7 +67,8 @@
 */
     private static function init(string $connection = null)
     {
-        if(is_null(self::$Medoo))
-            self::$Medoo = new Medoo($connection);
+        if(is_null(self::$Medoo)) {
+                    self::$Medoo = new Medoo($connection);
+        }
     }
 }

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

Spacing +21 added lines, -21 removed lines

@@ -27,7 +27,7 @@ 
      *
      * @var Column[]
      */
-    private $columns = [];
+    private $columns = [ ];
 
     /**
      * @var string
@@ -73,7 +73,7 @@ 
     public function boolean($name)
     {
         $tempColumn = new Column($name, 'BOOLEAN');
-        $this->columns[] = $tempColumn;
+        $this->columns[ ] = $tempColumn;
     }
 
     /**
@@ -87,7 +87,7 @@ 
         $tempColumn = new Column($name, 'DECIMAL');
         $tempColumn->length = $precision;
         $tempColumn->scale = $scale;
-        $this->columns[] = $tempColumn;
+        $this->columns[ ] = $tempColumn;
     }
 
     /**
@@ -101,7 +101,7 @@ 
         $tempColumn = new Column($name, 'DOUBLE');
         $tempColumn->length = $precision;
         $tempColumn->scale = $scale;
-        $this->columns[] = $tempColumn;
+        $this->columns[ ] = $tempColumn;
     }
 
     /**
@@ -115,7 +115,7 @@ 
         $tempColumn = new Column($name, 'FLOAT');
         $tempColumn->length = $precision;
         $tempColumn->scale = $scale;
-        $this->columns[] = $tempColumn;
+        $this->columns[ ] = $tempColumn;
     }
 
     /**
@@ -126,7 +126,7 @@ 
     public function integer($name)
     {
         $tempColumn = new Column($name, 'INTEGER');
-        $this->columns[] = $tempColumn;
+        $this->columns[ ] = $tempColumn;
     }
 
     /**
@@ -137,7 +137,7 @@ 
     public function mediumInteger($name)
     {
         $tempColumn = new Column($name, 'MEDIUMINT');
-        $this->columns[] = $tempColumn;
+        $this->columns[ ] = $tempColumn;
     }
 
     /**
@@ -148,7 +148,7 @@ 
     public function bigInteger($name)
     {
         $tempColumn = new Column($name, 'BIGINT');
-        $this->columns[] = $tempColumn;
+        $this->columns[ ] = $tempColumn;
     }
 
     /**
@@ -162,7 +162,7 @@ 
         $tempColumn->isAutoIncrement = true;
         $tempColumn->isPrimaryKey    = true;
         $tempColumn->isUnsigned      = true;
-        $this->columns[] = $tempColumn;
+        $this->columns[ ] = $tempColumn;
     }
 
     /**
@@ -176,7 +176,7 @@ 
         $tempColumn->isAutoIncrement = true;
         $tempColumn->isPrimaryKey    = true;
         $tempColumn->isUnsigned      = true;
-        $this->columns[] = $tempColumn;
+        $this->columns[ ] = $tempColumn;
     }
 
     /**
@@ -189,7 +189,7 @@ 
     {
         $tempColumn = new Column($name, 'VARCHAR');
         $tempColumn->length = $length;
-        $this->columns[] = $tempColumn;
+        $this->columns[ ] = $tempColumn;
     }
 
     /**
@@ -202,7 +202,7 @@ 
     {
         $tempColumn = new Column($name, 'CHAR');
         $tempColumn->length = $length;
-        $this->columns[] = $tempColumn;
+        $this->columns[ ] = $tempColumn;
     }
 
     /**
@@ -213,7 +213,7 @@ 
     public function text($name)
     {
         $tempColumn = new Column($name, 'TEXT');
-        $this->columns[] = $tempColumn;
+        $this->columns[ ] = $tempColumn;
     }
 
     /**
@@ -235,13 +235,13 @@ 
     {
         $tempColumn = new Column($name, 'TIMESTAMP');
         $tempColumn->isNull = $isNullable;
-        $this->columns[] = $tempColumn;
+        $this->columns[ ] = $tempColumn;
     }
 
     /**
      * TIMESTAMP (with timezone) equivalent column.
      */
-    public function timestampTz(){}
+    public function timestampTz() {}
 
     /**
      * YEAR equivalent column.
@@ -251,7 +251,7 @@ 
     public function year($name)
     {
         $tempColumn = new Column($name, 'YEAR');
-        $this->columns[] = $tempColumn;
+        $this->columns[ ] = $tempColumn;
     }
 
     /**
@@ -262,7 +262,7 @@ 
     public function date($name)
     {
         $tempColumn = new Column($name, 'DATE');
-        $this->columns[] = $tempColumn;
+        $this->columns[ ] = $tempColumn;
     }
 
     /**
@@ -273,13 +273,13 @@ 
     public function dateTime($name)
     {
         $tempColumn = new Column($name, 'DATETIME');
-        $this->columns[] = $tempColumn;
+        $this->columns[ ] = $tempColumn;
     }
 
     /**
      * DATETIME (with timezone) equivalent column.
      */
-    public function dateTimeTz(){}
+    public function dateTimeTz() {}
 
     /**
      * TIME equivalent column.
@@ -289,7 +289,7 @@ 
     public function time($name)
     {
         $tempColumn = new Column($name, 'TIME');
-        $this->columns[] = $tempColumn;
+        $this->columns[ ] = $tempColumn;
     }
 
     /**
@@ -300,6 +300,6 @@ 
     public function binary($name)
     {
         $tempColumn = new Column($name, 'BLOB ');
-        $this->columns[] = $tempColumn;
+        $this->columns[ ] = $tempColumn;
     }
 }

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/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;