o2system / framework

src/Containers/Modules/DataStructures/Module.php

Spacing +5 added lines, -5 removed lines

@@ -195,10 +195,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;
@@ -288,7 +288,7 @@ 
         $themes = [];
         foreach ($directory->getTree() as $themeName => $themeTree) {
             if (($theme = $this->getTheme($themeName)) instanceof Module\Theme) {
-                $themes[ $themeName ] = $theme;
+                $themes[$themeName] = $theme;
             }
         }
 
@@ -515,7 +515,7 @@ 
 
                     if ( ! empty($controller->name) and ! in_array($controller->getParameter(),
                             ['login', 'pages', 'setup', 'license'])) {
-                        $controllers[ $controller->getParameter() ] = $controller;
+                        $controllers[$controller->getParameter()] = $controller;
                     }
                 }
             }

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

Spacing +1 added lines, -1 removed lines

@@ -111,7 +111,7 @@
                 }
             }
 
-            if(empty($this->methods) and $this->hasMethod('route')) {
+            if (empty($this->methods) and $this->hasMethod('route')) {
                 $method = $this->getMethod('route');
                 $method->segment = dash($method->name);
                 $method->segments = implode('/', $segments);

src/Models/Sql/Traits/HierarchicalTrait.php

Spacing +3 added lines, -3 removed lines

@@ -85,7 +85,7 @@ 
                         ]);
                 }
 
-                $update[ $this->primaryKey ] = $child->{$this->primaryKey};
+                $update[$this->primaryKey] = $child->{$this->primaryKey};
 
                 if ($this->qb
                     ->table($this->table)
@@ -100,7 +100,7 @@ 
                         ->update($update = [
                             'record_right' => $right,
                         ]);
-                    $update[ $this->primaryKey ] = $child->{$this->primaryKey};
+                    $update[$this->primaryKey] = $child->{$this->primaryKey};
                 }
 
                 $i++;
@@ -256,7 +256,7 @@ 
             ->select($this->table . '.*')
             ->from($this->table)
             ->from($this->table . ' AS node')
-            ->whereBetween($this->table . '.record_left', [ 'node.record_left', 'node.record_right'])
+            ->whereBetween($this->table . '.record_left', ['node.record_left', 'node.record_right'])
             ->where([
                 'node.' . $this->primaryKey => $id,
                 $this->table . '.' . $this->primaryKey . '!=' => $id,

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

Spacing +12 added lines, -12 removed lines

@@ -62,9 +62,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;
@@ -198,10 +198,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;
@@ -253,10 +253,10 @@ 
         if (isset($layout)) {
             $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) {
@@ -290,7 +290,7 @@ 
         if ($this->layout instanceof Theme\Layout) {
             
             // load parent theme layout
-            if($this->layout->getFilename() !== 'theme') {
+            if ($this->layout->getFilename() !== 'theme') {
                 $themeLayout = $this->getLayout('theme');
                 
                 // add theme layout public directory

src/Models/Sql/DataObjects/Result.php

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
                     }
                 }
 
-                $ormResult[ $key ] = new Result\Row($row, $model);
+                $ormResult[$key] = new Result\Row($row, $model);
             }
 
             parent::__construct($ormResult->toArray());

src/Models/Sql/Traits/ModifierTrait.php

Spacing +49 added lines, -49 removed lines

@@ -40,7 +40,7 @@ 
             if (count($this->fillableColumns)) {
                 foreach ($sets as $key => $value) {
                     if ( ! in_array($key, $this->fillableColumns)) {
-                        unset($sets[ $key ]);
+                        unset($sets[$key]);
                     }
                 }
             }
@@ -54,8 +54,8 @@ 
             }
 
             if (method_exists($this, 'getRecordOrdering')) {
-                if ($this->recordOrdering === true && empty($sets[ 'record_ordering' ])) {
-                    $sets[ 'record_ordering' ] = $this->getRecordOrdering();
+                if ($this->recordOrdering === true && empty($sets['record_ordering'])) {
+                    $sets['record_ordering'] = $this->getRecordOrdering();
                 }
             }
 
@@ -70,7 +70,7 @@ 
                 if ($files = input()->files()) {
                     // Uploaded Image Process
                     if (isset($this->uploadedImageKey)) {
-                        if (isset($files[ $this->uploadedImageKey ])) {
+                        if (isset($files[$this->uploadedImageKey])) {
                             $upload->process($this->uploadedImageKey);
 
                             if ($upload->getErrors()) {
@@ -89,7 +89,7 @@ 
                         }
                     } elseif (count($this->uploadedImageKeys)) {
                         foreach ($this->uploadedImageKeys as $uploadedImageKey) {
-                            if (isset($files[ $uploadedImageKey ])) {
+                            if (isset($files[$uploadedImageKey])) {
                                 $upload->process($uploadedImageKey);
 
                                 if ($upload->getErrors()) {
@@ -111,7 +111,7 @@ 
 
                     // Uploaded File Process
                     if (isset($this->uploadedFileFilepath)) {
-                        if (isset($files[ $this->uploadedFileKey ])) {
+                        if (isset($files[$this->uploadedFileKey])) {
                             $upload->process($this->uploadedFileKey);
 
                             if ($upload->getErrors()) {
@@ -130,7 +130,7 @@ 
                         }
                     } elseif (count($this->uploadedFileKeys)) {
                         foreach ($this->uploadedFileKeys as $uploadedFileKey) {
-                            if (isset($files[ $uploadedFileKey ])) {
+                            if (isset($files[$uploadedFileKey])) {
                                 $upload->process($uploadedFileKey);
 
                                 if ($upload->getErrors()) {
@@ -163,9 +163,9 @@ 
 
                 $label = false;
                 foreach (['name', 'label', 'title', 'code'] as $labelField) {
-                    if (isset($sets[ $labelField ])) {
-                        if(services()->has('session')) {
-                            session()->setFlash('success', language('SUCCESS_INSERT_WITH_LABEL', [$sets[ $labelField ]]));
+                    if (isset($sets[$labelField])) {
+                        if (services()->has('session')) {
+                            session()->setFlash('success', language('SUCCESS_INSERT_WITH_LABEL', [$sets[$labelField]]));
                         }
 
                         $label = true;
@@ -174,7 +174,7 @@ 
                 }
 
                 if ($label === false) {
-                    if(services()->has('session')) {
+                    if (services()->has('session')) {
                         session()->setFlash('success', language('SUCCESS_INSERT'));
                     }
                 }
@@ -185,9 +185,9 @@ 
 
         $label = false;
         foreach (['name', 'label', 'title', 'code'] as $labelField) {
-            if (isset($sets[ $labelField ])) {
-                if(services()->has('session')) {
-                    session()->setFlash('danger', language('FAILED_INSERT_WITH_LABEL', [$sets[ $labelField ]]));
+            if (isset($sets[$labelField])) {
+                if (services()->has('session')) {
+                    session()->setFlash('danger', language('FAILED_INSERT_WITH_LABEL', [$sets[$labelField]]));
                 }
 
                 $label = true;
@@ -196,7 +196,7 @@ 
         }
 
         if ($label === false) {
-            if(services()->has('session')) {
+            if (services()->has('session')) {
                 session()->setFlash('danger', language('FAILED_INSERT'));
             }
         }
@@ -224,8 +224,8 @@ 
             $primaryKey = isset($this->primaryKey) ? $this->primaryKey : 'id';
 
             if (empty($conditions)) {
-                if (isset($sets[ $primaryKey ])) {
-                    $conditions = [$primaryKey => $sets[ $primaryKey ]];
+                if (isset($sets[$primaryKey])) {
+                    $conditions = [$primaryKey => $sets[$primaryKey]];
                 } else {
                     $conditions = $sets;
                 }
@@ -259,8 +259,8 @@ 
             if (method_exists($this, 'insertRecordSets')) {
                 foreach ($sets as $set) {
                     $this->insertRecordSets($set);
-                    if ($this->recordOrdering === true && empty($sets[ 'record_ordering' ])) {
-                        $set[ 'record_ordering' ] = $this->getRecordOrdering();
+                    if ($this->recordOrdering === true && empty($sets['record_ordering'])) {
+                        $set['record_ordering'] = $this->getRecordOrdering();
                     }
                 }
             }
@@ -332,15 +332,15 @@ 
             $primaryKey = isset($this->primaryKey) ? $this->primaryKey : 'id';
 
             if (empty($conditions)) {
-                if (isset($sets[ $primaryKey ])) {
-                    $conditions = [$primaryKey => $sets[ $primaryKey ]];
+                if (isset($sets[$primaryKey])) {
+                    $conditions = [$primaryKey => $sets[$primaryKey]];
                 }
             }
 
             if (count($this->fillableColumns)) {
                 foreach ($sets as $key => $value) {
                     if ( ! in_array($key, $this->fillableColumns)) {
-                        unset($sets[ $key ]);
+                        unset($sets[$key]);
                     }
                 }
             }
@@ -354,8 +354,8 @@ 
             }
 
             if (method_exists($this, 'getRecordOrdering')) {
-                if ($this->recordOrdering === true && empty($sets[ 'record_ordering' ])) {
-                    $sets[ 'record_ordering' ] = $this->getRecordOrdering();
+                if ($this->recordOrdering === true && empty($sets['record_ordering'])) {
+                    $sets['record_ordering'] = $this->getRecordOrdering();
                 }
             }
 
@@ -371,7 +371,7 @@ 
                     if ($files = input()->files()) {
                         // Uploaded Image Process
                         if (isset($this->uploadedImageKey)) {
-                            if (isset($files[ $this->uploadedImageKey ])) {
+                            if (isset($files[$this->uploadedImageKey])) {
                                 $upload->process($this->uploadedImageKey);
 
                                 if ($upload->getErrors()) {
@@ -386,8 +386,8 @@ 
                                     }
 
                                     return false;
-                                } elseif ($row->offsetGet($this->uploadedImageKey) !== $upload->getUploadedFiles()->first()[ 'name' ]) {
-                                    $sets[ $this->uploadedImageKey ] = $upload->getUploadedFiles()->first()[ 'name' ];
+                                } elseif ($row->offsetGet($this->uploadedImageKey) !== $upload->getUploadedFiles()->first()['name']) {
+                                    $sets[$this->uploadedImageKey] = $upload->getUploadedFiles()->first()['name'];
 
                                     if (is_file($filePath = $this->uploadedImageFilePath . $row->offsetGet($this->uploadedImageKey))) {
                                         unlink($filePath);
@@ -396,7 +396,7 @@ 
                             }
                         } elseif (count($this->uploadedImageKeys)) {
                             foreach ($this->uploadedImageKeys as $uploadedImageKey) {
-                                if (isset($files[ $uploadedImageKey ])) {
+                                if (isset($files[$uploadedImageKey])) {
                                     $upload->process($uploadedImageKey);
 
                                     if ($upload->getErrors()) {
@@ -411,8 +411,8 @@ 
                                         }
 
                                         return false;
-                                    } elseif ($row->offsetGet($uploadedImageKey) !== $upload->getUploadedFiles()->first()[ 'name' ]) {
-                                        $sets[ $uploadedImageKey ] = $upload->getUploadedFiles()->first()[ 'name' ];
+                                    } elseif ($row->offsetGet($uploadedImageKey) !== $upload->getUploadedFiles()->first()['name']) {
+                                        $sets[$uploadedImageKey] = $upload->getUploadedFiles()->first()['name'];
 
                                         if (is_file($filePath = $this->uploadedImageFilePath . $row->offsetGet($uploadedImageKey))) {
                                             unlink($filePath);
@@ -424,7 +424,7 @@ 
 
                         // Uploaded File Process
                         if (isset($this->uploadedFileFilepath)) {
-                            if (isset($files[ $this->uploadedFileKey ])) {
+                            if (isset($files[$this->uploadedFileKey])) {
                                 $upload->process($this->uploadedFileKey);
 
                                 if ($upload->getErrors()) {
@@ -439,8 +439,8 @@ 
                                     }
 
                                     return false;
-                                } elseif ($row->offsetGet($this->uploadedFileKey) !== $upload->getUploadedFiles()->first()[ 'name' ]) {
-                                    $sets[ $this->uploadedFileKey ] = $upload->getUploadedFiles()->first()[ 'name' ];
+                                } elseif ($row->offsetGet($this->uploadedFileKey) !== $upload->getUploadedFiles()->first()['name']) {
+                                    $sets[$this->uploadedFileKey] = $upload->getUploadedFiles()->first()['name'];
 
                                     if (is_file($filePath = $this->uploadedFileFilepath . $row->offsetGet($this->uploadedFileKey))) {
                                         unlink($filePath);
@@ -449,7 +449,7 @@ 
                             }
                         } elseif (count($this->uploadedFileKeys)) {
                             foreach ($this->uploadedFileKeys as $uploadedFileKey) {
-                                if (isset($files[ $uploadedFileKey ])) {
+                                if (isset($files[$uploadedFileKey])) {
                                     $upload->process($uploadedFileKey);
 
                                     if ($upload->getErrors()) {
@@ -464,8 +464,8 @@ 
                                         }
 
                                         return false;
-                                    } elseif ($row->offsetGet($uploadedFileKey) !== $upload->getUploadedFiles()->first()[ 'name' ]) {
-                                        $sets[ $uploadedFileKey ] = $upload->getUploadedFiles()->first()[ 'name' ];
+                                    } elseif ($row->offsetGet($uploadedFileKey) !== $upload->getUploadedFiles()->first()['name']) {
+                                        $sets[$uploadedFileKey] = $upload->getUploadedFiles()->first()['name'];
 
                                         if (is_file($filePath = $this->uploadedFileFilepath . $row->offsetGet($uploadedFileKey))) {
                                             unlink($filePath);
@@ -485,10 +485,10 @@ 
 
                     $label = false;
                     foreach (['name', 'label', 'title', 'code'] as $labelField) {
-                        if (isset($sets[ $labelField ])) {
-                            if(services()->has('session')) {
+                        if (isset($sets[$labelField])) {
+                            if (services()->has('session')) {
                                 session()->setFlash('success',
-                                    language('SUCCESS_UPDATE_WITH_LABEL', [$sets[ $labelField ]]));
+                                    language('SUCCESS_UPDATE_WITH_LABEL', [$sets[$labelField]]));
                             }
 
                             $label = true;
@@ -497,7 +497,7 @@ 
                     }
 
                     if ($label === false) {
-                        if(services()->has('session')) {
+                        if (services()->has('session')) {
                             session()->setFlash('success', language('SUCCESS_UPDATE'));
                         }
                     }
@@ -509,9 +509,9 @@ 
 
         $label = false;
         foreach (['name', 'label', 'title', 'code'] as $labelField) {
-            if (isset($sets[ $labelField ])) {
-                if(services()->has('session')) {
-                    session()->setFlash('danger', language('FAILED_UPDATE_WITH_LABEL', [$sets[ $labelField ]]));
+            if (isset($sets[$labelField])) {
+                if (services()->has('session')) {
+                    session()->setFlash('danger', language('FAILED_UPDATE_WITH_LABEL', [$sets[$labelField]]));
                 }
 
                 $label = true;
@@ -520,7 +520,7 @@ 
         }
 
         if ($label === false) {
-            if(services()->has('session')) {
+            if (services()->has('session')) {
                 session()->setFlash('danger', language('FAILED_UPDATE'));
             }
         }
@@ -562,7 +562,7 @@ 
 
         if (method_exists($this, 'updateRecordSets')) {
             foreach ($sets as $key => $set) {
-                $this->updateRecordSets($sets[ $key ]);
+                $this->updateRecordSets($sets[$key]);
             }
         }
 
@@ -778,7 +778,7 @@ 
      */
     private function updateRecordStatus($id, $recordStatus, $method)
     {
-        $sets[ 'record_status' ] = $recordStatus;
+        $sets['record_status'] = $recordStatus;
         $primaryKey = isset($this->primaryKey) ? $this->primaryKey : 'id';
 
         if (method_exists($this, 'updateRecordSets')) {
@@ -818,7 +818,7 @@ 
     private function updateRecordStatusMany(array $ids, $recordStatus, $method)
     {
         if (count($ids)) {
-            $sets[ 'record_status' ] = $recordStatus;
+            $sets['record_status'] = $recordStatus;
             $primaryKey = isset($this->primaryKey) ? $this->primaryKey : 'id';
 
             $this->qb->whereIn($primaryKey, $ids);
@@ -863,7 +863,7 @@ 
     private function updateRecordStatusBy($recordStatus, $method, array $conditions)
     {
         if (count($conditions)) {
-            $sets[ 'record_status' ] = $recordStatus;
+            $sets['record_status'] = $recordStatus;
 
             if (method_exists($this, 'updateRecordSets')) {
                 $this->updateRecordSets($sets);
@@ -905,7 +905,7 @@ 
     private function updateRecordStatusManyBy($recordStatus, $method, array $conditions)
     {
         if (count($conditions)) {
-            $sets[ 'record_status' ] = $recordStatus;
+            $sets['record_status'] = $recordStatus;
 
             if (method_exists($this, 'updateRecordSets')) {
                 $this->updateRecordSets($sets);

src/Libraries/AccessControl/User.php

Indentation +18 added lines, -18 removed lines

@@ -275,15 +275,15 @@ 
                             } elseif ($authority->first()->permission === 'GRANTED') {
                                 // Access only granted cannot do modifier access
                                 foreach ([
-                                             'form',
-                                             'add',
-                                             'add-as-new',
-                                             'edit',
-                                             'update',
-                                             'insert',
-                                             'create',
-                                             'delete',
-                                         ] as $segment
+                                                'form',
+                                                'add',
+                                                'add-as-new',
+                                                'edit',
+                                                'update',
+                                                'insert',
+                                                'create',
+                                                'delete',
+                                            ] as $segment
                                 ) {
                                     if (in_array($segment, $segments)) {
                                         return false;
@@ -303,15 +303,15 @@ 
                             } elseif ($authority->first()->permission === 'GRANTED') {
                                 // Access only granted cannot do modifier access
                                 foreach ([
-                                             'form',
-                                             'add',
-                                             'add-as-new',
-                                             'edit',
-                                             'update',
-                                             'insert',
-                                             'create',
-                                             'delete',
-                                         ] as $segment
+                                                'form',
+                                                'add',
+                                                'add-as-new',
+                                                'edit',
+                                                'update',
+                                                'insert',
+                                                'create',
+                                                'delete',
+                                            ] as $segment
                                 ) {
                                     if (in_array($segment, $segments)) {
                                         return false;

Spacing +9 added lines, -9 removed lines

@@ -99,10 +99,10 @@ 
             if (isset($account)) {
                 foreach ($account as $key => $value) {
                     if (strpos($key, 'record') !== false) {
-                        unset($account[ $key ]);
+                        unset($account[$key]);
                     } elseif (in_array($key,
                         ['password', 'pin', 'token', 'sso', 'id_sys_user', 'id_sys_module', 'id_sys_module_role'])) {
-                        unset($account[ $key ]);
+                        unset($account[$key]);
                     }
                 }
 
@@ -131,7 +131,7 @@ 
             $column = 'id';
         } elseif (filter_var($username, FILTER_VALIDATE_EMAIL)) {
             $column = 'email';
-        } elseif (preg_match($this->config[ 'msisdnRegex' ], $username)) {
+        } elseif (preg_match($this->config['msisdnRegex'], $username)) {
             $column = 'msisdn';
         }
 
@@ -155,7 +155,7 @@ 
     public function loggedIn()
     {
         if (parent::loggedIn()) {
-            if(is_object($_SESSION['account'])) {
+            if (is_object($_SESSION['account'])) {
                 $account = new Account($_SESSION['account']->getArrayCopy());
                 $username = $account->user->username;
             } else {
@@ -211,7 +211,7 @@ 
             $column = 'id';
         } elseif (filter_var($username, FILTER_VALIDATE_EMAIL)) {
             $column = 'email';
-        } elseif (preg_match($this->config[ 'msisdnRegex' ], $username)) {
+        } elseif (preg_match($this->config['msisdnRegex'], $username)) {
             $column = 'msisdn';
         } elseif (strpos($username, 'token-') !== false) {
             $username = str_replace('token-', '', $username);
@@ -226,15 +226,15 @@ 
 
             foreach ($account as $key => $value) {
                 if (strpos($key, 'record') !== false) {
-                    unset($account[ $key ]);
+                    unset($account[$key]);
                 } elseif (in_array($key, ['password', 'pin', 'token', 'sso'])) {
-                    unset($account[ $key ]);
+                    unset($account[$key]);
                 }
             }
 
             if ($column === 'token') {
                 models('users')->update([
-                    'id'    => $account[ 'id' ],
+                    'id'    => $account['id'],
                     'token' => null,
                 ]);
             }
@@ -386,7 +386,7 @@ 
     public function getIframeCode()
     {
         if ($this->signedOn() && $this->loggedIn() === false) {
-            return '<iframe id="sign-on-iframe" width="1" height="1" src="' . rtrim($this->config[ 'sso' ][ 'server' ],
+            return '<iframe id="sign-on-iframe" width="1" height="1" src="' . rtrim($this->config['sso']['server'],
                     '/') . '" style="display: none; visibility: hidden;"></iframe>';
         }
 

src/Cli/Commanders/Make/App.php

Spacing +3 added lines, -3 removed lines

@@ -100,7 +100,7 @@ 
             exit(EXIT_ERROR);
         }
 
-        $jsonProperties[ 'name' ] = readable(
+        $jsonProperties['name'] = readable(
             pathinfo($modulePath, PATHINFO_FILENAME),
             true
         );
@@ -113,10 +113,10 @@ 
                 ) . '\\';
         } else {
             $namespace = $this->namespace;
-            $jsonProperties[ 'namespace' ] = rtrim($namespace, '\\') . '\\';
+            $jsonProperties['namespace'] = rtrim($namespace, '\\') . '\\';
         }
 
-        $jsonProperties[ 'created' ] = date('d M Y');
+        $jsonProperties['created'] = date('d M Y');
 
         loader()->addNamespace($namespace, $modulePath);
 

src/Http/Router.php

Spacing +16 added lines, -16 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,20 +120,20 @@ 
         // 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();
 
                     $this->registerModule($module);
                 }
-            } elseif (false !== ($module = modules()->getModule( [$app->getParameter(), 'modules', reset($uriSegments) ] ))) {
+            } elseif (false !== ($module = modules()->getModule([$app->getParameter(), 'modules', reset($uriSegments)]))) {
                 array_shift($uriSegments);
                 $this->uri = $this->uri->withSegments(new KernelMessageUriSegments($uriSegments));
                 $uriString = $this->uri->getSegments()->getString();
 
                 $this->registerModule($module);
-            } elseif (false !== ($module = modules()->getModule( [$app->getParameter(), 'plugins', reset($uriSegments) ] ))) {
+            } elseif (false !== ($module = modules()->getModule([$app->getParameter(), 'plugins', reset($uriSegments)]))) {
                 array_shift($uriSegments);
                 $this->uri = $this->uri->withSegments(new KernelMessageUriSegments($uriSegments));
                 $uriString = $this->uri->getSegments()->getString();
@@ -141,7 +141,7 @@ 
                 $this->registerModule($module);
             }
 
-            if($numOfUriSegments = count($uriSegments)) {
+            if ($numOfUriSegments = count($uriSegments)) {
                 for ($i = 0; $i <= $numOfUriSegments; $i++) {
                     $uriRoutedSegments = array_diff($uriSegments,
                         array_slice($uriSegments, ($numOfUriSegments - $i)));
@@ -232,7 +232,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);
@@ -249,7 +249,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
@@ -284,12 +284,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')
@@ -332,19 +332,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';
         }
 
@@ -395,7 +395,7 @@ 
                 if (class_exists($controllerClassName)) {
                     $this->addresses->any(
                         '/',
-                        function () use ($controllerClassName) {
+                        function() use ($controllerClassName) {
                             return new $controllerClassName();
                         }
                     );
@@ -410,7 +410,7 @@ 
             if (class_exists($controllerClassName)) {
                 $this->addresses->any(
                     '/',
-                    function () use ($controllerClassName) {
+                    function() use ($controllerClassName) {
                         return new $controllerClassName();
                     }
                 );
@@ -462,8 +462,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) {