o2system / framework

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/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());
             }
         }
 

src/Framework.php

Spacing +4 added lines, -4 removed lines

@@ -420,12 +420,12 @@ 
                 $session->set('language', language()->getDefault());
             }
 
-            if (config('security')->protection[ 'csrf' ] === true) {
+            if (config('security')->protection['csrf'] === true) {
                 $csrfProtection = new Security\Protections\Csrf();
                 $this->services->add($csrfProtection, 'csrfProtection');
             }
 
-            if (config('security')->protection[ 'xss' ] === true) {
+            if (config('security')->protection['xss'] === true) {
                 $xssProtection = new Security\Protections\Xss();
                 $this->services->add($xssProtection, 'xssProtection');
             }
@@ -484,7 +484,7 @@ 
                 $module->loadModel();
 
                 // Add View Resource Directory
-                if($this->services->has('view')) {
+                if ($this->services->has('view')) {
                     view()->addFilePath($module->getResourcesDir());
                     presenter()->assets->pushFilePath($module->getResourcesDir());
                 }
@@ -608,7 +608,7 @@ 
                     }
 
                     if (presenter()->partials->offsetExists('content')) {
-                        if(is_ajax()) {
+                        if (is_ajax()) {
                             echo presenter()->partials->content;
                         } else {
                             $htmlOutput = view()->render();

src/Containers/Modules/DataStructures/Module.php

Spacing +6 added lines, -6 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;
             }
         }
 
@@ -312,9 +312,9 @@ 
         $dirPath = str_replace(PATH_APP, '', $this->getRealPath());
         $dirPathParts = explode(DIRECTORY_SEPARATOR, $dirPath);
 
-        if(count($dirPathParts)) {
+        if (count($dirPathParts)) {
             $dirPathParts = array_map('dash', $dirPathParts);
-            $dirResources.= implode(DIRECTORY_SEPARATOR, $dirPathParts);
+            $dirResources .= implode(DIRECTORY_SEPARATOR, $dirPathParts);
         }
 
         if (is_null($subDir)) {

src/Containers/Modules/DataStructures/Module/Theme.php

Spacing +12 added lines, -12 removed lines

@@ -61,9 +61,9 @@ 
             $properties = json_decode(file_get_contents($propFilePath), true);
 
             if (json_last_error() === JSON_ERROR_NONE) {
-                if (isset($properties[ 'config' ])) {
-                    $this->presets = $properties[ 'presets' ];
-                    unset($properties[ 'presets' ]);
+                if (isset($properties['config'])) {
+                    $this->presets = $properties['presets'];
+                    unset($properties['presets']);
                 }
 
                 $this->properties = $properties;
@@ -197,10 +197,10 @@ 
     {
         $extensions = ['.php', '.phtml', '.html', '.tpl'];
 
-        if (isset($this->presets[ 'extensions' ])) {
-            array_unshift($partialsExtensions, $this->presets[ 'extension' ]);
-        } elseif (isset($this->presets[ 'extension' ])) {
-            array_unshift($extensions, $this->presets[ 'extension' ]);
+        if (isset($this->presets['extensions'])) {
+            array_unshift($partialsExtensions, $this->presets['extension']);
+        } elseif (isset($this->presets['extension'])) {
+            array_unshift($extensions, $this->presets['extension']);
         }
 
         $found = false;
@@ -219,7 +219,7 @@ 
             }
         }
 
-        return (bool) $found;
+        return (bool)$found;
     }
 
     // ------------------------------------------------------------------------
@@ -235,10 +235,10 @@ 
     {
         $extensions = ['.php', '.phtml', '.html', '.tpl'];
 
-        if (isset($this->presets[ 'extensions' ])) {
-            array_unshift($partialsExtensions, $this->presets[ 'extension' ]);
-        } elseif (isset($this->presets[ 'extension' ])) {
-            array_unshift($extensions, $this->presets[ 'extension' ]);
+        if (isset($this->presets['extensions'])) {
+            array_unshift($partialsExtensions, $this->presets['extension']);
+        } elseif (isset($this->presets['extension'])) {
+            array_unshift($extensions, $this->presets['extension']);
         }
 
         foreach ($extensions as $extension) {

src/Http/Output.php

Spacing +8 added lines, -8 removed lines

@@ -32,7 +32,7 @@ 
     {
         parent::__construct();
 
-        if(services()->has('csrfProtection')) {
+        if (services()->has('csrfProtection')) {
             $this->addHeader('X-CSRF-TOKEN', services()->get('csrfProtection')->getToken());
         }
     }
@@ -148,7 +148,7 @@ 
         $error = new ErrorException($errorMessage, $errorSeverity, $errorFile, $errorLine, $errorContext);
 
         // Logged the error
-        if(services()->has('logger')) {
+        if (services()->has('logger')) {
             logger()->error(
                 implode(
                     ' ',
@@ -301,21 +301,21 @@ 
         ];
 
         $this->statusCode = $code;
-        $this->reasonPhrase = $error[ 'title' ];
+        $this->reasonPhrase = $error['title'];
 
         if (is_string($vars)) {
             $vars = ['message' => $vars];
-        } elseif (is_array($vars) and empty($vars[ 'message' ])) {
-            $vars[ 'message' ] = $error[ 'message' ];
+        } elseif (is_array($vars) and empty($vars['message'])) {
+            $vars['message'] = $error['message'];
         }
 
-        if (isset($vars[ 'message' ])) {
-            $error[ 'message' ] = $vars[ 'message' ];
+        if (isset($vars['message'])) {
+            $error['message'] = $vars['message'];
         }
 
         if (is_ajax() or $this->mimeType !== 'text/html') {
             $this->statusCode = $code;
-            $this->reasonPhrase = $error[ 'title' ];
+            $this->reasonPhrase = $error['title'];
             $this->send($vars);
 
             exit(EXIT_ERROR);

src/Http/View.php

Spacing +11 added lines, -11 removed lines

@@ -73,7 +73,7 @@ 
         );
 
         if ($this->config->offsetExists('extensions')) {
-            $this->setFileExtensions($this->config[ 'extensions' ]);
+            $this->setFileExtensions($this->config['extensions']);
         }
 
         $this->document = new Html\Document();
@@ -89,13 +89,13 @@ 
      */
     public function &__get($property)
     {
-        $get[ $property ] = false;
+        $get[$property] = false;
 
         if (property_exists($this, $property)) {
             return $this->{$property};
         }
 
-        return $get[ $property ];
+        return $get[$property];
     }
 
     // ------------------------------------------------------------------------
@@ -186,7 +186,7 @@ 
         if (false !== ($filePath = $this->getFilePath($filename))) {
             if ($return === false) {
                 if (presenter()->partials->hasPartial('content') === false) {
-                    if(is_ajax()) {
+                    if (is_ajax()) {
                         parser()->loadFile($filePath);
                         $content = parser()->parse(presenter()->getArrayCopy());
 
@@ -211,8 +211,8 @@ 
             $error = new ErrorException(
                 'E_VIEW_NOT_FOUND',
                 0,
-                @$backtrace[ 0 ][ 'file' ],
-                @$backtrace[ 0 ][ 'line' ],
+                @$backtrace[0]['file'],
+                @$backtrace[0]['line'],
                 [trim($filename)]
             );
 
@@ -726,12 +726,12 @@ 
         $htmlOutput = $this->document->saveHTML();
 
         // Uglify Output
-        if ($this->config->output[ 'uglify' ] === true) {
+        if ($this->config->output['uglify'] === true) {
             $htmlOutput = preg_replace(
                 [
-                    '/\>[^\S ]+/s',     // strip whitespaces after tags, except space
-                    '/[^\S ]+\</s',     // strip whitespaces before tags, except space
-                    '/(\s)+/s',         // shorten multiple whitespace sequences
+                    '/\>[^\S ]+/s', // strip whitespaces after tags, except space
+                    '/[^\S ]+\</s', // strip whitespaces before tags, except space
+                    '/(\s)+/s', // shorten multiple whitespace sequences
                     '/<!--(.|\s)*?-->/', // Remove HTML comments
                     '/<!--(.*)-->/Uis',
                     "/[[:blank:]]+/",
@@ -748,7 +748,7 @@ 
         }
 
         // Beautify Output
-        if ($this->config->output[ 'beautify' ] === true) {
+        if ($this->config->output['beautify'] === true) {
             $beautifier = new Html\Dom\Beautifier();
             $htmlOutput = $beautifier->format($htmlOutput);
         }

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) {