@@ -28,7 +28,7 @@ |
||
28 | 28 | */ |
29 | 29 | public function index() |
30 | 30 | { |
31 | - if($javascript = file_get_contents(PATH_PUBLIC . 'assets/sw.js')) { |
|
31 | + if ($javascript = file_get_contents(PATH_PUBLIC . 'assets/sw.js')) { |
|
32 | 32 | $javascript = str_replace(['{{$theme}}', '{{ $theme }}'], 'default', $javascript); |
33 | 33 | |
34 | 34 | header("Content-type: application/x-javascript"); |
@@ -156,8 +156,8 @@ |
||
156 | 156 | */ |
157 | 157 | public function reload() |
158 | 158 | { |
159 | - if(count($this->loaded)) { |
|
160 | - foreach($this->loaded as $filename) { |
|
159 | + if (count($this->loaded)) { |
|
160 | + foreach ($this->loaded as $filename) { |
|
161 | 161 | $this->loadFile($filename); |
162 | 162 | } |
163 | 163 | } |
@@ -105,12 +105,12 @@ discard block |
||
105 | 105 | } |
106 | 106 | |
107 | 107 | // autoload presenter assets |
108 | - if (isset($config[ 'assets' ])) { |
|
109 | - $this->assets->autoload($config[ 'assets' ]); |
|
108 | + if (isset($config['assets'])) { |
|
109 | + $this->assets->autoload($config['assets']); |
|
110 | 110 | } |
111 | 111 | |
112 | 112 | // autoload presenter theme |
113 | - if(isset($config['theme'])) { |
|
113 | + if (isset($config['theme'])) { |
|
114 | 114 | $this->setTheme($config['theme']); |
115 | 115 | } |
116 | 116 | |
@@ -128,19 +128,19 @@ discard block |
||
128 | 128 | */ |
129 | 129 | public function setTheme($theme) |
130 | 130 | { |
131 | - if($this->theme instanceof Theme) { |
|
131 | + if ($this->theme instanceof Theme) { |
|
132 | 132 | $this->assets->removeFilePath($this->theme->getRealPath()); |
133 | 133 | } |
134 | 134 | |
135 | 135 | if (is_bool($theme)) { |
136 | 136 | $this->theme = false; |
137 | - } elseif(($moduleTheme = modules()->top()->getTheme($theme, true)) instanceof Theme) { |
|
137 | + } elseif (($moduleTheme = modules()->top()->getTheme($theme, true)) instanceof Theme) { |
|
138 | 138 | $this->theme = $moduleTheme; |
139 | - } elseif(($appTheme = modules()->first()->getTheme($theme, true)) instanceof Theme) { |
|
139 | + } elseif (($appTheme = modules()->first()->getTheme($theme, true)) instanceof Theme) { |
|
140 | 140 | $this->theme = $appTheme; |
141 | 141 | } |
142 | 142 | |
143 | - if($this->theme) { |
|
143 | + if ($this->theme) { |
|
144 | 144 | if ( ! defined('PATH_THEME')) { |
145 | 145 | define('PATH_THEME', $this->theme->getRealPath()); |
146 | 146 | } |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | // add theme assets directory |
149 | 149 | $this->assets->pushFilePath($this->theme->getRealPath()); |
150 | 150 | |
151 | - if(is_dir($themeViewPath = $this->theme->getRealPath() . 'views' . DIRECTORY_SEPARATOR)) { |
|
151 | + if (is_dir($themeViewPath = $this->theme->getRealPath() . 'views' . DIRECTORY_SEPARATOR)) { |
|
152 | 152 | |
153 | 153 | // add theme view directory |
154 | 154 | view()->addFilePath($this->theme->getRealPath()); |
@@ -158,11 +158,11 @@ discard block |
||
158 | 158 | |
159 | 159 | $modules = modules()->getArrayCopy(); |
160 | 160 | |
161 | - foreach($modules as $module) { |
|
161 | + foreach ($modules as $module) { |
|
162 | 162 | if ( ! in_array($module->getType(), ['KERNEL', 'FRAMEWORK', 'APP'])) { |
163 | 163 | $moduleResourcesPath = str_replace(PATH_RESOURCES, '', $module->getResourcesDir()); |
164 | 164 | |
165 | - if(is_dir($themeViewPath . $moduleResourcesPath)) { |
|
165 | + if (is_dir($themeViewPath . $moduleResourcesPath)) { |
|
166 | 166 | view()->pushFilePath($themeViewPath . $moduleResourcesPath); |
167 | 167 | } |
168 | 168 | } |
@@ -203,25 +203,25 @@ discard block |
||
203 | 203 | $storage = $this->storage; |
204 | 204 | |
205 | 205 | // Add Properties |
206 | - $storage[ 'meta' ] = $this->meta; |
|
207 | - $storage[ 'page' ] = $this->page; |
|
208 | - $storage[ 'assets' ] = new SplArrayObject([ |
|
206 | + $storage['meta'] = $this->meta; |
|
207 | + $storage['page'] = $this->page; |
|
208 | + $storage['assets'] = new SplArrayObject([ |
|
209 | 209 | 'head' => $this->assets->getHead(), |
210 | 210 | 'body' => $this->assets->getBody(), |
211 | 211 | ]); |
212 | - $storage[ 'partials' ] = $this->partials; |
|
213 | - $storage[ 'widgets' ] = $this->widgets; |
|
214 | - $storage[ 'theme' ] = $this->theme; |
|
212 | + $storage['partials'] = $this->partials; |
|
213 | + $storage['widgets'] = $this->widgets; |
|
214 | + $storage['theme'] = $this->theme; |
|
215 | 215 | |
216 | 216 | // Add Services |
217 | - $storage[ 'config' ] = config(); |
|
218 | - $storage[ 'language' ] = language(); |
|
219 | - $storage[ 'session' ] = session(); |
|
220 | - $storage[ 'presenter' ] = presenter(); |
|
221 | - $storage[ 'input' ] = input(); |
|
217 | + $storage['config'] = config(); |
|
218 | + $storage['language'] = language(); |
|
219 | + $storage['session'] = session(); |
|
220 | + $storage['presenter'] = presenter(); |
|
221 | + $storage['input'] = input(); |
|
222 | 222 | |
223 | 223 | if (services()->has('csrfProtection')) { |
224 | - $storage[ 'csrfToken' ] = services()->get('csrfProtection')->getToken(); |
|
224 | + $storage['csrfToken'] = services()->get('csrfProtection')->getToken(); |
|
225 | 225 | } |
226 | 226 | |
227 | 227 | return $storage; |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | self::POST_CONTROLLER, |
119 | 119 | self::POST_COMMANDER, |
120 | 120 | ])) { |
121 | - $this->closures[ $offset ][ spl_object_hash($closure) ] = $closure; |
|
121 | + $this->closures[$offset][spl_object_hash($closure)] = $closure; |
|
122 | 122 | } |
123 | 123 | } |
124 | 124 | |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | public function callEvent($event) |
133 | 133 | { |
134 | 134 | if (array_key_exists($event, $this->closures)) { |
135 | - foreach ($this->closures[ $event ] as $closure) { |
|
135 | + foreach ($this->closures[$event] as $closure) { |
|
136 | 136 | call_user_func($closure); |
137 | 137 | } |
138 | 138 | } |
@@ -173,7 +173,7 @@ |
||
173 | 173 | $phar->buildFromIterator(new \RecursiveIteratorIterator(new \RecursiveCallbackFilterIterator( |
174 | 174 | new \RecursiveDirectoryIterator(PATH_ROOT, |
175 | 175 | \FilesystemIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS), |
176 | - function ($current, $key, $iterator) { |
|
176 | + function($current, $key, $iterator) { |
|
177 | 177 | if ($current->isDir()) { |
178 | 178 | // exclude build directory |
179 | 179 | if ($current->getFilename() === 'build') { |
@@ -191,16 +191,16 @@ discard block |
||
191 | 191 | $options = input()->get(); |
192 | 192 | |
193 | 193 | if (empty($options)) { |
194 | - $_GET[ 'switch' ] = 'ON'; |
|
195 | - $_GET[ 'mode' ] = 'default'; |
|
196 | - $_GET[ 'lifetime' ] = 300; |
|
197 | - $_GET[ 'title' ] = language()->getLine(strtoupper('CLI_MAINTENANCE_TITLE')); |
|
198 | - $_GET[ 'message' ] = language()->getLine(strtoupper('CLI_MAINTENANCE_MESSAGE')); |
|
194 | + $_GET['switch'] = 'ON'; |
|
195 | + $_GET['mode'] = 'default'; |
|
196 | + $_GET['lifetime'] = 300; |
|
197 | + $_GET['title'] = language()->getLine(strtoupper('CLI_MAINTENANCE_TITLE')); |
|
198 | + $_GET['message'] = language()->getLine(strtoupper('CLI_MAINTENANCE_MESSAGE')); |
|
199 | 199 | } else { |
200 | - $_GET[ 'mode' ] = 'default'; |
|
201 | - $_GET[ 'lifetime' ] = 300; |
|
202 | - $_GET[ 'title' ] = language()->getLine(strtoupper('CLI_MAINTENANCE_TITLE')); |
|
203 | - $_GET[ 'message' ] = language()->getLine(strtoupper('CLI_MAINTENANCE_MESSAGE')); |
|
200 | + $_GET['mode'] = 'default'; |
|
201 | + $_GET['lifetime'] = 300; |
|
202 | + $_GET['title'] = language()->getLine(strtoupper('CLI_MAINTENANCE_TITLE')); |
|
203 | + $_GET['message'] = language()->getLine(strtoupper('CLI_MAINTENANCE_MESSAGE')); |
|
204 | 204 | } |
205 | 205 | |
206 | 206 | $this->__callOptions(); |
@@ -213,11 +213,11 @@ discard block |
||
213 | 213 | (new Format()) |
214 | 214 | ->setContextualClass(Format::DANGER) |
215 | 215 | ->setString(language()->getLine('CLI_MAINTENANCE_ALREADY_STARTED', [ |
216 | - $maintenanceInfo[ 'mode' ], |
|
217 | - $maintenanceInfo[ 'datetime' ], |
|
218 | - date('r', strtotime($maintenanceInfo[ 'datetime' ]) + $maintenanceInfo[ 'lifetime' ]), |
|
219 | - $maintenanceInfo[ 'title' ], |
|
220 | - $maintenanceInfo[ 'message' ], |
|
216 | + $maintenanceInfo['mode'], |
|
217 | + $maintenanceInfo['datetime'], |
|
218 | + date('r', strtotime($maintenanceInfo['datetime']) + $maintenanceInfo['lifetime']), |
|
219 | + $maintenanceInfo['title'], |
|
220 | + $maintenanceInfo['message'], |
|
221 | 221 | ])) |
222 | 222 | ->setNewLinesAfter(1) |
223 | 223 | ); |
@@ -113,8 +113,8 @@ discard block |
||
113 | 113 | $options = input()->get(); |
114 | 114 | |
115 | 115 | if (empty($options)) { |
116 | - $_GET[ 'host' ] = 'localhost'; |
|
117 | - $_GET[ 'port' ] = 8000; |
|
116 | + $_GET['host'] = 'localhost'; |
|
117 | + $_GET['port'] = 8000; |
|
118 | 118 | } |
119 | 119 | |
120 | 120 | $this->__callOptions(); |
@@ -126,12 +126,12 @@ discard block |
||
126 | 126 | ->setNewLinesAfter(1) |
127 | 127 | ); |
128 | 128 | |
129 | - $_SERVER[ 'DOCUMENT_ROOT' ] = PATH_PUBLIC; |
|
129 | + $_SERVER['DOCUMENT_ROOT'] = PATH_PUBLIC; |
|
130 | 130 | |
131 | 131 | output()->write( |
132 | 132 | (new Format()) |
133 | 133 | ->setContextualClass(Format::INFO) |
134 | - ->setString(language()->getLine('CLI_SERVE_DOC_ROOT', [$_SERVER[ 'DOCUMENT_ROOT' ]])) |
|
134 | + ->setString(language()->getLine('CLI_SERVE_DOC_ROOT', [$_SERVER['DOCUMENT_ROOT']])) |
|
135 | 135 | ->setNewLinesAfter(1) |
136 | 136 | ); |
137 | 137 |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | $directory = new \RecursiveIteratorIterator(new \RecursiveCallbackFilterIterator( |
97 | 97 | new \RecursiveDirectoryIterator(PATH_ROOT, |
98 | 98 | \FilesystemIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS), |
99 | - function ($current, $key, $iterator) { |
|
99 | + function($current, $key, $iterator) { |
|
100 | 100 | if ($current->isDir()) { |
101 | 101 | // exclude build directory |
102 | 102 | if (in_array($current->getFilename(), [ |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | |
119 | 119 | $files[] = $packageJsonFileInfo; |
120 | 120 | |
121 | - if ($packageJsonFileInfo[ 'filename' ] === 'language') { |
|
121 | + if ($packageJsonFileInfo['filename'] === 'language') { |
|
122 | 122 | if (is_cli()) { |
123 | 123 | output()->verbose( |
124 | 124 | (new Format()) |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | ); |
142 | 142 | } |
143 | 143 | |
144 | - $registry[ $package->getDirName() ] = $package; |
|
144 | + $registry[$package->getDirName()] = $package; |
|
145 | 145 | } elseif (is_cli()) { |
146 | 146 | output()->verbose( |
147 | 147 | (new Format()) |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | { |
186 | 186 | if (isset($package)) { |
187 | 187 | if ($this->registered($package)) { |
188 | - return $this->registry[ $package ]; |
|
188 | + return $this->registry[$package]; |
|
189 | 189 | } |
190 | 190 | |
191 | 191 | return false; |
@@ -205,7 +205,7 @@ discard block |
||
205 | 205 | */ |
206 | 206 | public function registered($package) |
207 | 207 | { |
208 | - return isset($this->registry[ $package ]); |
|
208 | + return isset($this->registry[$package]); |
|
209 | 209 | } |
210 | 210 | |
211 | 211 | // ------------------------------------------------------------------------ |
@@ -487,11 +487,11 @@ |
||
487 | 487 | $moduleParentSegments = []; |
488 | 488 | |
489 | 489 | foreach ([ |
490 | - 'apps', |
|
491 | - 'modules', |
|
492 | - 'components', |
|
493 | - 'plugins', |
|
494 | - ] as $moduleType |
|
490 | + 'apps', |
|
491 | + 'modules', |
|
492 | + 'components', |
|
493 | + 'plugins', |
|
494 | + ] as $moduleType |
|
495 | 495 | ) { |
496 | 496 | if (false !== ($segmentKey = array_search($modularType, $moduleSegments))) { |
497 | 497 | $moduleParentSegments = array_slice($moduleSegments, 0, $segmentKey); |
@@ -188,13 +188,13 @@ discard block |
||
188 | 188 | |
189 | 189 | if (isset($config) AND is_array($config)) { |
190 | 190 | // Set default timezone |
191 | - if (isset($config[ 'datetime' ][ 'timezone' ])) { |
|
192 | - date_default_timezone_set($config[ 'datetime' ][ 'timezone' ]); |
|
191 | + if (isset($config['datetime']['timezone'])) { |
|
192 | + date_default_timezone_set($config['datetime']['timezone']); |
|
193 | 193 | } |
194 | 194 | |
195 | 195 | // Setup Language Ideom and Locale |
196 | - if (isset($config[ 'language' ])) { |
|
197 | - language()->setDefault($config[ 'language' ]); |
|
196 | + if (isset($config['language'])) { |
|
197 | + language()->setDefault($config['language']); |
|
198 | 198 | } |
199 | 199 | |
200 | 200 | config()->merge($config); |
@@ -424,8 +424,8 @@ discard block |
||
424 | 424 | $packageJsonFile = str_replace(['\\', '/'], DIRECTORY_SEPARATOR, $packageJsonFile); |
425 | 425 | $packageJsonFileInfo = pathinfo($packageJsonFile); |
426 | 426 | |
427 | - if ($packageJsonFileInfo[ 'filename' ] === 'widget' or |
|
428 | - $packageJsonFileInfo[ 'filename' ] === 'language' or |
|
427 | + if ($packageJsonFileInfo['filename'] === 'widget' or |
|
428 | + $packageJsonFileInfo['filename'] === 'language' or |
|
429 | 429 | strpos($packageJsonFile, '.svn') !== false // subversion properties file conflict. |
430 | 430 | ) { |
431 | 431 | continue; |
@@ -455,8 +455,8 @@ discard block |
||
455 | 455 | } |
456 | 456 | |
457 | 457 | if (strpos($packageJsonFile, |
458 | - $modularType = ucfirst(plural($packageJsonFileInfo[ 'filename' ])) . DIRECTORY_SEPARATOR) === false) { |
|
459 | - $modularType = ucfirst($packageJsonFileInfo[ 'filename' ]) . DIRECTORY_SEPARATOR; |
|
458 | + $modularType = ucfirst(plural($packageJsonFileInfo['filename'])) . DIRECTORY_SEPARATOR) === false) { |
|
459 | + $modularType = ucfirst($packageJsonFileInfo['filename']) . DIRECTORY_SEPARATOR; |
|
460 | 460 | } |
461 | 461 | |
462 | 462 | $modularType = strtolower(rtrim($modularType, DIRECTORY_SEPARATOR)); |
@@ -471,7 +471,7 @@ discard block |
||
471 | 471 | PATH_PUBLIC, |
472 | 472 | PATH_RESOURCES, |
473 | 473 | PATH_APP, |
474 | - $packageJsonFileInfo[ 'basename' ], |
|
474 | + $packageJsonFileInfo['basename'], |
|
475 | 475 | ], |
476 | 476 | '', |
477 | 477 | $packageJsonFile |
@@ -480,7 +480,7 @@ discard block |
||
480 | 480 | ) |
481 | 481 | ); |
482 | 482 | |
483 | - $moduleSegments = array_map(function ($string) { |
|
483 | + $moduleSegments = array_map(function($string) { |
|
484 | 484 | return dash(snakecase($string)); |
485 | 485 | }, $moduleSegments); |
486 | 486 | |
@@ -496,7 +496,7 @@ discard block |
||
496 | 496 | if (false !== ($segmentKey = array_search($modularType, $moduleSegments))) { |
497 | 497 | $moduleParentSegments = array_slice($moduleSegments, 0, $segmentKey); |
498 | 498 | |
499 | - unset($moduleSegments[ $segmentKey ]); |
|
499 | + unset($moduleSegments[$segmentKey]); |
|
500 | 500 | break; |
501 | 501 | } |
502 | 502 | } |
@@ -507,29 +507,29 @@ discard block |
||
507 | 507 | str_replace( |
508 | 508 | PATH_ROOT, |
509 | 509 | '', |
510 | - $packageJsonFileInfo[ 'dirname' ] |
|
510 | + $packageJsonFileInfo['dirname'] |
|
511 | 511 | ), |
512 | 512 | false |
513 | 513 | ); |
514 | 514 | |
515 | - if (isset($packageJsonMetadata[ 'namespace' ])) { |
|
516 | - $moduleNamespace = $packageJsonMetadata[ 'namespace' ]; |
|
517 | - unset($packageJsonMetadata[ 'namespace' ]); |
|
515 | + if (isset($packageJsonMetadata['namespace'])) { |
|
516 | + $moduleNamespace = $packageJsonMetadata['namespace']; |
|
517 | + unset($packageJsonMetadata['namespace']); |
|
518 | 518 | } |
519 | 519 | |
520 | 520 | $registryKey = implode('/', $moduleSegments); |
521 | 521 | |
522 | 522 | if ($registryKey === '') { |
523 | - if ($packageJsonFileInfo[ 'dirname' ] . DIRECTORY_SEPARATOR !== PATH_APP and $modularType === 'app') { |
|
523 | + if ($packageJsonFileInfo['dirname'] . DIRECTORY_SEPARATOR !== PATH_APP and $modularType === 'app') { |
|
524 | 524 | $registryKey = dash(snakecase( |
525 | - pathinfo($packageJsonFileInfo[ 'dirname' ], PATHINFO_FILENAME))); |
|
525 | + pathinfo($packageJsonFileInfo['dirname'], PATHINFO_FILENAME))); |
|
526 | 526 | } |
527 | 527 | } |
528 | 528 | |
529 | - $registry[ $registryKey ] = (new DataStructures\Module( |
|
530 | - $packageJsonFileInfo[ 'dirname' ] |
|
529 | + $registry[$registryKey] = (new DataStructures\Module( |
|
530 | + $packageJsonFileInfo['dirname'] |
|
531 | 531 | )) |
532 | - ->setType($packageJsonFileInfo[ 'filename' ]) |
|
532 | + ->setType($packageJsonFileInfo['filename']) |
|
533 | 533 | ->setNamespace($moduleNamespace) |
534 | 534 | ->setSegments($moduleSegments) |
535 | 535 | ->setParentSegments($moduleParentSegments) |
@@ -691,8 +691,8 @@ discard block |
||
691 | 691 | $segment = dash($segment); |
692 | 692 | |
693 | 693 | if ($this->exists($segment)) { |
694 | - if ($this->registry[ $segment ] instanceof DataStructures\Module) { |
|
695 | - return $this->registry[ $segment ]; |
|
694 | + if ($this->registry[$segment] instanceof DataStructures\Module) { |
|
695 | + return $this->registry[$segment]; |
|
696 | 696 | } |
697 | 697 | } |
698 | 698 | |
@@ -728,8 +728,8 @@ discard block |
||
728 | 728 | */ |
729 | 729 | public function first() |
730 | 730 | { |
731 | - if (isset($this->registry[ '' ])) { |
|
732 | - return $this->registry[ '' ]; |
|
731 | + if (isset($this->registry[''])) { |
|
732 | + return $this->registry['']; |
|
733 | 733 | } elseif (reset($this->registry)->type === 'APP') { |
734 | 734 | return reset($this->registry); |
735 | 735 | } |
@@ -751,7 +751,7 @@ discard block |
||
751 | 751 | $segments = (is_array($segments) ? implode('/', array_map('dash', $segments)) : $segments); |
752 | 752 | |
753 | 753 | if ($this->exists($segments)) { |
754 | - return $this->registry[ $segments ]; |
|
754 | + return $this->registry[$segments]; |
|
755 | 755 | } |
756 | 756 | |
757 | 757 | return false; |
@@ -772,7 +772,7 @@ discard block |
||
772 | 772 | |
773 | 773 | foreach ($this as $key => $module) { |
774 | 774 | if ($module instanceof DataStructures\Module) { |
775 | - $namespaces[ $key ] = new SplNamespaceInfo($module->getNamespace(), $module->getRealPath()); |
|
775 | + $namespaces[$key] = new SplNamespaceInfo($module->getNamespace(), $module->getRealPath()); |
|
776 | 776 | } |
777 | 777 | } |
778 | 778 |