o2system / kernel

src/Http/Output.php

Spacing +46 added lines, -46 removed lines

@@ -82,7 +82,7 @@ 
         $whoops = new \Whoops\Run();
 
         if (is_ajax() or $this->mimeType === 'application/json' or $this->mimeType === 'application/xml') {
-            $whoops->pushHandler(new CallbackHandler(function ($error) {
+            $whoops->pushHandler(new CallbackHandler(function($error) {
                 $this->send([
                     'status'   => 500,
                     'success'  => false,
@@ -123,10 +123,10 @@ 
 
         if (is_array($lastError)) {
             $this->errorHandler(
-                $lastError[ 'type' ],
-                $lastError[ 'message' ],
-                $lastError[ 'file' ],
-                $lastError[ 'line' ]
+                $lastError['type'],
+                $lastError['message'],
+                $lastError['file'],
+                $lastError['line']
             );
         }
     }
@@ -257,8 +257,8 @@ 
         if (strpos($mimeType, '/') === false) {
             $extension = ltrim($mimeType, '.');
             // Is this extension supported?
-            if (isset($mimes[ $extension ])) {
-                $mimeType =& $mimes[ $extension ];
+            if (isset($mimes[$extension])) {
+                $mimeType = & $mimes[$extension];
                 if (is_array($mimeType)) {
                     $mimeType = current($mimeType);
                 }
@@ -288,7 +288,7 @@ 
      */
     public function addHeader($name, $value)
     {
-        $this->headers[ $name ] = $value;
+        $this->headers[$name] = $value;
 
         return $this;
     }
@@ -312,56 +312,56 @@ 
         ];
 
         if (is_array($data)) {
-            if (isset($data[ 'status' ])) {
-                $response[ 'status' ] = $statusCode = $data[ 'status' ];
-                unset($data[ 'status' ]);
+            if (isset($data['status'])) {
+                $response['status'] = $statusCode = $data['status'];
+                unset($data['status']);
             }
 
-            if (isset($data[ 'reason' ])) {
-                $response[ 'reason' ] = $reasonPhrase = $data[ 'reason' ];
-                unset($data[ 'reason' ]);
+            if (isset($data['reason'])) {
+                $response['reason'] = $reasonPhrase = $data['reason'];
+                unset($data['reason']);
             }
 
-            if (isset($data[ 'success' ])) {
-                $response[ 'success' ] = $data[ 'success' ];
-                unset($data[ 'success' ]);
+            if (isset($data['success'])) {
+                $response['success'] = $data['success'];
+                unset($data['success']);
             }
 
-            if (isset($data[ 'message' ])) {
-                $response[ 'message' ] = $data[ 'message' ];
-                unset($data[ 'message' ]);
+            if (isset($data['message'])) {
+                $response['message'] = $data['message'];
+                unset($data['message']);
             }
 
-            if (isset($data[ 'metadata' ])) {
-                $response[ 'metadata' ] = $data[ 'metadata' ];
-                unset($data[ 'metadata' ]);
+            if (isset($data['metadata'])) {
+                $response['metadata'] = $data['metadata'];
+                unset($data['metadata']);
             }
 
-            if (isset($data[ 'result' ])) {
-                $data = $data[ 'result' ];
+            if (isset($data['result'])) {
+                $data = $data['result'];
             }
 
-            if (isset($data[ 'data' ])) {
-                $data = $data[ 'data' ];
+            if (isset($data['data'])) {
+                $data = $data['data'];
             }
         } elseif (is_object($data)) {
             if (isset($data->status)) {
-                $response[ 'status' ] = $statusCode = $data->status;
+                $response['status'] = $statusCode = $data->status;
                 unset($data->status);
             }
 
             if (isset($data->reason)) {
-                $response[ 'reason' ] = $reasonPhrase = $data->reason;
+                $response['reason'] = $reasonPhrase = $data->reason;
                 unset($data->reason);
             }
 
             if (isset($data->success)) {
-                $response[ 'success' ] = $data->success;
+                $response['success'] = $data->success;
                 unset($data->success);
             }
 
             if (isset($data->message)) {
-                $response[ 'message' ] = $data->message;
+                $response['message'] = $data->message;
                 unset($data->message);
             }
 
@@ -388,16 +388,16 @@ 
 
         if (is_array($data)) {
             if (is_string(key($data))) {
-                $response[ 'result' ] = [$data];
+                $response['result'] = [$data];
             } elseif (is_numeric(key($data))) {
-                $response[ 'result' ] = $data;
+                $response['result'] = $data;
             }
         } else {
-            $response[ 'result' ] = $data;
+            $response['result'] = $data;
         }
 
         if (is_ajax()) {
-            $contentType = isset($_SERVER[ 'HTTP_X_REQUESTED_CONTENT_TYPE' ]) ? $_SERVER[ 'HTTP_X_REQUESTED_CONTENT_TYPE' ] : 'application/json';
+            $contentType = isset($_SERVER['HTTP_X_REQUESTED_CONTENT_TYPE']) ? $_SERVER['HTTP_X_REQUESTED_CONTENT_TYPE'] : 'application/json';
             $this->setContentType($contentType);
         }
 
@@ -410,12 +410,12 @@ 
             $this->arrayToXml($response, $xml);
 
             echo $xml->asXML();
-        } elseif(is_cli()) {
+        } elseif (is_cli()) {
             print_cli($response, true);
-        } elseif(is_array($response['result'])) {
+        } elseif (is_array($response['result'])) {
             print_r($response['result']);
         } else {
-            echo $response[ 'result' ];
+            echo $response['result'];
         }
     }
 
@@ -434,8 +434,8 @@ 
         foreach (headers_list() as $header) {
             $headerParts = explode(':', $header);
             $headerParts = array_map('trim', $headerParts);
-            $headers[ $headerParts[ 0 ] ] = $headerParts[ 1 ];
-            header_remove($header[ 0 ]);
+            $headers[$headerParts[0]] = $headerParts[1];
+            header_remove($header[0]);
         }
 
         if (count($headers)) {
@@ -561,21 +561,21 @@ 
         ];
 
         $this->statusCode = $code;
-        $this->reasonPhrase = $error[ 'title' ];
+        $this->reasonPhrase = $error['title'];
 
         if (is_string($vars)) {
             $vars = ['message' => $vars];
-        } elseif (is_array($vars) and empty($vars[ 'message' ])) {
-            $vars[ 'message' ] = $error[ 'message' ];
+        } elseif (is_array($vars) and empty($vars['message'])) {
+            $vars['message'] = $error['message'];
         }
 
-        if (isset($vars[ 'message' ])) {
-            $error[ 'message' ] = $vars[ 'message' ];
+        if (isset($vars['message'])) {
+            $error['message'] = $vars['message'];
         }
 
         if (is_ajax() or $this->mimeType !== 'text/html') {
             $this->statusCode = $code;
-            $this->reasonPhrase = $error[ 'title' ];
+            $this->reasonPhrase = $error['title'];
             $this->send($vars);
 
             exit(EXIT_ERROR);

src/Http/Input.php

Spacing +47 added lines, -47 removed lines

@@ -44,7 +44,7 @@ 
             return;
         }
 
-        if (isset($_REQUEST[ 'GLOBALS' ])) {
+        if (isset($_REQUEST['GLOBALS'])) {
             die('GLOBALS overwrite attempt detected');
         }
 
@@ -54,8 +54,8 @@ 
         $input = array_merge($_GET, $_POST, $_COOKIE, $_SERVER, $_ENV, $_FILES,
             isset($_SESSION) && is_array($_SESSION) ? $_SESSION : []);
         foreach ($input as $k => $v) {
-            if ( ! in_array($k, $no_unset) && isset($GLOBALS[ $k ])) {
-                unset($GLOBALS[ $k ]);
+            if ( ! in_array($k, $no_unset) && isset($GLOBALS[$k])) {
+                unset($GLOBALS[$k]);
             }
         }
 
@@ -68,51 +68,51 @@ 
         $_SERVER = array_merge($default_server_values, $_SERVER);
 
         // Fix for IIS when running with PHP ISAPI
-        if (empty($_SERVER[ 'REQUEST_URI' ]) || (PHP_SAPI != 'cgi-fcgi' && preg_match('/^Microsoft-IIS\//',
-                    $_SERVER[ 'SERVER_SOFTWARE' ]))) {
+        if (empty($_SERVER['REQUEST_URI']) || (PHP_SAPI != 'cgi-fcgi' && preg_match('/^Microsoft-IIS\//',
+                    $_SERVER['SERVER_SOFTWARE']))) {
 
-            if (isset($_SERVER[ 'HTTP_X_ORIGINAL_URL' ])) {
+            if (isset($_SERVER['HTTP_X_ORIGINAL_URL'])) {
                 // IIS Mod-Rewrite
-                $_SERVER[ 'REQUEST_URI' ] = $_SERVER[ 'HTTP_X_ORIGINAL_URL' ];
-            } elseif (isset($_SERVER[ 'HTTP_X_REWRITE_URL' ])) {
+                $_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_ORIGINAL_URL'];
+            } elseif (isset($_SERVER['HTTP_X_REWRITE_URL'])) {
                 // IIS Isapi_Rewrite
-                $_SERVER[ 'REQUEST_URI' ] = $_SERVER[ 'HTTP_X_REWRITE_URL' ];
+                $_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_REWRITE_URL'];
             } else {
                 // Use ORIG_PATH_INFO if there is no PATH_INFO
-                if ( ! isset($_SERVER[ 'PATH_INFO' ]) && isset($_SERVER[ 'ORIG_PATH_INFO' ])) {
-                    $_SERVER[ 'PATH_INFO' ] = $_SERVER[ 'ORIG_PATH_INFO' ];
+                if ( ! isset($_SERVER['PATH_INFO']) && isset($_SERVER['ORIG_PATH_INFO'])) {
+                    $_SERVER['PATH_INFO'] = $_SERVER['ORIG_PATH_INFO'];
                 }
 
                 // Some IIS + PHP configurations puts the script-name in the path-info (No need to append it twice)
-                if (isset($_SERVER[ 'PATH_INFO' ])) {
-                    if ($_SERVER[ 'PATH_INFO' ] == $_SERVER[ 'SCRIPT_NAME' ]) {
-                        $_SERVER[ 'REQUEST_URI' ] = $_SERVER[ 'PATH_INFO' ];
+                if (isset($_SERVER['PATH_INFO'])) {
+                    if ($_SERVER['PATH_INFO'] == $_SERVER['SCRIPT_NAME']) {
+                        $_SERVER['REQUEST_URI'] = $_SERVER['PATH_INFO'];
                     } else {
-                        $_SERVER[ 'REQUEST_URI' ] = $_SERVER[ 'SCRIPT_NAME' ] . $_SERVER[ 'PATH_INFO' ];
+                        $_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'] . $_SERVER['PATH_INFO'];
                     }
                 }
 
                 // Append the query string if it exists and isn't null
-                if ( ! empty($_SERVER[ 'QUERY_STRING' ])) {
-                    $_SERVER[ 'REQUEST_URI' ] .= '?' . $_SERVER[ 'QUERY_STRING' ];
+                if ( ! empty($_SERVER['QUERY_STRING'])) {
+                    $_SERVER['REQUEST_URI'] .= '?' . $_SERVER['QUERY_STRING'];
                 }
             }
         }
 
         // Fix for PHP as CGI hosts that set SCRIPT_FILENAME to something ending in php.cgi for all requests
-        if (isset($_SERVER[ 'SCRIPT_FILENAME' ]) && (strpos($_SERVER[ 'SCRIPT_FILENAME' ],
-                    'php.cgi') == strlen($_SERVER[ 'SCRIPT_FILENAME' ]) - 7)) {
-            $_SERVER[ 'SCRIPT_FILENAME' ] = $_SERVER[ 'PATH_TRANSLATED' ];
+        if (isset($_SERVER['SCRIPT_FILENAME']) && (strpos($_SERVER['SCRIPT_FILENAME'],
+                    'php.cgi') == strlen($_SERVER['SCRIPT_FILENAME']) - 7)) {
+            $_SERVER['SCRIPT_FILENAME'] = $_SERVER['PATH_TRANSLATED'];
         }
 
         // Fix for Dreamhost and other PHP as CGI hosts
-        if (strpos($_SERVER[ 'SCRIPT_NAME' ], 'php.cgi') !== false) {
-            unset($_SERVER[ 'PATH_INFO' ]);
+        if (strpos($_SERVER['SCRIPT_NAME'], 'php.cgi') !== false) {
+            unset($_SERVER['PATH_INFO']);
         }
 
         // Fix empty PHP_SELF
         if (empty($PHP_SELF)) {
-            $_SERVER[ 'PHP_SELF' ] = $PHP_SELF = preg_replace('/(\?.*)?$/', '', $_SERVER[ 'REQUEST_URI' ]);
+            $_SERVER['PHP_SELF'] = $PHP_SELF = preg_replace('/(\?.*)?$/', '', $_SERVER['REQUEST_URI']);
         }
     }
 
@@ -137,7 +137,7 @@ 
         // Use $_GET directly here, since filter_has_var only
         // checks the initial GET data, not anything that might
         // have been added since.
-        return isset($_GET[ $offset ])
+        return isset($_GET[$offset])
             ? $this->get($offset, $filter)
             : $this->post($offset, $filter);
     }
@@ -223,7 +223,7 @@ 
             $loopThrough = [];
 
             foreach ($offset as $key) {
-                $loopThrough[ $key ] = $this->filter($type, $key, $filter);
+                $loopThrough[$key] = $this->filter($type, $key, $filter);
             }
 
             if (empty($loopThrough)) {
@@ -237,38 +237,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:
@@ -327,13 +327,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;
             }
         }
 
@@ -382,7 +382,7 @@ 
         // Use $_POST directly here, since filter_has_var only
         // checks the initial POST data, not anything that might
         // have been added since.
-        return isset($_POST[ $offset ])
+        return isset($_POST[$offset])
             ? $this->post($offset, $filter)
             : $this->get($offset, $filter);
     }
@@ -405,8 +405,8 @@ 
         $uploadFiles = server_request()->getUploadedFiles();
 
         if (isset($offset)) {
-            if (isset($uploadFiles[ $offset ])) {
-                return $uploadFiles[ $offset ];
+            if (isset($uploadFiles[$offset])) {
+                return $uploadFiles[$offset];
             }
         }
 
@@ -632,6 +632,6 @@ 
      */
     final public function submit()
     {
-        return (bool)isset($_POST[ 'submit' ]);
+        return (bool)isset($_POST['submit']);
     }
 }
\ No newline at end of file

src/Services/Language.php

Spacing +4 added lines, -4 removed lines

@@ -106,7 +106,7 @@ 
 
             if (count($this->loaded)) {
                 foreach ($this->loaded as $fileIndex => $filePath) {
-                    unset($this->loaded[ $fileIndex ]);
+                    unset($this->loaded[$fileIndex]);
                     $this->loadFile($fileIndex);
                 }
             }
@@ -216,7 +216,7 @@ 
 
         if (is_array($lines)) {
             if (count($lines)) {
-                $this->loaded[ $this->getFileIndex($filePath) ] = $filePath;
+                $this->loaded[$this->getFileIndex($filePath)] = $filePath;
 
                 $this->lines = array_merge($this->lines, $lines);
 
@@ -346,9 +346,9 @@ 
         $lineOffset = strtoupper($line);
 
         if (empty($context)) {
-            $lineContent = isset($this->lines[ $lineOffset ]) ? $this->lines[ $lineOffset ] : $line;
+            $lineContent = isset($this->lines[$lineOffset]) ? $this->lines[$lineOffset] : $line;
         } else {
-            $line = isset($this->lines[ $lineOffset ]) ? $this->lines[ $lineOffset ] : $line;
+            $line = isset($this->lines[$lineOffset]) ? $this->lines[$lineOffset] : $line;
             array_unshift($context, $line);
 
             $lineContent = @call_user_func_array('sprintf', $context);

src/Kernel.php

Spacing +6 added lines, -6 removed lines

@@ -55,8 +55,8 @@ 
 
         $this->services = new Kernel\Containers\Services();
 
-        if (isset($_ENV[ 'DEBUG_STAGE' ]) and $_ENV[ 'DEBUG_STAGE' ] === 'DEVELOPER') {
-            if(class_exists('\O2System\Gear\Profiler')) {
+        if (isset($_ENV['DEBUG_STAGE']) and $_ENV['DEBUG_STAGE'] === 'DEVELOPER') {
+            if (class_exists('\O2System\Gear\Profiler')) {
                 $this->services->load(Gear\Profiler::class);
             }
 
@@ -150,14 +150,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/Abstracts/AbstractCommander.php

Spacing +11 added lines, -11 removed lines

@@ -103,17 +103,17 @@ 
         $this->commandName = implode('/', array_map('strtolower', explode('/', $className)));
 
         foreach ($this->commandOptions as $optionName => $optionConfig) {
-            $shortcut = empty($optionConfig[ 'shortcut' ])
+            $shortcut = empty($optionConfig['shortcut'])
                 ? '-' . substr($optionName, 0, 1)
-                : '-' . rtrim($optionConfig[ 'shortcut' ]);
+                : '-' . rtrim($optionConfig['shortcut']);
 
             if (array_key_exists($shortcut, $this->commandOptionsShortcuts)) {
                 $shortcut = '-' . substr($optionName, 0, 2);
             }
 
-            $this->commandOptions[ $optionName ][ 'shortcut' ] = $shortcut;
+            $this->commandOptions[$optionName]['shortcut'] = $shortcut;
 
-            $this->commandOptionsShortcuts[ $shortcut ] = $optionName;
+            $this->commandOptionsShortcuts[$shortcut] = $optionName;
         }
 
         if (array_key_exists('VERBOSE', $_ENV)) {
@@ -160,7 +160,7 @@ 
             ? '-' . substr($optionName, 0, 1)
             : '-' . rtrim($optionShortcut);
 
-        $this->commandOptions[ $optionName ] = [
+        $this->commandOptions[$optionName] = [
             'shortcut'    => $optionShortcut,
             'description' => $optionDescription,
         ];
@@ -220,7 +220,7 @@ 
                 foreach ($options as $method => $arguments) {
 
                     if (array_key_exists('-' . $method, $this->commandOptionsShortcuts)) {
-                        $method = $this->commandOptionsShortcuts[ '-' . $method ];
+                        $method = $this->commandOptionsShortcuts['-' . $method];
                     }
 
                     if ($command->hasMethod($commandMethodName = camelcase('option-' . $method))) {
@@ -233,7 +233,7 @@ 
                         if ($commandMethod->getNumberOfRequiredParameters() == 0) {
                             call_user_func([&$this, $commandMethodName]);
                         } elseif ($commandMethod->getNumberOfRequiredParameters() > 0 and empty($arguments)) {
-                            if (isset($this->commandOptions[ $method ][ 'help' ])) {
+                            if (isset($this->commandOptions[$method]['help'])) {
                                 output()->write(
                                     (new Format())
                                         ->setContextualClass(Format::INFO)
@@ -245,7 +245,7 @@ 
                                 output()->write(
                                     (new Format())
                                         ->setContextualClass(Format::INFO)
-                                        ->setString(language()->getLine($this->commandOptions[ $method ][ 'help' ]))
+                                        ->setString(language()->getLine($this->commandOptions[$method]['help']))
                                         ->setNewLinesAfter(2)
                                 );
                             }
@@ -359,8 +359,8 @@ 
             $table
                 ->addRow()
                 ->addColumn('--' . $optionCaller)
-                ->addColumn($optionProps[ 'shortcut' ])
-                ->addColumn(language()->getLine($optionProps[ 'description' ]));
+                ->addColumn($optionProps['shortcut'])
+                ->addColumn(language()->getLine($optionProps['description']));
         }
 
         output()->write(
@@ -410,7 +410,7 @@ 
      */
     public function addCommander(AbstractCommander $commander)
     {
-        $this->actionsPool[ $commander->getCommandName() ] = $commander;
+        $this->actionsPool[$commander->getCommandName()] = $commander;
     }
 
     // ------------------------------------------------------------------------

src/Http/Message/Uri/Segments.php

Spacing +31 added lines, -31 removed lines

@@ -56,8 +56,8 @@ 
                     break;
                 case 'PATH_INFO':
                 default:
-                    $segments = isset($_SERVER[ $protocol ])
-                        ? $_SERVER[ $protocol ]
+                    $segments = isset($_SERVER[$protocol])
+                        ? $_SERVER[$protocol]
                         : $this->parseRequestUri();
                     break;
             }
@@ -87,23 +87,23 @@ 
      */
     protected function parseRequestUri()
     {
-        if ( ! isset($_SERVER[ 'REQUEST_URI' ], $_SERVER[ 'SCRIPT_NAME' ])) {
+        if ( ! isset($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])) {
             return '';
         }
 
-        $uri = parse_url($_SERVER[ 'REQUEST_URI' ]);
-        $query = isset($uri[ 'query' ])
-            ? $uri[ 'query' ]
+        $uri = parse_url($_SERVER['REQUEST_URI']);
+        $query = isset($uri['query'])
+            ? $uri['query']
             : '';
-        $uri = isset($uri[ 'path' ])
-            ? $uri[ 'path' ]
+        $uri = isset($uri['path'])
+            ? $uri['path']
             : '';
 
-        if (isset($_SERVER[ 'SCRIPT_NAME' ][ 0 ])) {
-            if (strpos($uri, $_SERVER[ 'SCRIPT_NAME' ]) === 0) {
-                $uri = (string)substr($uri, strlen($_SERVER[ 'SCRIPT_NAME' ]));
-            } elseif (strpos($uri, dirname($_SERVER[ 'SCRIPT_NAME' ])) === 0) {
-                $uri = (string)substr($uri, strlen(dirname($_SERVER[ 'SCRIPT_NAME' ])));
+        if (isset($_SERVER['SCRIPT_NAME'][0])) {
+            if (strpos($uri, $_SERVER['SCRIPT_NAME']) === 0) {
+                $uri = (string)substr($uri, strlen($_SERVER['SCRIPT_NAME']));
+            } elseif (strpos($uri, dirname($_SERVER['SCRIPT_NAME'])) === 0) {
+                $uri = (string)substr($uri, strlen(dirname($_SERVER['SCRIPT_NAME'])));
             }
         }
 
@@ -111,26 +111,26 @@ 
         // URI is found, and also fixes the QUERY_STRING server var and $_GET array.
         if (trim($uri, '/') === '' AND strncmp($query, '/', 1) === 0) {
             $query = explode('?', $query, 2);
-            $uri = $query[ 0 ];
+            $uri = $query[0];
 
-            $_SERVER[ 'QUERY_STRING' ] = isset($query[ 1 ])
-                ? $query[ 1 ]
+            $_SERVER['QUERY_STRING'] = isset($query[1])
+                ? $query[1]
                 : '';
         } else {
-            $_SERVER[ 'QUERY_STRING' ] = $query;
+            $_SERVER['QUERY_STRING'] = $query;
         }
 
-        if (isset($_GET[ 'SEGMENTS_STRING' ])) {
-            $uri = $_GET[ 'SEGMENTS_STRING' ];
-            unset($_GET[ 'SEGMENTS_STRING' ]);
+        if (isset($_GET['SEGMENTS_STRING'])) {
+            $uri = $_GET['SEGMENTS_STRING'];
+            unset($_GET['SEGMENTS_STRING']);
 
-            $_SERVER[ 'QUERY_STRING' ] = str_replace([
+            $_SERVER['QUERY_STRING'] = str_replace([
                 'SEGMENTS_STRING=' . $uri . '&',
                 'SEGMENTS_STRING=' . $uri,
-            ], '', $_SERVER[ 'QUERY_STRING' ]);
+            ], '', $_SERVER['QUERY_STRING']);
         }
 
-        parse_str($_SERVER[ 'QUERY_STRING' ], $_GET);
+        parse_str($_SERVER['QUERY_STRING'], $_GET);
 
         if ($uri === '/' || $uri === '') {
             return '/';
@@ -153,21 +153,21 @@ 
      */
     protected function parseQueryString()
     {
-        $uri = isset($_SERVER[ 'QUERY_STRING' ])
-            ? $_SERVER[ 'QUERY_STRING' ]
+        $uri = isset($_SERVER['QUERY_STRING'])
+            ? $_SERVER['QUERY_STRING']
             : @getenv('QUERY_STRING');
 
         if (trim($uri, '/') === '') {
             return '';
         } elseif (strncmp($uri, '/', 1) === 0) {
             $uri = explode('?', $uri, 2);
-            $_SERVER[ 'QUERY_STRING' ] = isset($uri[ 1 ])
-                ? $uri[ 1 ]
+            $_SERVER['QUERY_STRING'] = isset($uri[1])
+                ? $uri[1]
                 : '';
-            $uri = rawurldecode($uri[ 0 ]);
+            $uri = rawurldecode($uri[0]);
         }
 
-        parse_str($_SERVER[ 'QUERY_STRING' ], $_GET);
+        parse_str($_SERVER['QUERY_STRING'], $_GET);
 
         return $uri;
     }
@@ -252,7 +252,7 @@ 
      */
     public function getPart($index)
     {
-        if($this->offsetExists($index)) {
+        if ($this->offsetExists($index)) {
             return $this->offsetGet($index);
         }
 
@@ -295,7 +295,7 @@ 
             $validSegments = array_filter($validSegments);
             array_unshift($validSegments, null);
 
-            unset($validSegments[ 0 ]);
+            unset($validSegments[0]);
 
             $this->merge($validSegments);
         }

src/Cli/Router.php

Spacing +16 added lines, -16 removed lines

@@ -63,9 +63,9 @@ 
      */
     public function handle()
     {
-        $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,24 +111,24 @@ 
                 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;
         }
 
-        if( $this->parseCommands($this->commands) === false ){
+        if ($this->parseCommands($this->commands) === false) {
             output()->sendError(404);
         }
     }
@@ -213,17 +213,17 @@ 
         loader()->addNamespace($commander->getNamespaceName(), $commander->getFileInfo()->getPath());
 
         $commanderMethod = 'execute';
-        if(count($commands)) {
+        if (count($commands)) {
             $commanderMethod = camelcase(reset($commands));
         }
 
-        if($commander->hasMethod('route')) {
+        if ($commander->hasMethod('route')) {
             $commander
                 ->setRequestMethod('route')
                 ->setRequestMethodArgs([$commanderMethod]);
-        } elseif($commander->hasMethod($commanderMethod)) {
+        } elseif ($commander->hasMethod($commanderMethod)) {
             $commander->setRequestMethod($commanderMethod);
-        } elseif($commander->hasMethod('execute')) {
+        } elseif ($commander->hasMethod('execute')) {
             $commander->setRequestMethod('execute');
         }
 

src/Http/Message/Request.php

Spacing +13 added lines, -13 removed lines

@@ -68,7 +68,7 @@ 
      */
     public function __get($property)
     {
-        if(property_exists($this, $property)) {
+        if (property_exists($this, $property)) {
             return $this->{$property};
         }
 
@@ -128,8 +128,8 @@ 
      */
     public function isAjax()
     {
-        return ( ! empty($_SERVER[ 'HTTP_X_REQUESTED_WITH' ]) &&
-            strtolower($_SERVER[ 'HTTP_X_REQUESTED_WITH' ]) === 'xmlhttprequest');
+        return ( ! empty($_SERVER['HTTP_X_REQUESTED_WITH']) &&
+            strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) === 'xmlhttprequest');
     }
 
     //--------------------------------------------------------------------
@@ -144,12 +144,12 @@ 
      */
     public function isSecure()
     {
-        if ( ! empty($_SERVER[ 'HTTPS' ]) && strtolower($_SERVER[ 'HTTPS' ]) !== 'off') {
+        if ( ! empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off') {
             return true;
-        } elseif (isset($_SERVER[ 'HTTP_X_FORWARDED_PROTO' ]) && $_SERVER[ 'HTTP_X_FORWARDED_PROTO' ] === 'https') {
+        } elseif (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https') {
             return true;
-        } elseif ( ! empty($_SERVER[ 'HTTP_FRONT_END_HTTPS' ]) && strtolower(
-                $_SERVER[ 'HTTP_FRONT_END_HTTPS' ]
+        } elseif ( ! empty($_SERVER['HTTP_FRONT_END_HTTPS']) && strtolower(
+                $_SERVER['HTTP_FRONT_END_HTTPS']
             ) !== 'off'
         ) {
             return true;
@@ -170,8 +170,8 @@ 
     public function getTime($format = null)
     {
         return isset($format)
-            ? date($format, $_SERVER[ 'REQUEST_TIME' ])
-            : $_SERVER[ 'REQUEST_TIME' ];
+            ? date($format, $_SERVER['REQUEST_TIME'])
+            : $_SERVER['REQUEST_TIME'];
     }
 
     //--------------------------------------------------------------------
@@ -253,12 +253,12 @@ 
 
         $uri = $this->uri;
 
-        if (isset($parseTarget[ 'path' ])) {
-            $uri = $this->uri->withPath($parseTarget[ 'path' ]);
+        if (isset($parseTarget['path'])) {
+            $uri = $this->uri->withPath($parseTarget['path']);
         }
 
-        if (isset($parseTarget[ 'query' ])) {
-            $uri = $this->uri->withPath($parseTarget[ 'query' ]);
+        if (isset($parseTarget['query'])) {
+            $uri = $this->uri->withPath($parseTarget['query']);
         }
 
         $this->uri = $uri;

src/Http/Router.php

Spacing +6 added lines, -6 removed lines

@@ -102,7 +102,7 @@ 
             $this->handleExtensionRequest();
         } else {
             $uriPath = urldecode(
-                parse_url($_SERVER[ 'REQUEST_URI' ], PHP_URL_PATH)
+                parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)
             );
 
             $uriPathParts = explode('public/', $uriPath);
@@ -273,8 +273,8 @@ 
                 );
             } elseif (preg_match("/([a-zA-Z0-9\\\]+)(@)([a-zA-Z0-9\\\]+)/", $closure, $matches)) {
                 $this->setController(
-                    (new Router\DataStructures\Controller($matches[ 1 ]))
-                        ->setRequestMethod($matches[ 3 ]),
+                    (new Router\DataStructures\Controller($matches[1]))
+                        ->setRequestMethod($matches[3]),
                     $uriSegments
                 );
             } elseif (is_string($closure) && $closure !== '') {
@@ -363,10 +363,10 @@ 
                         $parameters = $controllerMethodParams;
                     } else {
                         foreach ($method->getParameters() as $index => $parameter) {
-                            if (isset($uriSegments[ $parameter->name ])) {
-                                $parameters[ $index ] = $controllerMethodParams[ $parameter->name ];
+                            if (isset($uriSegments[$parameter->name])) {
+                                $parameters[$index] = $controllerMethodParams[$parameter->name];
                             } else {
-                                $parameters[ $index ] = null;
+                                $parameters[$index] = null;
                             }
                         }
                     }