@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | */ |
65 | 65 | public function setApp($app) |
66 | 66 | { |
67 | - if($app = modules()->getApp($app)) { |
|
67 | + if ($app = modules()->getApp($app)) { |
|
68 | 68 | $this->app = $app; |
69 | 69 | } |
70 | 70 | |
@@ -102,10 +102,10 @@ discard block |
||
102 | 102 | if (isset($account)) { |
103 | 103 | foreach ($account as $key => $value) { |
104 | 104 | if (strpos($key, 'record') !== false) { |
105 | - unset($account[ $key ]); |
|
105 | + unset($account[$key]); |
|
106 | 106 | } elseif (in_array($key, |
107 | 107 | ['password', 'pin', 'token', 'sso', 'id_sys_user', 'id_sys_module', 'id_sys_module_role'])) { |
108 | - unset($account[ $key ]); |
|
108 | + unset($account[$key]); |
|
109 | 109 | } |
110 | 110 | } |
111 | 111 | |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | $column = 'id'; |
135 | 135 | } elseif (filter_var($username, FILTER_VALIDATE_EMAIL)) { |
136 | 136 | $column = 'email'; |
137 | - } elseif (preg_match($this->config[ 'msisdnRegex' ], $username)) { |
|
137 | + } elseif (preg_match($this->config['msisdnRegex'], $username)) { |
|
138 | 138 | $column = 'msisdn'; |
139 | 139 | } |
140 | 140 | |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | public function loggedIn() |
159 | 159 | { |
160 | 160 | if (parent::loggedIn()) { |
161 | - $account = new Account($_SESSION[ 'account' ]); |
|
161 | + $account = new Account($_SESSION['account']); |
|
162 | 162 | |
163 | 163 | if ($user = models('users')->findWhere(['username' => $account->username], 1)) { |
164 | 164 | // Store Account Profile |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | $column = 'id'; |
208 | 208 | } elseif (filter_var($username, FILTER_VALIDATE_EMAIL)) { |
209 | 209 | $column = 'email'; |
210 | - } elseif (preg_match($this->config[ 'msisdnRegex' ], $username)) { |
|
210 | + } elseif (preg_match($this->config['msisdnRegex'], $username)) { |
|
211 | 211 | $column = 'msisdn'; |
212 | 212 | } elseif (strpos($username, 'token-') !== false) { |
213 | 213 | $username = str_replace('token-', '', $username); |
@@ -222,15 +222,15 @@ discard block |
||
222 | 222 | |
223 | 223 | foreach ($account as $key => $value) { |
224 | 224 | if (strpos($key, 'record') !== false) { |
225 | - unset($account[ $key ]); |
|
225 | + unset($account[$key]); |
|
226 | 226 | } elseif (in_array($key, ['password', 'pin', 'token', 'sso'])) { |
227 | - unset($account[ $key ]); |
|
227 | + unset($account[$key]); |
|
228 | 228 | } |
229 | 229 | } |
230 | 230 | |
231 | 231 | if ($column === 'token') { |
232 | 232 | models('users')->update([ |
233 | - 'id' => $account[ 'id' ], |
|
233 | + 'id' => $account['id'], |
|
234 | 234 | 'token' => null, |
235 | 235 | ]); |
236 | 236 | } |
@@ -254,7 +254,7 @@ discard block |
||
254 | 254 | public function getIframeCode() |
255 | 255 | { |
256 | 256 | if ($this->signedOn() && $this->loggedIn() === false) { |
257 | - return '<iframe id="sign-on-iframe" width="1" height="1" src="' . rtrim($this->config[ 'sso' ][ 'server' ], |
|
257 | + return '<iframe id="sign-on-iframe" width="1" height="1" src="' . rtrim($this->config['sso']['server'], |
|
258 | 258 | '/') . '" style="display: none; visibility: hidden;"></iframe>'; |
259 | 259 | } |
260 | 260 |
@@ -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 |
@@ -195,10 +195,10 @@ discard block |
||
195 | 195 | */ |
196 | 196 | public function setProperties(array $properties) |
197 | 197 | { |
198 | - if (isset($properties[ 'presets' ])) { |
|
199 | - $this->setPresets($properties[ 'presets' ]); |
|
198 | + if (isset($properties['presets'])) { |
|
199 | + $this->setPresets($properties['presets']); |
|
200 | 200 | |
201 | - unset($properties[ 'presets' ]); |
|
201 | + unset($properties['presets']); |
|
202 | 202 | } |
203 | 203 | |
204 | 204 | $this->properties = $properties; |
@@ -288,7 +288,7 @@ discard block |
||
288 | 288 | $themes = []; |
289 | 289 | foreach ($directory->getTree() as $themeName => $themeTree) { |
290 | 290 | if (($theme = $this->getTheme($themeName)) instanceof Module\Theme) { |
291 | - $themes[ $themeName ] = $theme; |
|
291 | + $themes[$themeName] = $theme; |
|
292 | 292 | } |
293 | 293 | } |
294 | 294 | |
@@ -515,7 +515,7 @@ discard block |
||
515 | 515 | |
516 | 516 | if ( ! empty($controller->name) and ! in_array($controller->getParameter(), |
517 | 517 | ['login', 'pages', 'setup', 'license'])) { |
518 | - $controllers[ $controller->getParameter() ] = $controller; |
|
518 | + $controllers[$controller->getParameter()] = $controller; |
|
519 | 519 | } |
520 | 520 | } |
521 | 521 | } |
@@ -111,7 +111,7 @@ |
||
111 | 111 | } |
112 | 112 | } |
113 | 113 | |
114 | - if(empty($this->methods) and $this->hasMethod('route')) { |
|
114 | + if (empty($this->methods) and $this->hasMethod('route')) { |
|
115 | 115 | $method = $this->getMethod('route'); |
116 | 116 | $method->segment = dash($method->name); |
117 | 117 | $method->segments = implode('/', $segments); |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | ]); |
86 | 86 | } |
87 | 87 | |
88 | - $update[ $this->primaryKey ] = $child->{$this->primaryKey}; |
|
88 | + $update[$this->primaryKey] = $child->{$this->primaryKey}; |
|
89 | 89 | |
90 | 90 | if ($this->qb |
91 | 91 | ->table($this->table) |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | ->update($update = [ |
101 | 101 | 'record_right' => $right, |
102 | 102 | ]); |
103 | - $update[ $this->primaryKey ] = $child->{$this->primaryKey}; |
|
103 | + $update[$this->primaryKey] = $child->{$this->primaryKey}; |
|
104 | 104 | } |
105 | 105 | |
106 | 106 | $i++; |
@@ -256,7 +256,7 @@ discard block |
||
256 | 256 | ->select($this->table . '.*') |
257 | 257 | ->from($this->table) |
258 | 258 | ->from($this->table . ' AS node') |
259 | - ->whereBetween($this->table . '.record_left', [ 'node.record_left', 'node.record_right']) |
|
259 | + ->whereBetween($this->table . '.record_left', ['node.record_left', 'node.record_right']) |
|
260 | 260 | ->where([ |
261 | 261 | 'node.' . $this->primaryKey => $id, |
262 | 262 | $this->table . '.' . $this->primaryKey . '!=' => $id, |
@@ -62,9 +62,9 @@ discard block |
||
62 | 62 | $properties = json_decode(file_get_contents($propFilePath), true); |
63 | 63 | |
64 | 64 | if (json_last_error() === JSON_ERROR_NONE) { |
65 | - if (isset($properties[ 'config' ])) { |
|
66 | - $this->presets = $properties[ 'presets' ]; |
|
67 | - unset($properties[ 'presets' ]); |
|
65 | + if (isset($properties['config'])) { |
|
66 | + $this->presets = $properties['presets']; |
|
67 | + unset($properties['presets']); |
|
68 | 68 | } |
69 | 69 | |
70 | 70 | $this->properties = $properties; |
@@ -198,10 +198,10 @@ discard block |
||
198 | 198 | { |
199 | 199 | $extensions = ['.php', '.phtml', '.html', '.tpl']; |
200 | 200 | |
201 | - if (isset($this->presets[ 'extensions' ])) { |
|
202 | - array_unshift($partialsExtensions, $this->presets[ 'extension' ]); |
|
203 | - } elseif (isset($this->presets[ 'extension' ])) { |
|
204 | - array_unshift($extensions, $this->presets[ 'extension' ]); |
|
201 | + if (isset($this->presets['extensions'])) { |
|
202 | + array_unshift($partialsExtensions, $this->presets['extension']); |
|
203 | + } elseif (isset($this->presets['extension'])) { |
|
204 | + array_unshift($extensions, $this->presets['extension']); |
|
205 | 205 | } |
206 | 206 | |
207 | 207 | $found = false; |
@@ -253,10 +253,10 @@ discard block |
||
253 | 253 | if (isset($layout)) { |
254 | 254 | $extensions = ['.php', '.phtml', '.html', '.tpl']; |
255 | 255 | |
256 | - if (isset($this->presets[ 'extensions' ])) { |
|
257 | - array_unshift($partialsExtensions, $this->presets[ 'extension' ]); |
|
258 | - } elseif (isset($this->presets[ 'extension' ])) { |
|
259 | - array_unshift($extensions, $this->presets[ 'extension' ]); |
|
256 | + if (isset($this->presets['extensions'])) { |
|
257 | + array_unshift($partialsExtensions, $this->presets['extension']); |
|
258 | + } elseif (isset($this->presets['extension'])) { |
|
259 | + array_unshift($extensions, $this->presets['extension']); |
|
260 | 260 | } |
261 | 261 | |
262 | 262 | foreach ($extensions as $extension) { |
@@ -290,7 +290,7 @@ discard block |
||
290 | 290 | if ($this->layout instanceof Theme\Layout) { |
291 | 291 | |
292 | 292 | // load parent theme layout |
293 | - if($this->layout->getFilename() !== 'theme') { |
|
293 | + if ($this->layout->getFilename() !== 'theme') { |
|
294 | 294 | $themeLayout = $this->getLayout('theme'); |
295 | 295 | |
296 | 296 | // add theme layout public directory |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | if (count($this->fillableColumns)) { |
40 | 40 | foreach ($sets as $key => $value) { |
41 | 41 | if ( ! in_array($key, $this->fillableColumns)) { |
42 | - unset($sets[ $key ]); |
|
42 | + unset($sets[$key]); |
|
43 | 43 | } |
44 | 44 | } |
45 | 45 | } |
@@ -53,8 +53,8 @@ discard block |
||
53 | 53 | } |
54 | 54 | |
55 | 55 | if (method_exists($this, 'getRecordOrdering')) { |
56 | - if ($this->recordOrdering === true && empty($sets[ 'record_ordering' ])) { |
|
57 | - $sets[ 'record_ordering' ] = $this->getRecordOrdering(); |
|
56 | + if ($this->recordOrdering === true && empty($sets['record_ordering'])) { |
|
57 | + $sets['record_ordering'] = $this->getRecordOrdering(); |
|
58 | 58 | } |
59 | 59 | } |
60 | 60 | |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | if ($files = input()->files()) { |
70 | 70 | // Uploaded Image Process |
71 | 71 | if (isset($this->uploadedImageKey)) { |
72 | - if (isset($files[ $this->uploadedImageKey ])) { |
|
72 | + if (isset($files[$this->uploadedImageKey])) { |
|
73 | 73 | $upload->process($this->uploadedImageKey); |
74 | 74 | |
75 | 75 | if ($upload->getErrors()) { |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | } |
89 | 89 | } elseif (count($this->uploadedImageKeys)) { |
90 | 90 | foreach ($this->uploadedImageKeys as $uploadedImageKey) { |
91 | - if (isset($files[ $uploadedImageKey ])) { |
|
91 | + if (isset($files[$uploadedImageKey])) { |
|
92 | 92 | $upload->process($uploadedImageKey); |
93 | 93 | |
94 | 94 | if ($upload->getErrors()) { |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | |
111 | 111 | // Uploaded File Process |
112 | 112 | if (isset($this->uploadedFileFilepath)) { |
113 | - if (isset($files[ $this->uploadedFileKey ])) { |
|
113 | + if (isset($files[$this->uploadedFileKey])) { |
|
114 | 114 | $upload->process($this->uploadedFileKey); |
115 | 115 | |
116 | 116 | if ($upload->getErrors()) { |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | } |
130 | 130 | } elseif (count($this->uploadedFileKeys)) { |
131 | 131 | foreach ($this->uploadedFileKeys as $uploadedFileKey) { |
132 | - if (isset($files[ $uploadedFileKey ])) { |
|
132 | + if (isset($files[$uploadedFileKey])) { |
|
133 | 133 | $upload->process($uploadedFileKey); |
134 | 134 | |
135 | 135 | if ($upload->getErrors()) { |
@@ -162,8 +162,8 @@ discard block |
||
162 | 162 | |
163 | 163 | $label = false; |
164 | 164 | foreach (['name', 'label', 'title', 'code'] as $labelField) { |
165 | - if (isset($sets[ $labelField ])) { |
|
166 | - session()->setFlash('success', language('SUCCESS_INSERT_WITH_LABEL', $sets[ $labelField ])); |
|
165 | + if (isset($sets[$labelField])) { |
|
166 | + session()->setFlash('success', language('SUCCESS_INSERT_WITH_LABEL', $sets[$labelField])); |
|
167 | 167 | $label = true; |
168 | 168 | break; |
169 | 169 | } |
@@ -179,8 +179,8 @@ discard block |
||
179 | 179 | |
180 | 180 | $label = false; |
181 | 181 | foreach (['name', 'label', 'title', 'code'] as $labelField) { |
182 | - if (isset($sets[ $labelField ])) { |
|
183 | - session()->setFlash('danger', language('FAILED_INSERT_WITH_LABEL', $sets[ $labelField ])); |
|
182 | + if (isset($sets[$labelField])) { |
|
183 | + session()->setFlash('danger', language('FAILED_INSERT_WITH_LABEL', $sets[$labelField])); |
|
184 | 184 | $label = true; |
185 | 185 | break; |
186 | 186 | } |
@@ -213,8 +213,8 @@ discard block |
||
213 | 213 | $primaryKey = isset($this->primaryKey) ? $this->primaryKey : 'id'; |
214 | 214 | |
215 | 215 | if (empty($conditions)) { |
216 | - if (isset($sets[ $primaryKey ])) { |
|
217 | - $conditions = [$primaryKey => $sets[ $primaryKey ]]; |
|
216 | + if (isset($sets[$primaryKey])) { |
|
217 | + $conditions = [$primaryKey => $sets[$primaryKey]]; |
|
218 | 218 | } else { |
219 | 219 | $conditions = $sets; |
220 | 220 | } |
@@ -248,8 +248,8 @@ discard block |
||
248 | 248 | if (method_exists($this, 'insertRecordSets')) { |
249 | 249 | foreach ($sets as $set) { |
250 | 250 | $this->insertRecordSets($set); |
251 | - if ($this->recordOrdering === true && empty($sets[ 'record_ordering' ])) { |
|
252 | - $set[ 'record_ordering' ] = $this->getRecordOrdering(); |
|
251 | + if ($this->recordOrdering === true && empty($sets['record_ordering'])) { |
|
252 | + $set['record_ordering'] = $this->getRecordOrdering(); |
|
253 | 253 | } |
254 | 254 | } |
255 | 255 | } |
@@ -321,15 +321,15 @@ discard block |
||
321 | 321 | $primaryKey = isset($this->primaryKey) ? $this->primaryKey : 'id'; |
322 | 322 | |
323 | 323 | if (empty($conditions)) { |
324 | - if (isset($sets[ $primaryKey ])) { |
|
325 | - $conditions = [$primaryKey => $sets[ $primaryKey ]]; |
|
324 | + if (isset($sets[$primaryKey])) { |
|
325 | + $conditions = [$primaryKey => $sets[$primaryKey]]; |
|
326 | 326 | } |
327 | 327 | } |
328 | 328 | |
329 | 329 | if (count($this->fillableColumns)) { |
330 | 330 | foreach ($sets as $key => $value) { |
331 | 331 | if ( ! in_array($key, $this->fillableColumns)) { |
332 | - unset($sets[ $key ]); |
|
332 | + unset($sets[$key]); |
|
333 | 333 | } |
334 | 334 | } |
335 | 335 | } |
@@ -343,8 +343,8 @@ discard block |
||
343 | 343 | } |
344 | 344 | |
345 | 345 | if (method_exists($this, 'getRecordOrdering')) { |
346 | - if ($this->recordOrdering === true && empty($sets[ 'record_ordering' ])) { |
|
347 | - $sets[ 'record_ordering' ] = $this->getRecordOrdering(); |
|
346 | + if ($this->recordOrdering === true && empty($sets['record_ordering'])) { |
|
347 | + $sets['record_ordering'] = $this->getRecordOrdering(); |
|
348 | 348 | } |
349 | 349 | } |
350 | 350 | |
@@ -360,7 +360,7 @@ discard block |
||
360 | 360 | if ($files = input()->files()) { |
361 | 361 | // Uploaded Image Process |
362 | 362 | if (isset($this->uploadedImageKey)) { |
363 | - if (isset($files[ $this->uploadedImageKey ])) { |
|
363 | + if (isset($files[$this->uploadedImageKey])) { |
|
364 | 364 | $upload->process($this->uploadedImageKey); |
365 | 365 | |
366 | 366 | if ($upload->getErrors()) { |
@@ -375,8 +375,8 @@ discard block |
||
375 | 375 | } |
376 | 376 | |
377 | 377 | return false; |
378 | - } elseif ($row->offsetGet($this->uploadedImageKey) !== $upload->getUploadedFiles()->first()[ 'name' ]) { |
|
379 | - $sets[ $this->uploadedImageKey ] = $upload->getUploadedFiles()->first()[ 'name' ]; |
|
378 | + } elseif ($row->offsetGet($this->uploadedImageKey) !== $upload->getUploadedFiles()->first()['name']) { |
|
379 | + $sets[$this->uploadedImageKey] = $upload->getUploadedFiles()->first()['name']; |
|
380 | 380 | |
381 | 381 | if (is_file($filePath = $this->uploadedImageFilePath . $row->offsetGet($this->uploadedImageKey))) { |
382 | 382 | unlink($filePath); |
@@ -385,7 +385,7 @@ discard block |
||
385 | 385 | } |
386 | 386 | } elseif (count($this->uploadedImageKeys)) { |
387 | 387 | foreach ($this->uploadedImageKeys as $uploadedImageKey) { |
388 | - if (isset($files[ $uploadedImageKey ])) { |
|
388 | + if (isset($files[$uploadedImageKey])) { |
|
389 | 389 | $upload->process($uploadedImageKey); |
390 | 390 | |
391 | 391 | if ($upload->getErrors()) { |
@@ -400,8 +400,8 @@ discard block |
||
400 | 400 | } |
401 | 401 | |
402 | 402 | return false; |
403 | - } elseif ($row->offsetGet($uploadedImageKey) !== $upload->getUploadedFiles()->first()[ 'name' ]) { |
|
404 | - $sets[ $uploadedImageKey ] = $upload->getUploadedFiles()->first()[ 'name' ]; |
|
403 | + } elseif ($row->offsetGet($uploadedImageKey) !== $upload->getUploadedFiles()->first()['name']) { |
|
404 | + $sets[$uploadedImageKey] = $upload->getUploadedFiles()->first()['name']; |
|
405 | 405 | |
406 | 406 | if (is_file($filePath = $this->uploadedImageFilePath . $row->offsetGet($uploadedImageKey))) { |
407 | 407 | unlink($filePath); |
@@ -413,7 +413,7 @@ discard block |
||
413 | 413 | |
414 | 414 | // Uploaded File Process |
415 | 415 | if (isset($this->uploadedFileFilepath)) { |
416 | - if (isset($files[ $this->uploadedFileKey ])) { |
|
416 | + if (isset($files[$this->uploadedFileKey])) { |
|
417 | 417 | $upload->process($this->uploadedFileKey); |
418 | 418 | |
419 | 419 | if ($upload->getErrors()) { |
@@ -428,8 +428,8 @@ discard block |
||
428 | 428 | } |
429 | 429 | |
430 | 430 | return false; |
431 | - } elseif ($row->offsetGet($this->uploadedFileKey) !== $upload->getUploadedFiles()->first()[ 'name' ]) { |
|
432 | - $sets[ $this->uploadedFileKey ] = $upload->getUploadedFiles()->first()[ 'name' ]; |
|
431 | + } elseif ($row->offsetGet($this->uploadedFileKey) !== $upload->getUploadedFiles()->first()['name']) { |
|
432 | + $sets[$this->uploadedFileKey] = $upload->getUploadedFiles()->first()['name']; |
|
433 | 433 | |
434 | 434 | if (is_file($filePath = $this->uploadedFileFilepath . $row->offsetGet($this->uploadedFileKey))) { |
435 | 435 | unlink($filePath); |
@@ -438,7 +438,7 @@ discard block |
||
438 | 438 | } |
439 | 439 | } elseif (count($this->uploadedFileKeys)) { |
440 | 440 | foreach ($this->uploadedFileKeys as $uploadedFileKey) { |
441 | - if (isset($files[ $uploadedFileKey ])) { |
|
441 | + if (isset($files[$uploadedFileKey])) { |
|
442 | 442 | $upload->process($uploadedFileKey); |
443 | 443 | |
444 | 444 | if ($upload->getErrors()) { |
@@ -453,8 +453,8 @@ discard block |
||
453 | 453 | } |
454 | 454 | |
455 | 455 | return false; |
456 | - } elseif ($row->offsetGet($uploadedFileKey) !== $upload->getUploadedFiles()->first()[ 'name' ]) { |
|
457 | - $sets[ $uploadedFileKey ] = $upload->getUploadedFiles()->first()[ 'name' ]; |
|
456 | + } elseif ($row->offsetGet($uploadedFileKey) !== $upload->getUploadedFiles()->first()['name']) { |
|
457 | + $sets[$uploadedFileKey] = $upload->getUploadedFiles()->first()['name']; |
|
458 | 458 | |
459 | 459 | if (is_file($filePath = $this->uploadedFileFilepath . $row->offsetGet($uploadedFileKey))) { |
460 | 460 | unlink($filePath); |
@@ -474,8 +474,8 @@ discard block |
||
474 | 474 | |
475 | 475 | $label = false; |
476 | 476 | foreach (['name', 'label', 'title', 'code'] as $labelField) { |
477 | - if (isset($sets[ $labelField ])) { |
|
478 | - session()->setFlash('success', language('SUCCESS_UPDATE_WITH_LABEL', $sets[ $labelField ])); |
|
477 | + if (isset($sets[$labelField])) { |
|
478 | + session()->setFlash('success', language('SUCCESS_UPDATE_WITH_LABEL', $sets[$labelField])); |
|
479 | 479 | $label = true; |
480 | 480 | break; |
481 | 481 | } |
@@ -492,8 +492,8 @@ discard block |
||
492 | 492 | |
493 | 493 | $label = false; |
494 | 494 | foreach (['name', 'label', 'title', 'code'] as $labelField) { |
495 | - if (isset($sets[ $labelField ])) { |
|
496 | - session()->setFlash('danger', language('FAILED_UPDATE_WITH_LABEL', $sets[ $labelField ])); |
|
495 | + if (isset($sets[$labelField])) { |
|
496 | + session()->setFlash('danger', language('FAILED_UPDATE_WITH_LABEL', $sets[$labelField])); |
|
497 | 497 | $label = true; |
498 | 498 | break; |
499 | 499 | } |
@@ -540,7 +540,7 @@ discard block |
||
540 | 540 | |
541 | 541 | if (method_exists($this, 'updateRecordSets')) { |
542 | 542 | foreach ($sets as $key => $set) { |
543 | - $this->updateRecordSets($sets[ $key ]); |
|
543 | + $this->updateRecordSets($sets[$key]); |
|
544 | 544 | } |
545 | 545 | } |
546 | 546 | |
@@ -756,7 +756,7 @@ discard block |
||
756 | 756 | */ |
757 | 757 | private function updateRecordStatus($id, $recordStatus, $method) |
758 | 758 | { |
759 | - $sets[ 'record_status' ] = $recordStatus; |
|
759 | + $sets['record_status'] = $recordStatus; |
|
760 | 760 | $primaryKey = isset($this->primaryKey) ? $this->primaryKey : 'id'; |
761 | 761 | |
762 | 762 | if (method_exists($this, 'updateRecordSets')) { |
@@ -796,7 +796,7 @@ discard block |
||
796 | 796 | private function updateRecordStatusMany(array $ids, $recordStatus, $method) |
797 | 797 | { |
798 | 798 | if (count($ids)) { |
799 | - $sets[ 'record_status' ] = $recordStatus; |
|
799 | + $sets['record_status'] = $recordStatus; |
|
800 | 800 | $primaryKey = isset($this->primaryKey) ? $this->primaryKey : 'id'; |
801 | 801 | |
802 | 802 | $this->qb->whereIn($primaryKey, $ids); |
@@ -841,7 +841,7 @@ discard block |
||
841 | 841 | private function updateRecordStatusBy($recordStatus, $method, array $conditions) |
842 | 842 | { |
843 | 843 | if (count($conditions)) { |
844 | - $sets[ 'record_status' ] = $recordStatus; |
|
844 | + $sets['record_status'] = $recordStatus; |
|
845 | 845 | |
846 | 846 | if (method_exists($this, 'updateRecordSets')) { |
847 | 847 | $this->updateRecordSets($sets); |
@@ -883,7 +883,7 @@ discard block |
||
883 | 883 | private function updateRecordStatusManyBy($recordStatus, $method, array $conditions) |
884 | 884 | { |
885 | 885 | if (count($conditions)) { |
886 | - $sets[ 'record_status' ] = $recordStatus; |
|
886 | + $sets['record_status'] = $recordStatus; |
|
887 | 887 | |
888 | 888 | if (method_exists($this, 'updateRecordSets')) { |
889 | 889 | $this->updateRecordSets($sets); |
@@ -71,7 +71,7 @@ |
||
71 | 71 | } |
72 | 72 | } |
73 | 73 | |
74 | - $ormResult[ $key ] = new Result\Row($row, $model); |
|
74 | + $ormResult[$key] = new Result\Row($row, $model); |
|
75 | 75 | } |
76 | 76 | |
77 | 77 | parent::__construct($ormResult->toArray()); |