o2system / framework

src/Helpers/Framework.php

Spacing +8 added lines, -8 removed lines

@@ -55,7 +55,7 @@ 
         $args = func_get_args();
 
         if ($countArgs = count($args)) {
-            if(services()->has('config')) {
+            if (services()->has('config')) {
                 $config = services('config');
 
                 if ($countArgs == 1) {
@@ -82,7 +82,7 @@ 
      */
     function cache()
     {
-        if(services()->has('cache')) {
+        if (services()->has('cache')) {
             return services()->get('cache');
         }
 
@@ -102,7 +102,7 @@ 
      */
     function hooks()
     {
-        if(services()->has('hooks')) {
+        if (services()->has('hooks')) {
             return services()->get('hooks');
         }
 
@@ -141,7 +141,7 @@ 
         $args = func_get_args();
 
         if (count($args)) {
-            return o2system()->models->get($args[ 0 ]);
+            return o2system()->models->get($args[0]);
         }
 
         return o2system()->models;
@@ -163,7 +163,7 @@ 
         $args = func_get_args();
 
         if (count($args)) {
-            return o2system()->modules->getModule($args[ 0 ]);
+            return o2system()->modules->getModule($args[0]);
         }
 
         return o2system()->modules;
@@ -201,8 +201,8 @@ 
         $args = func_get_args();
 
         if (count($args)) {
-            if(isset($_SESSION[ $args[0] ])) {
-                return $_SESSION[ $args[0] ];
+            if (isset($_SESSION[$args[0]])) {
+                return $_SESSION[$args[0]];
             }
 
             return null;
@@ -243,7 +243,7 @@ 
         $args = func_get_args();
 
         if (count($args)) {
-            if(services()->has('view')) {
+            if (services()->has('view')) {
                 $view = services('view');
 
                 return call_user_func_array([&$view, 'load'], $args);

src/Containers/Models.php

Spacing +2 added lines, -2 removed lines

@@ -37,9 +37,9 @@
     public function __construct()
     {
         if ($config = config()->loadFile('database', true)) {
-            if ( ! empty($config[ 'default' ][ 'hostname' ]) AND ! empty($config[ 'default' ][ 'username' ])) {
+            if ( ! empty($config['default']['hostname']) AND ! empty($config['default']['username'])) {
 
-                if(profiler() !== false) {
+                if (profiler() !== false) {
                     profiler()->watch('Starting Database Service');
                 }
 

src/Containers/Modules.php

Spacing +7 added lines, -7 removed lines

@@ -98,7 +98,7 @@ 
      */
     public function push($module)
     {
-        if (!in_array($module->getNamespace(), ['O2System\Kernel\\', 'O2System\Framework\\', 'App\\'])) {
+        if ( ! in_array($module->getNamespace(), ['O2System\Kernel\\', 'O2System\Framework\\', 'App\\'])) {
             $this->autoload($module);
 
             parent::push($module);
@@ -114,7 +114,7 @@ 
 
         $this->autoloadHelpers($module);
 
-        if (!in_array($module->getType(), ['KERNEL', 'FRAMEWORK'])) {
+        if ( ! in_array($module->getType(), ['KERNEL', 'FRAMEWORK'])) {
             // Add Public Dir
             loader()->addPublicDir($module->getPublicDir());
 
@@ -359,7 +359,7 @@ 
      */
     public function loadRegistry()
     {
-        if(empty($this->registry)) {
+        if (empty($this->registry)) {
             $cacheItemPool = cache()->getItemPool('default');
 
             if (cache()->hasItemPool('registry')) {
@@ -434,7 +434,7 @@ 
                             ->setIndent(2)
                             ->setNewLinesAfter(1)
                     );
-                } elseif (!is_array($packageJsonMetadata)) {
+                } elseif ( ! is_array($packageJsonMetadata)) {
                     continue;
                 }
 
@@ -464,7 +464,7 @@ 
                     )
                 );
 
-                $moduleSegments = array_map(function ($string) {
+                $moduleSegments = array_map(function($string) {
                     return dash(snakecase($string));
                 }, $moduleSegments);
 
@@ -542,7 +542,7 @@ 
     {
         $pluralTypes = plural(strtolower($type));
 
-        if (!in_array($pluralTypes, $this->types)) {
+        if ( ! in_array($pluralTypes, $this->types)) {
             array_push($this->types, $pluralTypes);
         }
 
@@ -686,7 +686,7 @@ 
     {
         $segments = is_array($segments) ? implode('/', $segments) : $segments;
 
-        if(is_string($segments)) {
+        if (is_string($segments)) {
             return (bool)array_key_exists($segments, $this->registry);
         }
 

src/Cli/Commanders/Make/Theme.php

Spacing +5 added lines, -5 removed lines

@@ -38,7 +38,7 @@ 
 
     public function optionName($name)
     {
-        if(empty($this->optionPath)) {
+        if (empty($this->optionPath)) {
             $this->optionPath = PATH_RESOURCES . 'themes' . DIRECTORY_SEPARATOR;
         }
 
@@ -78,18 +78,18 @@ 
         // Make default structure
         mkdir($themePath . 'assets' . DIRECTORY_SEPARATOR, 0777, true);
 
-        foreach(['css','js', 'img', 'fonts', 'media', 'packages'] as $assetsDir) {
+        foreach (['css', 'js', 'img', 'fonts', 'media', 'packages'] as $assetsDir) {
             mkdir($themePath . 'assets' . DIRECTORY_SEPARATOR . $assetsDir . DIRECTORY_SEPARATOR, 0777, true);
         }
 
         mkdir($themePath . 'partials' . DIRECTORY_SEPARATOR, 0777, true);
 
-        $jsProps[ 'name' ] = readable(
+        $jsProps['name'] = readable(
             $this->optionName,
             true
         );
 
-        $jsProps[ 'created' ] = date('d M Y');
+        $jsProps['created'] = date('d M Y');
 
         file_put_contents($themePath . 'theme.jsprop', json_encode($jsProps, JSON_PRETTY_PRINT));
 
@@ -110,7 +110,7 @@ 
 </html>
 THEME;
 
-        file_put_contents($themePath . 'theme.phtml', str_replace('@','$',$themeTemplate));
+        file_put_contents($themePath . 'theme.phtml', str_replace('@', '$', $themeTemplate));
 
         if (is_dir($themePath)) {
             output()->write(

src/Datastructures/Module/Theme.php

Spacing +5 added lines, -5 removed lines

@@ -62,7 +62,7 @@ 
             $properties = json_decode(file_get_contents($propFilePath), true);
 
             if (json_last_error() === JSON_ERROR_NONE) {
-                if(isset($properties['config'])) {
+                if (isset($properties['config'])) {
                     $this->presets = $properties['presets'];
                     unset($properties['presets']);
                 }
@@ -157,10 +157,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/Framework.php

Spacing +2 added lines, -2 removed lines

@@ -359,12 +359,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) {
                 $csrfProtection = new Security\Protections\Xss();
                 $this->services->add($xssProtection, 'xssProtection');
             }

src/Services/Loader.php

Spacing +20 added lines, -20 removed lines

@@ -141,20 +141,20 @@ 
 
         if (is_dir($baseDirectory)) {
             // initialize the namespace prefix array
-            if (isset($this->namespaceDirs[ $namespace ]) === false) {
-                $this->namespaceDirs[ $namespace ] = [];
+            if (isset($this->namespaceDirs[$namespace]) === false) {
+                $this->namespaceDirs[$namespace] = [];
             }
 
             // retain the base directory for the namespace prefix
-            if ( ! in_array($baseDirectory, $this->namespaceDirs[ $namespace ])) {
+            if ( ! in_array($baseDirectory, $this->namespaceDirs[$namespace])) {
                 if ($prepend) {
-                    array_unshift($this->namespaceDirs[ $namespace ], $baseDirectory);
+                    array_unshift($this->namespaceDirs[$namespace], $baseDirectory);
                 } else {
-                    array_push($this->namespaceDirs[ $namespace ], $baseDirectory);
+                    array_push($this->namespaceDirs[$namespace], $baseDirectory);
                 }
             }
 
-            $this->namespaceDirsMap[ $baseDirectory ] = $namespace;
+            $this->namespaceDirsMap[$baseDirectory] = $namespace;
 
             // Register Namespace Language
             language()->addFilePath($baseDirectory);
@@ -192,7 +192,7 @@ 
 
         if (is_dir($publicDir) and ! in_array($publicDir, $this->publicDirs)) {
             if (isset($offset)) {
-                $this->publicDirs[ $offset ] = $publicDir;
+                $this->publicDirs[$offset] = $publicDir;
             } else {
                 $this->publicDirs[] = $publicDir;
             }
@@ -217,7 +217,7 @@ 
 
         if (is_dir($resourcesDir) and ! in_array($resourcesDir, $this->resourcesDirs)) {
             if (isset($offset)) {
-                $this->resourcesDirs[ $offset ] = $resourcesDir;
+                $this->resourcesDirs[$offset] = $resourcesDir;
             } else {
                 $this->resourcesDirs[] = $resourcesDir;
             }
@@ -275,7 +275,7 @@ 
         $dir = rtrim($dir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
 
         if (array_key_exists($dir, $this->namespaceDirsMap)) {
-            return $this->namespaceDirsMap[ $dir ];
+            return $this->namespaceDirsMap[$dir];
         }
 
         return false;
@@ -316,7 +316,7 @@ 
         $namespace = trim($namespace, '\\') . '\\';
 
         if (array_key_exists($namespace, $this->namespaceDirs)) {
-            return $this->namespaceDirs[ $namespace ];
+            return $this->namespaceDirs[$namespace];
         }
 
         return false;
@@ -339,7 +339,7 @@ 
         }
 
         if ($this->requireFile($helper)) {
-            $this->loadedHelpers[ pathinfo($helper, PATHINFO_FILENAME) ][] = $helper;
+            $this->loadedHelpers[pathinfo($helper, PATHINFO_FILENAME)][] = $helper;
 
             return;
         }
@@ -355,17 +355,17 @@ 
         }
 
         if ( ! array_key_exists($helper, $this->loadedHelpers)) {
-            $this->loadedHelpers[ $helper ] = [];
+            $this->loadedHelpers[$helper] = [];
         }
 
         foreach ($helperDirectories as $helperDirectory) {
 
             $helperFilePath = $helperDirectory . studlycase($helper) . '.php';
 
-            if (in_array($helperFilePath, $this->loadedHelpers[ $helper ])) {
+            if (in_array($helperFilePath, $this->loadedHelpers[$helper])) {
                 continue;
             } elseif ($this->requireFile($helperFilePath)) {
-                $this->loadedHelpers[ $helper ][] = $helperFilePath;
+                $this->loadedHelpers[$helper][] = $helperFilePath;
             }
         }
     }
@@ -396,7 +396,7 @@ 
             if (false !== ($modules = modules()->getRegistry())) {
                 foreach ($modules as $module) {
                     if ($module instanceof Module) {
-                        if (empty($this->namespaceDirs[ $module->getNamespace() ])) {
+                        if (empty($this->namespaceDirs[$module->getNamespace()])) {
                             $this->addNamespace($module->getNamespace(), $module->getRealPath());
                         }
                     }
@@ -458,12 +458,12 @@ 
     public function loadMappedFile($namespace, $relativeClass)
     {
         // are there any base directories for this namespace prefix?
-        if (isset($this->namespaceDirs[ $namespace ]) === false) {
+        if (isset($this->namespaceDirs[$namespace]) === false) {
             return false;
         }
 
         // look through base directories for this namespace prefix
-        foreach ($this->namespaceDirs[ $namespace ] as $namespaceDirectory) {
+        foreach ($this->namespaceDirs[$namespace] as $namespaceDirectory) {
 
             // replace the namespace prefix with the base directory,
             // replace namespace separators with directory separators
@@ -528,9 +528,9 @@ 
     public function services(array $classes)
     {
         foreach ($classes as $name => $class) {
-            if(is_numeric($name)) {
+            if (is_numeric($name)) {
                 services()->load($class);
-            } elseif(is_string($name)) {
+            } elseif (is_string($name)) {
                 services()->load($class, $name);
             }
         }
@@ -547,7 +547,7 @@ 
 
     public function models(array $models)
     {
-        foreach($models as $model) {
+        foreach ($models as $model) {
             models()->load($model);
         }
     }

src/Services/Language.php

Spacing +5 added lines, -5 removed lines

@@ -59,7 +59,7 @@ 
      */
     public function loadRegistry()
     {
-        if(empty($this->registry)) {
+        if (empty($this->registry)) {
             $cacheItemPool = cache()->getItemPool('default');
 
             if (cache()->hasItemPool('registry')) {
@@ -125,7 +125,7 @@ 
                             );
                         }
 
-                        $registry[ $package->getDirName() ] = $package;
+                        $registry[$package->getDirName()] = $package;
                     } elseif (is_cli()) {
                         output()->verbose(
                             (new Format())
@@ -155,7 +155,7 @@ 
      */
     public function registered($package)
     {
-        return isset($this->registry[ $package ]);
+        return isset($this->registry[$package]);
     }
 
     // ------------------------------------------------------------------------
@@ -171,7 +171,7 @@ 
     {
         if (isset($package)) {
             if ($this->registered($package)) {
-                return $this->registry[ $package ];
+                return $this->registry[$package];
             }
 
             return false;
@@ -182,7 +182,7 @@ 
 
     public function getDefaultMetadata()
     {
-        return $this->getRegistry( $this->getDefault() );
+        return $this->getRegistry($this->getDefault());
     }
 
     // ------------------------------------------------------------------------

src/Models/Files/Model.php

Spacing +3 added lines, -3 removed lines

@@ -39,7 +39,7 @@ 
             }
 
             $first = reset($this->storage);
-            if ( ! isset($first[ $this->primaryKey ])) {
+            if ( ! isset($first[$this->primaryKey])) {
                 $keys = $first->getKeys();
                 $this->primaryKey = reset($keys);
             }
@@ -48,7 +48,7 @@ 
 
     public function get($property)
     {
-        if (empty($get[ $property ])) {
+        if (empty($get[$property])) {
             if (services()->has($property)) {
                 return services()->get($property);
             } elseif (array_key_exists($property, $this->validSubModels)) {
@@ -63,7 +63,7 @@ 
 
     final protected function loadSubModel($model)
     {
-        if (is_file($this->validSubModels[ $model ])) {
+        if (is_file($this->validSubModels[$model])) {
             $className = '\\' . get_called_class() . '\\' . ucfirst($model);
             $className = str_replace('\Base\\Model', '\Models', $className);