o2system / framework

src/Helpers/Framework.php

Spacing +9 added lines, -9 removed lines

@@ -67,8 +67,8 @@ 
         $args = func_get_args();
 
         if (count($args)) {
-            if (isset($GLOBALS[ $args[ 0 ] ])) {
-                return $GLOBALS[ $args[ 0 ] ];
+            if (isset($GLOBALS[$args[0]])) {
+                return $GLOBALS[$args[0]];
             }
 
             return null;
@@ -93,8 +93,8 @@ 
         $args = func_get_args();
 
         if (count($args)) {
-            if (isset($_ENV[ $args[ 0 ] ])) {
-                return $_ENV[ $args[ 0 ] ];
+            if (isset($_ENV[$args[0]])) {
+                return $_ENV[$args[0]];
             }
 
             return null;
@@ -195,9 +195,9 @@ 
         $args = func_get_args();
 
         if (count($args) == 1) {
-            return o2system()->models->autoload($args[ 0 ]);
+            return o2system()->models->autoload($args[0]);
         } else if (count($args) == 2) {
-            return o2system()->models->autoload($args[ 0 ], $args[ 1 ]);
+            return o2system()->models->autoload($args[0], $args[1]);
         }
 
         return o2system()->models;
@@ -219,7 +219,7 @@ 
         $args = func_get_args();
 
         if (count($args)) {
-            return o2system()->modules->getModule($args[ 0 ]);
+            return o2system()->modules->getModule($args[0]);
         }
 
         return o2system()->modules;
@@ -261,8 +261,8 @@ 
         $args = func_get_args();
 
         if (count($args)) {
-            if (isset($_SESSION[ $args[ 0 ] ])) {
-                return $_SESSION[ $args[ 0 ] ];
+            if (isset($_SESSION[$args[0]])) {
+                return $_SESSION[$args[0]];
             }
 
             return null;

src/Models/Sql/Traits/RecordTrait.php

Spacing +35 added lines, -35 removed lines

@@ -99,64 +99,64 @@ 
     {
         $timestamp = $this->unixTimestamp === true ? strtotime(date('Y-m-d H:i:s')) : date('Y-m-d H:i:s');
 
-        if(is_null($this->recordUser)) {
-            if(globals()->offsetExists('account')) {
+        if (is_null($this->recordUser)) {
+            if (globals()->offsetExists('account')) {
                 $this->setRecordUser(globals()->account->id);
             }
         }
 
-        if ( ! isset($sets[ 'record_status' ])) {
-            $sets[ 'record_status' ] = $this->recordStatus;
+        if ( ! isset($sets['record_status'])) {
+            $sets['record_status'] = $this->recordStatus;
         }
 
         if (empty($this->primaryKeys)) {
             $primaryKey = isset($this->primaryKey) ? $this->primaryKey : 'id';
 
-            if (isset($sets[ $primaryKey ])) {
-                if (empty($sets[ $primaryKey ])) {
-                    unset($sets[ $primaryKey ]);
+            if (isset($sets[$primaryKey])) {
+                if (empty($sets[$primaryKey])) {
+                    unset($sets[$primaryKey]);
                 }
             }
 
-            if (empty($sets[ $primaryKey ])) {
-                if ( ! isset($sets[ 'record_create_user' ])) {
-                    $sets[ 'record_create_user' ] = $this->recordUser;
+            if (empty($sets[$primaryKey])) {
+                if ( ! isset($sets['record_create_user'])) {
+                    $sets['record_create_user'] = $this->recordUser;
                 }
 
-                if ( ! isset($sets[ 'record_create_timestamp' ])) {
-                    $sets[ 'record_create_timestamp' ] = $timestamp;
+                if ( ! isset($sets['record_create_timestamp'])) {
+                    $sets['record_create_timestamp'] = $timestamp;
                 } elseif ($this->unixTimestamp) {
-                    $sets[ 'record_create_timestamp' ] = strtotime($sets[ 'record_create_timestamp' ]);
+                    $sets['record_create_timestamp'] = strtotime($sets['record_create_timestamp']);
                 }
             }
         } else {
             foreach ($this->primaryKeys as $primaryKey) {
-                if (empty($sets[ $primaryKey ])) {
-                    if ( ! isset($sets[ 'record_create_user' ])) {
-                        $sets[ 'record_create_user' ] = $this->recordUser;
+                if (empty($sets[$primaryKey])) {
+                    if ( ! isset($sets['record_create_user'])) {
+                        $sets['record_create_user'] = $this->recordUser;
                     }
 
-                    if ( ! isset($sets[ 'record_create_timestamp' ])) {
-                        $sets[ 'record_create_timestamp' ] = $timestamp;
+                    if ( ! isset($sets['record_create_timestamp'])) {
+                        $sets['record_create_timestamp'] = $timestamp;
                     } elseif ($this->unixTimestamp) {
-                        $sets[ 'record_create_timestamp' ] = strtotime($sets[ 'record_create_timestamp' ]);
+                        $sets['record_create_timestamp'] = strtotime($sets['record_create_timestamp']);
                     }
                 }
             }
         }
 
-        if ( ! isset($sets[ 'record_update_user' ])) {
-            $sets[ 'record_update_user' ] = $this->recordUser;
+        if ( ! isset($sets['record_update_user'])) {
+            $sets['record_update_user'] = $this->recordUser;
         }
 
-        if ( ! isset($sets[ 'record_update_timestamp' ])) {
-            $sets[ 'record_update_timestamp' ] = $timestamp;
+        if ( ! isset($sets['record_update_timestamp'])) {
+            $sets['record_update_timestamp'] = $timestamp;
         } elseif ($this->unixTimestamp) {
-            $sets[ 'record_update_timestamp' ] = strtotime($sets[ 'record_update_timestamp' ]);
+            $sets['record_update_timestamp'] = strtotime($sets['record_update_timestamp']);
         }
 
-        if ( ! isset($sets[ 'record_ordering' ]) && $this->recordOrdering === true) {
-            $sets[ 'record_ordering' ] = $this->getRecordOrdering();
+        if ( ! isset($sets['record_ordering']) && $this->recordOrdering === true) {
+            $sets['record_ordering'] = $this->getRecordOrdering();
         }
     }
 
@@ -169,24 +169,24 @@ 
      */
     protected function updateRecordSets(array &$sets)
     {
-        if(is_null($this->recordUser)) {
-            if(globals()->offsetExists('account')) {
+        if (is_null($this->recordUser)) {
+            if (globals()->offsetExists('account')) {
                 $this->setRecordUser(globals()->account->id);
             }
         }
 
-        if ( ! isset($sets[ 'record_status' ])) {
-            $sets[ 'record_status' ] = $this->recordStatus;
+        if ( ! isset($sets['record_status'])) {
+            $sets['record_status'] = $this->recordStatus;
         }
 
-        if ( ! isset($sets[ 'record_update_user' ])) {
-            $sets[ 'record_update_user' ] = $this->recordUser;
+        if ( ! isset($sets['record_update_user'])) {
+            $sets['record_update_user'] = $this->recordUser;
         }
 
         $timestamp = $this->unixTimestamp === true ? strtotime(date('Y-m-d H:i:s')) : date('Y-m-d H:i:s');
 
-        if ( ! isset($sets[ 'record_update_timestamp' ])) {
-            $sets[ 'record_update_timestamp' ] = $timestamp;
+        if ( ! isset($sets['record_update_timestamp'])) {
+            $sets['record_update_timestamp'] = $timestamp;
         }
     }
 
@@ -199,7 +199,7 @@ 
      */
     public function getRecordOrdering()
     {
-        if($this->recordOrdering === true) {
+        if ($this->recordOrdering === true) {
             return $this->qb->countAllResults($this->table) + 1;
         }
 

src/Http/Controllers/ServiceWorker.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
      */
     public function index()
     {
-        if($javascript = file_get_contents(PATH_PUBLIC . 'assets/sw.js')) {
+        if ($javascript = file_get_contents(PATH_PUBLIC . 'assets/sw.js')) {
             $javascript = str_replace(['{{$theme}}', '{{ $theme }}'], 'default', $javascript);
 
             header("Content-type: application/x-javascript");

src/Containers/Config.php

Spacing +2 added lines, -2 removed lines

@@ -156,8 +156,8 @@
      */
     public function reload()
     {
-        if(count($this->loaded)) {
-            foreach($this->loaded as $filename) {
+        if (count($this->loaded)) {
+            foreach ($this->loaded as $filename) {
                 $this->loadFile($filename);
             }
         }

src/Http/Presenter.php

Spacing +22 added lines, -22 removed lines

@@ -105,12 +105,12 @@ 
         }
 
         // autoload presenter assets
-        if (isset($config[ 'assets' ])) {
-            $this->assets->autoload($config[ 'assets' ]);
+        if (isset($config['assets'])) {
+            $this->assets->autoload($config['assets']);
         }
 
         // autoload presenter theme
-        if(isset($config['theme'])) {
+        if (isset($config['theme'])) {
             $this->setTheme($config['theme']);
         }
 
@@ -128,19 +128,19 @@ 
      */
     public function setTheme($theme)
     {
-        if($this->theme instanceof Theme) {
+        if ($this->theme instanceof Theme) {
             $this->assets->removeFilePath($this->theme->getRealPath());
         }
 
         if (is_bool($theme)) {
             $this->theme = false;
-        } elseif(($moduleTheme = modules()->top()->getTheme($theme, true)) instanceof Theme) {
+        } elseif (($moduleTheme = modules()->top()->getTheme($theme, true)) instanceof Theme) {
             $this->theme = $moduleTheme;
-        } elseif(($appTheme = modules()->first()->getTheme($theme, true)) instanceof Theme) {
+        } elseif (($appTheme = modules()->first()->getTheme($theme, true)) instanceof Theme) {
             $this->theme = $appTheme;
         }
 
-        if($this->theme) {
+        if ($this->theme) {
             if ( ! defined('PATH_THEME')) {
                 define('PATH_THEME', $this->theme->getRealPath());
             }
@@ -148,7 +148,7 @@ 
             // add theme assets directory
             $this->assets->pushFilePath($this->theme->getRealPath());
 
-            if(is_dir($themeViewPath = $this->theme->getRealPath() . 'views' . DIRECTORY_SEPARATOR)) {
+            if (is_dir($themeViewPath = $this->theme->getRealPath() . 'views' . DIRECTORY_SEPARATOR)) {
 
                 // add theme view directory
                 view()->addFilePath($this->theme->getRealPath());
@@ -158,11 +158,11 @@ 
 
                 $modules = modules()->getArrayCopy();
 
-                foreach($modules as $module) {
+                foreach ($modules as $module) {
                     if ( ! in_array($module->getType(), ['KERNEL', 'FRAMEWORK', 'APP'])) {
                         $moduleResourcesPath = str_replace(PATH_RESOURCES, '', $module->getResourcesDir());
 
-                        if(is_dir($themeViewPath . $moduleResourcesPath)) {
+                        if (is_dir($themeViewPath . $moduleResourcesPath)) {
                             view()->pushFilePath($themeViewPath . $moduleResourcesPath);
                         }
                     }
@@ -203,25 +203,25 @@ 
         $storage = $this->storage;
 
         // Add Properties
-        $storage[ 'meta' ] = $this->meta;
-        $storage[ 'page' ] = $this->page;
-        $storage[ 'assets' ] = new SplArrayObject([
+        $storage['meta'] = $this->meta;
+        $storage['page'] = $this->page;
+        $storage['assets'] = new SplArrayObject([
             'head' => $this->assets->getHead(),
             'body' => $this->assets->getBody(),
         ]);
-        $storage[ 'partials' ] = $this->partials;
-        $storage[ 'widgets' ] = $this->widgets;
-        $storage[ 'theme' ] = $this->theme;
+        $storage['partials'] = $this->partials;
+        $storage['widgets'] = $this->widgets;
+        $storage['theme'] = $this->theme;
 
         // Add Services
-        $storage[ 'config' ] = config();
-        $storage[ 'language' ] = language();
-        $storage[ 'session' ] = session();
-        $storage[ 'presenter' ] = presenter();
-        $storage[ 'input' ] = input();
+        $storage['config'] = config();
+        $storage['language'] = language();
+        $storage['session'] = session();
+        $storage['presenter'] = presenter();
+        $storage['input'] = input();
 
         if (services()->has('csrfProtection')) {
-            $storage[ 'csrfToken' ] = services()->get('csrfProtection')->getToken();
+            $storage['csrfToken'] = services()->get('csrfProtection')->getToken();
         }
 
         return $storage;

src/Http/Router.php

Spacing +15 added lines, -15 removed lines

@@ -77,7 +77,7 @@ 
             }
         } else {
             $uriPath = urldecode(
-                parse_url($_SERVER[ 'REQUEST_URI' ], PHP_URL_PATH)
+                parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)
             );
 
             $uriPathParts = explode('public/', $uriPath);
@@ -120,7 +120,7 @@ 
         // Module routing
         if ($numOfUriSegments = count($uriSegments)) {
             if (empty($app)) {
-                if (false !== ($module = modules()->getModule( reset($uriSegments) ))) {
+                if (false !== ($module = modules()->getModule(reset($uriSegments)))) {
                     //array_shift($uriSegments);
                     $this->uri = $this->uri->withSegments(new KernelMessageUriSegments($uriSegments));
                     $uriString = $this->uri->getSegments()->getString();
@@ -128,7 +128,7 @@ 
                     $this->registerModule($module);
                 }
             } else {
-                if (false !== ($module = modules()->getModule( [$app->getParameter(), reset($uriSegments) ] ))) {
+                if (false !== ($module = modules()->getModule([$app->getParameter(), reset($uriSegments)]))) {
                     array_shift($uriSegments);
                     $this->uri = $this->uri->withSegments(new KernelMessageUriSegments($uriSegments));
                     $uriString = $this->uri->getSegments()->getString();
@@ -137,7 +137,7 @@ 
                 }
             }
 
-            if($numOfUriSegments = count($uriSegments)) {
+            if ($numOfUriSegments = count($uriSegments)) {
                 for ($i = 0; $i <= $numOfUriSegments; $i++) {
                     $uriRoutedSegments = array_diff($uriSegments,
                         array_slice($uriSegments, ($numOfUriSegments - $i)));
@@ -228,7 +228,7 @@ 
                     if (class_exists($controllerClassName = $controllerNamespace . implode('\\',
                             array_map('studlycase', $uriRoutedSegments)))) {
 
-                        if($controllerClassName::$inherited) {
+                        if ($controllerClassName::$inherited) {
                             $uriSegments = array_diff($uriSegments, $uriRoutedSegments);
                             $this->setController(new KernelControllerDataStructure($controllerClassName),
                                 $uriSegments);
@@ -245,7 +245,7 @@ 
                      * Try to find requested page
                      */
                     if (false !== ($pagesDir = $module->getResourcesDir('pages', true))) {
-                        if($controllerClassName = $this->getPagesControllerClassName()) {
+                        if ($controllerClassName = $this->getPagesControllerClassName()) {
 
                             /**
                              * Try to find from database
@@ -280,12 +280,12 @@ 
                                 presenter()->page->setFile($pageFilePath);
                             } else {
                                 $pageFilePath = str_replace('.phtml', DIRECTORY_SEPARATOR . 'index.phtml', $pageFilePath);
-                                if(is_file($pageFilePath)) {
+                                if (is_file($pageFilePath)) {
                                     presenter()->page->setFile($pageFilePath);
                                 }
                             }
 
-                            if(presenter()->page->file instanceof SplFileInfo) {
+                            if (presenter()->page->file instanceof SplFileInfo) {
                                 $this->setController(
                                     (new KernelControllerDataStructure($controllerClassName))
                                         ->setRequestMethod('index')
@@ -328,19 +328,19 @@ 
     {
         $modules = modules()->getArrayCopy();
 
-        foreach($modules as $module) {
+        foreach ($modules as $module) {
             $controllerClassName = $module->getNamespace() . 'Controllers\Pages';
             if ($module->getNamespace() === 'O2System\Framework\\') {
                 $controllerClassName = 'O2System\Framework\Http\Controllers\Pages';
             }
 
-            if(class_exists($controllerClassName)) {
+            if (class_exists($controllerClassName)) {
                 return $controllerClassName;
                 break;
             }
         }
 
-        if(class_exists('O2System\Framework\Http\Controllers\Pages')) {
+        if (class_exists('O2System\Framework\Http\Controllers\Pages')) {
             return 'O2System\Framework\Http\Controllers\Pages';
         }
 
@@ -391,7 +391,7 @@ 
                 if (class_exists($controllerClassName)) {
                     $this->addresses->any(
                         '/',
-                        function () use ($controllerClassName) {
+                        function() use ($controllerClassName) {
                             return new $controllerClassName();
                         }
                     );
@@ -406,7 +406,7 @@ 
             if (class_exists($controllerClassName)) {
                 $this->addresses->any(
                     '/',
-                    function () use ($controllerClassName) {
+                    function() use ($controllerClassName) {
                         return new $controllerClassName();
                     }
                 );
@@ -458,8 +458,8 @@ 
                 );
             } elseif (preg_match("/([a-zA-Z0-9\\\]+)(@)([a-zA-Z0-9\\\]+)/", $closure, $matches)) {
                 $this->setController(
-                    (new KernelControllerDataStructure($matches[ 1 ]))
-                        ->setRequestMethod($matches[ 3 ]),
+                    (new KernelControllerDataStructure($matches[1]))
+                        ->setRequestMethod($matches[3]),
                     $uriSegments
                 );
             } elseif (presenter()->theme->use === true) {

src/Services/Hooks.php

Spacing +2 added lines, -2 removed lines

@@ -118,7 +118,7 @@ 
             self::POST_CONTROLLER,
             self::POST_COMMANDER,
         ])) {
-            $this->closures[ $offset ][ spl_object_hash($closure) ] = $closure;
+            $this->closures[$offset][spl_object_hash($closure)] = $closure;
         }
     }
 
@@ -132,7 +132,7 @@ 
     public function callEvent($event)
     {
         if (array_key_exists($event, $this->closures)) {
-            foreach ($this->closures[ $event ] as $closure) {
+            foreach ($this->closures[$event] as $closure) {
                 call_user_func($closure);
             }
         }

src/Cli/Commanders/Build.php

Spacing +1 added lines, -1 removed lines

@@ -173,7 +173,7 @@
             $phar->buildFromIterator(new \RecursiveIteratorIterator(new \RecursiveCallbackFilterIterator(
                 new \RecursiveDirectoryIterator(PATH_ROOT,
                     \FilesystemIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS),
-                function ($current, $key, $iterator) {
+                function($current, $key, $iterator) {
                     if ($current->isDir()) {
                         // exclude build directory
                         if ($current->getFilename() === 'build') {

src/Cli/Commanders/Maintenance.php

Spacing +14 added lines, -14 removed lines

@@ -191,16 +191,16 @@ 
         $options = input()->get();
 
         if (empty($options)) {
-            $_GET[ 'switch' ] = 'ON';
-            $_GET[ 'mode' ] = 'default';
-            $_GET[ 'lifetime' ] = 300;
-            $_GET[ 'title' ] = language()->getLine(strtoupper('CLI_MAINTENANCE_TITLE'));
-            $_GET[ 'message' ] = language()->getLine(strtoupper('CLI_MAINTENANCE_MESSAGE'));
+            $_GET['switch'] = 'ON';
+            $_GET['mode'] = 'default';
+            $_GET['lifetime'] = 300;
+            $_GET['title'] = language()->getLine(strtoupper('CLI_MAINTENANCE_TITLE'));
+            $_GET['message'] = language()->getLine(strtoupper('CLI_MAINTENANCE_MESSAGE'));
         } else {
-            $_GET[ 'mode' ] = 'default';
-            $_GET[ 'lifetime' ] = 300;
-            $_GET[ 'title' ] = language()->getLine(strtoupper('CLI_MAINTENANCE_TITLE'));
-            $_GET[ 'message' ] = language()->getLine(strtoupper('CLI_MAINTENANCE_MESSAGE'));
+            $_GET['mode'] = 'default';
+            $_GET['lifetime'] = 300;
+            $_GET['title'] = language()->getLine(strtoupper('CLI_MAINTENANCE_TITLE'));
+            $_GET['message'] = language()->getLine(strtoupper('CLI_MAINTENANCE_MESSAGE'));
         }
 
         $this->__callOptions();
@@ -213,11 +213,11 @@ 
                     (new Format())
                         ->setContextualClass(Format::DANGER)
                         ->setString(language()->getLine('CLI_MAINTENANCE_ALREADY_STARTED', [
-                            $maintenanceInfo[ 'mode' ],
-                            $maintenanceInfo[ 'datetime' ],
-                            date('r', strtotime($maintenanceInfo[ 'datetime' ]) + $maintenanceInfo[ 'lifetime' ]),
-                            $maintenanceInfo[ 'title' ],
-                            $maintenanceInfo[ 'message' ],
+                            $maintenanceInfo['mode'],
+                            $maintenanceInfo['datetime'],
+                            date('r', strtotime($maintenanceInfo['datetime']) + $maintenanceInfo['lifetime']),
+                            $maintenanceInfo['title'],
+                            $maintenanceInfo['message'],
                         ]))
                         ->setNewLinesAfter(1)
                 );