o2system / framework

src/Http/Presenter.php

Spacing +14 added lines, -14 removed lines

@@ -105,8 +105,8 @@ 
         }
 
         // autoload presenter assets
-        if (isset($config[ 'assets' ])) {
-            $this->assets->autoload($config[ 'assets' ]);
+        if (isset($config['assets'])) {
+            $this->assets->autoload($config['assets']);
         }
 
         return $this;
@@ -183,25 +183,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 +7 added lines, -7 removed lines

@@ -63,7 +63,7 @@ 
             }
         } else {
             $uriPath = urldecode(
-                parse_url($_SERVER[ 'REQUEST_URI' ], PHP_URL_PATH)
+                parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)
             );
 
             $uriPathParts = explode('public/', $uriPath);
@@ -233,12 +233,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')
@@ -315,7 +315,7 @@ 
                 if (class_exists($controllerClassName)) {
                     $this->addresses->any(
                         '/',
-                        function () use ($controllerClassName) {
+                        function() use ($controllerClassName) {
                             return new $controllerClassName();
                         }
                     );
@@ -330,7 +330,7 @@ 
             if (class_exists($controllerClassName)) {
                 $this->addresses->any(
                     '/',
-                    function () use ($controllerClassName) {
+                    function() use ($controllerClassName) {
                         return new $controllerClassName();
                     }
                 );
@@ -382,8 +382,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/Controllers/Resources.php

Spacing +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
         $download = false;
         if (false !== ($key = array_search('download', $segments))) {
             $download = true;
-            unset($segments[ $key ]);
+            unset($segments[$key]);
             $segments = array_values($segments);
         }
 

src/Http/Controllers/Pages.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
      */
     public function index()
     {
-        if($this->presenter->page->file instanceof SplFileInfo) {
+        if ($this->presenter->page->file instanceof SplFileInfo) {
             $this->view->page(presenter()->page->file->getRealPath());
         }
     }

src/Http/Presenter/Page.php

Spacing +4 added lines, -4 removed lines

@@ -155,12 +155,12 @@
                 $properties = file_get_contents($propertiesFilePath);
                 $properties = json_decode($properties, true);
 
-                if (isset($properties[ 'vars' ])) {
-                    $this->vars = $properties[ 'vars' ];
+                if (isset($properties['vars'])) {
+                    $this->vars = $properties['vars'];
                 }
 
-                if (isset($properties[ 'presets' ])) {
-                    $this->presets = new SplArrayObject($properties[ 'presets' ]);
+                if (isset($properties['presets'])) {
+                    $this->presets = new SplArrayObject($properties['presets']);
                 }
             }
         }

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

Spacing +9 added lines, -9 removed lines

@@ -63,7 +63,7 @@ 
                     $jsVersion = $this->getVersion($js);
                     $output[] = '<script type="text/javascript" src="' . $this->getUrl($js) . '?v=' . $jsVersion . '"></script>';
                 } else {
-                    $bundleJsMap[ 'sources' ][] = $js;
+                    $bundleJsMap['sources'][] = $js;
                     $bundleJsContents[] = file_get_contents($js);
                 }
             }
@@ -71,17 +71,17 @@ 
             // Bundled Js
             $bundleJsVersion = $this->getVersion(serialize($bundleJsContents));
 
-            if(presenter()->page->file instanceof \SplFileInfo) {
-                if(presenter()->page->file->getFilename() === 'index') {
+            if (presenter()->page->file instanceof \SplFileInfo) {
+                if (presenter()->page->file->getFilename() === 'index') {
                     $bundleJsFilename = 'body-' . presenter()->page->file->getDirectoryInfo()->getDirName();
                 } else {
                     $bundleJsFilename = 'body-' . presenter()->page->file->getDirectoryInfo()->getDirName() . '-' . presenter()->page->file->getFilename();
                 }
-            } elseif(services()->has('controller')) {
+            } elseif (services()->has('controller')) {
                 $bundleJsFilename = 'body-' . controller()->getParameter();
 
-                if(controller()->getRequestMethod() !== 'index') {
-                    $bundleJsFilename.= '-' . controller()->getRequestMethod();
+                if (controller()->getRequestMethod() !== 'index') {
+                    $bundleJsFilename .= '-' . controller()->getRequestMethod();
                 }
             } else {
                 $bundleJsFilename = 'body-' . md5($bundleJsVersion);
@@ -94,14 +94,14 @@ 
             if (is_file($bundleJsFilePath . '.map')) {
                 $bundleJsMap = json_decode(file_get_contents($bundleJsFilePath . '.map'), true);
                 // if the file version is changed delete it first
-                if ( ! hash_equals($bundleJsVersion, $bundleJsMap[ 'version' ])) {
+                if ( ! hash_equals($bundleJsVersion, $bundleJsMap['version'])) {
                     unlink($bundleJsFilePath);
                     unlink($bundleJsFilePath . '.map');
                 }
             }
 
             if ( ! is_file($bundleJsFilePath)) {
-                $bundleJsMap[ 'version' ] = $bundleJsVersion;
+                $bundleJsMap['version'] = $bundleJsVersion;
 
                 // Create css file
                 if (count($bundleJsContents)) {
@@ -128,7 +128,7 @@ 
                 }
             }
 
-            if(is_file($bundleJsFilePath)) {
+            if (is_file($bundleJsFilePath)) {
                 if (input()->env('DEBUG_STAGE') === 'PRODUCTION') {
                     $output[] = '<script type="text/javascript" src="' . $this->getUrl($bundleJsMinifyFilePath) . '?v=' . $bundleJsVersion . '"></script>';
                 } else {

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

Spacing +19 added lines, -19 removed lines

@@ -81,7 +81,7 @@ 
             if (is_file($bundleFontFilePath . '.map')) {
                 $bundleFontMap = json_decode(file_get_contents($bundleFontFilePath . '.map'), true);
                 // if the file version is changed delete it first
-                if ( ! hash_equals($bundleFontVersion, $bundleFontMap[ 'version' ])) {
+                if ( ! hash_equals($bundleFontVersion, $bundleFontMap['version'])) {
                     unlink($bundleFontFilePath);
                     unlink($bundleFontFilePath . '.map');
                 }
@@ -97,7 +97,7 @@ 
                     flock($bundleFileStream, LOCK_EX);
 
                     foreach ($this->font as $font) {
-                        $bundleFontMap[ 'sources' ][] = $font;
+                        $bundleFontMap['sources'][] = $font;
                         fwrite($bundleFileStream, file_get_contents($font));
                     }
 
@@ -138,7 +138,7 @@ 
                     $cssVersion = $this->getVersion($css);
                     $output[] = '<link rel="stylesheet" type="text/css" media="all" href="' . $this->getUrl($css) . '?v=' . $cssVersion . '">';
                 } else {
-                    $bundleCssMap[ 'sources' ][] = $css;
+                    $bundleCssMap['sources'][] = $css;
                     $bundleCssContents[] = file_get_contents($css);
                 }
             }
@@ -146,17 +146,17 @@ 
             // Bundled Css
             $bundleCssVersion = $this->getVersion(serialize($bundleCssContents));
 
-            if(presenter()->page->file instanceof \SplFileInfo) {
-                if(presenter()->page->file->getFilename() === 'index') {
+            if (presenter()->page->file instanceof \SplFileInfo) {
+                if (presenter()->page->file->getFilename() === 'index') {
                     $bundleJsFilename = 'body-' . presenter()->page->file->getDirectoryInfo()->getDirName();
                 } else {
                     $bundleJsFilename = 'body-' . presenter()->page->file->getDirectoryInfo()->getDirName() . '-' . presenter()->page->file->getFilename();
                 }
-            } elseif(services()->has('controller')) {
+            } elseif (services()->has('controller')) {
                 $bundleJsFilename = 'body-' . controller()->getParameter();
 
-                if(controller()->getRequestMethod() !== 'index') {
-                    $bundleJsFilename.= '-' . controller()->getRequestMethod();
+                if (controller()->getRequestMethod() !== 'index') {
+                    $bundleJsFilename .= '-' . controller()->getRequestMethod();
                 }
             } else {
                 $bundleJsFilename = 'body-' . md5($bundleCssVersion);
@@ -169,14 +169,14 @@ 
             if (is_file($bundleCssFilePath . '.map')) {
                 $bundleCssMap = json_decode(file_get_contents($bundleCssFilePath . '.map'), true);
                 // if the file version is changed delete it first
-                if ( ! hash_equals($bundleCssVersion, $bundleCssMap[ 'version' ])) {
+                if ( ! hash_equals($bundleCssVersion, $bundleCssMap['version'])) {
                     unlink($bundleCssFilePath);
                     unlink($bundleCssFilePath . '.map');
                 }
             }
 
             if ( ! is_file($bundleCssFilePath)) {
-                $bundleCssMap[ 'version' ] = $bundleCssVersion;
+                $bundleCssMap['version'] = $bundleCssVersion;
 
                 // Create css file
                 if (count($bundleCssContents)) {
@@ -222,7 +222,7 @@ 
                     $jsVersion = $this->getVersion($js);
                     $output[] = '<script type="text/javascript" src="' . $this->getUrl($js) . '?v=' . $jsVersion . '"></script>';
                 } else {
-                    $bundleJsMap[ 'sources' ][] = $js;
+                    $bundleJsMap['sources'][] = $js;
                     $bundleJsContents[] = file_get_contents($js);
                 }
             }
@@ -230,17 +230,17 @@ 
             // Bundled Js
             $bundleJsVersion = $this->getVersion(serialize($bundleJsContents));
 
-            if(presenter()->page->file instanceof \SplFileInfo) {
-                if(presenter()->page->file->getFilename() === 'index') {
+            if (presenter()->page->file instanceof \SplFileInfo) {
+                if (presenter()->page->file->getFilename() === 'index') {
                     $bundleJsFilename = 'body-' . presenter()->page->file->getDirectoryInfo()->getDirName();
                 } else {
                     $bundleJsFilename = 'body-' . presenter()->page->file->getDirectoryInfo()->getDirName() . '-' . presenter()->page->file->getFilename();
                 }
-            } elseif(services()->has('controller')) {
+            } elseif (services()->has('controller')) {
                 $bundleJsFilename = 'body-' . controller()->getParameter();
 
-                if(controller()->getRequestMethod() !== 'index') {
-                    $bundleJsFilename.= '-' . controller()->getRequestMethod();
+                if (controller()->getRequestMethod() !== 'index') {
+                    $bundleJsFilename .= '-' . controller()->getRequestMethod();
                 }
             } else {
                 $bundleJsFilename = 'body-' . md5($bundleJsVersion);
@@ -253,14 +253,14 @@ 
             if (is_file($bundleJsFilePath . '.map')) {
                 $bundleJsMap = json_decode(file_get_contents($bundleJsFilePath . '.map'), true);
                 // if the file version is changed delete it first
-                if ( ! hash_equals($bundleJsVersion, $bundleJsMap[ 'version' ])) {
+                if ( ! hash_equals($bundleJsVersion, $bundleJsMap['version'])) {
                     unlink($bundleJsFilePath);
                     unlink($bundleJsFilePath . '.map');
                 }
             }
 
             if ( ! is_file($bundleJsFilePath)) {
-                $bundleJsMap[ 'version' ] = $bundleJsVersion;
+                $bundleJsMap['version'] = $bundleJsVersion;
 
                 // Create css file
                 if (count($bundleJsContents)) {
@@ -287,7 +287,7 @@ 
                 }
             }
 
-            if(is_file($bundleJsFilePath)) {
+            if (is_file($bundleJsFilePath)) {
                 if (input()->env('DEBUG_STAGE') === 'PRODUCTION') {
                     $output[] = '<script type="text/javascript" src="' . $this->getUrl($bundleJsMinifyFilePath) . '?v=' . $bundleJsVersion . '"></script>';
                 } else {

src/Containers/Modules/DataStructures/Module.php

Spacing +4 added lines, -4 removed lines

@@ -196,10 +196,10 @@ 
      */
     public function setProperties(array $properties)
     {
-        if (isset($properties[ 'presets' ])) {
-            $this->setPresets($properties[ 'presets' ]);
+        if (isset($properties['presets'])) {
+            $this->setPresets($properties['presets']);
 
-            unset($properties[ 'presets' ]);
+            unset($properties['presets']);
         }
 
         $this->properties = $properties;
@@ -289,7 +289,7 @@ 
         $themes = [];
         foreach ($directory->getTree() as $themeName => $themeTree) {
             if (($theme = $this->getTheme($themeName)) instanceof Module\Theme) {
-                $themes[ $themeName ] = $theme;
+                $themes[$themeName] = $theme;
             }
         }
 

src/Containers/Modules.php

Spacing +25 added lines, -25 removed lines

@@ -184,13 +184,13 @@ 
 
         if (isset($config) AND is_array($config)) {
             // Set default timezone
-            if (isset($config[ 'datetime' ][ 'timezone' ])) {
-                date_default_timezone_set($config[ 'datetime' ][ 'timezone' ]);
+            if (isset($config['datetime']['timezone'])) {
+                date_default_timezone_set($config['datetime']['timezone']);
             }
 
             // Setup Language Ideom and Locale
-            if (isset($config[ 'language' ])) {
-                language()->setDefault($config[ 'language' ]);
+            if (isset($config['language'])) {
+                language()->setDefault($config['language']);
             }
 
             config()->merge($config);
@@ -420,8 +420,8 @@ 
                 $packageJsonFile = str_replace(['\\', '/'], DIRECTORY_SEPARATOR, $packageJsonFile);
                 $packageJsonFileInfo = pathinfo($packageJsonFile);
 
-                if ($packageJsonFileInfo[ 'filename' ] === 'widget' or
-                    $packageJsonFileInfo[ 'filename' ] === 'language' or
+                if ($packageJsonFileInfo['filename'] === 'widget' or
+                    $packageJsonFileInfo['filename'] === 'language' or
                     strpos($packageJsonFile, '.svn') !== false // subversion properties file conflict.
                 ) {
                     continue;
@@ -451,8 +451,8 @@ 
                 }
 
                 if (strpos($packageJsonFile,
-                        $modularType = ucfirst(plural($packageJsonFileInfo[ 'filename' ])) . DIRECTORY_SEPARATOR) === false) {
-                    $modularType = ucfirst($packageJsonFileInfo[ 'filename' ]) . DIRECTORY_SEPARATOR;
+                        $modularType = ucfirst(plural($packageJsonFileInfo['filename'])) . DIRECTORY_SEPARATOR) === false) {
+                    $modularType = ucfirst($packageJsonFileInfo['filename']) . DIRECTORY_SEPARATOR;
                 }
 
                 $modularType = strtolower(rtrim($modularType, DIRECTORY_SEPARATOR));
@@ -467,7 +467,7 @@ 
                                 PATH_PUBLIC,
                                 PATH_RESOURCES,
                                 PATH_APP,
-                                $packageJsonFileInfo[ 'basename' ],
+                                $packageJsonFileInfo['basename'],
                                 ucfirst($modularType) . DIRECTORY_SEPARATOR,
                             ],
                             '',
@@ -477,7 +477,7 @@ 
                     )
                 );
 
-                $moduleSegments = array_map(function ($string) {
+                $moduleSegments = array_map(function($string) {
                     return dash(snakecase($string));
                 }, $moduleSegments);
 
@@ -485,14 +485,14 @@ 
                     str_replace(
                         PATH_ROOT,
                         '',
-                        $packageJsonFileInfo[ 'dirname' ]
+                        $packageJsonFileInfo['dirname']
                     ),
                     false
                 );
 
-                if (isset($packageJsonMetadata[ 'namespace' ])) {
-                    $moduleNamespace = $packageJsonMetadata[ 'namespace' ];
-                    unset($packageJsonMetadata[ 'namespace' ]);
+                if (isset($packageJsonMetadata['namespace'])) {
+                    $moduleNamespace = $packageJsonMetadata['namespace'];
+                    unset($packageJsonMetadata['namespace']);
                 }
 
                 $moduleParentSegments = [];
@@ -506,16 +506,16 @@ 
                 $registryKey = implode('/', $moduleSegments);
 
                 if ($registryKey === '') {
-                    if ($packageJsonFileInfo[ 'dirname' ] . DIRECTORY_SEPARATOR !== PATH_APP and $modularType === 'app') {
+                    if ($packageJsonFileInfo['dirname'] . DIRECTORY_SEPARATOR !== PATH_APP and $modularType === 'app') {
                         $registryKey = dash(snakecase(
-                            pathinfo($packageJsonFileInfo[ 'dirname' ], PATHINFO_FILENAME)));
+                            pathinfo($packageJsonFileInfo['dirname'], PATHINFO_FILENAME)));
                     }
                 }
 
-                $registry[ $registryKey ] = (new DataStructures\Module(
-                    $packageJsonFileInfo[ 'dirname' ]
+                $registry[$registryKey] = (new DataStructures\Module(
+                    $packageJsonFileInfo['dirname']
                 ))
-                    ->setType($packageJsonFileInfo[ 'filename' ])
+                    ->setType($packageJsonFileInfo['filename'])
                     ->setNamespace($moduleNamespace)
                     ->setSegments($moduleSegments)
                     ->setParentSegments($moduleParentSegments)
@@ -677,8 +677,8 @@ 
         $segment = dash($segment);
 
         if ($this->exists($segment)) {
-            if ($this->registry[ $segment ] instanceof DataStructures\Module) {
-                return $this->registry[ $segment ];
+            if ($this->registry[$segment] instanceof DataStructures\Module) {
+                return $this->registry[$segment];
             }
         }
 
@@ -714,8 +714,8 @@ 
      */
     public function first()
     {
-        if (isset($this->registry[ '' ])) {
-            return $this->registry[ '' ];
+        if (isset($this->registry[''])) {
+            return $this->registry[''];
         } elseif (reset($this->registry)->type === 'APP') {
             return reset($this->registry);
         }
@@ -737,7 +737,7 @@ 
         $segments = (is_array($segments) ? implode('/', array_map('dash', $segments)) : $segments);
 
         if ($this->exists($segments)) {
-            return $this->registry[ $segments ];
+            return $this->registry[$segments];
         }
 
         return false;
@@ -758,7 +758,7 @@ 
 
         foreach ($this as $key => $module) {
             if ($module instanceof DataStructures\Module) {
-                $namespaces[ $key ] = new SplNamespaceInfo($module->getNamespace(), $module->getRealPath());
+                $namespaces[$key] = new SplNamespaceInfo($module->getNamespace(), $module->getRealPath());
             }
         }