o2system / reactor

src/Helpers/Reactor.php

Spacing +17 added lines, -17 removed lines

@@ -10,7 +10,7 @@ 
  */
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('o2system')) {
+if (!function_exists('o2system')) {
     /**
      * o2system
      *
@@ -26,7 +26,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('loader')) {
+if (!function_exists('loader')) {
     /**
      * loader
      *
@@ -42,7 +42,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('config')) {
+if (!function_exists('config')) {
     /**
      * config
      *
@@ -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) {
@@ -72,7 +72,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('cache')) {
+if (!function_exists('cache')) {
     /**
      * cache
      *
@@ -82,7 +82,7 @@ 
      */
     function cache()
     {
-        if(services()->has('cache')) {
+        if (services()->has('cache')) {
             return services()->get('cache');
         }
 
@@ -92,7 +92,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('hooks')) {
+if (!function_exists('hooks')) {
     /**
      * hooks
      *
@@ -102,7 +102,7 @@ 
      */
     function hooks()
     {
-        if(services()->has('hooks')) {
+        if (services()->has('hooks')) {
             return services()->get('hooks');
         }
 
@@ -112,7 +112,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('database')) {
+if (!function_exists('database')) {
     /**
      * database
      *
@@ -128,7 +128,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('models')) {
+if (!function_exists('models')) {
     /**
      * models
      *
@@ -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;
@@ -150,7 +150,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('router')) {
+if (!function_exists('router')) {
     /**
      * router
      *
@@ -166,7 +166,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('session')) {
+if (!function_exists('session')) {
     /**
      * session
      *
@@ -179,8 +179,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;
@@ -192,7 +192,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('middleware')) {
+if (!function_exists('middleware')) {
     /**
      * O2System
      *
@@ -208,7 +208,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('controller')) {
+if (!function_exists('controller')) {
     /**
      * controller
      *

src/Models/NoSql/Model.php

Spacing +12 added lines, -12 removed lines

@@ -140,23 +140,23 @@ 
         $filename = pathinfo($filePath, PATHINFO_FILENAME);
 
         // Get model class directory name
-        $dirName = dirname($filePath) . DIRECTORY_SEPARATOR;
+        $dirName = dirname($filePath).DIRECTORY_SEPARATOR;
 
         if ($filename === 'Model') {
-            $subModelsDirName = dirname($dirName) . DIRECTORY_SEPARATOR . 'Models' . DIRECTORY_SEPARATOR;
+            $subModelsDirName = dirname($dirName).DIRECTORY_SEPARATOR.'Models'.DIRECTORY_SEPARATOR;
 
             if (is_dir($subModelsDirName)) {
                 $subModelPath = $subModelsDirName;
             }
-        } elseif (is_dir($subModelsDirName = $dirName . $filename . DIRECTORY_SEPARATOR)) {
+        } elseif (is_dir($subModelsDirName = $dirName.$filename.DIRECTORY_SEPARATOR)) {
             $subModelPath = $subModelsDirName;
         }
 
         if (isset($subModelPath)) {
             loader()->addNamespace($reflection->name, $subModelPath);
 
-            foreach (glob($subModelPath . '*.php') as $filepath) {
-                $this->validSubModels[ strtolower(pathinfo($filepath, PATHINFO_FILENAME)) ] = $filepath;
+            foreach (glob($subModelPath.'*.php') as $filepath) {
+                $this->validSubModels[strtolower(pathinfo($filepath, PATHINFO_FILENAME))] = $filepath;
             }
         }
     }
@@ -183,25 +183,25 @@ 
 
     public function &__get($property)
     {
-        $get[ $property ] = false;
+        $get[$property] = false;
 
         if (services()->has($property)) {
-            $get[ $property ] = services()->get($property);
+            $get[$property] = services()->get($property);
         } elseif (array_key_exists($property, $this->validSubModels)) {
-            $get[ $property ] = $this->loadSubModel($property);
+            $get[$property] = $this->loadSubModel($property);
         } elseif (o2system()->__isset($property)) {
-            $get[ $property ] = o2system()->__get($property);
+            $get[$property] = o2system()->__get($property);
         }
 
-        return $get[ $property ];
+        return $get[$property];
     }
 
     // ------------------------------------------------------------------------
 
     final protected function loadSubModel($model)
     {
-        if (is_file($this->validSubModels[ $model ])) {
-            $className = '\\' . get_called_class() . '\\' . ucfirst($model);
+        if (is_file($this->validSubModels[$model])) {
+            $className = '\\'.get_called_class().'\\'.ucfirst($model);
             $className = str_replace('\Base\\Model', '\Models', $className);
 
             if (class_exists($className)) {

src/Models/Sql/Model.php

Spacing +10 added lines, -10 removed lines

@@ -143,27 +143,27 @@ 
         $filename = pathinfo($filePath, PATHINFO_FILENAME);
 
         // Get model class directory name
-        $dirName = dirname($filePath) . DIRECTORY_SEPARATOR;
+        $dirName = dirname($filePath).DIRECTORY_SEPARATOR;
 
         // Get sub models or siblings models
         if ($filename === 'Model' || $filename === modules()->current()->getDirName()) {
-            $subModelsDirName = dirname($dirName) . DIRECTORY_SEPARATOR . 'Models' . DIRECTORY_SEPARATOR;
+            $subModelsDirName = dirname($dirName).DIRECTORY_SEPARATOR.'Models'.DIRECTORY_SEPARATOR;
 
             if (is_dir($subModelsDirName)) {
                 $subModelPath = $subModelsDirName;
             }
-        } elseif (is_dir($subModelsDirName = $dirName . $filename . DIRECTORY_SEPARATOR)) {
+        } elseif (is_dir($subModelsDirName = $dirName.$filename.DIRECTORY_SEPARATOR)) {
             $subModelPath = $subModelsDirName;
         }
 
         if (isset($subModelPath)) {
             loader()->addNamespace($reflection->name, $subModelPath);
 
-            foreach (glob($subModelPath . '*.php') as $filepath) {
+            foreach (glob($subModelPath.'*.php') as $filepath) {
                 if ($filepath === $filePath) {
                     continue;
                 }
-                $this->validSubModels[ camelcase(pathinfo($filepath, PATHINFO_FILENAME)) ] = $filepath;
+                $this->validSubModels[camelcase(pathinfo($filepath, PATHINFO_FILENAME))] = $filepath;
             }
         }
     }
@@ -174,7 +174,7 @@ 
     {
         $modelClassName = get_called_class();
 
-        if ( ! models()->has($modelClassName)) {
+        if (!models()->has($modelClassName)) {
             models()->load($modelClassName, $modelClassName);
         }
 
@@ -210,7 +210,7 @@ 
             }
         }
 
-        if (empty($get[ $property ])) {
+        if (empty($get[$property])) {
             if (services()->has($property)) {
                 return services()->get($property);
             } elseif ($this->hasSubModel($property)) {
@@ -229,8 +229,8 @@ 
     {
         if ($this->hasSubModel($model)) {
             $classNames = [
-                '\\' . get_called_class() . '\\' . ucfirst($model),
-                '\\' . get_namespace(get_called_class()) . ucfirst($model),
+                '\\'.get_called_class().'\\'.ucfirst($model),
+                '\\'.get_namespace(get_called_class()).ucfirst($model),
             ];
 
             foreach ($classNames as $className) {
@@ -251,7 +251,7 @@ 
     final protected function hasSubModel($model)
     {
         if (array_key_exists($model, $this->validSubModels)) {
-            return (bool)is_file($this->validSubModels[ $model ]);
+            return (bool) is_file($this->validSubModels[$model]);
         }
 
         return false;

src/Http/Controller.php

Spacing +6 added lines, -6 removed lines

@@ -24,7 +24,7 @@ 
 {
     public function &__get($property)
     {
-        $get[ $property ] = false;
+        $get[$property] = false;
 
         // CodeIgniter property aliasing
         if ($property === 'load') {
@@ -32,15 +32,15 @@ 
         }
 
         if (services()->has($property)) {
-            $get[ $property ] = services()->get($property);
+            $get[$property] = services()->get($property);
         } elseif (o2system()->__isset($property)) {
-            $get[ $property ] = o2system()->__get($property);
+            $get[$property] = o2system()->__get($property);
         } elseif ($property === 'model') {
-            $get[ $property ] = models('controller');
+            $get[$property] = models('controller');
         } elseif ($property === 'services' || $property === 'libraries') {
-            $get[ $property ] = services();
+            $get[$property] = services();
         }
 
-        return $get[ $property ];
+        return $get[$property];
     }
 }
\ No newline at end of file

src/Reactor.php

Spacing +19 added lines, -19 removed lines

@@ -48,8 +48,8 @@ 
  *
  * WITH TRAILING SLASH!
  */
-if ( ! defined('PATH_VENDOR')) {
-    define('PATH_VENDOR', PATH_ROOT . 'vendor' . DIRECTORY_SEPARATOR);
+if (!defined('PATH_VENDOR')) {
+    define('PATH_VENDOR', PATH_ROOT.'vendor'.DIRECTORY_SEPARATOR);
 }
 
 /*
@@ -61,8 +61,8 @@ 
  *
  * WITH TRAILING SLASH!
  */
-if ( ! defined('PATH_REACTOR')) {
-    define('PATH_REACTOR', __DIR__ . DIRECTORY_SEPARATOR);
+if (!defined('PATH_REACTOR')) {
+    define('PATH_REACTOR', __DIR__.DIRECTORY_SEPARATOR);
 }
 
 /*
@@ -74,8 +74,8 @@ 
  *
  * WITH TRAILING SLASH!
  */
-if ( ! defined('PATH_APP')) {
-    define('PATH_APP', PATH_ROOT . DIR_APP . DIRECTORY_SEPARATOR);
+if (!defined('PATH_APP')) {
+    define('PATH_APP', PATH_ROOT.DIR_APP.DIRECTORY_SEPARATOR);
 }
 
 /*
@@ -87,8 +87,8 @@ 
  *
  * WITH TRAILING SLASH!
  */
-if ( ! defined('PATH_PUBLIC')) {
-    define('PATH_PUBLIC', PATH_ROOT . DIR_PUBLIC . DIRECTORY_SEPARATOR);
+if (!defined('PATH_PUBLIC')) {
+    define('PATH_PUBLIC', PATH_ROOT.DIR_PUBLIC.DIRECTORY_SEPARATOR);
 }
 
 /*
@@ -100,8 +100,8 @@ 
  *
  * WITH TRAILING SLASH!
  */
-if ( ! defined('PATH_CACHE')) {
-    define('PATH_CACHE', PATH_ROOT . DIR_CACHE . DIRECTORY_SEPARATOR);
+if (!defined('PATH_CACHE')) {
+    define('PATH_CACHE', PATH_ROOT.DIR_CACHE.DIRECTORY_SEPARATOR);
 }
 
 /*
@@ -113,8 +113,8 @@ 
  *
  * WITH TRAILING SLASH!
  */
-if ( ! defined('PATH_STORAGE')) {
-    define('PATH_STORAGE', PATH_ROOT . DIR_STORAGE . DIRECTORY_SEPARATOR);
+if (!defined('PATH_STORAGE')) {
+    define('PATH_STORAGE', PATH_ROOT.DIR_STORAGE.DIRECTORY_SEPARATOR);
 }
 
 /*
@@ -126,8 +126,8 @@ 
  *
  * WITH TRAILING SLASH!
  */
-if ( ! defined('PATH_RESOURCES')) {
-    define('PATH_RESOURCES', PATH_ROOT . DIR_RESOURCES . DIRECTORY_SEPARATOR);
+if (!defined('PATH_RESOURCES')) {
+    define('PATH_RESOURCES', PATH_ROOT.DIR_RESOURCES.DIRECTORY_SEPARATOR);
 }
 
 
@@ -136,14 +136,14 @@ 
  * FRAMEWORK CONSTANTS
  *---------------------------------------------------------------
  */
-require __DIR__ . '/Config/Constants.php';
+require __DIR__.'/Config/Constants.php';
 
 /*
  *---------------------------------------------------------------
  * FRAMEWORK HELPERS
  *---------------------------------------------------------------
  */
-require __DIR__ . '/Helpers/Reactor.php';
+require __DIR__.'/Helpers/Reactor.php';
 
 /**
  * Class Reactor
@@ -261,12 +261,12 @@ 
                 }
 
                 if (profiler() !== false) {
-                    profiler()->watch('Instantiating Requested Commander: ' . $commander->getClass());
+                    profiler()->watch('Instantiating Requested Commander: '.$commander->getClass());
                 }
                 $requestCommander = $commander->getInstance();
 
                 if (profiler() !== false) {
-                    profiler()->watch('Execute Requested Commander: ' . $commander->getClass());
+                    profiler()->watch('Execute Requested Commander: '.$commander->getClass());
                 }
                 $requestCommander->execute();
 
@@ -315,7 +315,7 @@ 
                 }
 
                 if (profiler() !== false) {
-                    profiler()->watch('Instantiating Requested Controller: ' . $controller->getClass());
+                    profiler()->watch('Instantiating Requested Controller: '.$controller->getClass());
                 }
                 $requestController = $controller->getInstance();
 

src/Services/Loader.php

Spacing +26 added lines, -26 removed lines

@@ -114,7 +114,7 @@ 
     public function addNamespace($namespace, $baseDirectory, $prepend = false)
     {
         // normalize namespace prefix
-        $namespace = trim($namespace, '\\') . '\\';
+        $namespace = trim($namespace, '\\').'\\';
 
         if (empty($namespace) OR $namespace === '\\') {
             return;
@@ -122,24 +122,24 @@ 
 
         // normalize the base directory with a trailing separator
         $baseDirectory = str_replace(['/', '\\'], DIRECTORY_SEPARATOR, $baseDirectory);
-        $baseDirectory = rtrim($baseDirectory, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+        $baseDirectory = rtrim($baseDirectory, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR;
 
         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);
@@ -148,8 +148,8 @@ 
             output()->addFilePath($baseDirectory);
 
             // Autoload Composer
-            if (is_file($baseDirectory . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php')) {
-                require($baseDirectory . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php');
+            if (is_file($baseDirectory.'vendor'.DIRECTORY_SEPARATOR.'autoload.php')) {
+                require($baseDirectory.'vendor'.DIRECTORY_SEPARATOR.'autoload.php');
             }
         }
     }
@@ -170,10 +170,10 @@ 
         $dir = str_replace(['\\', '/'], DIRECTORY_SEPARATOR, $dir);
 
         $dir = realpath($dir);
-        $dir = rtrim($dir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+        $dir = rtrim($dir, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR;
 
         if (array_key_exists($dir, $this->namespaceDirsMap)) {
-            return $this->namespaceDirsMap[ $dir ];
+            return $this->namespaceDirsMap[$dir];
         }
 
         return false;
@@ -211,10 +211,10 @@ 
      */
     public function getNamespaceDirs($namespace)
     {
-        $namespace = trim($namespace, '\\') . '\\';
+        $namespace = trim($namespace, '\\').'\\';
 
         if (array_key_exists($namespace, $this->namespaceDirs)) {
-            return $this->namespaceDirs[ $namespace ];
+            return $this->namespaceDirs[$namespace];
         }
 
         return false;
@@ -237,33 +237,33 @@ 
         }
 
         if ($this->requireFile($helper)) {
-            $this->loadedHelpers[ pathinfo($helper, PATHINFO_FILENAME) ][] = $helper;
+            $this->loadedHelpers[pathinfo($helper, PATHINFO_FILENAME)][] = $helper;
 
             return;
         }
 
         $helperDirectories = [
-            PATH_KERNEL . 'Helpers' . DIRECTORY_SEPARATOR,
-            PATH_FRAMEWORK . 'Helpers' . DIRECTORY_SEPARATOR,
-            PATH_APP . 'Helpers' . DIRECTORY_SEPARATOR,
+            PATH_KERNEL.'Helpers'.DIRECTORY_SEPARATOR,
+            PATH_FRAMEWORK.'Helpers'.DIRECTORY_SEPARATOR,
+            PATH_APP.'Helpers'.DIRECTORY_SEPARATOR,
         ];
 
         if (method_exists(modules(), 'current')) {
-            array_push($helperDirectories, modules()->current()->getPath() . 'Helpers' . DIRECTORY_SEPARATOR);
+            array_push($helperDirectories, modules()->current()->getPath().'Helpers'.DIRECTORY_SEPARATOR);
         }
 
-        if ( ! array_key_exists($helper, $this->loadedHelpers)) {
-            $this->loadedHelpers[ $helper ] = [];
+        if (!array_key_exists($helper, $this->loadedHelpers)) {
+            $this->loadedHelpers[$helper] = [];
         }
 
         foreach ($helperDirectories as $helperDirectory) {
 
-            $helperFilePath = $helperDirectory . studlycase($helper) . '.php';
+            $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;
             }
         }
     }
@@ -339,12 +339,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

src/Services/Config.php

Spacing +8 added lines, -8 removed lines

@@ -31,12 +31,12 @@ 
     public function __construct()
     {
         if (is_file(
-            $filePath = PATH_APP . 'Config' . DIRECTORY_SEPARATOR . ucfirst(
+            $filePath = PATH_APP.'Config'.DIRECTORY_SEPARATOR.ucfirst(
                     strtolower(ENVIRONMENT)
-                ) . DIRECTORY_SEPARATOR . 'Config.php'
+                ).DIRECTORY_SEPARATOR.'Config.php'
         )) {
             include($filePath);
-        } elseif (is_file($filePath = PATH_APP . 'Config' . DIRECTORY_SEPARATOR . 'Config.php')) {
+        } elseif (is_file($filePath = PATH_APP.'Config'.DIRECTORY_SEPARATOR.'Config.php')) {
             include($filePath);
         }
 
@@ -71,18 +71,18 @@ 
         $offset = camelcase($basename);
 
         $configDirs = [
-            PATH_REACTOR . 'Config' . DIRECTORY_SEPARATOR,
-            PATH_APP . 'Config' . DIRECTORY_SEPARATOR,
+            PATH_REACTOR.'Config'.DIRECTORY_SEPARATOR,
+            PATH_APP.'Config'.DIRECTORY_SEPARATOR,
         ];
 
         foreach ($configDirs as $configDir) {
             if (is_file(
-                $filePath = $configDir . ucfirst(
+                $filePath = $configDir.ucfirst(
                         strtolower(ENVIRONMENT)
-                    ) . DIRECTORY_SEPARATOR . $configFile . '.php'
+                    ).DIRECTORY_SEPARATOR.$configFile.'.php'
             )) {
                 include($filePath);
-            } elseif (is_file($filePath = $configDir . DIRECTORY_SEPARATOR . $configFile . '.php')) {
+            } elseif (is_file($filePath = $configDir.DIRECTORY_SEPARATOR.$configFile.'.php')) {
                 include($filePath);
             }
         }