o2system / kernel

src/Helpers/Common.php

Spacing +36 added lines, -36 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
@@ -344,7 +344,7 @@ 
 
         if (defined('PATH_RESOURCES')) {
             $path_url = str_replace(PATH_RESOURCES, '', $path);
-            if(strpos($path, 'resources') !== false) {
+            if (strpos($path, 'resources') !== false) {
                 $path_url = 'resources/' . $path_url; 
             }
         } elseif (defined('PATH_PUBLIC')) {
@@ -422,7 +422,7 @@ 
         $segments = explode('\\', $class);
 
         if (count($segments) > 1) {
-            if ($segments[ 0 ] === $segments[ 1 ]) {
+            if ($segments[0] === $segments[1]) {
                 array_shift($segments);
             }
         }
@@ -495,27 +495,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]); // [+]
             } // [+]
         }
 
@@ -733,8 +733,8 @@ 
 
         $string = null;
 
-        if (isset($errors[ $code ])) {
-            $string = $errors[ $code ];
+        if (isset($errors[$code])) {
+            $string = $errors[$code];
         }
 
         return strtoupper($string);

src/Helpers/Kernel.php

Spacing +14 added lines, -14 removed lines

@@ -10,7 +10,7 @@ 
  */
 // ------------------------------------------------------------------------
 
-if (!function_exists('kernel')) {
+if ( ! function_exists('kernel')) {
     /**
      * kernel
      *
@@ -33,7 +33,7 @@ 
 // ------------------------------------------------------------------------
 
 
-if (!function_exists('services')) {
+if ( ! function_exists('services')) {
     /**
      * services
      *
@@ -47,7 +47,7 @@ 
 
         if (count($args)) {
             if (kernel()->services->has($args[0])) {
-                if(isset($args[1]) and is_array($args[1])) {
+                if (isset($args[1]) and is_array($args[1])) {
                     return kernel()->services->get($args[0], $args[1]);
                 }
                 return kernel()->services->get($args[0]);
@@ -62,7 +62,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if (!function_exists('profiler')) {
+if ( ! function_exists('profiler')) {
     /**
      * profiler
      *
@@ -78,7 +78,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if (!function_exists('language')) {
+if ( ! function_exists('language')) {
     /**
      * language
      *
@@ -92,7 +92,7 @@ 
 
         if (count($args)) {
             if (services()->has('language')) {
-                $language =& kernel()->services->get('language');
+                $language = & kernel()->services->get('language');
 
                 return call_user_func_array([&$language, 'getLine'], $args);
             }
@@ -106,7 +106,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if (!function_exists('logger')) {
+if ( ! function_exists('logger')) {
     /**
      * logger
      *
@@ -120,7 +120,7 @@ 
 
         if (count($args)) {
             if (services()->has('logger')) {
-                $logger =& services('logger');
+                $logger = & services('logger');
 
                 return call_user_func_array([&$logger, 'log'], $args);
             }
@@ -134,7 +134,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if (!function_exists('shutdown')) {
+if ( ! function_exists('shutdown')) {
     /**
      * shutdown
      *
@@ -150,7 +150,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if (!function_exists('input')) {
+if ( ! function_exists('input')) {
     /**
      * input
      *
@@ -166,7 +166,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if (!function_exists('output')) {
+if ( ! function_exists('output')) {
     /**
      * output
      *
@@ -182,7 +182,7 @@ 
 
 // ------------------------------------------------------------------------
 
-if (!function_exists('server_request')) {
+if ( ! function_exists('server_request')) {
     /**
      * server_request
      *
@@ -193,13 +193,13 @@ 
     function server_request()
     {
         if (function_exists('o2system')) {
-            if (!services()->has('serverRequest')) {
+            if ( ! services()->has('serverRequest')) {
                 services()->load(new \O2System\Kernel\Http\Message\ServerRequest(), 'serverRequest');
             }
 
             return services('serverRequest');
         } else {
-            if (!services()->has('serverRequest')) {
+            if ( ! services()->has('serverRequest')) {
                 services()->load(new \O2System\Kernel\Http\Message\ServerRequest(), 'serverRequest');
             }
 

src/Containers/Services.php

Spacing +7 added lines, -7 removed lines

@@ -34,27 +34,27 @@ 
     public function load($service, $offset = null)
     {
         if (is_string($service)) {
-            if(class_exists('O2System\Framework', false)) {
+            if (class_exists('O2System\Framework', false)) {
                 $className = str_replace(
-                    ['App\\','App\Kernel\\','O2System\Framework\\','O2System\Kernel\\'],
+                    ['App\\', 'App\Kernel\\', 'O2System\Framework\\', 'O2System\Kernel\\'],
                     '',
                     $service
                 );
 
-                foreach(['App\\','App\Kernel\\','O2System\Framework\\','O2System\Kernel\\'] as $namespace) {
+                foreach (['App\\', 'App\Kernel\\', 'O2System\Framework\\', 'O2System\Kernel\\'] as $namespace) {
                     if (class_exists($namespace . $className)) {
                         $service = $namespace . $className;
                         break;
                     }
                 }
-            } elseif(class_exists('O2System\Reactor', false)) {
+            } elseif (class_exists('O2System\Reactor', false)) {
                 $className = str_replace(
-                    ['App\\','App\Kernel\\','O2System\Reactor\\','O2System\Kernel\\'],
+                    ['App\\', 'App\Kernel\\', 'O2System\Reactor\\', 'O2System\Kernel\\'],
                     '',
                     $service
                 );
 
-                foreach(['App\\','App\Kernel\\','O2System\Reactor\\','O2System\Kernel\\'] as $namespace) {
+                foreach (['App\\', 'App\Kernel\\', 'O2System\Reactor\\', 'O2System\Kernel\\'] as $namespace) {
                     if (class_exists($namespace . $className)) {
                         $service = $namespace . $className;
                         break;
@@ -67,7 +67,7 @@ 
             }
         }
 
-        if($service instanceof SplServiceRegistry) {
+        if ($service instanceof SplServiceRegistry) {
             if (profiler() !== false) {
                 profiler()->watch('Load New Service: ' . $service->getClassName());
             }

src/Http/Router.php

Spacing +9 added lines, -9 removed lines

@@ -62,15 +62,15 @@ 
         $uriSegments = $this->uri->getSegments()->getParts();
         $uriString = $this->uri->getSegments()->getString();
 
-        if($this->uri->getSegments()->getTotalParts()) {
-            if(strpos(end($uriSegments), '.json') !== false) {
+        if ($this->uri->getSegments()->getTotalParts()) {
+            if (strpos(end($uriSegments), '.json') !== false) {
                 output()->setContentType('application/json');
                 $endSegment = str_replace('.json', '', end($uriSegments));
                 array_pop($uriSegments);
                 array_push($uriSegments, $endSegment);
                 $this->uri = $this->uri->withSegments(new Message\Uri\Segments($uriSegments));
                 $uriString = $this->uri->getSegments()->getString();
-            } elseif(strpos(end($uriSegments), '.xml') !== false) {
+            } elseif (strpos(end($uriSegments), '.xml') !== false) {
                 output()->setContentType('application/xml');
                 $endSegment = str_replace('.xml', '', end($uriSegments));
                 array_pop($uriSegments);
@@ -80,7 +80,7 @@ 
             }
         } else {
             $uriPath = urldecode(
-                parse_url($_SERVER[ 'REQUEST_URI' ], PHP_URL_PATH)
+                parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)
             );
 
             $uriPathParts = explode('public/', $uriPath);
@@ -168,8 +168,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 !== '') {
@@ -250,10 +250,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/Request.php

Spacing +13 added lines, -13 removed lines

@@ -54,7 +54,7 @@ 
 
     public function getClientIpAddress()
     {
-        if($ipAddresses = config()->getItem('ipAddresses')) {
+        if ($ipAddresses = config()->getItem('ipAddresses')) {
             return input()->ipAddress($ipAddresses->proxy);
         }
 
@@ -89,8 +89,8 @@ 
      */
     public function isAjax()
     {
-        return ( ! empty($_SERVER[ 'HTTP_X_REQUESTED_WITH' ]) &&
-            strtolower($_SERVER[ 'HTTP_X_REQUESTED_WITH' ]) === 'xmlhttprequest');
+        return ( ! empty($_SERVER['HTTP_X_REQUESTED_WITH']) &&
+            strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) === 'xmlhttprequest');
     }
 
     //--------------------------------------------------------------------
@@ -103,12 +103,12 @@ 
      */
     public function isSecure()
     {
-        if ( ! empty($_SERVER[ 'HTTPS' ]) && strtolower($_SERVER[ 'HTTPS' ]) !== 'off') {
+        if ( ! empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off') {
             return true;
-        } elseif (isset($_SERVER[ 'HTTP_X_FORWARDED_PROTO' ]) && $_SERVER[ 'HTTP_X_FORWARDED_PROTO' ] === 'https') {
+        } elseif (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https') {
             return true;
-        } elseif ( ! empty($_SERVER[ 'HTTP_FRONT_END_HTTPS' ]) && strtolower(
-                $_SERVER[ 'HTTP_FRONT_END_HTTPS' ]
+        } elseif ( ! empty($_SERVER['HTTP_FRONT_END_HTTPS']) && strtolower(
+                $_SERVER['HTTP_FRONT_END_HTTPS']
             ) !== 'off'
         ) {
             return true;
@@ -129,8 +129,8 @@ 
     public function getTime($format = null)
     {
         return isset($format)
-            ? date($format, $_SERVER[ 'REQUEST_TIME' ])
-            : $_SERVER[ 'REQUEST_TIME' ];
+            ? date($format, $_SERVER['REQUEST_TIME'])
+            : $_SERVER['REQUEST_TIME'];
     }
 
     //--------------------------------------------------------------------
@@ -212,12 +212,12 @@ 
 
         $uri = $this->uri;
 
-        if (isset($parseTarget[ 'path' ])) {
-            $uri = $this->uri->withPath($parseTarget[ 'path' ]);
+        if (isset($parseTarget['path'])) {
+            $uri = $this->uri->withPath($parseTarget['path']);
         }
 
-        if (isset($parseTarget[ 'query' ])) {
-            $uri = $this->uri->withPath($parseTarget[ 'query' ]);
+        if (isset($parseTarget['query'])) {
+            $uri = $this->uri->withPath($parseTarget['query']);
         }
 
         $this->uri = $uri;

src/Services/Language.php

Spacing +8 added lines, -8 removed lines

@@ -86,13 +86,13 @@ 
             $this->setDefaultLocale(reset($xDefault));
         }
 
-        if(class_exists('O2System\Framework', false) or class_exists('\O2System\Reactor', false)) {
-            if(services()->has('session')) {
+        if (class_exists('O2System\Framework', false) or class_exists('\O2System\Reactor', false)) {
+            if (services()->has('session')) {
                 session()->set('language', $this->getDefault());
             }
 
-            if(count($this->isLoaded)) {
-                foreach($this->isLoaded as $fileIndex => $filePath) {
+            if (count($this->isLoaded)) {
+                foreach ($this->isLoaded as $fileIndex => $filePath) {
                     unset($this->isLoaded[$fileIndex]);
                     $this->loadFile($fileIndex);
                 }
@@ -177,7 +177,7 @@ 
 
         foreach ($filename as $file) {
             $file = dash($file);
-            if(! $this->isLoaded($file)) {
+            if ( ! $this->isLoaded($file)) {
                 if (is_file($file)) {
                     $this->parseFile($file);
                 } else {
@@ -235,7 +235,7 @@ 
         if ( ! empty($lines)) {
             $fileIndex = pathinfo($filePath, PATHINFO_FILENAME);
             $fileIndex = str_replace('_' . $this->getDefault(), '', $fileIndex);
-            $this->isLoaded[ $fileIndex ] = $filePath;
+            $this->isLoaded[$fileIndex] = $filePath;
 
             $this->lines = array_merge($this->lines, $lines);
         }
@@ -258,9 +258,9 @@ 
         $lineOffset = strtoupper($line);
 
         if (empty($context)) {
-            $lineContent = isset($this->lines[ $lineOffset ]) ? $this->lines[ $lineOffset ] : $line;
+            $lineContent = isset($this->lines[$lineOffset]) ? $this->lines[$lineOffset] : $line;
         } else {
-            $line = isset($this->lines[ $lineOffset ]) ? $this->lines[ $lineOffset ] : $line;
+            $line = isset($this->lines[$lineOffset]) ? $this->lines[$lineOffset] : $line;
             array_unshift($context, $line);
 
             $lineContent = @call_user_func_array('sprintf', $context);