o2system / framework

src/Libraries/AccessControl/User.php

Spacing +10 added lines, -10 removed lines

@@ -64,7 +64,7 @@ 
      */
     public function setApp($app)
     {
-        if($app = modules()->getApp($app)) {
+        if ($app = modules()->getApp($app)) {
             $this->app = $app;
         }
 
@@ -102,10 +102,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]);
                     }
                 }
 
@@ -134,7 +134,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';
         }
 
@@ -158,7 +158,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
@@ -207,7 +207,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);
@@ -222,15 +222,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,
                 ]);
             }
@@ -254,7 +254,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/Models/Sql/Traits/HierarchicalTrait.php

Spacing +2 added lines, -2 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++;

src/Services/Language.php

Spacing +5 added lines, -5 removed lines

@@ -96,7 +96,7 @@ 
         $directory = new \RecursiveIteratorIterator(new \RecursiveCallbackFilterIterator(
             new \RecursiveDirectoryIterator(PATH_ROOT,
                 \FilesystemIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS),
-            function ($current, $key, $iterator) {
+            function($current, $key, $iterator) {
                 if ($current->isDir()) {
                     // exclude build directory
                     if (in_array($current->getFilename(), [
@@ -118,7 +118,7 @@ 
 
                 $files[] = $packageJsonFileInfo;
 
-                if ($packageJsonFileInfo[ 'filename' ] === 'language') {
+                if ($packageJsonFileInfo['filename'] === 'language') {
                     if (is_cli()) {
                         output()->verbose(
                             (new Format())
@@ -141,7 +141,7 @@ 
                             );
                         }
 
-                        $registry[ $package->getDirName() ] = $package;
+                        $registry[$package->getDirName()] = $package;
                     } elseif (is_cli()) {
                         output()->verbose(
                             (new Format())
@@ -185,7 +185,7 @@ 
     {
         if (isset($package)) {
             if ($this->registered($package)) {
-                return $this->registry[ $package ];
+                return $this->registry[$package];
             }
 
             return false;
@@ -205,7 +205,7 @@ 
      */
     public function registered($package)
     {
-        return isset($this->registry[ $package ]);
+        return isset($this->registry[$package]);
     }
 
     // ------------------------------------------------------------------------

src/Containers/Modules.php

Spacing +26 added lines, -26 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'],
                             ],
                             '',
                             $packageJsonFile
@@ -480,7 +480,7 @@ 
                     )
                 );
 
-                $moduleSegments = array_map(function ($string) {
+                $moduleSegments = array_map(function($string) {
                     return dash(snakecase($string));
                 }, $moduleSegments);
 
@@ -496,7 +496,7 @@ 
                     if (false !== ($segmentKey = array_search($modularType, $moduleSegments))) {
                         $moduleParentSegments = array_slice($moduleSegments, 0, $segmentKey);
 
-                        unset($moduleSegments[ $segmentKey ]);
+                        unset($moduleSegments[$segmentKey]);
                         break;
                     }
                 }
@@ -507,29 +507,29 @@ 
                     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']);
                 }
 
                 $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)
@@ -691,8 +691,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];
             }
         }
 
@@ -728,8 +728,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);
         }
@@ -751,7 +751,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;
@@ -772,7 +772,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/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);