o2system / framework

src/Models/NoSql/Model.php

Spacing +7 added lines, -7 removed lines

@@ -156,7 +156,7 @@ 
             loader()->addNamespace($reflection->name, $subModelPath);
 
             foreach (glob($subModelPath . '*.php') as $filepath) {
-                $this->validSubModels[ strtolower(pathinfo($filepath, PATHINFO_FILENAME)) ] = $filepath;
+                $this->validSubModels[strtolower(pathinfo($filepath, PATHINFO_FILENAME))] = $filepath;
             }
         }
     }
@@ -183,24 +183,24 @@ 
 
     public function &__get($property)
     {
-        $get[ $property ] = false;
+        $get[$property] = false;
 
         if (services()->has($property)) {
-            $get[ $property ] = services()->get($property);
+            $get[$property] = services()->get($property);
         } elseif (array_key_exists($property, $this->validSubModels)) {
-            $get[ $property ] = $this->loadSubModel($property);
+            $get[$property] = $this->loadSubModel($property);
         } elseif (o2system()->__isset($property)) {
-            $get[ $property ] = o2system()->__get($property);
+            $get[$property] = o2system()->__get($property);
         }
 
-        return $get[ $property ];
+        return $get[$property];
     }
 
     // ------------------------------------------------------------------------
 
     final protected function loadSubModel($model)
     {
-        if (is_file($this->validSubModels[ $model ])) {
+        if (is_file($this->validSubModels[$model])) {
             $className = '\\' . get_called_class() . '\\' . ucfirst($model);
             $className = str_replace('\Base\\Model', '\Models', $className);
 

src/Models/Sql/Model.php

Spacing +3 added lines, -3 removed lines

@@ -163,7 +163,7 @@ 
                 if ($filepath === $filePath) {
                     continue;
                 }
-                $this->validSubModels[ camelcase(pathinfo($filepath, PATHINFO_FILENAME)) ] = $filepath;
+                $this->validSubModels[camelcase(pathinfo($filepath, PATHINFO_FILENAME))] = $filepath;
             }
         }
     }
@@ -210,7 +210,7 @@ 
             }
         }
 
-        if (empty($get[ $property ])) {
+        if (empty($get[$property])) {
             if (services()->has($property)) {
                 return services()->get($property);
             } elseif ($this->hasSubModel($property)) {
@@ -251,7 +251,7 @@ 
     final protected function hasSubModel($model)
     {
         if (array_key_exists($model, $this->validSubModels)) {
-            return (bool)is_file($this->validSubModels[ $model ]);
+            return (bool)is_file($this->validSubModels[$model]);
         }
 
         return false;

src/Http/Presenter/Assets.php

Spacing +14 added lines, -14 removed lines

@@ -134,7 +134,7 @@ 
         if (count($subPackages)) {
 
             if (array_key_exists('libraries', $subPackages)) {
-                foreach ($subPackages[ 'libraries' ] as $subPackageFile) {
+                foreach ($subPackages['libraries'] as $subPackageFile) {
                     $pluginDir = $packageDir . 'libraries' . DIRECTORY_SEPARATOR;
                     $pluginName = $subPackageFile;
 
@@ -145,7 +145,7 @@ 
                     }
                 }
 
-                unset($subPackages[ 'libraries' ]);
+                unset($subPackages['libraries']);
             }
 
             $this->head->loadFile($packageDir . $package . '.css');
@@ -400,19 +400,19 @@ 
         }
 
         // Valet path fixes
-        if (isset($_SERVER[ 'SCRIPT_FILENAME' ])) {
-            $valetPath = dirname($_SERVER[ 'SCRIPT_FILENAME' ]) . DIRECTORY_SEPARATOR;
+        if (isset($_SERVER['SCRIPT_FILENAME'])) {
+            $valetPath = dirname($_SERVER['SCRIPT_FILENAME']) . DIRECTORY_SEPARATOR;
         } else {
-            $PATH_ROOT = $_SERVER[ 'DOCUMENT_ROOT' ];
-
-            if (isset($_SERVER[ 'PHP_SELF' ])) {
-                $valetPath = $PATH_ROOT . dirname($_SERVER[ 'PHP_SELF' ]) . DIRECTORY_SEPARATOR;
-            } elseif (isset($_SERVER[ 'DOCUMENT_URI' ])) {
-                $valetPath = $PATH_ROOT . dirname($_SERVER[ 'DOCUMENT_URI' ]) . DIRECTORY_SEPARATOR;
-            } elseif (isset($_SERVER[ 'REQUEST_URI' ])) {
-                $valetPath = $PATH_ROOT . dirname($_SERVER[ 'REQUEST_URI' ]) . DIRECTORY_SEPARATOR;
-            } elseif (isset($_SERVER[ 'SCRIPT_NAME' ])) {
-                $valetPath = $PATH_ROOT . dirname($_SERVER[ 'SCRIPT_NAME' ]) . DIRECTORY_SEPARATOR;
+            $PATH_ROOT = $_SERVER['DOCUMENT_ROOT'];
+
+            if (isset($_SERVER['PHP_SELF'])) {
+                $valetPath = $PATH_ROOT . dirname($_SERVER['PHP_SELF']) . DIRECTORY_SEPARATOR;
+            } elseif (isset($_SERVER['DOCUMENT_URI'])) {
+                $valetPath = $PATH_ROOT . dirname($_SERVER['DOCUMENT_URI']) . DIRECTORY_SEPARATOR;
+            } elseif (isset($_SERVER['REQUEST_URI'])) {
+                $valetPath = $PATH_ROOT . dirname($_SERVER['REQUEST_URI']) . DIRECTORY_SEPARATOR;
+            } elseif (isset($_SERVER['SCRIPT_NAME'])) {
+                $valetPath = $PATH_ROOT . dirname($_SERVER['SCRIPT_NAME']) . DIRECTORY_SEPARATOR;
             }
         }
 

src/DataStructures/Commons/Money.php

Spacing +4 added lines, -4 removed lines

@@ -32,16 +32,16 @@
     {
         $money = [];
         if (is_numeric($amount)) {
-            $money[ 'amount' ] = (int)$amount;
+            $money['amount'] = (int)$amount;
         } elseif (is_array($amount)) {
             $money = $amount;
         }
 
-        (int)$storage[ 'amount' ] = 0;
-        $storage[ 'currency' ] = config()->getItem('units')->currency;
+        (int)$storage['amount'] = 0;
+        $storage['currency'] = config()->getItem('units')->currency;
 
         $storage = array_merge($storage, $money);
-        (int)$storage[ 'amount' ] = empty($storage[ 'amount' ]) ? 0 : abs($storage[ 'amount' ]);
+        (int)$storage['amount'] = empty($storage['amount']) ? 0 : abs($storage['amount']);
 
         $this->storage = $storage;
     }

src/DataStructures/Commons/Name.php

Spacing +12 added lines, -12 removed lines

@@ -36,23 +36,23 @@
             $name = [];
 
             if (count($parts) == 1) {
-                $name[ 'first' ] = $parts[ 0 ];
-                $name[ 'middle' ] = null;
-                $name[ 'last' ] = null;
+                $name['first'] = $parts[0];
+                $name['middle'] = null;
+                $name['last'] = null;
             } elseif (count($parts) == 2) {
-                $name[ 'first' ] = $parts[ 0 ];
-                $name[ 'middle' ] = null;
-                $name[ 'last' ] = $parts[ 1 ];
+                $name['first'] = $parts[0];
+                $name['middle'] = null;
+                $name['last'] = $parts[1];
             } elseif (count($parts) == 3) {
-                $name[ 'first' ] = $parts[ 0 ];
-                $name[ 'middle' ] = $parts[ 1 ];
-                $name[ 'last' ] = $parts[ 2 ];
+                $name['first'] = $parts[0];
+                $name['middle'] = $parts[1];
+                $name['last'] = $parts[2];
             } else {
-                $name[ 'first' ] = $parts[ 0 ];
-                $name[ 'middle' ] = $parts[ 1 ];
+                $name['first'] = $parts[0];
+                $name['middle'] = $parts[1];
 
                 $parts = array_slice($parts, 2);
-                $name[ 'last' ] = implode(' ', $parts);
+                $name['last'] = implode(' ', $parts);
             }
         }
 

src/Http/Presenter/Meta/Opengraph.php

Spacing +4 added lines, -4 removed lines

@@ -76,8 +76,8 @@ 
     {
         $element = new Element('meta');
 
-        $element->attributes[ 'name' ] = 'fb:app_id';
-        $element->attributes[ 'content' ] = $appId;
+        $element->attributes['name'] = 'fb:app_id';
+        $element->attributes['content'] = $appId;
 
         parent::offsetSet('fb:app_id', $element);
 
@@ -117,8 +117,8 @@ 
         $property = 'og:' . $property;
         $element = new Element('meta');
 
-        $element->attributes[ 'name' ] = $property;
-        $element->attributes[ 'content' ] = (is_array($content) ? implode(', ', $content) : trim($content));
+        $element->attributes['name'] = $property;
+        $element->attributes['content'] = (is_array($content) ? implode(', ', $content) : trim($content));
 
         parent::offsetSet($property, $element);
 

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