o2system / kernel

src/autoload.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
  * @param $className
  */
 spl_autoload_register(
-    function ($className) {
+    function($className) {
         if ($className === 'O2System\Kernel') {
             require __DIR__ . DIRECTORY_SEPARATOR . 'Kernel.php';
         } elseif (strpos($className, 'O2System\Kernel\\') === false) {

src/Helpers/Inflector.php

Spacing +18 added lines, -18 removed lines

@@ -114,24 +114,24 @@
         }
 
         $rules = [
-            '/^(ox)$/'                => '\1\2en',     // ox
-            '/([m|l])ouse$/'          => '\1ice',      // mouse, louse
-            '/(matr|vert|ind)ix|ex$/' => '\1ices',     // matrix, vertex, index
-            '/(x|ch|ss|sh)$/'         => '\1es',       // search, switch, fix, box, process, address
-            '/([^aeiouy]|qu)y$/'      => '\1ies',      // query, ability, agency
-            '/(hive)$/'               => '\1s',        // archive, hive
-            '/(?:([^f])fe|([lr])f)$/' => '\1\2ves',    // half, safe, wife
-            '/sis$/'                  => 'ses',        // basis, diagnosis
-            '/([ti])um$/'             => '\1a',        // datum, medium
-            '/(p)erson$/'             => '\1eople',    // person, salesperson
-            '/(m)an$/'                => '\1en',       // man, woman, spokesman
-            '/(c)hild$/'              => '\1hildren',  // child
-            '/(buffal|tomat)o$/'      => '\1\2oes',    // buffalo, tomato
-            '/(bu|campu)s$/'          => '\1\2ses',    // bus, campus
-            '/(alias|status|virus)$/' => '\1es',       // alias
-            '/(octop)us$/'            => '\1i',        // octopus
-            '/(ax|cris|test)is$/'     => '\1es',       // axis, crisis
-            '/s$/'                    => 's',          // no change (compatibility)
+            '/^(ox)$/'                => '\1\2en', // ox
+            '/([m|l])ouse$/'          => '\1ice', // mouse, louse
+            '/(matr|vert|ind)ix|ex$/' => '\1ices', // matrix, vertex, index
+            '/(x|ch|ss|sh)$/'         => '\1es', // search, switch, fix, box, process, address
+            '/([^aeiouy]|qu)y$/'      => '\1ies', // query, ability, agency
+            '/(hive)$/'               => '\1s', // archive, hive
+            '/(?:([^f])fe|([lr])f)$/' => '\1\2ves', // half, safe, wife
+            '/sis$/'                  => 'ses', // basis, diagnosis
+            '/([ti])um$/'             => '\1a', // datum, medium
+            '/(p)erson$/'             => '\1eople', // person, salesperson
+            '/(m)an$/'                => '\1en', // man, woman, spokesman
+            '/(c)hild$/'              => '\1hildren', // child
+            '/(buffal|tomat)o$/'      => '\1\2oes', // buffalo, tomato
+            '/(bu|campu)s$/'          => '\1\2ses', // bus, campus
+            '/(alias|status|virus)$/' => '\1es', // alias
+            '/(octop)us$/'            => '\1i', // octopus
+            '/(ax|cris|test)is$/'     => '\1es', // axis, crisis
+            '/s$/'                    => 's', // no change (compatibility)
             '/$/'                     => 's',
         ];
 

src/Helpers/Cookie.php

Spacing +15 added lines, -15 removed lines

@@ -43,30 +43,30 @@ 
         if (is_array($name)) {
             // always leave 'name' in last place, as the loop will break otherwise, due to $$item
             foreach (['value', 'expire', 'domain', 'path', 'prefix', 'secure', 'httponly', 'name'] as $item) {
-                if (isset($name[ $item ])) {
-                    $$item = $name[ $item ];
+                if (isset($name[$item])) {
+                    $$item = $name[$item];
                 }
             }
         }
 
         if ($prefix === '' && function_exists('config')) {
-            $prefix = config()->offsetGet('cookie')[ 'prefix' ];
+            $prefix = config()->offsetGet('cookie')['prefix'];
         }
 
         if ($domain === '' && function_exists('config')) {
-            $domain = config()->offsetGet('cookie')[ 'domain' ];
+            $domain = config()->offsetGet('cookie')['domain'];
         }
 
         if ($path === '' && function_exists('config')) {
-            $path = config()->offsetGet('cookie')[ 'path' ];
+            $path = config()->offsetGet('cookie')['path'];
         }
 
         if ($secure === null && function_exists('config')) {
-            $secure = config()->offsetGet('cookie')[ 'secure' ];
+            $secure = config()->offsetGet('cookie')['secure'];
         }
 
         if ($httponly === null && function_exists('config')) {
-            $httponly = config()->offsetGet('cookie')[ 'httpOnly' ];
+            $httponly = config()->offsetGet('cookie')['httpOnly'];
         }
 
         if ( ! is_numeric($expire) OR $expire < 0) {
@@ -99,12 +99,12 @@ 
      */
     function get_cookie($name)
     {
-        if (isset($_COOKIE[ $name ])) {
-            return $_COOKIE[ $name ];
+        if (isset($_COOKIE[$name])) {
+            return $_COOKIE[$name];
         } elseif (function_exists('config')) {
-            $prefix = config()->offsetGet('cookie')[ 'prefix' ];
-            if (isset($_COOKIE[ $prefix . $name ])) {
-                return $_COOKIE[ $prefix . $name ];
+            $prefix = config()->offsetGet('cookie')['prefix'];
+            if (isset($_COOKIE[$prefix . $name])) {
+                return $_COOKIE[$prefix . $name];
             }
         }
 
@@ -128,11 +128,11 @@ 
     function delete_cookie($name, $domain = '', $path = '/', $prefix = '')
     {
         if ($prefix === '' && function_exists('config')) {
-            $prefix = config()->offsetGet('cookie')[ 'prefix' ];
+            $prefix = config()->offsetGet('cookie')['prefix'];
         }
 
-        if (isset($_COOKIE[ $prefix . $name ])) {
-            unset($_COOKIE[ $prefix . $name ]);
+        if (isset($_COOKIE[$prefix . $name])) {
+            unset($_COOKIE[$prefix . $name]);
         }
 
         return set_cookie($name, '', -1, $domain, $path, $prefix);

src/Helpers/Common.php

Braces +6 added lines, -2 removed lines

@@ -502,14 +502,18 @@
                 $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 ]);
+                }
                 } // [+]
-                elseif ( ! $key) // [+]
+                elseif ( ! $key) {
+                    // [+]
                 {
                     $headers[ 0 ] = trim($h[ 0 ]);
                 }
+                }
                 trim($h[ 0 ]); // [+]
             } // [+]
         }

Spacing +38 added lines, -38 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
@@ -342,11 +342,11 @@ 
         $base_url = str_replace(DIRECTORY_SEPARATOR, '/', $base_url);
         $base_url = trim($base_url, '/') . '/';
 
-        if(strpos($path, 'resources') !== false && defined('PATH_RESOURCES')) {
+        if (strpos($path, 'resources') !== false && defined('PATH_RESOURCES')) {
             $path_url = 'resources' . '/' . str_replace(PATH_RESOURCES, '', $path);
-        } elseif(strpos($path, 'public') !== false && defined('PATH_PUBLIC')) {
+        } elseif (strpos($path, 'public') !== false && defined('PATH_PUBLIC')) {
             $path_url = str_replace(PATH_PUBLIC, '', $path);
-        } elseif(strpos($path, 'storage') !== false && defined('PATH_RESOURCES')) {
+        } elseif (strpos($path, 'storage') !== false && defined('PATH_RESOURCES')) {
             $path_url = 'storage' . '/' . str_replace(PATH_RESOURCES, '', $path);
         } else {
             $path_url = str_replace($base_dir, '', $path);
@@ -421,7 +421,7 @@ 
         $segments = explode('\\', $class);
 
         if (count($segments) > 1) {
-            if ($segments[ 0 ] === $segments[ 1 ]) {
+            if ($segments[0] === $segments[1]) {
                 array_shift($segments);
             }
         }
@@ -494,27 +494,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]); // [+]
             } // [+]
         }
 
@@ -732,8 +732,8 @@ 
 
         $string = null;
 
-        if (isset($errors[ $code ])) {
-            $string = $errors[ $code ];
+        if (isset($errors[$code])) {
+            $string = $errors[$code];
         }
 
         return strtoupper($string);

src/Services/Logger.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
             $this->path = PATH_CACHE . 'logs' . DIRECTORY_SEPARATOR;
         } else {
             $this->path = dirname(
-                    $_SERVER[ 'SCRIPT_FILENAME' ]
+                    $_SERVER['SCRIPT_FILENAME']
                 ) . DIRECTORY_SEPARATOR . 'cache' . DIRECTORY_SEPARATOR . 'logs' . DIRECTORY_SEPARATOR;
         }
 

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/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 +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