FramyFramework / Framy

routes/web.php

Spacing +1 added lines, -1 removed lines

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

bootstrap/helper.php

Spacing +23 added lines, -23 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) {
-        var_dump($val);die;
+        var_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,7 +155,7 @@ 
     }
 }
 
-if(! function_exists("isDebug")) {
+if (!function_exists("isDebug")) {
     function isDebug() {
         return \app\framework\Component\Config\Config::getInstance()->get("debug", "app");
     }

app/framework/Component/Database/Commands/MakeModelCommand.php

Spacing +4 added lines, -4 removed lines

@@ -46,17 +46,17 @@
     protected function execute(InputInterface $input, ConsoleOutput $output)
     {
         $migrationName = $input->getArgument("name");
-        $tableName =  $input->getArgument("tableName");
-        $connectionName =  $input->getArgument("connectionName");
+        $tableName = $input->getArgument("tableName");
+        $connectionName = $input->getArgument("connectionName");
 
         $template = str_replace("§NAME§", $migrationName, $this->template);
 
-        if(isset($connectionName))
+        if (isset($connectionName))
             $template = str_replace("§CONNECTION§", 'protected $connection = "'.$connectionName.'";', $template);
         else
             $template = str_replace("§CONNECTION§", '', $template);
 
-        if(isset($tableName))
+        if (isset($tableName))
             $template = str_replace("§TABLE§", 'protected $table = "'.$tableName.'";', $template);
         else
             $template = str_replace("§TABLE§", '', $template);

Braces +10 added lines, -8 removed lines

@@ -51,15 +51,17 @@
 
         $template = str_replace("§NAME§", $migrationName, $this->template);
 
-        if(isset($connectionName))
-            $template = str_replace("§CONNECTION§", 'protected $connection = "'.$connectionName.'";', $template);
-        else
-            $template = str_replace("§CONNECTION§", '', $template);
+        if(isset($connectionName)) {
+                    $template = str_replace("§CONNECTION§", 'protected $connection = "'.$connectionName.'";', $template);
+        } else {
+                    $template = str_replace("§CONNECTION§", '', $template);
+        }
 
-        if(isset($tableName))
-            $template = str_replace("§TABLE§", 'protected $table = "'.$tableName.'";', $template);
-        else
-            $template = str_replace("§TABLE§", '', $template);
+        if(isset($tableName)) {
+                    $template = str_replace("§TABLE§", 'protected $table = "'.$tableName.'";', $template);
+        } else {
+                    $template = str_replace("§TABLE§", '', $template);
+        }
 
         $File = new File($migrationName.".php", new Storage("model"));
         //$File->setContents($template);

app/framework/Component/Database/Commands/MakeMigration.php

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
         try {
             $File = new File($newMigrationName.".php", new Storage("migrations"));
 
-            if(fopen($File->getAbsolutePath(), "w")) {
+            if (fopen($File->getAbsolutePath(), "w")) {
                 $tempDefaultCommand = str_replace("§NAME§", $newMigrationName, $this->template);
                 $tempDefaultCommand = str_replace("§connection§", $connection, $tempDefaultCommand);
                 file_put_contents($File->getAbsolutePath(), $tempDefaultCommand);

app/framework/Component/Database/Commands/Migrate.php

Spacing +12 added lines, -12 removed lines

@@ -23,7 +23,7 @@ 
     /**
      * @var Migration[] $migrations
      */
-    private $migrations = [];
+    private $migrations = [ ];
 
     protected function configure()
     {
@@ -59,24 +59,24 @@ 
     private function setMigrations(ConsoleOutput $output)
     {
         // get all migrations
-        $classes   = [];
+        $classes   = [ ];
         $namespace = $this->namespace;
 
-        $path = str_replace("\\","/", $namespace);
+        $path = str_replace("\\", "/", $namespace);
         $filesInNamespace = new ArrayObject(scandir(ROOT_PATH."/".$path."/"));
         $filesInNamespace->removeFirst()->removeFirst();
 
-        for ($i = 0; $i <= $filesInNamespace->count()-1; $i++)
-            $filesInNamespace->key($i, explode(".php", $filesInNamespace->key($i))[0]);
+        for ($i = 0; $i <= $filesInNamespace->count() - 1; $i++)
+            $filesInNamespace->key($i, explode(".php", $filesInNamespace->key($i))[ 0 ]);
 
         foreach ($filesInNamespace->val() as $value) {
             $class = $namespace.$value;
-            if(class_exists($class) && is_subclass_of($class,'app\framework\Component\Database\Migrations\Migration'))
-                $classes[$value] = new $class();
+            if (class_exists($class) && is_subclass_of($class, 'app\framework\Component\Database\Migrations\Migration'))
+                $classes[ $value ] = new $class();
         }
 
         // tell user so if there are no migrations
-        if($classes == []) {
+        if ($classes == [ ]) {
             $output->writeln("No migrations found! You can Create migrations via the make:migration command.");
         } else {
             $this->migrations = $classes;
@@ -87,15 +87,15 @@ 
     {
         $migrationInstance = null;
         $class = $this->namespace.$migration;
-        if(class_exists($class) && is_subclass_of($class,'app\framework\Component\Database\Migrations\Migration'))
+        if (class_exists($class) && is_subclass_of($class, 'app\framework\Component\Database\Migrations\Migration'))
             $migrationInstance = new $class();
 
-        if($migrationInstance == null) {
+        if ($migrationInstance == null) {
             $output->writeln("Migration not found");
         } else {
             // to make sure that only one element is in array
-            $this->migrations = [];
-            $this->migrations[] = $migrationInstance;
+            $this->migrations = [ ];
+            $this->migrations[ ] = $migrationInstance;
         }
     }
 }

Braces +12 added lines, -8 removed lines

@@ -52,8 +52,9 @@ 
             $class->up();
         }
 
-        if (count($this->migrations) > 0)
-            $output->writeln("Migration successful");
+        if (count($this->migrations) > 0) {
+                    $output->writeln("Migration successful");
+        }
     }
 
     private function setMigrations(ConsoleOutput $output)
@@ -66,13 +67,15 @@ 
         $filesInNamespace = new ArrayObject(scandir(ROOT_PATH."/".$path."/"));
         $filesInNamespace->removeFirst()->removeFirst();
 
-        for ($i = 0; $i <= $filesInNamespace->count()-1; $i++)
-            $filesInNamespace->key($i, explode(".php", $filesInNamespace->key($i))[0]);
+        for ($i = 0; $i <= $filesInNamespace->count()-1; $i++) {
+                    $filesInNamespace->key($i, explode(".php", $filesInNamespace->key($i))[0]);
+        }
 
         foreach ($filesInNamespace->val() as $value) {
             $class = $namespace.$value;
-            if(class_exists($class) && is_subclass_of($class,'app\framework\Component\Database\Migrations\Migration'))
-                $classes[$value] = new $class();
+            if(class_exists($class) && is_subclass_of($class,'app\framework\Component\Database\Migrations\Migration')) {
+                            $classes[$value] = new $class();
+            }
         }
 
         // tell user so if there are no migrations
@@ -87,8 +90,9 @@ 
     {
         $migrationInstance = null;
         $class = $this->namespace.$migration;
-        if(class_exists($class) && is_subclass_of($class,'app\framework\Component\Database\Migrations\Migration'))
-            $migrationInstance = new $class();
+        if(class_exists($class) && is_subclass_of($class,'app\framework\Component\Database\Migrations\Migration')) {
+                    $migrationInstance = new $class();
+        }
 
         if($migrationInstance == null) {
             $output->writeln("Migration not found");

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

Spacing +22 added lines, -22 removed lines

@@ -54,14 +54,14 @@ 
      *
      * @var array
      */
-    protected $config = [];
+    protected $config = [ ];
 
     /**
      * All of the queries run against the connection.
      *
      * @var array
      */
-    protected $queryLog = [];
+    protected $queryLog = [ ];
 
     /**
      * Indicates whether queries are being logged.
@@ -70,7 +70,7 @@ 
      */
     protected $loggingQueries = true;
 
-    public function __construct(Pdo $pdo, string $database = '', string $name = '', array $conf = [])
+    public function __construct(Pdo $pdo, string $database = '', string $name = '', array $conf = [ ])
     {
         $this->pdo  = $pdo;
         $this->name = $name;
@@ -100,7 +100,7 @@ 
      */
     public function flushQueryLog()
     {
-        $this->queryLog = [];
+        $this->queryLog = [ ];
     }
 
     /**
@@ -160,12 +160,12 @@ 
 
     public function getDriver()
     {
-        return $this->config['driver'];
+        return $this->config[ 'driver' ];
     }
 
-    public function select(string $query, array $bindings = [], $table = "")
+    public function select(string $query, array $bindings = [ ], $table = "")
     {
-        return $this->run($query, $bindings, function ($me, $query, $bindings) use ($table) {
+        return $this->run($query, $bindings, function($me, $query, $bindings) use ($table) {
             // For select statements, we'll simply execute the query and return an array
             // of the database result set. Each element in the array will be a single
             // row from the database table, and will either be an array or objects.
@@ -185,7 +185,7 @@ 
      * @param  array   $bindings
      * @return bool
      */
-    public function insert($query, $bindings = [])
+    public function insert($query, $bindings = [ ])
     {
         return $this->statement($query, $bindings);
     }
@@ -197,7 +197,7 @@ 
      * @param  array   $bindings
      * @return int
      */
-    public function update($query, $bindings = [])
+    public function update($query, $bindings = [ ])
     {
         return $this->affectingStatement($query, $bindings);
     }
@@ -209,7 +209,7 @@ 
      * @param  array   $bindings
      * @return int
      */
-    public function delete($query, $bindings = [])
+    public function delete($query, $bindings = [ ])
     {
         return $this->affectingStatement($query, $bindings);
     }
@@ -221,9 +221,9 @@ 
      * @param  array   $bindings
      * @return bool
      */
-    public function statement($query, $bindings = [])
+    public function statement($query, $bindings = [ ])
     {
-        return $this->run($query, $bindings, function ($me, $query, $bindings) {
+        return $this->run($query, $bindings, function($me, $query, $bindings) {
             return $me->pdo->prepare($query)->execute($bindings);
         });
     }
@@ -235,9 +235,9 @@ 
      * @param  array   $bindings
      * @return int
      */
-    public function affectingStatement($query, $bindings = [])
+    public function affectingStatement($query, $bindings = [ ])
     {
-        return $this->run($query, $bindings, function ($me, $query, $bindings) {
+        return $this->run($query, $bindings, function($me, $query, $bindings) {
 
             // For update or delete statements, we want to get the number of rows affected
             // by the statement and return that back to the developer. We'll first need
@@ -318,12 +318,12 @@ 
     {
         $this->eventManager()->fire("ff.database.query_execution");
 
-        if($this->loggingQueries) {
-            $logEntry['startTime']     = $stopwatchEvent->getStartTime();
-            $logEntry['query']         = $query;
-            $logEntry['executionTime'] = $stopwatchEvent->getDuration();
+        if ($this->loggingQueries) {
+            $logEntry[ 'startTime' ]     = $stopwatchEvent->getStartTime();
+            $logEntry[ 'query' ]         = $query;
+            $logEntry[ 'executionTime' ] = $stopwatchEvent->getDuration();
 
-            $this->queryLog[] = $logEntry;
+            $this->queryLog[ ] = $logEntry;
         }
     }
 
@@ -335,12 +335,12 @@ 
      */
     public function fetch(PDOStatement $statement)
     {
-        $result    = [];
+        $result    = [ ];
         $statement = $statement->fetchAll(PDO::FETCH_ASSOC);
 
         foreach ($statement as $key => $value) {
-            $result[$key] = new Model($this);
-            $result[$key]->fillData($value);
+            $result[ $key ] = new Model($this);
+            $result[ $key ]->fillData($value);
         }
 
         return $result;

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

Spacing +16 added lines, -16 removed lines

@@ -42,14 +42,14 @@ 
     /**
      * @var Connection[]
      */
-    private $connections = [];
+    private $connections = [ ];
 
     /**
      * Contains the connection configuration information's
      *
      * @var array
      */
-    private $configuration = [];
+    private $configuration = [ ];
 
     /**
      * @param string|null $name
@@ -59,8 +59,8 @@ 
     public function get(string $name = null): Connection
     {
         // check if connection with $name was already instantiated if yes return
-        if(isset($this->connections[$name])) {
-            return $this->connections[$name];
+        if (isset($this->connections[ $name ])) {
+            return $this->connections[ $name ];
         }
 
         // otherwise create and save in $connections
@@ -83,7 +83,7 @@ 
             $this->getConnectionName($name)
         );
 
-        $this->connections[$name] = $connection;
+        $this->connections[ $name ] = $connection;
 
         return $connection;
     }
@@ -94,10 +94,10 @@ 
     private function extractConfig()
     {
         $connByConfig = Config::getInstance()->get("connections");
-        $config = [];
+        $config = [ ];
 
         foreach ($connByConfig as $name => $con) {
-            $config[$name] = $this->parseConfig($con);
+            $config[ $name ] = $this->parseConfig($con);
         }
 
         $this->configuration = $config;
@@ -117,7 +117,7 @@ 
             return key($config);
         }
 
-        if (isset($config[$name])) {
+        if (isset($config[ $name ])) {
             return $name;
         } else {
             // if conf not found Exception
@@ -134,9 +134,9 @@ 
     private function parseConfig(array $config): array
     {
         // make sure that the default config elements exist to prevent an undefined index warning
-        foreach(self::defaultConfigElements as $configElement) {
-            if(!array_key_exists($configElement, $config)) {
-                $config[$configElement];
+        foreach (self::defaultConfigElements as $configElement) {
+            if (!array_key_exists($configElement, $config)) {
+                $config[ $configElement ];
             }
         }
 
@@ -153,9 +153,9 @@ 
     {
         $config = $this->configuration;
 
-        $Pdo = $this->createPdoInstance($config[$name]);
+        $Pdo = $this->createPdoInstance($config[ $name ]);
 
-        return $this->createConnection($Pdo, $config[$name]['database'], $name, $config);
+        return $this->createConnection($Pdo, $config[ $name ][ 'database' ], $name, $config);
     }
 
     /**
@@ -166,7 +166,7 @@ 
     {
         $dsn = "";
 
-        switch ($config['driver']) {
+        switch ($config[ 'driver' ]) {
             case Driver::MariaDB:
             case Driver::MySql:
                 $dsn = Driver::mysql($config);
@@ -193,7 +193,7 @@ 
             //    break;
         }
 
-        return new PDO($dsn, $config['username'], $config['password']);
+        return new PDO($dsn, $config[ 'username' ], $config[ 'password' ]);
     }
 
     /**
@@ -203,7 +203,7 @@ 
      * @param array $config
      * @return Connection
      */
-    private function createConnection(PDO $Pdo, $database = "", string $name = '', array $config = [])
+    private function createConnection(PDO $Pdo, $database = "", string $name = '', array $config = [ ])
     {
         return new Connection($Pdo, $database, $name, $config);
     }

app/framework/Component/Database/Model/Model.php

Spacing +17 added lines, -17 removed lines

@@ -76,14 +76,14 @@ 
      *
      * @var array
      */
-    protected $attributes = [];
+    protected $attributes = [ ];
 
     /**
      * The model attribute's original state.
      *
      * @var array
      */
-    protected $original = [];
+    protected $original = [ ];
 
     /**
      * The number of models to return for pagination.
@@ -118,7 +118,7 @@ 
      * Model constructor.
      * @param array $attributes
      */
-    public function __construct(array $attributes = [])
+    public function __construct(array $attributes = [ ])
     {
         $this->bootIfNotBooted();
 
@@ -137,7 +137,7 @@ 
      */
     public function bootIfNotBooted()
     {
-        if (! self::$isBooted) {
+        if (!self::$isBooted) {
             self::boot();
 
             self::$isBooted = true;
@@ -164,7 +164,7 @@ 
      */
     public function syncOriginalAttribute($attribute)
     {
-        $this->original[$attribute] = $this->attributes[$attribute];
+        $this->original[ $attribute ] = $this->attributes[ $attribute ];
 
         return $this;
     }
@@ -282,13 +282,13 @@ 
      * @param array $columns
      * @return mixed
      */
-    public static function all(array $columns = ['*'])
+    public static function all(array $columns = [ '*' ])
     {
         $instance = new static();
         /** @var ArrayObject $result */
         $result   = $instance->newQuery()->get($columns);
 
-        $result->map(function ($item) {
+        $result->map(function($item) {
             $item->exists = true;
         });
 
@@ -304,7 +304,7 @@ 
         $instance = new static();
         $result   = $instance->newQuery()->find($id);
 
-        if (! is_null($result)) {
+        if (!is_null($result)) {
             $result->exists = true;
         }
 
@@ -340,8 +340,8 @@ 
     {
         $instance = new static();
 
-        if (! is_array($id)) {
-            $id = [$id];
+        if (!is_array($id)) {
+            $id = [ $id ];
         }
 
         return $instance->newQuery()->remove($id);
@@ -371,7 +371,7 @@ 
      */
     public function setAttribute($key, $value)
     {
-        $this->attributes[$key] = $value;
+        $this->attributes[ $key ] = $value;
 
         return $this;
     }
@@ -539,7 +539,7 @@ 
      */
     public function offsetExists($offset)
     {
-        return isset($this->attributes[$offset]);
+        return isset($this->attributes[ $offset ]);
     }
 
     /**
@@ -553,7 +553,7 @@ 
      */
     public function offsetGet($offset)
     {
-        return $this->attributes[$offset];
+        return $this->attributes[ $offset ];
     }
 
     /**
@@ -570,7 +570,7 @@ 
      */
     public function offsetSet($offset, $value)
     {
-        $this->attributes[$offset] = $value;
+        $this->attributes[ $offset ] = $value;
     }
 
     /**
@@ -584,7 +584,7 @@ 
      */
     public function offsetUnset($offset)
     {
-        unset($this->attributes[$offset]);
+        unset($this->attributes[ $offset ]);
     }
 
     /**
@@ -653,11 +653,11 @@ 
     {
         $time = $this->freshTimestamp();
 
-        if (! is_null(static::UPDATED_AT) ) {
+        if (!is_null(static::UPDATED_AT)) {
             $this->setUpdatedAt($time);
         }
 
-        if (! is_null(static::CREATED_AT)) {
+        if (!is_null(static::CREATED_AT)) {
             $this->setCreatedAt($time);
         }
     }

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

Spacing +3 added lines, -3 removed lines

@@ -102,7 +102,7 @@ 
             ->from($this->model->getTable());
 
         if (!is_array($id)) {
-            $id = [$id];
+            $id = [ $id ];
         }
 
         foreach ($id as $item) {
@@ -174,8 +174,8 @@ 
      */
     public function __call($name, $arguments)
     {
-        if(in_array($name, $this->passThru)) {
-            return call_user_func_array([$this->fromTable(), $name], $arguments);
+        if (in_array($name, $this->passThru)) {
+            return call_user_func_array([ $this->fromTable(), $name ], $arguments);
         }
     }
 }