o2system / kernel

src/Http/Message/Request.php

Spacing +12 added lines, -12 removed lines

@@ -85,8 +85,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');
     }
 
     //--------------------------------------------------------------------
@@ -99,12 +99,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;
@@ -125,8 +125,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'];
     }
 
     //--------------------------------------------------------------------
@@ -208,12 +208,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/Helpers/Common.php

Spacing +35 added lines, -35 removed lines

@@ -25,11 +25,11 @@ 
         static $_is_php;
         $version = (string)$version;
 
-        if ( ! isset($_is_php[ $version ])) {
-            $_is_php[ $version ] = version_compare(PHP_VERSION, $version, '>=');
+        if ( ! isset($_is_php[$version])) {
+            $_is_php[$version] = version_compare(PHP_VERSION, $version, '>=');
         }
 
-        return $_is_php[ $version ];
+        return $_is_php[$version];
     }
 }
 
@@ -131,12 +131,12 @@ 
      */
     function is_https()
     {
-        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;
@@ -174,8 +174,8 @@ 
      */
     function is_ajax()
     {
-        return ( ! empty($_SERVER[ 'HTTP_X_REQUESTED_WITH' ]) && strtolower(
-                $_SERVER[ 'HTTP_X_REQUESTED_WITH' ]
+        return ( ! empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower(
+                $_SERVER['HTTP_X_REQUESTED_WITH']
             ) === 'xmlhttprequest');
     }
 }
@@ -201,11 +201,11 @@ 
         // every control character except newline (dec 10),
         // carriage return (dec 13) and horizontal tab (dec 09)
         if ($url_encoded) {
-            $non_displayables[] = '/%0[0-8bcef]/';    // url encoded 00-08, 11, 12, 14, 15
-            $non_displayables[] = '/%1[0-9a-f]/';    // url encoded 16-31
+            $non_displayables[] = '/%0[0-8bcef]/'; // url encoded 00-08, 11, 12, 14, 15
+            $non_displayables[] = '/%1[0-9a-f]/'; // url encoded 16-31
         }
 
-        $non_displayables[] = '/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]+/S';    // 00-08, 11, 12, 14-31, 127
+        $non_displayables[] = '/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]+/S'; // 00-08, 11, 12, 14-31, 127
 
         do {
             $str = preg_replace($non_displayables, '', $str, -1, $count);
@@ -286,11 +286,11 @@ 
                 $matches_regex = explode('_', $header_key);
                 if (count($matches_regex) > 0 and strlen($header_key) > 2) {
                     foreach ($matches_regex as $match_key => $match_value) {
-                        $matches_regex[ $match_key ] = ucfirst($match_value);
+                        $matches_regex[$match_key] = ucfirst($match_value);
                     }
                     $header_key = implode('-', $matches_regex);
                 }
-                $headers[ $header_key ] = $server_value;
+                $headers[$header_key] = $server_value;
             }
         }
 
@@ -310,8 +310,8 @@ 
     function path_to_url($path)
     {
         $path = str_replace(['/', '\\'], DIRECTORY_SEPARATOR, $path);
-        $root_dir = str_replace(['/', '\\'], DIRECTORY_SEPARATOR, $_SERVER[ 'DOCUMENT_ROOT' ]);
-        $base_dir = str_replace(['/', '\\'], DIRECTORY_SEPARATOR, dirname($_SERVER[ 'SCRIPT_FILENAME' ]));
+        $root_dir = str_replace(['/', '\\'], DIRECTORY_SEPARATOR, $_SERVER['DOCUMENT_ROOT']);
+        $base_dir = str_replace(['/', '\\'], DIRECTORY_SEPARATOR, dirname($_SERVER['SCRIPT_FILENAME']));
 
         $root_dir = rtrim($root_dir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
         $base_dir = rtrim($base_dir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
@@ -326,15 +326,15 @@ 
 
         $base_url = is_https() ? 'https' : 'http';
 
-        if (isset($_SERVER[ 'HTTP_HOST' ])) {
-            $base_url .= '://' . $_SERVER[ 'HTTP_HOST' ];
-        } elseif (isset($_SERVER[ 'SERVER_NAME' ])) {
+        if (isset($_SERVER['HTTP_HOST'])) {
+            $base_url .= '://' . $_SERVER['HTTP_HOST'];
+        } elseif (isset($_SERVER['SERVER_NAME'])) {
 
             // Add server name
-            $base_url .= '://' . $_SERVER[ 'SERVER_NAME' ];
+            $base_url .= '://' . $_SERVER['SERVER_NAME'];
 
             // Add server port if needed
-            $base_url .= $_SERVER[ 'SERVER_PORT' ] !== '80' ? ':' . $_SERVER[ 'SERVER_PORT' ] : '';
+            $base_url .= $_SERVER['SERVER_PORT'] !== '80' ? ':' . $_SERVER['SERVER_PORT'] : '';
         }
 
         // Add base path
@@ -417,7 +417,7 @@ 
         $segments = explode('\\', $class);
 
         if (count($segments) > 1) {
-            if ($segments[ 0 ] === $segments[ 1 ]) {
+            if ($segments[0] === $segments[1]) {
                 array_shift($segments);
             }
         }
@@ -490,27 +490,27 @@ 
         foreach (explode("\n", $raw_headers) as $i => $h) {
             $h = explode(':', $h, 2);
 
-            if (isset($h[ 1 ])) {
-                if ( ! isset($headers[ $h[ 0 ] ])) {
-                    $headers[ $h[ 0 ] ] = trim($h[ 1 ]);
-                } elseif (is_array($headers[ $h[ 0 ] ])) {
-                    $headers[ $h[ 0 ] ] = array_merge($headers[ $h[ 0 ] ], [trim($h[ 1 ])]); // [+]
+            if (isset($h[1])) {
+                if ( ! isset($headers[$h[0]])) {
+                    $headers[$h[0]] = trim($h[1]);
+                } elseif (is_array($headers[$h[0]])) {
+                    $headers[$h[0]] = array_merge($headers[$h[0]], [trim($h[1])]); // [+]
                 } else {
-                    $headers[ $h[ 0 ] ] = array_merge([$headers[ $h[ 0 ] ]], [trim($h[ 1 ])]); // [+]
+                    $headers[$h[0]] = array_merge([$headers[$h[0]]], [trim($h[1])]); // [+]
                 }
 
-                $key = $h[ 0 ]; // [+]
+                $key = $h[0]; // [+]
             } else // [+]
             { // [+]
-                if (substr($h[ 0 ], 0, 1) == "\t") // [+]
+                if (substr($h[0], 0, 1) == "\t") // [+]
                 {
-                    $headers[ $key ] .= "\r\n\t" . trim($h[ 0 ]);
+                    $headers[$key] .= "\r\n\t" . trim($h[0]);
                 } // [+]
                 elseif ( ! $key) // [+]
                 {
-                    $headers[ 0 ] = trim($h[ 0 ]);
+                    $headers[0] = trim($h[0]);
                 }
-                trim($h[ 0 ]); // [+]
+                trim($h[0]); // [+]
             } // [+]
         }
 
@@ -728,8 +728,8 @@ 
 
         $string = null;
 
-        if (isset($errors[ $code ])) {
-            $string = $errors[ $code ];
+        if (isset($errors[$code])) {
+            $string = $errors[$code];
         }
 
         return strtoupper($string);

src/Helpers/Kernel.php

Spacing +6 added lines, -6 removed lines

@@ -46,12 +46,12 @@ 
         $args = func_get_args();
 
         if (count($args)) {
-            if (kernel()->services->has($args[ 0 ])) {
-                if (isset($args[ 1 ]) and is_array($args[ 1 ])) {
-                    return kernel()->services->get($args[ 0 ], $args[ 1 ]);
+            if (kernel()->services->has($args[0])) {
+                if (isset($args[1]) and is_array($args[1])) {
+                    return kernel()->services->get($args[0], $args[1]);
                 }
 
-                return kernel()->services->get($args[ 0 ]);
+                return kernel()->services->get($args[0]);
             }
 
             return false;
@@ -97,7 +97,7 @@ 
 
         if (count($args)) {
             if (services()->has('language')) {
-                $language =& services()->get('language');
+                $language = & services()->get('language');
 
                 return call_user_func_array([&$language, 'getLine'], $args);
             }
@@ -125,7 +125,7 @@ 
 
         if (count($args)) {
             if (services()->has('logger')) {
-                $logger =& services('logger');
+                $logger = & services('logger');
 
                 return call_user_func_array([&$logger, 'log'], $args);
             }

src/Services/Language.php

Spacing +4 added lines, -4 removed lines

@@ -106,7 +106,7 @@ 
 
             if (count($this->isLoaded)) {
                 foreach ($this->isLoaded as $fileIndex => $filePath) {
-                    unset($this->isLoaded[ $fileIndex ]);
+                    unset($this->isLoaded[$fileIndex]);
                     $this->loadFile($fileIndex);
                 }
             }
@@ -216,7 +216,7 @@ 
 
         if (is_array($lines)) {
             if (count($lines)) {
-                $this->isLoaded[ $this->getFileIndex($filePath) ] = $filePath;
+                $this->isLoaded[$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/Http/Abstracts/AbstractTransport.php

Spacing +3 added lines, -3 removed lines

@@ -52,11 +52,11 @@ 
      */
     public function getOption($name, $default = null)
     {
-        if ( ! isset($this->options[ $name ])) {
+        if ( ! isset($this->options[$name])) {
             return $default;
         }
 
-        return $this->options[ $name ];
+        return $this->options[$name];
     }
 
     // ------------------------------------------------------------------------
@@ -73,7 +73,7 @@ 
      */
     public function setOption($name, $value)
     {
-        $this->options[ $name ] = $value;
+        $this->options[$name] = $value;
 
         return $this;
     }

src/Http/Input.php

Indentation +7 added lines, -7 removed lines

@@ -432,13 +432,13 @@
         }
 
         foreach ([
-                     'HTTP_CLIENT_IP',
-                     'HTTP_FORWARDED',
-                     'HTTP_X_FORWARDED_FOR',
-                     'HTTP_X_CLIENT_IP',
-                     'HTTP_X_CLUSTER_CLIENT_IP',
-                     'REMOTE_ADDR',
-                 ] as $header
+                        'HTTP_CLIENT_IP',
+                        'HTTP_FORWARDED',
+                        'HTTP_X_FORWARDED_FOR',
+                        'HTTP_X_CLIENT_IP',
+                        'HTTP_X_CLUSTER_CLIENT_IP',
+                        'REMOTE_ADDR',
+                    ] as $header
         ) {
             if (null !== ($ipAddress = $this->server($header))) {
                 if (filter_var($ipAddress, FILTER_VALIDATE_IP)) {

Spacing +24 added lines, -24 removed lines

@@ -53,7 +53,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);
     }
@@ -139,7 +139,7 @@ 
             $loopThrough = [];
 
             foreach ($offset as $key) {
-                $loopThrough[ $key ] = $this->filter($type, $key, $filter);
+                $loopThrough[$key] = $this->filter($type, $key, $filter);
             }
 
             if (empty($loopThrough)) {
@@ -153,38 +153,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:
@@ -243,13 +243,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;
             }
         }
 
@@ -298,7 +298,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);
     }
@@ -321,8 +321,8 @@ 
         $uploadFiles = server_request()->getUploadedFiles();
 
         if (isset($offset)) {
-            if (isset($uploadFiles[ $offset ])) {
-                return $uploadFiles[ $offset ];
+            if (isset($uploadFiles[$offset])) {
+                return $uploadFiles[$offset];
             }
         }
 
@@ -548,6 +548,6 @@ 
      */
     final public function submit()
     {
-        return (bool)isset($_POST[ 'submit' ]);
+        return (bool)isset($_POST['submit']);
     }
 }
\ No newline at end of file

src/Http/Router.php

Spacing +6 added lines, -6 removed lines

@@ -113,7 +113,7 @@ 
             }
         } else {
             $uriPath = urldecode(
-                parse_url($_SERVER[ 'REQUEST_URI' ], PHP_URL_PATH)
+                parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)
             );
 
             $uriPathParts = explode('public/', $uriPath);
@@ -227,8 +227,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 !== '') {
@@ -317,10 +317,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;
                             }
                         }
                     }

src/Http/Message/Uri/Path.php

Spacing +27 added lines, -27 removed lines

@@ -64,8 +64,8 @@ 
                 break;
             case 'PATH_INFO':
             default:
-                $this->string = isset($_SERVER[ $protocol ])
-                    ? $_SERVER[ $protocol ]
+                $this->string = isset($_SERVER[$protocol])
+                    ? $_SERVER[$protocol]
                     : $this->parseRequestUri();
                 break;
         }
@@ -90,23 +90,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'])));
             }
         }
 
@@ -114,16 +114,16 @@ 
         // 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;
         }
 
-        parse_str($_SERVER[ 'QUERY_STRING' ], $_GET);
+        parse_str($_SERVER['QUERY_STRING'], $_GET);
 
         if ($uri === '/' || $uri === '') {
             return '/';
@@ -184,21 +184,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 $this->removeRelativeDirectory($uri);
     }
@@ -234,7 +234,7 @@ 
         $validSegments = array_filter($validSegments);
         array_unshift($validSegments, null);
 
-        unset($validSegments[ 0 ]);
+        unset($validSegments[0]);
 
         $this->segments = $validSegments;
         $this->string = implode('/', $this->segments);
@@ -273,8 +273,8 @@ 
 
         // Convert programatic characters to entities and return
         return str_replace(
-            ['$', '(', ')', '%28', '%29', $config->offsetGet('suffix')],    // Bad
-            ['$', '(', ')', '(', ')', ''],    // Good
+            ['$', '(', ')', '%28', '%29', $config->offsetGet('suffix')], // Bad
+            ['$', '(', ')', '(', ')', ''], // Good
             $segment
         );
     }

src/Http/Message/Uri/Domain.php

Spacing +26 added lines, -26 removed lines

@@ -94,15 +94,15 @@ 
      */
     public function __construct($string = null)
     {
-        $this->origin = isset($_SERVER[ 'HTTP_HOST' ])
-            ? $_SERVER[ 'HTTP_HOST' ]
-            : $_SERVER[ 'SERVER_NAME' ];
+        $this->origin = isset($_SERVER['HTTP_HOST'])
+            ? $_SERVER['HTTP_HOST']
+            : $_SERVER['SERVER_NAME'];
         $this->scheme = is_https()
             ? 'https'
             : 'http';
 
-        $paths = explode('.php', $_SERVER[ 'PHP_SELF' ]);
-        $paths = explode('/', trim($paths[ 0 ], '/'));
+        $paths = explode('.php', $_SERVER['PHP_SELF']);
+        $paths = explode('/', trim($paths[0], '/'));
         array_pop($paths);
 
         $this->path = empty($paths)
@@ -112,26 +112,26 @@ 
         if (isset($string)) {
             $this->string = trim($string, '/');
             $metadata = parse_url($string);
-            $metadata[ 'path' ] = empty($metadata[ 'path' ])
+            $metadata['path'] = empty($metadata['path'])
                 ? null
-                : $metadata[ 'path' ];
+                : $metadata['path'];
 
-            $this->scheme = empty($metadata[ 'scheme' ])
+            $this->scheme = empty($metadata['scheme'])
                 ? $this->scheme
-                : $metadata[ 'scheme' ];
+                : $metadata['scheme'];
 
-            if ($metadata[ 'path' ] === $this->string) {
+            if ($metadata['path'] === $this->string) {
                 $paths = explode('/', $this->string);
-                $this->origin = $paths[ 0 ];
+                $this->origin = $paths[0];
 
                 $this->path = implode('/', array_slice($paths, 1));
-            } elseif (isset($metadata[ 'host' ])) {
-                $this->path = trim($metadata[ 'path' ]);
-                $this->origin = $metadata[ 'host' ];
+            } elseif (isset($metadata['host'])) {
+                $this->path = trim($metadata['path']);
+                $this->origin = $metadata['host'];
             }
         }
 
-        $directories = explode('/', str_replace('\\', '/', dirname($_SERVER[ 'SCRIPT_FILENAME' ])));
+        $directories = explode('/', str_replace('\\', '/', dirname($_SERVER['SCRIPT_FILENAME'])));
         $paths = explode('/', $this->path);
         $paths = array_intersect($paths, $directories);
 
@@ -143,7 +143,7 @@ 
         }
 
         if (preg_match('/(:)([0-9]+)/', $this->string, $matches)) {
-            $this->port = $matches[ 2 ];
+            $this->port = $matches[2];
         }
 
         if (filter_var($this->origin, FILTER_VALIDATE_IP) !== false) {
@@ -194,12 +194,12 @@ 
             if ((($ordinalNumber % 100) >= 11) && (($ordinalNumber % 100) <= 13)) {
                 $ordinalKey = $ordinalNumber . 'th';
             } else {
-                $ordinalKey = $ordinalNumber . $ordinalEnds[ $ordinalNumber % 10 ];
+                $ordinalKey = $ordinalNumber . $ordinalEnds[$ordinalNumber % 10];
             }
 
-            $this->subDomains[ $ordinalKey ] = $subdomain;
+            $this->subDomains[$ordinalKey] = $subdomain;
 
-            unset($this->subDomains[ $key ]);
+            unset($this->subDomains[$key]);
         }
 
         foreach ($this->tlds as $key => $tld) {
@@ -208,12 +208,12 @@ 
             if ((($ordinalNumber % 100) >= 11) && (($ordinalNumber % 100) <= 13)) {
                 $ordinalKey = $ordinalNumber . 'th';
             } else {
-                $ordinalKey = $ordinalNumber . $ordinalEnds[ $ordinalNumber % 10 ];
+                $ordinalKey = $ordinalNumber . $ordinalEnds[$ordinalNumber % 10];
             }
 
-            $this->tlds[ $ordinalKey ] = $tld;
+            $this->tlds[$ordinalKey] = $tld;
 
-            unset($this->tlds[ $key ]);
+            unset($this->tlds[$key]);
         }
     }
 
@@ -312,8 +312,8 @@ 
      */
     public function getSubDomain($level = '3rd')
     {
-        if (isset($this->subDomains[ $level ])) {
-            return $this->subDomains[ $level ];
+        if (isset($this->subDomains[$level])) {
+            return $this->subDomains[$level];
         }
 
         return false;
@@ -356,8 +356,8 @@ 
     {
         if (is_null($level)) {
             return implode('.', $this->tlds);
-        } elseif (isset($this->tlds[ $level ])) {
-            return $this->tlds[ $level ];
+        } elseif (isset($this->tlds[$level])) {
+            return $this->tlds[$level];
         }
 
         return false;