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