o2system / kernel

src/Cli/Writers/Line.php

Spacing +1 added lines, -1 removed lines

@@ -153,7 +153,7 @@
         $lines = [];
 
         for ($i = 0; $i < $this->numbers; $i++) {
-            $lines[ $i ] = $this->color->paint(str_repeat($this->string, $this->width));
+            $lines[$i] = $this->color->paint(str_repeat($this->string, $this->width));
         }
 
         return str_repeat(PHP_EOL, $this->newLinesBefore) . implode(PHP_EOL, $lines) . str_repeat(PHP_EOL,

src/Cli/Writers/Form.php

Spacing +4 added lines, -4 removed lines

@@ -57,7 +57,7 @@ 
             return;
         }
 
-        $_POST[ $name ] = $standardInput;
+        $_POST[$name] = $standardInput;
     }
 
     // ------------------------------------------------------------------------
@@ -97,7 +97,7 @@ 
             return;
         }
 
-        $_POST[ $name ] = (bool)($standardInput === 'Y');
+        $_POST[$name] = (bool)($standardInput === 'Y');
     }
 
     // ------------------------------------------------------------------------
@@ -119,7 +119,7 @@ 
         $choices = [];
         $i = 1;
         foreach ($options as $value => $label) {
-            $choices[ $i ] = $value;
+            $choices[$i] = $value;
             output()->write(
                 (new Format())
                     ->setString('(' . $i . ') ' . language()->getLine($label))
@@ -166,6 +166,6 @@ 
             return;
         }
 
-        $_POST[ $name ] = $choices[ $standardInput ];
+        $_POST[$name] = $choices[$standardInput];
     }
 }
\ No newline at end of file

src/Cli/Writers/Color.php

Spacing +2 added lines, -2 removed lines

@@ -161,12 +161,12 @@
 
         // set foreground color
         if (array_key_exists($this->foreground, $this->foregroundColors)) {
-            $coloredString .= "\033[" . $this->foregroundColors[ $this->foreground ] . "m";
+            $coloredString .= "\033[" . $this->foregroundColors[$this->foreground] . "m";
         }
 
         // set background color
         if (array_key_exists($this->background, $this->backgroundColors)) {
-            $coloredString .= "\033[" . $this->backgroundColors[ $this->background ] . "m";
+            $coloredString .= "\033[" . $this->backgroundColors[$this->background] . "m";
         }
 
         // combine with string and end the painting

src/Cli/App.php

Spacing +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
             $commander->setApp($this);
         }
 
-        $this->commandersPool[ $commander->getCommandName() ] = $commander;
+        $this->commandersPool[$commander->getCommandName()] = $commander;
     }
 
     // ------------------------------------------------------------------------

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

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

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 ]); // [+]
             } // [+]
         }

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