o2system / kernel

src/Http/Router/Addresses.php

Spacing +25 added lines, -25 removed lines

@@ -142,8 +142,8 @@ 
         $path = '/' . ltrim($path, '/');
         $translations = $this->getTranslations($domain);
 
-        if (isset($translations[ $path ])) {
-            return $translations[ $path ];
+        if (isset($translations[$path])) {
+            return $translations[$path];
         } elseif (count($translations)) {
             foreach ($translations as $translation => $action) {
                 if ($action->isValidUriString($path)) {
@@ -177,12 +177,12 @@ 
 
         $translations = [];
 
-        if (isset($this->translations[ $domain ])) {
-            $translations = $this->translations[ $domain ];
+        if (isset($this->translations[$domain])) {
+            $translations = $this->translations[$domain];
         } else {
             $domain = new Domain($domain);
             if (array_key_exists($domain->getString(), $this->translations)) {
-                $translations = $this->translations[ $domain->getString() ];
+                $translations = $this->translations[$domain->getString()];
             } else {
                 foreach ($this->translations as $domainRoute => $domainMap) {
                     if (preg_match('/[{][a-zA-Z0-9$_]+[}]/', $domainRoute)) {
@@ -191,13 +191,13 @@ 
                         if ($domain->getParentDomain() === $domainRoute->getParentDomain() AND
                             $domain->getTotalSubDomains() == $domainRoute->getTotalSubDomains()
                         ) {
-                            if (isset($domainMap[ $domainRoute->getSubDomain() ])) {
+                            if (isset($domainMap[$domainRoute->getSubDomain()])) {
                                 $translations = $domainMap;
-                                $address = $translations[ $domainRoute->getSubDomain() ]->setClosureParameters(
+                                $address = $translations[$domainRoute->getSubDomain()]->setClosureParameters(
                                     $domain->getSubDomains()
                                 );
 
-                                unset($translations[ $domainRoute->getSubDomain() ]);
+                                unset($translations[$domainRoute->getSubDomain()]);
 
                                 if (false !== ($closureParameters = $address->getClosure())) {
 
@@ -259,8 +259,8 @@ 
         } else {
 
             if (is_string($address)) {
-                $namespace = isset($this->attributes[ 'namespace' ])
-                    ? $this->attributes[ 'namespace' ]
+                $namespace = isset($this->attributes['namespace'])
+                    ? $this->attributes['namespace']
                     : null;
                 $controllerClassName = trim($namespace, '\\') . '\\' . $address;
 
@@ -269,17 +269,17 @@ 
                 }
             }
 
-            $closure = function () use ($address) {
+            $closure = function() use ($address) {
                 return $address;
             };
         }
 
-        $domain = isset($this->attributes[ 'domain' ])
-            ? $this->attributes[ 'domain' ]
+        $domain = isset($this->attributes['domain'])
+            ? $this->attributes['domain']
             : null;
 
-        $prefix = isset($this->attributes[ 'prefix' ])
-            ? $this->attributes[ 'prefix' ]
+        $prefix = isset($this->attributes['prefix'])
+            ? $this->attributes['prefix']
             : null;
 
         if ( ! preg_match('/[{][a-zA-Z0-9$_]+[}]/', $path)) {
@@ -288,7 +288,7 @@ 
 
         $action = new DataStructures\Action($method, $path, $closure, $domain);
 
-        $this->translations[ $action->getDomain() ][ $action->getPath() ] = $action;
+        $this->translations[$action->getDomain()][$action->getPath()] = $action;
 
         return $this;
     }
@@ -372,7 +372,7 @@ 
             }
         }
 
-        $this->domains[ $domain ] = $address;
+        $this->domains[$domain] = $address;
     }
 
     // ------------------------------------------------------------------------
@@ -387,20 +387,20 @@ 
     public function getDomain($domain = null)
     {
         $domain = is_null($domain)
-            ? isset($_SERVER[ 'HTTP_HOST' ])
-                ? $_SERVER[ 'HTTP_HOST' ]
-                : $_SERVER[ 'SERVER_NAME' ]
+            ? isset($_SERVER['HTTP_HOST'])
+                ? $_SERVER['HTTP_HOST']
+                : $_SERVER['SERVER_NAME']
             : $domain;
 
         if (array_key_exists($domain, $this->domains)) {
-            if (is_callable($this->domains[ $domain ])) {
-                return call_user_func($this->domains[ $domain ]);
+            if (is_callable($this->domains[$domain])) {
+                return call_user_func($this->domains[$domain]);
             }
 
-            return $this->domains[ $domain ];
-        } elseif (isset($this->domains[ '*' ]) and is_callable($this->domains[ '*' ])) {
+            return $this->domains[$domain];
+        } elseif (isset($this->domains['*']) and is_callable($this->domains['*'])) {
             // check wildcard domain closure
-            if (false !== ($address = call_user_func($this->domains[ '*' ], $domain))) {
+            if (false !== ($address = call_user_func($this->domains['*'], $domain))) {
                 return $address;
             }
         } elseif (count($this->domains)) {

src/Http/Controller.php

Spacing +3 added lines, -3 removed lines

@@ -47,13 +47,13 @@
      */
     public function &__get($property)
     {
-        $get[ $property ] = false;
+        $get[$property] = false;
 
         if (services()->has($property)) {
-            $get[ $property ] = services()->get($property);
+            $get[$property] = services()->get($property);
         }
 
-        return $get[ $property ];
+        return $get[$property];
     }
 
     // ------------------------------------------------------------------------

src/Cli/Input.php

Spacing +47 added lines, -47 removed lines

@@ -106,7 +106,7 @@ 
             $loopThrough = [];
 
             foreach ($offset as $key) {
-                $loopThrough[ $key ] = $this->filter($type, $key, $filter);
+                $loopThrough[$key] = $this->filter($type, $key, $filter);
             }
 
             if (empty($loopThrough)) {
@@ -120,38 +120,38 @@ 
             // of the simpler filter_input();
             switch ($type) {
                 case INPUT_GET:
-                    $value = isset($_GET[ $offset ])
-                        ? $_GET[ $offset ]
+                    $value = isset($_GET[$offset])
+                        ? $_GET[$offset]
                         : null;
                     break;
                 case INPUT_POST:
-                    $value = isset($_POST[ $offset ])
-                        ? $_POST[ $offset ]
+                    $value = isset($_POST[$offset])
+                        ? $_POST[$offset]
                         : null;
                     break;
                 case INPUT_SERVER:
-                    $value = isset($_SERVER[ $offset ])
-                        ? $_SERVER[ $offset ]
+                    $value = isset($_SERVER[$offset])
+                        ? $_SERVER[$offset]
                         : null;
                     break;
                 case INPUT_ENV:
-                    $value = isset($_ENV[ $offset ])
-                        ? $_ENV[ $offset ]
+                    $value = isset($_ENV[$offset])
+                        ? $_ENV[$offset]
                         : null;
                     break;
                 case INPUT_COOKIE:
-                    $value = isset($_COOKIE[ $offset ])
-                        ? $_COOKIE[ $offset ]
+                    $value = isset($_COOKIE[$offset])
+                        ? $_COOKIE[$offset]
                         : null;
                     break;
                 case INPUT_REQUEST:
-                    $value = isset($_REQUEST[ $offset ])
-                        ? $_REQUEST[ $offset ]
+                    $value = isset($_REQUEST[$offset])
+                        ? $_REQUEST[$offset]
                         : null;
                     break;
                 case INPUT_SESSION:
-                    $value = isset($_SESSION[ $offset ])
-                        ? $_SESSION[ $offset ]
+                    $value = isset($_SESSION[$offset])
+                        ? $_SESSION[$offset]
                         : null;
                     break;
                 default:
@@ -210,13 +210,13 @@ 
     {
         foreach ($data as $key => $value) {
             if (is_array($value) AND is_array($filter)) {
-                $data[ $key ] = filter_var_array($value, $filter);
+                $data[$key] = filter_var_array($value, $filter);
             } elseif (is_array($value)) {
-                $data[ $key ] = $this->filterRecursive($value, $filter);
+                $data[$key] = $this->filterRecursive($value, $filter);
             } elseif (isset($filter)) {
-                $data[ $key ] = filter_var($value, $filter);
+                $data[$key] = filter_var($value, $filter);
             } else {
-                $data[ $key ] = $value;
+                $data[$key] = $value;
             }
         }
 
@@ -262,12 +262,12 @@ 
      */
     final public function argv($offset = null, $filter = null)
     {
-        $arguments = $_SERVER[ 'argv' ];
-        $numArguments = $_SERVER[ 'argc' ];
+        $arguments = $_SERVER['argv'];
+        $numArguments = $_SERVER['argc'];
 
         $argv = [];
         for ($i = 1; $i < $numArguments; $i++) {
-            $optionCommand = trim($arguments[ $i ]);
+            $optionCommand = trim($arguments[$i]);
             $optionValue = true;
 
             if (empty($optionCommand)) {
@@ -278,10 +278,10 @@ 
                 $xOptionCommand = explode('=', $optionCommand);
                 $xOptionCommand = array_map('trim', $xOptionCommand);
 
-                $optionCommand = str_replace(['-', '--'], '', $xOptionCommand[ 0 ]);
-                $optionValue = $xOptionCommand[ 1 ];
+                $optionCommand = str_replace(['-', '--'], '', $xOptionCommand[0]);
+                $optionValue = $xOptionCommand[1];
 
-                $argv[ $optionCommand ] = $optionValue;
+                $argv[$optionCommand] = $optionValue;
                 continue;
             }
 
@@ -290,14 +290,14 @@ 
             ) {
                 $optionCommand = str_replace(['-', '--'], '', $optionCommand);
 
-                if (isset($arguments[ $i + 1 ])) {
-                    $nextOptionCommand = $arguments[ $i + 1 ];
+                if (isset($arguments[$i + 1])) {
+                    $nextOptionCommand = $arguments[$i + 1];
 
                     if (strpos($nextOptionCommand, '--') === false
                         || strpos($nextOptionCommand, '-') === false
                     ) {
                         $optionValue = $nextOptionCommand;
-                        $arguments[ $i + 1 ] = null;
+                        $arguments[$i + 1] = null;
                     }
                 }
             }
@@ -308,13 +308,13 @@ 
                 $optionValue = filter_var($optionValue, FILTER_DEFAULT);
             }
 
-            $argv[ $optionCommand ] = $optionValue;
+            $argv[$optionCommand] = $optionValue;
         }
 
         if (empty($offset)) {
             return $argv;
-        } elseif (isset($argv[ $offset ])) {
-            return $argv[ $offset ];
+        } elseif (isset($argv[$offset])) {
+            return $argv[$offset];
         }
     }
 
@@ -339,8 +339,8 @@ 
      */
     public function getApp()
     {
-        return isset($_SERVER[ 'argv' ][ 0 ])
-            ? $_SERVER[ 'argv' ][ 0 ]
+        return isset($_SERVER['argv'][0])
+            ? $_SERVER['argv'][0]
             : false;
     }
 
@@ -353,8 +353,8 @@ 
      */
     public function getCommand()
     {
-        return isset($_SERVER[ 'argv' ][ 1 ])
-            ? $_SERVER[ 'argv' ][ 1 ]
+        return isset($_SERVER['argv'][1])
+            ? $_SERVER['argv'][1]
             : false;
     }
 
@@ -370,13 +370,13 @@ 
      */
     public function getOptions($offset = null, $filter = null)
     {
-        $arguments = $_SERVER[ 'argv' ];
-        $numArguments = $_SERVER[ 'argc' ];
+        $arguments = $_SERVER['argv'];
+        $numArguments = $_SERVER['argc'];
 
         $argv = [];
 
         for ($i = 2; $i < $numArguments; $i++) {
-            $optionCommand = trim($arguments[ $i ]);
+            $optionCommand = trim($arguments[$i]);
             $optionValue = true;
 
             if (empty($optionCommand)) {
@@ -387,10 +387,10 @@ 
                 $xOptionCommand = explode('=', $optionCommand);
                 $xOptionCommand = array_map('trim', $xOptionCommand);
 
-                $optionCommand = str_replace(['-', '--'], '', $xOptionCommand[ 0 ]);
-                $optionValue = $xOptionCommand[ 1 ];
+                $optionCommand = str_replace(['-', '--'], '', $xOptionCommand[0]);
+                $optionValue = $xOptionCommand[1];
 
-                $argv[ $optionCommand ] = $optionValue;
+                $argv[$optionCommand] = $optionValue;
                 continue;
             }
 
@@ -399,14 +399,14 @@ 
             ) {
                 $optionCommand = str_replace(['-', '--'], '', $optionCommand);
 
-                if (isset($arguments[ $i + 1 ])) {
-                    $nextOptionCommand = $arguments[ $i + 1 ];
+                if (isset($arguments[$i + 1])) {
+                    $nextOptionCommand = $arguments[$i + 1];
 
                     if (strpos($nextOptionCommand, '--') === false
                         || strpos($nextOptionCommand, '-') === false
                     ) {
                         $optionValue = $nextOptionCommand;
-                        $arguments[ $i + 1 ] = null;
+                        $arguments[$i + 1] = null;
                     }
                 }
             }
@@ -417,13 +417,13 @@ 
                 $optionValue = filter_var($optionValue, FILTER_DEFAULT);
             }
 
-            $argv[ $optionCommand ] = $optionValue;
+            $argv[$optionCommand] = $optionValue;
         }
 
         if (empty($offset)) {
             return $argv;
-        } elseif (isset($argv[ $offset ])) {
-            return $argv[ $offset ];
+        } elseif (isset($argv[$offset])) {
+            return $argv[$offset];
         }
     }
 

src/Cli/Router.php

Spacing +11 added lines, -11 removed lines

@@ -63,9 +63,9 @@ 
      */
     public function parseRequest()
     {
-        $argv = $_SERVER[ 'argv' ];
+        $argv = $_SERVER['argv'];
 
-        if ($_SERVER[ 'SCRIPT_NAME' ] === $_SERVER[ 'argv' ][ 0 ]) {
+        if ($_SERVER['SCRIPT_NAME'] === $_SERVER['argv'][0]) {
             array_shift($argv);
 
             if (empty($argv)) {
@@ -73,11 +73,11 @@ 
             }
         }
 
-        $this->string = str_replace(['/', '\\', ':'], '/', $argv[ 0 ]);
+        $this->string = str_replace(['/', '\\', ':'], '/', $argv[0]);
         $this->commands = explode('/', $this->string);
 
-        if (strpos($this->commands[ 0 ], '--') !== false
-            || strpos($this->commands[ 0 ], '-') !== false
+        if (strpos($this->commands[0], '--') !== false
+            || strpos($this->commands[0], '-') !== false
         ) {
             $options = $this->commands;
             $this->commands = [];
@@ -96,8 +96,8 @@ 
 
                 if (strpos($option, '=') !== false) {
                     $optionParts = explode('=', $option);
-                    $option = $optionParts[ 0 ];
-                    $value = $optionParts[ 1 ];
+                    $option = $optionParts[0];
+                    $value = $optionParts[1];
                 } else {
                     $value = current($options);
                 }
@@ -111,21 +111,21 @@ 
                 if (strpos($value, '--') === false
                     || strpos($value, '-') === false
                 ) {
-                    $_GET[ $option ] = $value;
+                    $_GET[$option] = $value;
                 } else {
-                    $_GET[ $option ] = null;
+                    $_GET[$option] = null;
                 }
             } else {
                 $keys = array_keys($_GET);
                 if (count($keys)) {
                     $key = end($keys);
-                    $_GET[ $key ] = $option;
+                    $_GET[$key] = $option;
                 }
             }
         }
 
         if (array_key_exists('verbose', $_GET) or array_key_exists('v', $_GET)) {
-            $_ENV[ 'VERBOSE' ] = true;
+            $_ENV['VERBOSE'] = true;
         }
 
         $this->parseCommands($this->commands);

src/Cli/Output.php

Spacing +13 added lines, -13 removed lines

@@ -82,15 +82,15 @@ 
 
         if (is_array($lastError)) {
             $this->errorHandler(
-                $lastError[ 'type' ],
-                $lastError[ 'message' ],
-                $lastError[ 'file' ],
-                $lastError[ 'line' ]
+                $lastError['type'],
+                $lastError['message'],
+                $lastError['file'],
+                $lastError['line']
             );
         }
 
         // Execute shutdown service
-        if(services()->has('shutdown')) {
+        if (services()->has('shutdown')) {
             shutdown()->execute();
         }
     }
@@ -134,7 +134,7 @@ 
         $error = new ErrorException($errstr, $errno, $errfile, $errline);
         
         // Logged the error
-        if(services()->has('logger')) {
+        if (services()->has('logger')) {
             logger()->error(
                 implode(
                     ' ',
@@ -370,8 +370,8 @@ 
             $errors = require(str_replace('Cli', 'Config', __DIR__) . DIRECTORY_SEPARATOR . 'Errors.php');
         }
 
-        if (isset($errors[ $code ])) {
-            $languageKey = $errors[ $code ];
+        if (isset($errors[$code])) {
+            $languageKey = $errors[$code];
         }
 
         $languageKey = strtoupper($code . '_' . $languageKey);
@@ -383,10 +383,10 @@ 
         ];
 
         $this->statusCode = $code;
-        $this->reasonPhrase = $error[ 'title' ];
+        $this->reasonPhrase = $error['title'];
 
         if (is_string($vars)) {
-            $error[ 'message' ] = $vars;
+            $error['message'] = $vars;
         } elseif (is_array($vars)) {
             $error = array_merge($error, $vars);
         }
@@ -394,13 +394,13 @@ 
         $this->write(
             (new Format())
                 ->setContextualClass(Format::DANGER)
-                ->setString($error[ 'code' ] . ' - ' . $error[ 'title' ])
+                ->setString($error['code'] . ' - ' . $error['title'])
                 ->setNewLinesAfter(1)
         );
 
         $this->write(
             (new Format())
-                ->setString($error[ 'message' ])
+                ->setString($error['message'])
                 ->setNewLinesAfter(1)
         );
 
@@ -419,7 +419,7 @@ 
      */
     public function verbose($text, $type = 'stdout')
     {
-        if (isset($_ENV[ 'VERBOSE' ]) and $_ENV[ 'VERBOSE' ] === true) {
+        if (isset($_ENV['VERBOSE']) and $_ENV['VERBOSE'] === true) {
             $this->write($text, $type);
         }
     }

src/Kernel.php

Spacing +5 added lines, -5 removed lines

@@ -55,7 +55,7 @@ 
 
         $this->services = new Kernel\Containers\Services();
 
-        if (isset($_ENV[ 'DEBUG_STAGE' ]) and $_ENV[ 'DEBUG_STAGE' ] === 'DEVELOPER') {
+        if (isset($_ENV['DEBUG_STAGE']) and $_ENV['DEBUG_STAGE'] === 'DEVELOPER') {
             $this->services->load(Gear\Profiler::class);
             if (profiler() !== false) {
                 profiler()->watch('Starting Kernel Services');
@@ -147,14 +147,14 @@ 
      */
     public function &__get($property)
     {
-        $get[ $property ] = null;
+        $get[$property] = null;
 
         if (isset($this->{$property})) {
-            $get[ $property ] =& $this->{$property};
+            $get[$property] = & $this->{$property};
         } elseif ($this->services->has($property)) {
-            $get[ $property ] = $this->services->get($property);
+            $get[$property] = $this->services->get($property);
         }
 
-        return $get[ $property ];
+        return $get[$property];
     }
 }
\ No newline at end of file

src/Cli/Router/DataStructures/Commander.php

Spacing +1 added lines, -1 removed lines

@@ -155,7 +155,7 @@
     {
         $arguments = array_values($arguments);
         array_unshift($arguments, null);
-        unset($arguments[ 0 ]);
+        unset($arguments[0]);
 
         $this->requestMethodArgs = $arguments;
 

src/Http/Router/DataStructures/Controller.php

Spacing +1 added lines, -1 removed lines

@@ -155,7 +155,7 @@
     {
         $arguments = array_values($arguments);
         array_unshift($arguments, null);
-        unset($arguments[ 0 ]);
+        unset($arguments[0]);
 
         $this->requestMethodArgs = $arguments;
 

src/Http/Router/DataStructures/Action.php

Spacing +22 added lines, -22 removed lines

@@ -84,9 +84,9 @@ 
         $this->path = $path;
         $this->closure = $closure;
         $this->domain = is_null($domain)
-            ? isset($_SERVER[ 'HTTP_HOST' ])
-                ? @$_SERVER[ 'HTTP_HOST' ]
-                : @$_SERVER[ 'SERVER_NAME' ]
+            ? isset($_SERVER['HTTP_HOST'])
+                ? @$_SERVER['HTTP_HOST']
+                : @$_SERVER['SERVER_NAME']
             : $domain;
 
         // Remove www
@@ -95,7 +95,7 @@ 
         }
 
         if (preg_match_all("/{(.*)}/", $this->domain, $matches)) {
-            foreach ($matches[ 1 ] as $match) {
+            foreach ($matches[1] as $match) {
                 $this->closureParameters[] = $match;
             }
         }
@@ -202,9 +202,9 @@ 
      */
     public function isValidDomain()
     {
-        $domain = isset($_SERVER[ 'HTTP_HOST' ])
-            ? $_SERVER[ 'HTTP_HOST' ]
-            : $_SERVER[ 'SERVER_NAME' ];
+        $domain = isset($_SERVER['HTTP_HOST'])
+            ? $_SERVER['HTTP_HOST']
+            : $_SERVER['SERVER_NAME'];
 
         if ($this->domain === $domain) {
             return true;
@@ -243,22 +243,22 @@ 
                     if (($class = $parameter->getClass()) instanceof \ReflectionClass) {
                         $className = $class->getName();
                         if (class_exists($className)) {
-                            if (isset($matches[ $parameter->name ])) {
-                                $parameters[ $index ] = new $className($matches[ $parameter->name ]);
+                            if (isset($matches[$parameter->name])) {
+                                $parameters[$index] = new $className($matches[$parameter->name]);
                             }
                         }
-                    } elseif (isset($matches[ $parameter->name ])) {
-                        $parameters[ $index ] = $matches[ $parameter->name ];
+                    } elseif (isset($matches[$parameter->name])) {
+                        $parameters[$index] = $matches[$parameter->name];
                     } else {
-                        $parameters[ $index ] = null;
+                        $parameters[$index] = null;
                     }
                 }
             } else {
                 foreach ($closure->getParameters() as $index => $parameter) {
-                    if (isset($matches[ $index ])) {
-                        $parameters[ $index ] = $matches[ $index ];
+                    if (isset($matches[$index])) {
+                        $parameters[$index] = $matches[$index];
                     } else {
-                        $parameters[ $index ] = null;
+                        $parameters[$index] = null;
                     }
                 }
             }
@@ -310,16 +310,16 @@ 
             $parameters = [];
 
             for ($i = 0; $i <= count($pathParts); $i++) {
-                if (isset($pathParts[ $i ]) && isset($stringParts[ $i ])) {
-                    if ($pathParts[ $i ] == $stringParts[ $i ]) {
-                        $matches[ $i ] = $stringParts[ $i ];
+                if (isset($pathParts[$i]) && isset($stringParts[$i])) {
+                    if ($pathParts[$i] == $stringParts[$i]) {
+                        $matches[$i] = $stringParts[$i];
                     }
                 }
 
-                if (isset($pathParts[ $i ])) {
-                    if (preg_match("/{(.*)}/", $pathParts[ $i ])) {
-                        $index = str_replace(['{$', '}'], '', $pathParts[ $i ]);
-                        $parameters[ $index ] = isset($stringParts[ $i ]) ? $stringParts[ $i ] : null;
+                if (isset($pathParts[$i])) {
+                    if (preg_match("/{(.*)}/", $pathParts[$i])) {
+                        $index = str_replace(['{$', '}'], '', $pathParts[$i]);
+                        $parameters[$index] = isset($stringParts[$i]) ? $stringParts[$i] : null;
                     }
                 }
             }