o2system / framework

src/Models/Sql/Traits/RecordTrait.php

Spacing +35 added lines, -35 removed lines

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

src/Libraries/AccessControl/User.php

Spacing +11 added lines, -11 removed lines

@@ -77,10 +77,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]);
                     }
                 }
 
@@ -109,7 +109,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';
         }
 
@@ -131,7 +131,7 @@ 
     public function loggedIn()
     {
         if (parent::loggedIn()) {
-            $account = new Account($_SESSION[ 'account' ]);
+            $account = new Account($_SESSION['account']);
 
             if ($user = models('users')->findWhere(['username' => $account->username], 1)) {
                 // Store Account Profile
@@ -180,7 +180,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);
@@ -195,15 +195,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,
                 ]);
             }
@@ -227,9 +227,9 @@ 
      */
     public function authorize(ServerRequest $request)
     {
-        if (isset($GLOBALS[ 'account' ][ 'role' ])) {
+        if (isset($GLOBALS['account']['role'])) {
             $uriSegments = $request->getUri()->getSegments()->getString();
-            $role = $GLOBALS[ 'account' ][ 'role' ];
+            $role = $GLOBALS['account']['role'];
             if (in_array($role->code, ['DEVELOPER', 'ADMINISTRATOR'])) {
                 globals()->store('authority', new Authority([
                     'permission' => 'GRANTED',
@@ -269,7 +269,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/Http/Controllers/ServiceWorker.php

Spacing +1 added lines, -1 removed lines

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

src/Models/Sql/Traits/HierarchicalTrait.php

Spacing +4 added lines, -4 removed lines

@@ -85,7 +85,7 @@ 
                         ]);
                 }
 
-                $update[ 'id' ] = $child->id;
+                $update['id'] = $child->id;
 
                 if ($this->qb
                     ->table($this->table)
@@ -100,7 +100,7 @@ 
                         ->update($update = [
                             'record_right' => $right,
                         ]);
-                    $update[ 'id' ] = $child->id;
+                    $update['id'] = $child->id;
                 }
 
                 $i++;
@@ -215,7 +215,7 @@ 
      */
     public function getNumOfParents($id)
     {
-        if($parents = $this->getParents($id)) {
+        if ($parents = $this->getParents($id)) {
             return $parents->count();
         }
 
@@ -281,7 +281,7 @@ 
      */
     public function getNumOfChilds($idParent, $direct = true)
     {
-        if($childs = $this->getChilds($idParent)) {
+        if ($childs = $this->getChilds($idParent)) {
             return $childs->count();
         }
 

src/Containers/Modules.php

Spacing +25 added lines, -25 removed lines

@@ -188,13 +188,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);
@@ -424,8 +424,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;
@@ -455,8 +455,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));
@@ -471,7 +471,7 @@ 
                                 PATH_PUBLIC,
                                 PATH_RESOURCES,
                                 PATH_APP,
-                                $packageJsonFileInfo[ 'basename' ],
+                                $packageJsonFileInfo['basename'],
                                 ucfirst($modularType) . DIRECTORY_SEPARATOR,
                                 ucfirst($modularType . 's') . DIRECTORY_SEPARATOR, // manual plural
                             ],
@@ -482,7 +482,7 @@ 
                     )
                 );
 
-                $moduleSegments = array_map(function ($string) {
+                $moduleSegments = array_map(function($string) {
                     return dash(snakecase($string));
                 }, $moduleSegments);
 
@@ -490,14 +490,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 = [];
@@ -511,16 +511,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)
@@ -682,8 +682,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];
             }
         }
 
@@ -719,8 +719,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);
         }
@@ -742,7 +742,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;
@@ -763,7 +763,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/Containers/Config.php

Spacing +2 added lines, -2 removed lines

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

src/Http/Presenter.php

Spacing +22 added lines, -22 removed lines

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