o2system / framework

src/Http/Presenter.php

Spacing +21 added lines, -21 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']);
         }
 
@@ -130,13 +130,13 @@ 
     {
         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());
             }
@@ -144,7 +144,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());
@@ -154,11 +154,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);
                         }
                     }
@@ -199,25 +199,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 +13 added lines, -13 removed lines

@@ -64,7 +64,7 @@ 
             }
         } else {
             $uriPath = urldecode(
-                parse_url($_SERVER[ 'REQUEST_URI' ], PHP_URL_PATH)
+                parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)
             );
 
             $uriPathParts = explode('public/', $uriPath);
@@ -107,7 +107,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();
@@ -116,7 +116,7 @@ 
                 }
             }
 
-            if($numOfUriSegments = count($uriSegments)) {
+            if ($numOfUriSegments = count($uriSegments)) {
                 for ($i = 0; $i <= $numOfUriSegments; $i++) {
                     $uriRoutedSegments = array_diff($uriSegments,
                         array_slice($uriSegments, ($numOfUriSegments - $i)));
@@ -216,7 +216,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
@@ -251,12 +251,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')
@@ -299,19 +299,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';
         }
 
@@ -356,7 +356,7 @@ 
                 if (class_exists($controllerClassName)) {
                     $this->addresses->any(
                         '/',
-                        function () use ($controllerClassName) {
+                        function() use ($controllerClassName) {
                             return new $controllerClassName();
                         }
                     );
@@ -371,7 +371,7 @@ 
             if (class_exists($controllerClassName)) {
                 $this->addresses->any(
                     '/',
-                    function () use ($controllerClassName) {
+                    function() use ($controllerClassName) {
                         return new $controllerClassName();
                     }
                 );
@@ -423,8 +423,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/Http/Presenter/Assets/Positions/Head.php

Spacing +16 added lines, -16 removed lines

@@ -193,11 +193,11 @@ 
             $bundleFontsFile = $this->bundleFile('assets' . DIRECTORY_SEPARATOR . 'fonts.css',
                 implode(PHP_EOL, $this->fonts));
 
-            if (is_file($bundleFontsFile[ 'filePath' ])) {
+            if (is_file($bundleFontsFile['filePath'])) {
                 if (input()->env('DEBUG_STAGE') === 'PRODUCTION') {
-                    $output[] = '<link rel="stylesheet" type="text/css" media="all" href="' . $bundleFontsFile[ 'url' ] . '?v=' . $bundleFontsFile[ 'version' ] . '">';
+                    $output[] = '<link rel="stylesheet" type="text/css" media="all" href="' . $bundleFontsFile['url'] . '?v=' . $bundleFontsFile['version'] . '">';
                 } else {
-                    $output[] = '<link rel="stylesheet" type="text/css" media="all" href="' . $bundleFontsFile[ 'url' ] . '?v=' . $bundleFontsFile[ 'version' ] . '">';
+                    $output[] = '<link rel="stylesheet" type="text/css" media="all" href="' . $bundleFontsFile['url'] . '?v=' . $bundleFontsFile['version'] . '">';
                 }
             }
         }
@@ -233,11 +233,11 @@ 
                 } elseif (in_array(pathinfo($style, PATHINFO_FILENAME), ['module', 'module.min'])) {
                     $modulePublicFile = $this->publishFile($style);
                     
-                    if (is_file($modulePublicFile[ 'filePath' ])) {
+                    if (is_file($modulePublicFile['filePath'])) {
                         if (input()->env('DEBUG_STAGE') === 'PRODUCTION') {
-                            $output[] = '<link rel="stylesheet" type="text/css" media="all" href="' . $modulePublicFile[ 'minify' ][ 'url' ] . '?v=' . $modulePublicFile[ 'version' ] . '">';
+                            $output[] = '<link rel="stylesheet" type="text/css" media="all" href="' . $modulePublicFile['minify']['url'] . '?v=' . $modulePublicFile['version'] . '">';
                         } else {
-                            $output[] = '<link rel="stylesheet" type="text/css" media="all" href="' . $modulePublicFile[ 'url' ] . '?v=' . $modulePublicFile[ 'version' ] . '">';
+                            $output[] = '<link rel="stylesheet" type="text/css" media="all" href="' . $modulePublicFile['url'] . '?v=' . $modulePublicFile['version'] . '">';
                         }
                     }
                 } else {
@@ -248,11 +248,11 @@ 
             if (count($bundleStyleSources)) {
                 $bundleStylePublicFile = $this->bundleFile($bundleFilename . '.css', $bundleStyleSources);
 
-                if (is_file($bundleStylePublicFile[ 'filePath' ])) {
+                if (is_file($bundleStylePublicFile['filePath'])) {
                     if (input()->env('DEBUG_STAGE') === 'PRODUCTION') {
-                        $output[] = '<link rel="stylesheet" type="text/css" media="all" href="' . $bundleStylePublicFile[ 'minify' ][ 'url' ] . '?v=' . $bundleStylePublicFile[ 'version' ] . '">';
+                        $output[] = '<link rel="stylesheet" type="text/css" media="all" href="' . $bundleStylePublicFile['minify']['url'] . '?v=' . $bundleStylePublicFile['version'] . '">';
                     } else {
-                        $output[] = '<link rel="stylesheet" type="text/css" media="all" href="' . $bundleStylePublicFile[ 'url' ] . '?v=' . $bundleStylePublicFile[ 'version' ] . '">';
+                        $output[] = '<link rel="stylesheet" type="text/css" media="all" href="' . $bundleStylePublicFile['url'] . '?v=' . $bundleStylePublicFile['version'] . '">';
                     }
                 }
             }
@@ -265,15 +265,15 @@ 
             foreach ($this->javascripts as $javascript) {
                 if (in_array(pathinfo($style, PATHINFO_FILENAME), $unbundledFilenames)) {
                     $fileVersion = $this->getVersion(filemtime($javascript));
-                    $output[] = '<script type="text/javascript" id="js-'.pathinfo($javascript, PATHINFO_FILENAME).'" src="' . $this->getUrl($javascript) . '?v=' . $fileVersion . '"></script>';
+                    $output[] = '<script type="text/javascript" id="js-' . pathinfo($javascript, PATHINFO_FILENAME) . '" src="' . $this->getUrl($javascript) . '?v=' . $fileVersion . '"></script>';
                 } elseif (in_array(pathinfo($javascript, PATHINFO_FILENAME), ['module', 'module.min'])) {
                     $modulePublicFile = $this->publishFile($javascript);
                     
-                    if (is_file($modulePublicFile[ 'filePath' ])) {
+                    if (is_file($modulePublicFile['filePath'])) {
                         if (input()->env('DEBUG_STAGE') === 'PRODUCTION') {
-                            $output[] = '<script type="text/javascript" id="js-module" src="' . $modulePublicFile[ 'minify' ][ 'url' ] . '?v=' . $modulePublicFile[ 'version' ] . '"></script>';
+                            $output[] = '<script type="text/javascript" id="js-module" src="' . $modulePublicFile['minify']['url'] . '?v=' . $modulePublicFile['version'] . '"></script>';
                         } else {
-                            $output[] = '<script type="text/javascript" id="js-module" src="' . $modulePublicFile[ 'url' ] . '?v=' . $modulePublicFile[ 'version' ] . '"></script>';
+                            $output[] = '<script type="text/javascript" id="js-module" src="' . $modulePublicFile['url'] . '?v=' . $modulePublicFile['version'] . '"></script>';
                         }
                     }
                 } else {
@@ -284,11 +284,11 @@ 
             if (count($bundleJavascriptSources)) {
                 $bundleJavascriptPublicFile = $this->bundleFile($bundleFilename . '.js', $bundleJavascriptSources);
 
-                if (is_file($bundleJavascriptPublicFile[ 'filePath' ])) {
+                if (is_file($bundleJavascriptPublicFile['filePath'])) {
                     if (input()->env('DEBUG_STAGE') === 'PRODUCTION') {
-                        $output[] = '<script type="text/javascript" id="js-bundle" src="' . $bundleJavascriptPublicFile[ 'minify' ][ 'url' ] . '?v=' . $bundleJavascriptPublicFile[ 'version' ] . '"></script>';
+                        $output[] = '<script type="text/javascript" id="js-bundle" src="' . $bundleJavascriptPublicFile['minify']['url'] . '?v=' . $bundleJavascriptPublicFile['version'] . '"></script>';
                     } else {
-                        $output[] = '<script type="text/javascript" id="js-bundle" src="' . $bundleJavascriptPublicFile[ 'url' ] . '?v=' . $bundleJavascriptPublicFile[ 'version' ] . '"></script>';
+                        $output[] = '<script type="text/javascript" id="js-bundle" src="' . $bundleJavascriptPublicFile['url'] . '?v=' . $bundleJavascriptPublicFile['version'] . '"></script>';
                     }
                 }
             }

src/Http/Presenter/Assets/Positions/Abstracts/AbstractPosition.php

Spacing +3 added lines, -3 removed lines

@@ -173,7 +173,7 @@ 
         if (is_file($mapFilePath = $publicFilePath . '.map')) {
             $mapMetadata = json_decode(file_get_contents($mapFilePath), true);
             // if the file version is changed delete it first
-            if ( ! hash_equals($fileVersion, $mapMetadata[ 'version' ])) {
+            if ( ! hash_equals($fileVersion, $mapMetadata['version'])) {
                 unlink($publicFilePath);
                 unlink($publicMinifyFilePath);
                 unlink($mapFilePath);
@@ -266,7 +266,7 @@ 
             if ( ! empty($content)) {
                 $sourcesContent[] = $content;
             } else {
-                unset($sources[ $key ]);
+                unset($sources[$key]);
             }
         }
 
@@ -287,7 +287,7 @@ 
             if (is_file($mapFilePath = $publicFilePath . '.map')) {
                 $mapMetadata = json_decode(file_get_contents($mapFilePath), true);
                 // if the file version is changed delete it first
-                if ( ! hash_equals($fileVersion, $mapMetadata[ 'version' ])) {
+                if ( ! hash_equals($fileVersion, $mapMetadata['version'])) {
                     unlink($publicFilePath);
                     unlink($publicMinifyFilePath);
                     unlink($mapFilePath);

src/Http/Presenter/Assets/Positions/Body.php

Spacing +7 added lines, -7 removed lines

@@ -111,15 +111,15 @@ 
             foreach ($this->javascripts as $javascript) {
                 if (in_array(pathinfo($javascript, PATHINFO_FILENAME), $unbundledFilenames)) {
                     $fileVersion = $this->getVersion(filemtime($javascript));
-                    $output[] = '<script type="text/javascript" id="js-'.pathinfo($javascript, PATHINFO_FILENAME).'" src="' . $this->getUrl($javascript) . '?v=' . $fileVersion . '"></script>';
+                    $output[] = '<script type="text/javascript" id="js-' . pathinfo($javascript, PATHINFO_FILENAME) . '" src="' . $this->getUrl($javascript) . '?v=' . $fileVersion . '"></script>';
                 } elseif (in_array(pathinfo($javascript, PATHINFO_FILENAME), ['module', 'module.min'])) {
                     $modulePublicFile = $this->publishFile($javascript);
 
-                    if (is_file($modulePublicFile[ 'filePath' ])) {
+                    if (is_file($modulePublicFile['filePath'])) {
                         if (input()->env('DEBUG_STAGE') === 'PRODUCTION') {
-                            $output[] = '<script type="text/javascript" id="js-module" src="' . $modulePublicFile[ 'minify' ][ 'url' ] . '?v=' . $modulePublicFile[ 'version' ] . '"></script>';
+                            $output[] = '<script type="text/javascript" id="js-module" src="' . $modulePublicFile['minify']['url'] . '?v=' . $modulePublicFile['version'] . '"></script>';
                         } else {
-                            $output[] = '<script type="text/javascript" id="js-module" src="' . $modulePublicFile[ 'url' ] . '?v=' . $modulePublicFile[ 'version' ] . '"></script>';
+                            $output[] = '<script type="text/javascript" id="js-module" src="' . $modulePublicFile['url'] . '?v=' . $modulePublicFile['version'] . '"></script>';
                         }
                     }
                 } else {
@@ -130,11 +130,11 @@ 
             if (count($bundleJavascriptSources)) {
                 $bundleJavascriptPublicFile = $this->bundleFile($bundleFilename . '.js', $bundleJavascriptSources);
 
-                if (is_file($bundleJavascriptPublicFile[ 'filePath' ])) {
+                if (is_file($bundleJavascriptPublicFile['filePath'])) {
                     if (input()->env('DEBUG_STAGE') === 'PRODUCTION') {
-                        $output[] = '<script type="text/javascript" id="js-bundle" src="' . $bundleJavascriptPublicFile[ 'minify' ][ 'url' ] . '?v=' . $bundleJavascriptPublicFile[ 'version' ] . '"></script>';
+                        $output[] = '<script type="text/javascript" id="js-bundle" src="' . $bundleJavascriptPublicFile['minify']['url'] . '?v=' . $bundleJavascriptPublicFile['version'] . '"></script>';
                     } else {
-                        $output[] = '<script type="text/javascript" id="js-bundle" src="' . $bundleJavascriptPublicFile[ 'url' ] . '?v=' . $bundleJavascriptPublicFile[ 'version' ] . '"></script>';
+                        $output[] = '<script type="text/javascript" id="js-bundle" src="' . $bundleJavascriptPublicFile['url'] . '?v=' . $bundleJavascriptPublicFile['version'] . '"></script>';
                     }
                 }
             }

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;