o2system / kernel

src/DataStructures/Config.php

Spacing +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
                     $newValue = [];
 
                     foreach ($value as $key => $val) {
-                        $newValue[ camelcase($key) ] = $val;
+                        $newValue[camelcase($key)] = $val;
                     }
 
                     parent::offsetSet(camelcase($offset), new self($newValue));

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;

src/Http/Message/ServerRequest.php

Spacing +33 added lines, -33 removed lines

@@ -70,8 +70,8 @@ 
             $this->headers = apache_request_headers();
         }
 
-        $this->headers[ 'Content-Type' ] = isset($_SERVER[ 'CONTENT_TYPE' ])
-            ? $_SERVER[ 'CONTENT_TYPE' ]
+        $this->headers['Content-Type'] = isset($_SERVER['CONTENT_TYPE'])
+            ? $_SERVER['CONTENT_TYPE']
             : @getenv(
                 'CONTENT_TYPE'
             );
@@ -79,7 +79,7 @@ 
         foreach ($_SERVER as $key => $val) {
             if (strpos($key, 'SERVER') !== false) {
                 $key = str_replace('SERVER_', '', $key);
-                $this->serverParams[ $key ] = $val;
+                $this->serverParams[$key] = $val;
             }
 
             if (sscanf($key, 'HTTP_%s', $header) === 1) {
@@ -87,7 +87,7 @@ 
                 $header = str_replace('_', ' ', strtolower($header));
                 $header = str_replace(' ', '-', ucwords($header));
 
-                $this->headers[ $header ] = $_SERVER[ $key ];
+                $this->headers[$header] = $_SERVER[$key];
             }
         }
 
@@ -101,25 +101,25 @@ 
 
         if (count($_FILES)) {
             foreach ($_FILES as $key => $value) {
-                if (is_array($value[ 'name' ])) {
-                    for ($i = 0; $i < count($value[ 'name' ]); $i++) {
-                        if ( ! is_array($value[ 'name' ])) {
-                            $uploadedFiles[ $key ][ $i ] = $value;
+                if (is_array($value['name'])) {
+                    for ($i = 0; $i < count($value['name']); $i++) {
+                        if ( ! is_array($value['name'])) {
+                            $uploadedFiles[$key][$i] = $value;
                             break;
                         }
 
-                        $uploadedFiles[ $key ][ $i ][ 'name' ] = $value[ 'name' ][ $i ];
-                        $uploadedFiles[ $key ][ $i ][ 'type' ] = $value[ 'type' ][ $i ];
-                        $uploadedFiles[ $key ][ $i ][ 'tmp_name' ] = $value[ 'tmp_name' ][ $i ];
-                        $uploadedFiles[ $key ][ $i ][ 'error' ] = $value[ 'error' ][ $i ];
-                        $uploadedFiles[ $key ][ $i ][ 'size' ] = $value[ 'size' ][ $i ];
+                        $uploadedFiles[$key][$i]['name'] = $value['name'][$i];
+                        $uploadedFiles[$key][$i]['type'] = $value['type'][$i];
+                        $uploadedFiles[$key][$i]['tmp_name'] = $value['tmp_name'][$i];
+                        $uploadedFiles[$key][$i]['error'] = $value['error'][$i];
+                        $uploadedFiles[$key][$i]['size'] = $value['size'][$i];
                     }
                 } else {
-                    $uploadedFiles[ $key ][ 'name' ] = $value[ 'name' ];
-                    $uploadedFiles[ $key ][ 'type' ] = $value[ 'type' ];
-                    $uploadedFiles[ $key ][ 'tmp_name' ] = $value[ 'tmp_name' ];
-                    $uploadedFiles[ $key ][ 'error' ] = $value[ 'error' ];
-                    $uploadedFiles[ $key ][ 'size' ] = $value[ 'size' ];
+                    $uploadedFiles[$key]['name'] = $value['name'];
+                    $uploadedFiles[$key]['type'] = $value['type'];
+                    $uploadedFiles[$key]['tmp_name'] = $value['tmp_name'];
+                    $uploadedFiles[$key]['error'] = $value['error'];
+                    $uploadedFiles[$key]['size'] = $value['size'];
                 }
             }
         }
@@ -191,7 +191,7 @@ 
         $message = clone $this;
 
         foreach ($cookies as $key => $value) {
-            $message->cookieParams[ $key ] = $value;
+            $message->cookieParams[$key] = $value;
         }
 
         return $message;
@@ -275,14 +275,14 @@ 
     {
         $response = [];
         foreach ($this->uploadedFiles as $key => $uploadedFile) {
-            if (empty($uploadedFile[ 'name' ])) {
+            if (empty($uploadedFile['name'])) {
                 continue;
             } elseif (is_numeric(key($uploadedFile))) {
                 foreach ($uploadedFile as $index => $file) {
-                    $response[ $key ][ $index ] = new UploadFile($file);
+                    $response[$key][$index] = new UploadFile($file);
                 }
             } else {
-                $response[ $key ] = new UploadFile($uploadedFile);
+                $response[$key] = new UploadFile($uploadedFile);
             }
         }
 
@@ -342,9 +342,9 @@ 
      */
     public function getParsedBody()
     {
-        if (isset($this->headers[ 'Content-Type' ])) {
+        if (isset($this->headers['Content-Type'])) {
             if (in_array(
-                strtolower($this->headers[ 'Content-Type' ]),
+                strtolower($this->headers['Content-Type']),
                 [
                     'application/x-www-form-urlencoded',
                     'multipart/form-data',
@@ -449,10 +449,10 @@ 
         $name = str_replace('SERVER_', '', $name);
         $name = strtoupper($name);
 
-        if (isset($this->serverParams[ $name ])) {
-            return $this->serverParams[ $name ];
-        } elseif (isset($_SERVER[ $name ])) {
-            return $_SERVER[ $name ];
+        if (isset($this->serverParams[$name])) {
+            return $this->serverParams[$name];
+        } elseif (isset($_SERVER[$name])) {
+            return $_SERVER[$name];
         }
 
         return $default;
@@ -485,10 +485,10 @@ 
         $name = strtoupper($name);
 
         $message = clone $this;
-        $message->serverParams[ $name ] = $value;
+        $message->serverParams[$name] = $value;
 
-        if (empty($_SERVER[ 'SERVER_' . $name ])) {
-            $_SERVER[ 'SERVER_' . $name ] = $value;
+        if (empty($_SERVER['SERVER_' . $name])) {
+            $_SERVER['SERVER_' . $name] = $value;
         }
 
         return $message;
@@ -521,8 +521,8 @@ 
 
         $message = clone $this;
 
-        if (isset($this->serverParams[ $name ])) {
-            unset($this->serverParams[ $name ]);
+        if (isset($this->serverParams[$name])) {
+            unset($this->serverParams[$name]);
         }
 
         return $message;

src/Http/Message/Uri.php

Spacing +30 added lines, -30 removed lines

@@ -164,9 +164,9 @@ 
             $httpStringRequest = trim($httpStringRequest, '/');
             $parseUrl = parse_url($httpStringRequest);
 
-            $this->host = isset($parseUrl[ 'host' ]) ? $parseUrl[ 'host' ] : null;
+            $this->host = isset($parseUrl['host']) ? $parseUrl['host'] : null;
 
-            $this->scheme = isset($parseUrl[ 'scheme' ]) ? $parseUrl[ 'scheme' ] : (is_https() ? 'https' : 'http');
+            $this->scheme = isset($parseUrl['scheme']) ? $parseUrl['scheme'] : (is_https() ? 'https' : 'http');
 
             /**
              * Define Uri Port
@@ -175,33 +175,33 @@ 
                 $this->port = 443;
             }
 
-            if (isset($parseUrl[ 'path' ])) {
-                $xRequest = explode('/', $parseUrl[ 'path' ]);
+            if (isset($parseUrl['path'])) {
+                $xRequest = explode('/', $parseUrl['path']);
                 $this->path = implode('/', array_slice($xRequest, 1));
             }
 
             if (strpos($this->path, '.php') !== false) {
                 $xPath = explode('.php', $this->path);
-                $xPath = explode('/', trim($xPath[ 0 ], '/'));
+                $xPath = explode('/', trim($xPath[0], '/'));
                 array_pop($xPath);
 
                 $this->path = empty($xPath) ? null : implode('/', $xPath);
             }
 
-            $this->query = isset($parseUrl[ 'query' ]) ? $parseUrl[ 'query' ] : null;
-            $this->username = isset($parseUrl[ 'user' ]) ? $parseUrl[ 'user' ] : null;
-            $this->password = isset($parseUrl[ 'pass' ]) ? $parseUrl[ 'pass' ] : null;
-            $this->port = isset($parseUrl[ 'port' ]) ? $parseUrl[ 'port' ] : 80;
-            $this->fragment = isset($parseUrl[ 'fragment' ]) ? $parseUrl[ 'fragment' ] : null;
+            $this->query = isset($parseUrl['query']) ? $parseUrl['query'] : null;
+            $this->username = isset($parseUrl['user']) ? $parseUrl['user'] : null;
+            $this->password = isset($parseUrl['pass']) ? $parseUrl['pass'] : null;
+            $this->port = isset($parseUrl['port']) ? $parseUrl['port'] : 80;
+            $this->fragment = isset($parseUrl['fragment']) ? $parseUrl['fragment'] : null;
         } else {
             $this->segments = new Segments();
 
             /**
              * Define Uri Host
              */
-            $this->host = isset($_SERVER[ 'HTTP_HOST' ])
-                ? str_replace('www.', '', $_SERVER[ 'HTTP_HOST' ])
-                : str_replace('www.', '', $_SERVER[ 'SERVER_NAME' ]);
+            $this->host = isset($_SERVER['HTTP_HOST'])
+                ? str_replace('www.', '', $_SERVER['HTTP_HOST'])
+                : str_replace('www.', '', $_SERVER['SERVER_NAME']);
 
             /**
              * Define Uri Scheme
@@ -211,25 +211,25 @@ 
             /**
              * Define Uri Attribute
              */
-            if (strpos($_SERVER[ 'PHP_SELF' ], '/@') !== false) {
-                $xPhpSelf = explode('/@', $_SERVER[ 'PHP_SELF' ]);
+            if (strpos($_SERVER['PHP_SELF'], '/@') !== false) {
+                $xPhpSelf = explode('/@', $_SERVER['PHP_SELF']);
 
-                $this->attribute = '@' . $xPhpSelf[ 1 ];
+                $this->attribute = '@' . $xPhpSelf[1];
 
                 if (strpos($this->attribute, '/') !== false) {
                     $xAttribute = explode('/', $this->attribute);
 
-                    $this->attribute = $xAttribute[ 0 ];
+                    $this->attribute = $xAttribute[0];
                 }
             }
 
             /**
              * Define Uri User and Password
              */
-            if (preg_match("/[a-zA-Z0-9]+[@][a-zA-Z0-9]+/", $_SERVER[ 'PHP_SELF' ], $usernamePassword)) {
-                $xUsernamePassword = explode('@', $usernamePassword[ 0 ]);
-                $this->username = $xUsernamePassword[ 0 ];
-                $this->password = $xUsernamePassword[ 1 ];
+            if (preg_match("/[a-zA-Z0-9]+[@][a-zA-Z0-9]+/", $_SERVER['PHP_SELF'], $usernamePassword)) {
+                $xUsernamePassword = explode('@', $usernamePassword[0]);
+                $this->username = $xUsernamePassword[0];
+                $this->password = $xUsernamePassword[1];
             }
 
             /**
@@ -246,13 +246,13 @@ 
             /**
              * Define Uri Path
              */
-            $xPath = explode('.php', $_SERVER[ 'PHP_SELF' ]);
-            $xPath = explode('/', trim($xPath[ 0 ], '/'));
+            $xPath = explode('.php', $_SERVER['PHP_SELF']);
+            $xPath = explode('/', trim($xPath[0], '/'));
             array_pop($xPath);
 
             $this->path = empty($xPath) ? null : implode('/', $xPath) . '/';
 
-            $this->query = isset($_SERVER[ 'QUERY_STRING' ]) ? $_SERVER[ 'QUERY_STRING' ] : null;
+            $this->query = isset($_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : null;
 
         }
 
@@ -321,12 +321,12 @@ 
             if ((($ordinalNumber % 100) >= 11) && (($ordinalNumber % 100) <= 13)) {
                 $ordinalKey = $ordinalNumber . 'th';
             } else {
-                $ordinalKey = $ordinalNumber . $ordinalEnds[ $ordinalNumber % 10 ];
+                $ordinalKey = $ordinalNumber . $ordinalEnds[$ordinalNumber % 10];
             }
 
-            $elements[ $ordinalKey ] = $subdomain;
+            $elements[$ordinalKey] = $subdomain;
 
-            unset($elements[ $key ]);
+            unset($elements[$key]);
         }
     }
 
@@ -624,8 +624,8 @@ 
     {
         if ($level === 'AUTO') {
             return reset($this->subDomains);
-        } elseif (isset($this->subDomains[ $level ])) {
-            return $this->subDomains[ $level ];
+        } elseif (isset($this->subDomains[$level])) {
+            return $this->subDomains[$level];
         }
 
         return false;
@@ -1075,7 +1075,7 @@ 
         if ($uriPath !== '/' &&
             substr($uriPath, strlen($uriPath) - 1) !== '/' &&
             $this->suffix !== '' && $this->suffix !== '.' &&
-            ($uriPath . '/' !== $_SERVER[ 'REQUEST_URI' ]) &&
+            ($uriPath . '/' !== $_SERVER['REQUEST_URI']) &&
             pathinfo($uriPath, PATHINFO_EXTENSION) === '' &&
             strpos($uriPath, '#') === false &&
             empty($this->query)

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)) {