o2system / framework

src/Http/Presenter.php

Spacing +16 added lines, -16 removed lines

@@ -105,13 +105,13 @@ 
         }
 
         // autoload presenter assets
-        if (isset($config[ 'assets' ])) {
-            $this->assets->autoload($config[ 'assets' ]);
+        if (isset($config['assets'])) {
+            $this->assets->autoload($config['assets']);
         }
 
         // autoload presenter theme
-        if (isset($config[ 'theme' ])) {
-            if (false !== ($theme = $config[ 'theme' ])) {
+        if (isset($config['theme'])) {
+            if (false !== ($theme = $config['theme'])) {
                 $this->setTheme($theme);
             }
         }
@@ -190,25 +190,25 @@ 
         $storage = $this->storage;
 
         // Add Properties
-        $storage[ 'meta' ] = $this->meta;
-        $storage[ 'page' ] = $this->page;
-        $storage[ 'assets' ] = new SplArrayObject([
+        $storage['meta'] = $this->meta;
+        $storage['page'] = $this->page;
+        $storage['assets'] = new SplArrayObject([
             'head' => $this->assets->getHead(),
             'body' => $this->assets->getBody(),
         ]);
-        $storage[ 'partials' ] = $this->partials;
-        $storage[ 'widgets' ] = $this->widgets;
-        $storage[ 'theme' ] = $this->theme;
+        $storage['partials'] = $this->partials;
+        $storage['widgets'] = $this->widgets;
+        $storage['theme'] = $this->theme;
 
         // Add Services
-        $storage[ 'config' ] = config();
-        $storage[ 'language' ] = language();
-        $storage[ 'session' ] = session();
-        $storage[ 'presenter' ] = presenter();
-        $storage[ 'input' ] = input();
+        $storage['config'] = config();
+        $storage['language'] = language();
+        $storage['session'] = session();
+        $storage['presenter'] = presenter();
+        $storage['input'] = input();
 
         if (services()->has('csrfProtection')) {
-            $storage[ 'csrfToken' ] = services()->get('csrfProtection')->getToken();
+            $storage['csrfToken'] = services()->get('csrfProtection')->getToken();
         }
 
         return $storage;

src/Http/View.php

Spacing +10 added lines, -10 removed lines

@@ -72,7 +72,7 @@ 
         );
 
         if ($this->config->offsetExists('extensions')) {
-            $this->setFileExtensions($this->config[ 'extensions' ]);
+            $this->setFileExtensions($this->config['extensions']);
         }
 
         $this->document = new Html\Document();
@@ -88,13 +88,13 @@ 
      */
     public function &__get($property)
     {
-        $get[ $property ] = false;
+        $get[$property] = false;
 
         if (property_exists($this, $property)) {
             return $this->{$property};
         }
 
-        return $get[ $property ];
+        return $get[$property];
     }
 
     // ------------------------------------------------------------------------
@@ -205,8 +205,8 @@ 
             $error = new ErrorException(
                 'E_VIEW_NOT_FOUND',
                 0,
-                @$backtrace[ 0 ][ 'file' ],
-                @$backtrace[ 0 ][ 'line' ],
+                @$backtrace[0]['file'],
+                @$backtrace[0]['line'],
                 [trim($filename)]
             );
 
@@ -455,12 +455,12 @@ 
         $htmlOutput = $this->document->saveHTML();
 
         // Uglify Output
-        if ($this->config->output[ 'uglify' ] === true) {
+        if ($this->config->output['uglify'] === true) {
             $htmlOutput = preg_replace(
                 [
-                    '/\>[^\S ]+/s',     // strip whitespaces after tags, except space
-                    '/[^\S ]+\</s',     // strip whitespaces before tags, except space
-                    '/(\s)+/s',         // shorten multiple whitespace sequences
+                    '/\>[^\S ]+/s', // strip whitespaces after tags, except space
+                    '/[^\S ]+\</s', // strip whitespaces before tags, except space
+                    '/(\s)+/s', // shorten multiple whitespace sequences
                     '/<!--(.|\s)*?-->/', // Remove HTML comments
                     '/<!--(.*)-->/Uis',
                     "/[[:blank:]]+/",
@@ -477,7 +477,7 @@ 
         }
 
         // Beautify Output
-        if ($this->config->output[ 'beautify' ] === true) {
+        if ($this->config->output['beautify'] === true) {
             $beautifier = new Html\Dom\Beautifier();
             $htmlOutput = $beautifier->format($htmlOutput);
         }

src/Http/Controller.php

Spacing +6 added lines, -6 removed lines

@@ -33,7 +33,7 @@ 
      */
     public function &__get($property)
     {
-        $get[ $property ] = false;
+        $get[$property] = false;
 
         // CodeIgniter property aliasing
         if ($property === 'load') {
@@ -41,15 +41,15 @@ 
         }
 
         if (services()->has($property)) {
-            $get[ $property ] = services()->get($property);
+            $get[$property] = services()->get($property);
         } elseif (o2system()->__isset($property)) {
-            $get[ $property ] = o2system()->__get($property);
+            $get[$property] = o2system()->__get($property);
         } elseif ($property === 'model') {
-            $get[ $property ] = models('controller');
+            $get[$property] = models('controller');
         } elseif ($property === 'services' || $property === 'libraries') {
-            $get[ $property ] = services();
+            $get[$property] = services();
         }
 
-        return $get[ $property ];
+        return $get[$property];
     }
 }
\ No newline at end of file

src/Http/Controllers/Images.php

Spacing +18 added lines, -18 removed lines

@@ -111,24 +111,24 @@ 
 
         $this->imageFilePath = $this->imageNotFoundFilename;
 
-        $this->imageSize[ 'width' ] = $this->input->get('width');
-        $this->imageSize[ 'height' ] = $this->input->get('height');
+        $this->imageSize['width'] = $this->input->get('width');
+        $this->imageSize['height'] = $this->input->get('height');
         $this->imageScale = $this->input->get('scale');
         $this->imageQuality = $this->input->get('quality');
         $this->imageCrop = $this->input->get('crop');
 
         if (false !== ($key = array_search('crop', $segments))) {
             $this->imageCrop = true;
-            unset($segments[ $key ]);
+            unset($segments[$key]);
             $segments = array_values($segments);
         }
 
         if (count($segments) == 1) {
             $this->imageFilePath = $this->storagePath . end($segments);
         } elseif (count($segments) >= 2) {
-            if (preg_match("/(\d+)(x)(\d+)/", $segments[ count($segments) - 2 ], $matches)) {
-                $this->imageSize[ 'width' ] = $matches[ 1 ];
-                $this->imageSize[ 'height' ] = $matches[ 3 ];
+            if (preg_match("/(\d+)(x)(\d+)/", $segments[count($segments) - 2], $matches)) {
+                $this->imageSize['width'] = $matches[1];
+                $this->imageSize['height'] = $matches[3];
 
                 if (count($segments) == 2) {
                     $this->imageFilePath = $this->storagePath . end($segments);
@@ -137,10 +137,10 @@ 
                             array_slice($segments, 0,
                                 count($segments) - 2)) . DIRECTORY_SEPARATOR . end($segments);
                 }
-            } elseif (preg_match("/(\d+)(p)/", $segments[ count($segments) - 2 ],
-                    $matches) or is_numeric($segments[ count($segments) - 2 ])
+            } elseif (preg_match("/(\d+)(p)/", $segments[count($segments) - 2],
+                    $matches) or is_numeric($segments[count($segments) - 2])
             ) {
-                $this->imageScale = isset($matches[ 1 ]) ? $matches[ 1 ] : $segments[ count($segments) - 2 ];
+                $this->imageScale = isset($matches[1]) ? $matches[1] : $segments[count($segments) - 2];
                 if (count($segments) == 2) {
                     $this->imageFilePath = $this->storagePath . end($segments);
                 } else {
@@ -154,14 +154,14 @@ 
         }
 
         $imageFilePath = $this->imageFilePath;
-        $extensions[ 0 ] = pathinfo($imageFilePath, PATHINFO_EXTENSION);
+        $extensions[0] = pathinfo($imageFilePath, PATHINFO_EXTENSION);
 
         for ($i = 0; $i < 2; $i++) {
             $extension = pathinfo($imageFilePath, PATHINFO_EXTENSION);
 
             if ($extension !== '') {
-                $extensions[ $i ] = $extension;
-                $imageFilePath = str_replace('.' . $extensions[ $i ], '', $imageFilePath);
+                $extensions[$i] = $extension;
+                $imageFilePath = str_replace('.' . $extensions[$i], '', $imageFilePath);
             }
         }
 
@@ -173,13 +173,13 @@ 
         ];
 
         if (count($extensions) == 2) {
-            $this->imageFilePath = $imageFilePath . '.' . $extensions[ 1 ];
+            $this->imageFilePath = $imageFilePath . '.' . $extensions[1];
         }
 
         if (array_key_exists($extension = reset($extensions), $mimes)) {
-            $this->imageFileMime = $mimes[ $extension ];
+            $this->imageFileMime = $mimes[$extension];
         } elseif (array_key_exists($extension = pathinfo($this->imageFilePath, PATHINFO_EXTENSION), $mimes)) {
-            $this->imageFileMime = $mimes[ $extension ];
+            $this->imageFileMime = $mimes[$extension];
         }
 
         if ( ! is_file($this->imageFilePath)) {
@@ -188,7 +188,7 @@ 
 
         if ( ! empty($this->imageScale)) {
             $this->scale();
-        } elseif ( ! empty($this->imageSize[ 'width' ]) || ! empty($this->imageSize[ 'height' ])) {
+        } elseif ( ! empty($this->imageSize['width']) || ! empty($this->imageSize['height'])) {
             $this->resize();
         } else {
             $this->original();
@@ -278,7 +278,7 @@ 
                     } else {
                         $manipulation = new Manipulation($config);
                         $manipulation->setImageFile($this->imageFilePath);
-                        $manipulation->resizeImage($this->imageSize[ 'width' ], $this->imageSize[ 'height' ],
+                        $manipulation->resizeImage($this->imageSize['width'], $this->imageSize['height'],
                             (bool)$this->imageCrop);
                         $cacheItemPool->save(new Item($cacheImageKey, $manipulation->getBlobImage(), false));
 
@@ -291,7 +291,7 @@ 
 
         $manipulation = new Manipulation($config);
         $manipulation->setImageFile($this->imageFilePath);
-        $manipulation->resizeImage($this->imageSize[ 'width' ], $this->imageSize[ 'height' ], (bool)$this->imageCrop);
+        $manipulation->resizeImage($this->imageSize['width'], $this->imageSize['height'], (bool)$this->imageCrop);
         $manipulation->displayImage(intval($this->imageQuality), $this->imageFileMime);
         exit(EXIT_SUCCESS);
     }

src/Http/Controllers/Manifest.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
      */
     public function index()
     {
-        if(false !== ($config = $this->config->loadFile('manifest', true))) {
+        if (false !== ($config = $this->config->loadFile('manifest', true))) {
             print_out('test');
         }
 

src/Http/Output.php

Spacing +6 added lines, -6 removed lines

@@ -282,21 +282,21 @@
         ];
 
         $this->statusCode = $code;
-        $this->reasonPhrase = $error[ 'title' ];
+        $this->reasonPhrase = $error['title'];
 
         if (is_string($vars)) {
             $vars = ['message' => $vars];
-        } elseif (is_array($vars) and empty($vars[ 'message' ])) {
-            $vars[ 'message' ] = $error[ 'message' ];
+        } elseif (is_array($vars) and empty($vars['message'])) {
+            $vars['message'] = $error['message'];
         }
 
-        if (isset($vars[ 'message' ])) {
-            $error[ 'message' ] = $vars[ 'message' ];
+        if (isset($vars['message'])) {
+            $error['message'] = $vars['message'];
         }
 
         if (is_ajax() or $this->mimeType !== 'text/html') {
             $this->statusCode = $code;
-            $this->reasonPhrase = $error[ 'title' ];
+            $this->reasonPhrase = $error['title'];
             $this->send($vars);
 
             exit(EXIT_ERROR);

src/Http/UserAgent.php

Spacing +13 added lines, -13 removed lines

@@ -152,8 +152,8 @@ 
      */
     public function __construct()
     {
-        if (isset($_SERVER[ 'HTTP_USER_AGENT' ])) {
-            $this->string = trim($_SERVER[ 'HTTP_USER_AGENT' ]);
+        if (isset($_SERVER['HTTP_USER_AGENT'])) {
+            $this->string = trim($_SERVER['HTTP_USER_AGENT']);
         }
 
         if ($this->string !== null && $this->loadAgentFile()) {
@@ -276,7 +276,7 @@ 
         }
 
         // Check for a specific browser
-        return (isset(static::$browsers[ $key ]) && $this->browser === static::$browsers[ $key ]);
+        return (isset(static::$browsers[$key]) && $this->browser === static::$browsers[$key]);
     }
 
     // --------------------------------------------------------------------
@@ -300,7 +300,7 @@ 
         }
 
         // Check for a specific robot
-        return (isset(static::$robots[ $key ]) && $this->robot === static::$robots[ $key ]);
+        return (isset(static::$robots[$key]) && $this->robot === static::$robots[$key]);
     }
 
     // --------------------------------------------------------------------
@@ -326,7 +326,7 @@ 
         }
 
         // Check for a specific robot
-        return (isset(static::$mobiles[ $key ]) && $this->mobile === static::$mobiles[ $key ]);
+        return (isset(static::$mobiles[$key]) && $this->mobile === static::$mobiles[$key]);
     }
 
     // --------------------------------------------------------------------
@@ -341,10 +341,10 @@ 
     public function isReferral()
     {
         if ( ! isset($this->referer)) {
-            if (empty($_SERVER[ 'HTTP_REFERER' ])) {
+            if (empty($_SERVER['HTTP_REFERER'])) {
                 $this->referer = false;
             } else {
-                $referer_host = @parse_url($_SERVER[ 'HTTP_REFERER' ], PHP_URL_HOST);
+                $referer_host = @parse_url($_SERVER['HTTP_REFERER'], PHP_URL_HOST);
                 $own_host = parse_url(base_url(), PHP_URL_HOST);
 
                 $this->referer = ($referer_host && $referer_host !== $own_host);
@@ -449,7 +449,7 @@ 
      */
     public function isHttpReferrerExists()
     {
-        return empty($_SERVER[ 'HTTP_REFERER' ]) ? '' : trim($_SERVER[ 'HTTP_REFERER' ]);
+        return empty($_SERVER['HTTP_REFERER']) ? '' : trim($_SERVER['HTTP_REFERER']);
     }
 
     // --------------------------------------------------------------------
@@ -497,13 +497,13 @@ 
      */
     protected function setLanguages()
     {
-        if ((count($this->languages) === 0) && ! empty($_SERVER[ 'HTTP_ACCEPT_LANGUAGE' ])) {
+        if ((count($this->languages) === 0) && ! empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
             $this->languages = explode(
                 ',',
                 preg_replace(
                     '/(;\s?q=[0-9\.]+)|\s/i',
                     '',
-                    strtolower(trim($_SERVER[ 'HTTP_ACCEPT_LANGUAGE' ]))
+                    strtolower(trim($_SERVER['HTTP_ACCEPT_LANGUAGE']))
                 )
             );
         }
@@ -557,13 +557,13 @@ 
      */
     protected function setCharsets()
     {
-        if ((count($this->charsets) === 0) && ! empty($_SERVER[ 'HTTP_ACCEPT_CHARSET' ])) {
+        if ((count($this->charsets) === 0) && ! empty($_SERVER['HTTP_ACCEPT_CHARSET'])) {
             $this->charsets = explode(
                 ',',
                 preg_replace(
                     '/(;\s?q=.+)|\s/i',
                     '',
-                    strtolower(trim($_SERVER[ 'HTTP_ACCEPT_CHARSET' ]))
+                    strtolower(trim($_SERVER['HTTP_ACCEPT_CHARSET']))
                 )
             );
         }
@@ -618,7 +618,7 @@ 
             foreach (static::$browsers as $key => $val) {
                 if (preg_match('|' . $key . '.*?([0-9\.]+)|i', $this->string, $match)) {
                     $this->isBrowser = true;
-                    $this->browserVersion = $match[ 1 ];
+                    $this->browserVersion = $match[1];
                     $this->browser = $val;
                     $this->setMobile();
 

src/Framework.php

Spacing +2 added lines, -2 removed lines

@@ -418,12 +418,12 @@
                 $session->set('language', language()->getDefault());
             }
 
-            if (config('security')->protection[ 'csrf' ] === true) {
+            if (config('security')->protection['csrf'] === true) {
                 $csrfProtection = new Security\Protections\Csrf();
                 $this->services->add($csrfProtection, 'csrfProtection');
             }
 
-            if (config('security')->protection[ 'xss' ] === true) {
+            if (config('security')->protection['xss'] === true) {
                 $xssProtection = new Security\Protections\Xss();
                 $this->services->add($xssProtection, 'xssProtection');
             }

src/Cli/Commander.php

Spacing +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
      */
     public function &__get($property)
     {
-        $get[ $property ] = false;
+        $get[$property] = false;
 
         // CodeIgniter property aliasing
         if ($property === 'load') {
@@ -45,6 +45,6 @@ 
             return models('controller');
         }
 
-        return $get[ $property ];
+        return $get[$property];
     }
 }
\ No newline at end of file