o2system / reactor

src/Cli/Commanders/Maintenance.php

Spacing +15 added lines, -15 removed lines

@@ -152,7 +152,7 @@ 
      */
     public function optionLifetime($lifetime)
     {
-        $this->optionLifetime = (int)$lifetime;
+        $this->optionLifetime = (int) $lifetime;
     }
 
     // ------------------------------------------------------------------------
@@ -191,16 +191,16 @@ 
         $options = input()->get();
 
         if (empty($options)) {
-            $_GET[ 'switch' ] = 'ON';
-            $_GET[ 'mode' ] = 'default';
-            $_GET[ 'lifetime' ] = 300;
-            $_GET[ 'title' ] = language()->getLine(strtoupper('CLI_MAINTENANCE_TITLE'));
-            $_GET[ 'message' ] = language()->getLine(strtoupper('CLI_MAINTENANCE_MESSAGE'));
+            $_GET['switch'] = 'ON';
+            $_GET['mode'] = 'default';
+            $_GET['lifetime'] = 300;
+            $_GET['title'] = language()->getLine(strtoupper('CLI_MAINTENANCE_TITLE'));
+            $_GET['message'] = language()->getLine(strtoupper('CLI_MAINTENANCE_MESSAGE'));
         } else {
-            $_GET[ 'mode' ] = 'default';
-            $_GET[ 'lifetime' ] = 300;
-            $_GET[ 'title' ] = language()->getLine(strtoupper('CLI_MAINTENANCE_TITLE'));
-            $_GET[ 'message' ] = language()->getLine(strtoupper('CLI_MAINTENANCE_MESSAGE'));
+            $_GET['mode'] = 'default';
+            $_GET['lifetime'] = 300;
+            $_GET['title'] = language()->getLine(strtoupper('CLI_MAINTENANCE_TITLE'));
+            $_GET['message'] = language()->getLine(strtoupper('CLI_MAINTENANCE_MESSAGE'));
         }
 
         parent::execute();
@@ -213,11 +213,11 @@ 
                     (new Format())
                         ->setContextualClass(Format::DANGER)
                         ->setString(language()->getLine('CLI_MAINTENANCE_ALREADY_STARTED', [
-                            $maintenanceInfo[ 'mode' ],
-                            $maintenanceInfo[ 'datetime' ],
-                            date('r', strtotime($maintenanceInfo[ 'datetime' ]) + $maintenanceInfo[ 'lifetime' ]),
-                            $maintenanceInfo[ 'title' ],
-                            $maintenanceInfo[ 'message' ],
+                            $maintenanceInfo['mode'],
+                            $maintenanceInfo['datetime'],
+                            date('r', strtotime($maintenanceInfo['datetime']) + $maintenanceInfo['lifetime']),
+                            $maintenanceInfo['title'],
+                            $maintenanceInfo['message'],
                         ]))
                         ->setNewLinesAfter(1)
                 );

src/Cli/Commanders/Make.php

Spacing +4 added lines, -4 removed lines

@@ -97,14 +97,14 @@ 
     public function optionPath($path)
     {
         $path = str_replace(['\\', '/'], DIRECTORY_SEPARATOR, $path);
-        $path = PATH_ROOT . str_replace(PATH_ROOT, '', $path);
+        $path = PATH_ROOT.str_replace(PATH_ROOT, '', $path);
 
         if (pathinfo($path, PATHINFO_EXTENSION)) {
             $this->optionFilename(pathinfo($path, PATHINFO_FILENAME));
             $path = dirname($path);
         }
 
-        $this->optionPath = rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+        $this->optionPath = rtrim($path, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR;
     }
 
     // ------------------------------------------------------------------------
@@ -117,7 +117,7 @@ 
     public function optionFilename($name)
     {
         $name = str_replace('.php', '', $name);
-        $this->optionFilename = prepare_filename($name) . '.php';
+        $this->optionFilename = prepare_filename($name).'.php';
 
         $this->optionPath = empty($this->optionPath) ? modules()->current()->getRealPath() : $this->optionPath;
     }
@@ -156,7 +156,7 @@ 
     public function getPhpTemplateFile($filename)
     {
         $directories = [
-            PATH_FRAMEWORK . 'Config' . DIRECTORY_SEPARATOR . 'PhpTemplateFiles',
+            PATH_FRAMEWORK.'Config'.DIRECTORY_SEPARATOR.'PhpTemplateFiles',
         ];
 
     }

src/Services/Loader.php

Spacing +25 added lines, -25 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,29 +237,29 @@ 
         }
 
         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 ( ! 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;
             }
         }
     }
@@ -335,12 +335,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/Http/Middleware.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
      */
     public function run()
     {
-        if ( ! empty($this->registry)) {
+        if (!empty($this->registry)) {
 
             $request = server_request();
 

src/Reactor.php

Spacing +20 added lines, -20 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
@@ -265,12 +265,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();
 
@@ -304,7 +304,7 @@ 
         }
         middleware()->run();
         
-        if($this->services->has('controller')) {
+        if ($this->services->has('controller')) {
             $controller = $this->services->get('controller');
             
             // Autoload Model
@@ -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/Containers/Models.php

Spacing +5 added lines, -5 removed lines

@@ -41,7 +41,7 @@ 
     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) {
                     profiler()->watch('Starting Database Service');
@@ -74,7 +74,7 @@ 
 
         if (isset($service) && $service instanceof SplServiceRegistry) {
             if (profiler() !== false) {
-                profiler()->watch('Load New Model: ' . $service->getClassName());
+                profiler()->watch('Load New Model: '.$service->getClassName());
             }
 
             $this->register($service, $offset);
@@ -103,7 +103,7 @@ 
                 $this->attach($offset, $service);
 
                 if (profiler() !== false) {
-                    profiler()->watch('Register New Model: ' . $service->getClassName());
+                    profiler()->watch('Register New Model: '.$service->getClassName());
                 }
             }
         }
@@ -120,13 +120,13 @@ 
     public function add($model, $offset = null)
     {
         if (is_object($model)) {
-            if ( ! $model instanceof SplServiceRegistry) {
+            if (!$model instanceof SplServiceRegistry) {
                 $model = new SplServiceRegistry($model);
             }
         }
 
         if (profiler() !== false) {
-            profiler()->watch('Add New Model: ' . $model->getClassName());
+            profiler()->watch('Add New Model: '.$model->getClassName());
         }
 
         $this->register($model, $offset);

src/Containers/Globals.php

Spacing +8 added lines, -8 removed lines

@@ -103,7 +103,7 @@ 
      */
     public function offsetExists($offset)
     {
-        return isset($GLOBALS[ $offset ]);
+        return isset($GLOBALS[$offset]);
     }
 
     // ------------------------------------------------------------------------
@@ -120,7 +120,7 @@ 
      */
     public function &__get($offset)
     {
-        return $GLOBALS[ $offset ];
+        return $GLOBALS[$offset];
     }
 
     // ------------------------------------------------------------------------
@@ -178,7 +178,7 @@ 
      */
     public function offsetSet($offset, $value)
     {
-        $GLOBALS[ $offset ] = $value;
+        $GLOBALS[$offset] = $value;
     }
 
     // ------------------------------------------------------------------------
@@ -233,8 +233,8 @@ 
      */
     public function offsetUnset($offset)
     {
-        if (isset($GLOBALS[ $offset ])) {
-            unset($GLOBALS[ $offset ]);
+        if (isset($GLOBALS[$offset])) {
+            unset($GLOBALS[$offset]);
         }
     }
 
@@ -306,7 +306,7 @@ 
      */
     public function count()
     {
-        return (int)count($GLOBALS);
+        return (int) count($GLOBALS);
     }
 
     // ------------------------------------------------------------------------
@@ -414,7 +414,7 @@ 
      */
     public function has($id)
     {
-        return (bool)$this->offsetExists($id);
+        return (bool) $this->offsetExists($id);
     }
 
     // ------------------------------------------------------------------------
@@ -435,6 +435,6 @@ 
      */
     public function offsetGet($offset)
     {
-        return (isset($GLOBALS[ $offset ])) ? $GLOBALS[ $offset ] : false;
+        return (isset($GLOBALS[$offset])) ? $GLOBALS[$offset] : false;
     }
 }
\ No newline at end of file

src/Containers/Environment.php

Spacing +8 added lines, -8 removed lines

@@ -103,7 +103,7 @@ 
      */
     public function offsetExists($offset)
     {
-        return isset($_ENV[ $offset ]);
+        return isset($_ENV[$offset]);
     }
 
     // ------------------------------------------------------------------------
@@ -120,7 +120,7 @@ 
      */
     public function &__get($offset)
     {
-        return $_ENV[ $offset ];
+        return $_ENV[$offset];
     }
 
     // ------------------------------------------------------------------------
@@ -178,7 +178,7 @@ 
      */
     public function offsetSet($offset, $value)
     {
-        $_ENV[ $offset ] = $value;
+        $_ENV[$offset] = $value;
     }
 
     // ------------------------------------------------------------------------
@@ -233,8 +233,8 @@ 
      */
     public function offsetUnset($offset)
     {
-        if (isset($_ENV[ $offset ])) {
-            unset($_ENV[ $offset ]);
+        if (isset($_ENV[$offset])) {
+            unset($_ENV[$offset]);
         }
     }
 
@@ -306,7 +306,7 @@ 
      */
     public function count()
     {
-        return (int)count($_ENV);
+        return (int) count($_ENV);
     }
 
     // ------------------------------------------------------------------------
@@ -414,7 +414,7 @@ 
      */
     public function has($id)
     {
-        return (bool)$this->offsetExists($id);
+        return (bool) $this->offsetExists($id);
     }
 
     // ------------------------------------------------------------------------
@@ -435,6 +435,6 @@ 
      */
     public function offsetGet($offset)
     {
-        return (isset($_ENV[ $offset ])) ? $_ENV[ $offset ] : false;
+        return (isset($_ENV[$offset])) ? $_ENV[$offset] : false;
     }
 }
\ No newline at end of file

src/Helpers/Reactor.php

Spacing +19 added lines, -19 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
      *
@@ -36,7 +36,7 @@ 
      */
     function loader()
     {
-        if(services()->has('loader')) {
+        if (services()->has('loader')) {
             return services()->get('loader');
         }
 
@@ -46,7 +46,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('config')) {
+if (!function_exists('config')) {
     /**
      * config
      *
@@ -61,7 +61,7 @@ 
         if ($numArgs = count($args)) {
             $config = o2system()->config;
 
-            if($numArgs == 1) {
+            if ($numArgs == 1) {
                 return call_user_func_array([&$config, 'getItem'], $args);
             } else {
                 return call_user_func_array([&$config, 'loadFile'], $args);
@@ -74,7 +74,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('cache')) {
+if (!function_exists('cache')) {
     /**
      * cache
      *
@@ -84,7 +84,7 @@ 
      */
     function cache()
     {
-        if(services()->has('cache')) {
+        if (services()->has('cache')) {
             return services()->get('cache');
         }
 
@@ -94,7 +94,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('database')) {
+if (!function_exists('database')) {
     /**
      * database
      *
@@ -110,7 +110,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('models')) {
+if (!function_exists('models')) {
     /**
      * models
      *
@@ -123,7 +123,7 @@ 
         $args = func_get_args();
 
         if (count($args)) {
-            return o2system()->models->get($args[ 0 ]);
+            return o2system()->models->get($args[0]);
         }
 
         return o2system()->models;
@@ -132,7 +132,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('router')) {
+if (!function_exists('router')) {
     /**
      * router
      *
@@ -142,7 +142,7 @@ 
      */
     function router()
     {
-        if(services()->has('router')) {
+        if (services()->has('router')) {
             return services()->get('router');
         }
 
@@ -152,7 +152,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('session')) {
+if (!function_exists('session')) {
     /**
      * session
      *
@@ -165,8 +165,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;
@@ -178,7 +178,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('middleware')) {
+if (!function_exists('middleware')) {
     /**
      * O2System
      *
@@ -188,7 +188,7 @@ 
      */
     function middleware()
     {
-        if(services()->has('middleware')) {
+        if (services()->has('middleware')) {
             return services()->get('middleware');
         }
 
@@ -198,7 +198,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if ( ! function_exists('controller')) {
+if (!function_exists('controller')) {
     /**
      * controller
      *
@@ -208,7 +208,7 @@ 
      */
     function controller()
     {
-        if(services()->has('controller')) {
+        if (services()->has('controller')) {
             $args = func_get_args();
 
             if (count($args)) {