@@ -173,7 +173,7 @@ discard block |
||
173 | 173 | if (is_file($mapFilePath = $publicFilePath . '.map')) { |
174 | 174 | $mapMetadata = json_decode(file_get_contents($mapFilePath), true); |
175 | 175 | // if the file version is changed delete it first |
176 | - if ( ! hash_equals($fileVersion, $mapMetadata[ 'version' ])) { |
|
176 | + if ( ! hash_equals($fileVersion, $mapMetadata['version'])) { |
|
177 | 177 | unlink($publicFilePath); |
178 | 178 | unlink($publicMinifyFilePath); |
179 | 179 | unlink($mapFilePath); |
@@ -266,7 +266,7 @@ discard block |
||
266 | 266 | if ( ! empty($content)) { |
267 | 267 | $sourcesContent[] = $content; |
268 | 268 | } else { |
269 | - unset($sources[ $key ]); |
|
269 | + unset($sources[$key]); |
|
270 | 270 | } |
271 | 271 | } |
272 | 272 | |
@@ -287,7 +287,7 @@ discard block |
||
287 | 287 | if (is_file($mapFilePath = $publicFilePath . '.map')) { |
288 | 288 | $mapMetadata = json_decode(file_get_contents($mapFilePath), true); |
289 | 289 | // if the file version is changed delete it first |
290 | - if ( ! hash_equals($fileVersion, $mapMetadata[ 'version' ])) { |
|
290 | + if ( ! hash_equals($fileVersion, $mapMetadata['version'])) { |
|
291 | 291 | unlink($publicFilePath); |
292 | 292 | unlink($publicMinifyFilePath); |
293 | 293 | unlink($mapFilePath); |
@@ -111,15 +111,15 @@ discard block |
||
111 | 111 | foreach ($this->javascripts as $javascript) { |
112 | 112 | if (in_array(pathinfo($javascript, PATHINFO_FILENAME), $unbundledFilenames)) { |
113 | 113 | $fileVersion = $this->getVersion(filemtime($javascript)); |
114 | - $output[] = '<script type="text/javascript" id="js-'.pathinfo($javascript, PATHINFO_FILENAME).'" src="' . $this->getUrl($javascript) . '?v=' . $fileVersion . '"></script>'; |
|
114 | + $output[] = '<script type="text/javascript" id="js-' . pathinfo($javascript, PATHINFO_FILENAME) . '" src="' . $this->getUrl($javascript) . '?v=' . $fileVersion . '"></script>'; |
|
115 | 115 | } elseif (in_array(pathinfo($javascript, PATHINFO_FILENAME), ['module', 'module.min'])) { |
116 | 116 | $modulePublicFile = $this->publishFile($javascript); |
117 | 117 | |
118 | - if (is_file($modulePublicFile[ 'filePath' ])) { |
|
118 | + if (is_file($modulePublicFile['filePath'])) { |
|
119 | 119 | if (input()->env('DEBUG_STAGE') === 'PRODUCTION') { |
120 | - $output[] = '<script type="text/javascript" id="js-module" src="' . $modulePublicFile[ 'minify' ][ 'url' ] . '?v=' . $modulePublicFile[ 'version' ] . '"></script>'; |
|
120 | + $output[] = '<script type="text/javascript" id="js-module" src="' . $modulePublicFile['minify']['url'] . '?v=' . $modulePublicFile['version'] . '"></script>'; |
|
121 | 121 | } else { |
122 | - $output[] = '<script type="text/javascript" id="js-module" src="' . $modulePublicFile[ 'url' ] . '?v=' . $modulePublicFile[ 'version' ] . '"></script>'; |
|
122 | + $output[] = '<script type="text/javascript" id="js-module" src="' . $modulePublicFile['url'] . '?v=' . $modulePublicFile['version'] . '"></script>'; |
|
123 | 123 | } |
124 | 124 | } |
125 | 125 | } else { |
@@ -130,11 +130,11 @@ discard block |
||
130 | 130 | if (count($bundleJavascriptSources)) { |
131 | 131 | $bundleJavascriptPublicFile = $this->bundleFile($bundleFilename . '.js', $bundleJavascriptSources); |
132 | 132 | |
133 | - if (is_file($bundleJavascriptPublicFile[ 'filePath' ])) { |
|
133 | + if (is_file($bundleJavascriptPublicFile['filePath'])) { |
|
134 | 134 | if (input()->env('DEBUG_STAGE') === 'PRODUCTION') { |
135 | - $output[] = '<script type="text/javascript" id="js-bundle" src="' . $bundleJavascriptPublicFile[ 'minify' ][ 'url' ] . '?v=' . $bundleJavascriptPublicFile[ 'version' ] . '"></script>'; |
|
135 | + $output[] = '<script type="text/javascript" id="js-bundle" src="' . $bundleJavascriptPublicFile['minify']['url'] . '?v=' . $bundleJavascriptPublicFile['version'] . '"></script>'; |
|
136 | 136 | } else { |
137 | - $output[] = '<script type="text/javascript" id="js-bundle" src="' . $bundleJavascriptPublicFile[ 'url' ] . '?v=' . $bundleJavascriptPublicFile[ 'version' ] . '"></script>'; |
|
137 | + $output[] = '<script type="text/javascript" id="js-bundle" src="' . $bundleJavascriptPublicFile['url'] . '?v=' . $bundleJavascriptPublicFile['version'] . '"></script>'; |
|
138 | 138 | } |
139 | 139 | } |
140 | 140 | } |
@@ -67,8 +67,8 @@ discard block |
||
67 | 67 | $args = func_get_args(); |
68 | 68 | |
69 | 69 | if (count($args)) { |
70 | - if (isset($GLOBALS[ $args[ 0 ] ])) { |
|
71 | - return $GLOBALS[ $args[ 0 ] ]; |
|
70 | + if (isset($GLOBALS[$args[0]])) { |
|
71 | + return $GLOBALS[$args[0]]; |
|
72 | 72 | } |
73 | 73 | |
74 | 74 | return null; |
@@ -93,8 +93,8 @@ discard block |
||
93 | 93 | $args = func_get_args(); |
94 | 94 | |
95 | 95 | if (count($args)) { |
96 | - if (isset($_ENV[ $args[ 0 ] ])) { |
|
97 | - return $_ENV[ $args[ 0 ] ]; |
|
96 | + if (isset($_ENV[$args[0]])) { |
|
97 | + return $_ENV[$args[0]]; |
|
98 | 98 | } |
99 | 99 | |
100 | 100 | return null; |
@@ -195,9 +195,9 @@ discard block |
||
195 | 195 | $args = func_get_args(); |
196 | 196 | |
197 | 197 | if (count($args) == 1) { |
198 | - return o2system()->models->autoload($args[ 0 ]); |
|
198 | + return o2system()->models->autoload($args[0]); |
|
199 | 199 | } else if (count($args) == 2) { |
200 | - return o2system()->models->autoload($args[ 0 ], $args[ 1 ]); |
|
200 | + return o2system()->models->autoload($args[0], $args[1]); |
|
201 | 201 | } |
202 | 202 | |
203 | 203 | return o2system()->models; |
@@ -219,7 +219,7 @@ discard block |
||
219 | 219 | $args = func_get_args(); |
220 | 220 | |
221 | 221 | if (count($args)) { |
222 | - return o2system()->modules->getModule($args[ 0 ]); |
|
222 | + return o2system()->modules->getModule($args[0]); |
|
223 | 223 | } |
224 | 224 | |
225 | 225 | return o2system()->modules; |
@@ -261,8 +261,8 @@ discard block |
||
261 | 261 | $args = func_get_args(); |
262 | 262 | |
263 | 263 | if (count($args)) { |
264 | - if (isset($_SESSION[ $args[ 0 ] ])) { |
|
265 | - return $_SESSION[ $args[ 0 ] ]; |
|
264 | + if (isset($_SESSION[$args[0]])) { |
|
265 | + return $_SESSION[$args[0]]; |
|
266 | 266 | } |
267 | 267 | |
268 | 268 | return null; |
@@ -41,8 +41,8 @@ discard block |
||
41 | 41 | } |
42 | 42 | |
43 | 43 | if (method_exists($this, 'getRecordOrdering')) { |
44 | - if ($this->recordOrdering === true && empty($sets[ 'record_ordering' ])) { |
|
45 | - $sets[ 'record_ordering' ] = $this->getRecordOrdering($this->table); |
|
44 | + if ($this->recordOrdering === true && empty($sets['record_ordering'])) { |
|
45 | + $sets['record_ordering'] = $this->getRecordOrdering($this->table); |
|
46 | 46 | } |
47 | 47 | } |
48 | 48 | |
@@ -93,8 +93,8 @@ discard block |
||
93 | 93 | if (method_exists($this, 'insertRecordSets')) { |
94 | 94 | foreach ($sets as $set) { |
95 | 95 | $this->insertRecordSets($set); |
96 | - if ($this->recordOrdering === true && empty($sets[ 'record_ordering' ])) { |
|
97 | - $set[ 'record_ordering' ] = $this->getRecordOrdering($this->table); |
|
96 | + if ($this->recordOrdering === true && empty($sets['record_ordering'])) { |
|
97 | + $set['record_ordering'] = $this->getRecordOrdering($this->table); |
|
98 | 98 | } |
99 | 99 | } |
100 | 100 | } |
@@ -154,8 +154,8 @@ discard block |
||
154 | 154 | $primaryKey = isset($this->primaryKey) ? $this->primaryKey : 'id'; |
155 | 155 | |
156 | 156 | if (empty($conditions)) { |
157 | - if (isset($sets[ $primaryKey ])) { |
|
158 | - $conditions = [$primaryKey => $sets[ $primaryKey ]]; |
|
157 | + if (isset($sets[$primaryKey])) { |
|
158 | + $conditions = [$primaryKey => $sets[$primaryKey]]; |
|
159 | 159 | } |
160 | 160 | } |
161 | 161 | |
@@ -168,8 +168,8 @@ discard block |
||
168 | 168 | } |
169 | 169 | |
170 | 170 | if (method_exists($this, 'getRecordOrdering')) { |
171 | - if ($this->recordOrdering === true && empty($sets[ 'record_ordering' ])) { |
|
172 | - $sets[ 'record_ordering' ] = $this->getRecordOrdering($this->table); |
|
171 | + if ($this->recordOrdering === true && empty($sets['record_ordering'])) { |
|
172 | + $sets['record_ordering'] = $this->getRecordOrdering($this->table); |
|
173 | 173 | } |
174 | 174 | } |
175 | 175 | |
@@ -202,8 +202,8 @@ discard block |
||
202 | 202 | $primaryKey = isset($this->primaryKey) ? $this->primaryKey : 'id'; |
203 | 203 | |
204 | 204 | if (empty($conditions)) { |
205 | - if (isset($sets[ $primaryKey ])) { |
|
206 | - $conditions = [$primaryKey => $sets[ $primaryKey ]]; |
|
205 | + if (isset($sets[$primaryKey])) { |
|
206 | + $conditions = [$primaryKey => $sets[$primaryKey]]; |
|
207 | 207 | } else { |
208 | 208 | $conditions = $sets; |
209 | 209 | } |
@@ -235,7 +235,7 @@ discard block |
||
235 | 235 | |
236 | 236 | if (method_exists($this, 'updateRecordSets')) { |
237 | 237 | foreach ($sets as $key => $set) { |
238 | - $this->updateRecordSets($sets[ $key ]); |
|
238 | + $this->updateRecordSets($sets[$key]); |
|
239 | 239 | } |
240 | 240 | } |
241 | 241 | |
@@ -383,7 +383,7 @@ discard block |
||
383 | 383 | */ |
384 | 384 | private function updateRecordStatus($id, $recordStatus, $method) |
385 | 385 | { |
386 | - $sets[ 'record_status' ] = $recordStatus; |
|
386 | + $sets['record_status'] = $recordStatus; |
|
387 | 387 | $primaryKey = isset($this->primaryKey) ? $this->primaryKey : 'id'; |
388 | 388 | |
389 | 389 | if (method_exists($this, 'updateRecordSets')) { |
@@ -417,13 +417,13 @@ discard block |
||
417 | 417 | private function updateRecordStatusMany(array $ids, $recordStatus, $method) |
418 | 418 | { |
419 | 419 | if (count($ids)) { |
420 | - $sets[ 'record_status' ] = $recordStatus; |
|
420 | + $sets['record_status'] = $recordStatus; |
|
421 | 421 | $primaryKey = isset($this->primaryKey) ? $this->primaryKey : 'id'; |
422 | 422 | |
423 | 423 | $this->qb->whereIn($primaryKey, $ids); |
424 | 424 | |
425 | 425 | if (method_exists($this, 'updateRecordSets')) { |
426 | - $this->updateRecordSets($sets[ $key ]); |
|
426 | + $this->updateRecordSets($sets[$key]); |
|
427 | 427 | } |
428 | 428 | |
429 | 429 | if (method_exists($this, $beforeMethod = 'before' . ucfirst($method))) { |
@@ -455,7 +455,7 @@ discard block |
||
455 | 455 | private function updateRecordStatusBy(array $conditions = [], $recordStatus, $method) |
456 | 456 | { |
457 | 457 | if (count($conditions)) { |
458 | - $sets[ 'record_status' ] = $recordStatus; |
|
458 | + $sets['record_status'] = $recordStatus; |
|
459 | 459 | |
460 | 460 | if (method_exists($this, 'updateRecordSets')) { |
461 | 461 | $this->updateRecordSets($sets); |
@@ -490,7 +490,7 @@ discard block |
||
490 | 490 | private function updateRecordStatusManyBy($conditions = [], $recordStatus, $method) |
491 | 491 | { |
492 | 492 | if (count($conditions)) { |
493 | - $sets[ 'record_status' ] = $recordStatus; |
|
493 | + $sets['record_status'] = $recordStatus; |
|
494 | 494 | |
495 | 495 | if (method_exists($this, 'updateRecordSets')) { |
496 | 496 | $this->updateRecordSets($sets); |
@@ -99,64 +99,64 @@ discard block |
||
99 | 99 | { |
100 | 100 | $timestamp = $this->unixTimestamp === true ? strtotime(date('Y-m-d H:i:s')) : date('Y-m-d H:i:s'); |
101 | 101 | |
102 | - if(is_null($this->recordUser)) { |
|
103 | - if(globals()->offsetExists('account')) { |
|
102 | + if (is_null($this->recordUser)) { |
|
103 | + if (globals()->offsetExists('account')) { |
|
104 | 104 | $this->setRecordUser(globals()->account->id); |
105 | 105 | } |
106 | 106 | } |
107 | 107 | |
108 | - if ( ! isset($sets[ 'record_status' ])) { |
|
109 | - $sets[ 'record_status' ] = $this->recordStatus; |
|
108 | + if ( ! isset($sets['record_status'])) { |
|
109 | + $sets['record_status'] = $this->recordStatus; |
|
110 | 110 | } |
111 | 111 | |
112 | 112 | if (empty($this->primaryKeys)) { |
113 | 113 | $primaryKey = isset($this->primaryKey) ? $this->primaryKey : 'id'; |
114 | 114 | |
115 | - if (isset($sets[ $primaryKey ])) { |
|
116 | - if (empty($sets[ $primaryKey ])) { |
|
117 | - unset($sets[ $primaryKey ]); |
|
115 | + if (isset($sets[$primaryKey])) { |
|
116 | + if (empty($sets[$primaryKey])) { |
|
117 | + unset($sets[$primaryKey]); |
|
118 | 118 | } |
119 | 119 | } |
120 | 120 | |
121 | - if (empty($sets[ $primaryKey ])) { |
|
122 | - if ( ! isset($sets[ 'record_create_user' ])) { |
|
123 | - $sets[ 'record_create_user' ] = $this->recordUser; |
|
121 | + if (empty($sets[$primaryKey])) { |
|
122 | + if ( ! isset($sets['record_create_user'])) { |
|
123 | + $sets['record_create_user'] = $this->recordUser; |
|
124 | 124 | } |
125 | 125 | |
126 | - if ( ! isset($sets[ 'record_create_timestamp' ])) { |
|
127 | - $sets[ 'record_create_timestamp' ] = $timestamp; |
|
126 | + if ( ! isset($sets['record_create_timestamp'])) { |
|
127 | + $sets['record_create_timestamp'] = $timestamp; |
|
128 | 128 | } elseif ($this->unixTimestamp) { |
129 | - $sets[ 'record_create_timestamp' ] = strtotime($sets[ 'record_create_timestamp' ]); |
|
129 | + $sets['record_create_timestamp'] = strtotime($sets['record_create_timestamp']); |
|
130 | 130 | } |
131 | 131 | } |
132 | 132 | } else { |
133 | 133 | foreach ($this->primaryKeys as $primaryKey) { |
134 | - if (empty($sets[ $primaryKey ])) { |
|
135 | - if ( ! isset($sets[ 'record_create_user' ])) { |
|
136 | - $sets[ 'record_create_user' ] = $this->recordUser; |
|
134 | + if (empty($sets[$primaryKey])) { |
|
135 | + if ( ! isset($sets['record_create_user'])) { |
|
136 | + $sets['record_create_user'] = $this->recordUser; |
|
137 | 137 | } |
138 | 138 | |
139 | - if ( ! isset($sets[ 'record_create_timestamp' ])) { |
|
140 | - $sets[ 'record_create_timestamp' ] = $timestamp; |
|
139 | + if ( ! isset($sets['record_create_timestamp'])) { |
|
140 | + $sets['record_create_timestamp'] = $timestamp; |
|
141 | 141 | } elseif ($this->unixTimestamp) { |
142 | - $sets[ 'record_create_timestamp' ] = strtotime($sets[ 'record_create_timestamp' ]); |
|
142 | + $sets['record_create_timestamp'] = strtotime($sets['record_create_timestamp']); |
|
143 | 143 | } |
144 | 144 | } |
145 | 145 | } |
146 | 146 | } |
147 | 147 | |
148 | - if ( ! isset($sets[ 'record_update_user' ])) { |
|
149 | - $sets[ 'record_update_user' ] = $this->recordUser; |
|
148 | + if ( ! isset($sets['record_update_user'])) { |
|
149 | + $sets['record_update_user'] = $this->recordUser; |
|
150 | 150 | } |
151 | 151 | |
152 | - if ( ! isset($sets[ 'record_update_timestamp' ])) { |
|
153 | - $sets[ 'record_update_timestamp' ] = $timestamp; |
|
152 | + if ( ! isset($sets['record_update_timestamp'])) { |
|
153 | + $sets['record_update_timestamp'] = $timestamp; |
|
154 | 154 | } elseif ($this->unixTimestamp) { |
155 | - $sets[ 'record_update_timestamp' ] = strtotime($sets[ 'record_update_timestamp' ]); |
|
155 | + $sets['record_update_timestamp'] = strtotime($sets['record_update_timestamp']); |
|
156 | 156 | } |
157 | 157 | |
158 | - if ( ! isset($sets[ 'record_ordering' ]) && $this->recordOrdering === true) { |
|
159 | - $sets[ 'record_ordering' ] = $this->getRecordOrdering(); |
|
158 | + if ( ! isset($sets['record_ordering']) && $this->recordOrdering === true) { |
|
159 | + $sets['record_ordering'] = $this->getRecordOrdering(); |
|
160 | 160 | } |
161 | 161 | } |
162 | 162 | |
@@ -169,24 +169,24 @@ discard block |
||
169 | 169 | */ |
170 | 170 | protected function updateRecordSets(array &$sets) |
171 | 171 | { |
172 | - if(is_null($this->recordUser)) { |
|
173 | - if(globals()->offsetExists('account')) { |
|
172 | + if (is_null($this->recordUser)) { |
|
173 | + if (globals()->offsetExists('account')) { |
|
174 | 174 | $this->setRecordUser(globals()->account->id); |
175 | 175 | } |
176 | 176 | } |
177 | 177 | |
178 | - if ( ! isset($sets[ 'record_status' ])) { |
|
179 | - $sets[ 'record_status' ] = $this->recordStatus; |
|
178 | + if ( ! isset($sets['record_status'])) { |
|
179 | + $sets['record_status'] = $this->recordStatus; |
|
180 | 180 | } |
181 | 181 | |
182 | - if ( ! isset($sets[ 'record_update_user' ])) { |
|
183 | - $sets[ 'record_update_user' ] = $this->recordUser; |
|
182 | + if ( ! isset($sets['record_update_user'])) { |
|
183 | + $sets['record_update_user'] = $this->recordUser; |
|
184 | 184 | } |
185 | 185 | |
186 | 186 | $timestamp = $this->unixTimestamp === true ? strtotime(date('Y-m-d H:i:s')) : date('Y-m-d H:i:s'); |
187 | 187 | |
188 | - if ( ! isset($sets[ 'record_update_timestamp' ])) { |
|
189 | - $sets[ 'record_update_timestamp' ] = $timestamp; |
|
188 | + if ( ! isset($sets['record_update_timestamp'])) { |
|
189 | + $sets['record_update_timestamp'] = $timestamp; |
|
190 | 190 | } |
191 | 191 | } |
192 | 192 | |
@@ -199,7 +199,7 @@ discard block |
||
199 | 199 | */ |
200 | 200 | public function getRecordOrdering() |
201 | 201 | { |
202 | - if($this->recordOrdering === true) { |
|
202 | + if ($this->recordOrdering === true) { |
|
203 | 203 | return $this->qb->countAllResults($this->table) + 1; |
204 | 204 | } |
205 | 205 |
@@ -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; |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | } |
78 | 78 | } else { |
79 | 79 | $uriPath = urldecode( |
80 | - parse_url($_SERVER[ 'REQUEST_URI' ], PHP_URL_PATH) |
|
80 | + parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH) |
|
81 | 81 | ); |
82 | 82 | |
83 | 83 | $uriPathParts = explode('public/', $uriPath); |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | // Module routing |
121 | 121 | if ($numOfUriSegments = count($uriSegments)) { |
122 | 122 | if (empty($app)) { |
123 | - if (false !== ($module = modules()->getModule( reset($uriSegments) ))) { |
|
123 | + if (false !== ($module = modules()->getModule(reset($uriSegments)))) { |
|
124 | 124 | //array_shift($uriSegments); |
125 | 125 | $this->uri = $this->uri->withSegments(new KernelMessageUriSegments($uriSegments)); |
126 | 126 | $uriString = $this->uri->getSegments()->getString(); |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | $this->registerModule($module); |
129 | 129 | } |
130 | 130 | } else { |
131 | - if (false !== ($module = modules()->getModule( [$app->getParameter(), reset($uriSegments) ] ))) { |
|
131 | + if (false !== ($module = modules()->getModule([$app->getParameter(), reset($uriSegments)]))) { |
|
132 | 132 | array_shift($uriSegments); |
133 | 133 | $this->uri = $this->uri->withSegments(new KernelMessageUriSegments($uriSegments)); |
134 | 134 | $uriString = $this->uri->getSegments()->getString(); |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | } |
138 | 138 | } |
139 | 139 | |
140 | - if($numOfUriSegments = count($uriSegments)) { |
|
140 | + if ($numOfUriSegments = count($uriSegments)) { |
|
141 | 141 | for ($i = 0; $i <= $numOfUriSegments; $i++) { |
142 | 142 | $uriRoutedSegments = array_diff($uriSegments, |
143 | 143 | array_slice($uriSegments, ($numOfUriSegments - $i))); |
@@ -228,7 +228,7 @@ discard block |
||
228 | 228 | if (class_exists($controllerClassName = $controllerNamespace . implode('\\', |
229 | 229 | array_map('studlycase', $uriRoutedSegments)))) { |
230 | 230 | |
231 | - if($controllerClassName::$inherited) { |
|
231 | + if ($controllerClassName::$inherited) { |
|
232 | 232 | $uriSegments = array_diff($uriSegments, $uriRoutedSegments); |
233 | 233 | $this->setController(new KernelControllerDataStructure($controllerClassName), |
234 | 234 | $uriSegments); |
@@ -245,7 +245,7 @@ discard block |
||
245 | 245 | * Try to find requested page |
246 | 246 | */ |
247 | 247 | if (false !== ($pagesDir = $module->getResourcesDir('pages', true))) { |
248 | - if($controllerClassName = $this->getPagesControllerClassName()) { |
|
248 | + if ($controllerClassName = $this->getPagesControllerClassName()) { |
|
249 | 249 | |
250 | 250 | /** |
251 | 251 | * Try to find from database |
@@ -280,12 +280,12 @@ discard block |
||
280 | 280 | presenter()->page->setFile($pageFilePath); |
281 | 281 | } else { |
282 | 282 | $pageFilePath = str_replace('.phtml', DIRECTORY_SEPARATOR . 'index.phtml', $pageFilePath); |
283 | - if(is_file($pageFilePath)) { |
|
283 | + if (is_file($pageFilePath)) { |
|
284 | 284 | presenter()->page->setFile($pageFilePath); |
285 | 285 | } |
286 | 286 | } |
287 | 287 | |
288 | - if(presenter()->page->file instanceof SplFileInfo) { |
|
288 | + if (presenter()->page->file instanceof SplFileInfo) { |
|
289 | 289 | $this->setController( |
290 | 290 | (new KernelControllerDataStructure($controllerClassName)) |
291 | 291 | ->setRequestMethod('index') |
@@ -328,19 +328,19 @@ discard block |
||
328 | 328 | { |
329 | 329 | $modules = modules()->getArrayCopy(); |
330 | 330 | |
331 | - foreach($modules as $module) { |
|
331 | + foreach ($modules as $module) { |
|
332 | 332 | $controllerClassName = $module->getNamespace() . 'Controllers\Pages'; |
333 | 333 | if ($module->getNamespace() === 'O2System\Framework\\') { |
334 | 334 | $controllerClassName = 'O2System\Framework\Http\Controllers\Pages'; |
335 | 335 | } |
336 | 336 | |
337 | - if(class_exists($controllerClassName)) { |
|
337 | + if (class_exists($controllerClassName)) { |
|
338 | 338 | return $controllerClassName; |
339 | 339 | break; |
340 | 340 | } |
341 | 341 | } |
342 | 342 | |
343 | - if(class_exists('O2System\Framework\Http\Controllers\Pages')) { |
|
343 | + if (class_exists('O2System\Framework\Http\Controllers\Pages')) { |
|
344 | 344 | return 'O2System\Framework\Http\Controllers\Pages'; |
345 | 345 | } |
346 | 346 | |
@@ -391,7 +391,7 @@ discard block |
||
391 | 391 | if (class_exists($controllerClassName)) { |
392 | 392 | $this->addresses->any( |
393 | 393 | '/', |
394 | - function () use ($controllerClassName) { |
|
394 | + function() use ($controllerClassName) { |
|
395 | 395 | return new $controllerClassName(); |
396 | 396 | } |
397 | 397 | ); |
@@ -406,7 +406,7 @@ discard block |
||
406 | 406 | if (class_exists($controllerClassName)) { |
407 | 407 | $this->addresses->any( |
408 | 408 | '/', |
409 | - function () use ($controllerClassName) { |
|
409 | + function() use ($controllerClassName) { |
|
410 | 410 | return new $controllerClassName(); |
411 | 411 | } |
412 | 412 | ); |
@@ -458,8 +458,8 @@ discard block |
||
458 | 458 | ); |
459 | 459 | } elseif (preg_match("/([a-zA-Z0-9\\\]+)(@)([a-zA-Z0-9\\\]+)/", $closure, $matches)) { |
460 | 460 | $this->setController( |
461 | - (new KernelControllerDataStructure($matches[ 1 ])) |
|
462 | - ->setRequestMethod($matches[ 3 ]), |
|
461 | + (new KernelControllerDataStructure($matches[1])) |
|
462 | + ->setRequestMethod($matches[3]), |
|
463 | 463 | $uriSegments |
464 | 464 | ); |
465 | 465 | } elseif (presenter()->theme->use === true) { |