o2system / framework

src/Http/Presenter.php

Spacing +13 added lines, -13 removed lines

@@ -58,27 +58,27 @@ 
 
             // autoload presenter assets
             if ($config->offsetExists('assets')) {
-                $this->assets->autoload($config->assets[ 'autoload' ]);
+                $this->assets->autoload($config->assets['autoload']);
             }
 
             // autoload presenter theme
             if ($config->offsetExists('theme')) {
-                if(false !== ($theme = $config->offsetGet('theme'))) {
+                if (false !== ($theme = $config->offsetGet('theme'))) {
                     $this->theme->set($config->offsetGet('theme'));
                     $this->theme->load();
                 }
             }
 
             // autoload presenter manifest
-            if($config->offsetExists('manifest')) {
+            if ($config->offsetExists('manifest')) {
                 $manifest = $config->offsetGet('manifest');
 
-                foreach($manifest as $offset => $value) {
-                    if(empty($value)) {
+                foreach ($manifest as $offset => $value) {
+                    if (empty($value)) {
                         continue;
                     }
 
-                    if($offset === 'icons') {
+                    if ($offset === 'icons') {
                         $value = array_values($value);
                     }
 
@@ -95,14 +95,14 @@ 
         $storage = $this->storage;
 
         // 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();
 
         // Add Container
-        $storage[ 'globals' ] = globals();
+        $storage['globals'] = globals();
 
         return $storage;
     }
@@ -120,7 +120,7 @@ 
             return models('controller');
         } elseif ($property === 'services' || $property === 'libraries') {
             return services();
-        } elseif( method_exists($this, $property) ) {
+        } elseif (method_exists($this, $property)) {
             return call_user_func([&$this, $property]);
         }
 

src/Http/Presenter/Theme.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
                 define('PATH_THEME', $pathTheme);
             }
 
-            if(services()->has('view')) {
+            if (services()->has('view')) {
                 // add theme view directory
                 view()->addFilePath($this->active->getRealPath());
             }

src/Http/Presenter/Assets/Positions/Body.php

Spacing +5 added lines, -5 removed lines

@@ -56,8 +56,8 @@ 
 
         // Render js
         if ($this->javascript->count()) {
-            foreach($this->javascript as $js) {
-                if(in_array(pathinfo($js, PATHINFO_FILENAME), $unbundledFilename)) {
+            foreach ($this->javascript as $js) {
+                if (in_array(pathinfo($js, PATHINFO_FILENAME), $unbundledFilename)) {
                     $jsVersion = $this->getVersion($js);
                     $output[] = '<script type="text/javascript" src="' . $this->getUrl($js) . '?v=' . $jsVersion . '"></script>';
                 }
@@ -72,7 +72,7 @@ 
             if (is_file($bundleJsFilePath . '.map')) {
                 $bundleJsMap = json_decode(file_get_contents($bundleJsFilePath . '.map'), true);
                 // if the file version is changed delete it first
-                if ( ! hash_equals($bundleJsVersion, $bundleJsMap[ 'version' ])) {
+                if ( ! hash_equals($bundleJsVersion, $bundleJsMap['version'])) {
                     unlink($bundleJsFilePath);
                     unlink($bundleJsFilePath . '.map');
                 }
@@ -88,8 +88,8 @@ 
                     flock($bundleFileStream, LOCK_EX);
 
                     foreach ($this->css as $css) {
-                        if( ! in_array(pathinfo($css, PATHINFO_FILENAME), $unbundledFilename)) {
-                            $bundleJsMap[ 'sources' ][] = $css;
+                        if ( ! in_array(pathinfo($css, PATHINFO_FILENAME), $unbundledFilename)) {
+                            $bundleJsMap['sources'][] = $css;
                             fwrite($bundleFileStream, file_get_contents($css));
                         }
                     }

src/Http/Presenter/Assets/Positions/Abstracts/AbstractPosition.php

Spacing +6 added lines, -6 removed lines

@@ -107,7 +107,7 @@ 
     {
         $property = is_null($subDir) ? 'css' : null;
 
-        if(is_null($property)) {
+        if (is_null($property)) {
             switch ($subDir) {
                 default:
                 case 'css/':
@@ -153,9 +153,9 @@ 
         foreach ($directories as $directory) {
             $extension = pathinfo($directory . $filePath, PATHINFO_EXTENSION);
 
-            if(empty($extension) and empty($subDir)) {
+            if (empty($extension) and empty($subDir)) {
                 $extensions = ['.css', '.js'];
-            } elseif(empty($extension) and isset($subDir)) {
+            } elseif (empty($extension) and isset($subDir)) {
                 switch ($subDir) {
                     default:
                     case 'css/':
@@ -198,7 +198,7 @@ 
                 }
             }
 
-            foreach($extensions as $extension) {
+            foreach ($extensions as $extension) {
                 // without subdirectory
                 if (input()->env('DEBUG_STAGE') === 'PRODUCTION') {
                     $filePaths[] = $directory . $filePath . '.min' . $extension; // minify version support
@@ -219,7 +219,7 @@ 
 
         foreach ($filePaths as $filePath) {
             if (is_file($filePath)) {
-                if(empty($property)) {
+                if (empty($property)) {
                     $extension = pathinfo($filePath, PATHINFO_EXTENSION);
                     switch ($extension) {
                         case 'font':
@@ -267,7 +267,7 @@ 
             $strInt[] = str_pad(hexdec($strPart), 5, '0', STR_PAD_LEFT);
         }
 
-        $codeVersion = round( implode('', $strInt), 10 );
+        $codeVersion = round(implode('', $strInt), 10);
 
         return substr_replace($codeVersion, '.', 3, strlen($codeVersion) - 5);
     }

src/Http/Presenter/Assets/Positions/Head.php

Spacing +12 added lines, -12 removed lines

@@ -81,7 +81,7 @@ 
             if (is_file($bundleFontFilePath . '.map')) {
                 $bundleFontMap = json_decode(file_get_contents($bundleFontFilePath . '.map'), true);
                 // if the file version is changed delete it first
-                if ( ! hash_equals($bundleFontVersion, $bundleFontMap[ 'version' ])) {
+                if ( ! hash_equals($bundleFontVersion, $bundleFontMap['version'])) {
                     unlink($bundleFontFilePath);
                     unlink($bundleFontFilePath . '.map');
                 }
@@ -97,7 +97,7 @@ 
                     flock($bundleFileStream, LOCK_EX);
 
                     foreach ($this->font as $font) {
-                        $bundleFontMap[ 'sources' ][] = $font;
+                        $bundleFontMap['sources'][] = $font;
                         fwrite($bundleFileStream, file_get_contents($font));
                     }
 
@@ -131,8 +131,8 @@ 
 
         // Render css
         if ($this->css->count()) {
-            foreach($this->css as $css) {
-                if(in_array(pathinfo($css, PATHINFO_FILENAME), $unbundledFilename)) {
+            foreach ($this->css as $css) {
+                if (in_array(pathinfo($css, PATHINFO_FILENAME), $unbundledFilename)) {
                     $cssVersion = $this->getVersion($css);
                     $output[] = '<link rel="stylesheet" type="text/css" media="all" href="' . $this->getUrl($css) . '?v=' . $cssVersion . '">';
                 }
@@ -147,7 +147,7 @@ 
             if (is_file($bundleCssFilePath . '.map')) {
                 $bundleCssMap = json_decode(file_get_contents($bundleCssFilePath . '.map'), true);
                 // if the file version is changed delete it first
-                if ( ! hash_equals($bundleCssVersion, $bundleCssMap[ 'version' ])) {
+                if ( ! hash_equals($bundleCssVersion, $bundleCssMap['version'])) {
                     unlink($bundleCssFilePath);
                     unlink($bundleCssFilePath . '.map');
                 }
@@ -163,8 +163,8 @@ 
                     flock($bundleFileStream, LOCK_EX);
 
                     foreach ($this->css as $css) {
-                        if( ! in_array(pathinfo($css, PATHINFO_FILENAME), $unbundledFilename)) {
-                            $bundleCssMap[ 'sources' ][] = $css;
+                        if ( ! in_array(pathinfo($css, PATHINFO_FILENAME), $unbundledFilename)) {
+                            $bundleCssMap['sources'][] = $css;
                             fwrite($bundleFileStream, file_get_contents($css));
                         }
                     }
@@ -197,8 +197,8 @@ 
 
         // Render js
         if ($this->javascript->count()) {
-            foreach($this->javascript as $js) {
-                if(in_array(pathinfo($css, PATHINFO_FILENAME), $unbundledFilename)) {
+            foreach ($this->javascript as $js) {
+                if (in_array(pathinfo($css, PATHINFO_FILENAME), $unbundledFilename)) {
                     $jsVersion = $this->getVersion($js);
                     $output[] = '<script type="text/javascript" src="' . $this->getUrl($js) . '?v=' . $jsVersion . '"></script>';
                 }
@@ -213,7 +213,7 @@ 
             if (is_file($bundleJsFilePath . '.map')) {
                 $bundleJsMap = json_decode(file_get_contents($bundleJsFilePath . '.map'), true);
                 // if the file version is changed delete it first
-                if ( ! hash_equals($bundleJsVersion, $bundleJsMap[ 'version' ])) {
+                if ( ! hash_equals($bundleJsVersion, $bundleJsMap['version'])) {
                     unlink($bundleJsFilePath);
                     unlink($bundleJsFilePath . '.map');
                 }
@@ -229,8 +229,8 @@ 
                     flock($bundleFileStream, LOCK_EX);
 
                     foreach ($this->css as $css) {
-                        if( ! in_array(pathinfo($css, PATHINFO_FILENAME), $unbundledFilename)) {
-                            $bundleJsMap[ 'sources' ][] = $css;
+                        if ( ! in_array(pathinfo($css, PATHINFO_FILENAME), $unbundledFilename)) {
+                            $bundleJsMap['sources'][] = $css;
                             fwrite($bundleFileStream, file_get_contents($css));
                         }
                     }

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