@@ -45,7 +45,7 @@ |
||
45 | 45 | $ormResult = new \SplFixedArray($result->count()); |
46 | 46 | |
47 | 47 | foreach ($result as $key => $row) { |
48 | - $ormResult[ $key ] = new Result\Row($row, $model); |
|
48 | + $ormResult[$key] = new Result\Row($row, $model); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | parent::__construct($ormResult->toArray()); |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | } |
72 | 72 | |
73 | 73 | $first = reset($this->storage); |
74 | - if ( ! isset($first[ $this->primaryKey ])) { |
|
74 | + if ( ! isset($first[$this->primaryKey])) { |
|
75 | 75 | $keys = $first->getKeys(); |
76 | 76 | $this->primaryKey = reset($keys); |
77 | 77 | } |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | */ |
90 | 90 | public function get($property) |
91 | 91 | { |
92 | - if (empty($get[ $property ])) { |
|
92 | + if (empty($get[$property])) { |
|
93 | 93 | if (services()->has($property)) { |
94 | 94 | return services()->get($property); |
95 | 95 | } elseif (array_key_exists($property, $this->validSubModels)) { |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | */ |
114 | 114 | final protected function loadSubModel($model) |
115 | 115 | { |
116 | - if (is_file($this->validSubModels[ $model ])) { |
|
116 | + if (is_file($this->validSubModels[$model])) { |
|
117 | 117 | $className = '\\' . get_called_class() . '\\' . ucfirst($model); |
118 | 118 | $className = str_replace('\Base\\Model', '\Models', $className); |
119 | 119 |
@@ -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,7 +195,7 @@ discard block |
||
195 | 195 | $args = func_get_args(); |
196 | 196 | |
197 | 197 | if (count($args)) { |
198 | - return o2system()->models->get($args[ 0 ]); |
|
198 | + return o2system()->models->get($args[0]); |
|
199 | 199 | } |
200 | 200 | |
201 | 201 | return o2system()->models; |
@@ -217,7 +217,7 @@ discard block |
||
217 | 217 | $args = func_get_args(); |
218 | 218 | |
219 | 219 | if (count($args)) { |
220 | - return o2system()->modules->getModule($args[ 0 ]); |
|
220 | + return o2system()->modules->getModule($args[0]); |
|
221 | 221 | } |
222 | 222 | |
223 | 223 | return o2system()->modules; |
@@ -259,8 +259,8 @@ discard block |
||
259 | 259 | $args = func_get_args(); |
260 | 260 | |
261 | 261 | if (count($args)) { |
262 | - if (isset($_SESSION[ $args[ 0 ] ])) { |
|
263 | - return $_SESSION[ $args[ 0 ] ]; |
|
262 | + if (isset($_SESSION[$args[0]])) { |
|
263 | + return $_SESSION[$args[0]]; |
|
264 | 264 | } |
265 | 265 | |
266 | 266 | return null; |
@@ -26,9 +26,9 @@ discard block |
||
26 | 26 | ->withQuery(''); |
27 | 27 | |
28 | 28 | if ($uriConfig = config()->offsetGet('uri')) { |
29 | - if ( ! empty($uriConfig[ 'base' ])) { |
|
29 | + if ( ! empty($uriConfig['base'])) { |
|
30 | 30 | $base = (is_https() ? 'https' : 'http') . '://' . str_replace(['http://', 'https://'], '', |
31 | - $uriConfig[ 'base' ]); |
|
31 | + $uriConfig['base']); |
|
32 | 32 | $uri = new \O2System\Kernel\Http\Message\Uri($base); |
33 | 33 | } |
34 | 34 | } |
@@ -64,9 +64,9 @@ discard block |
||
64 | 64 | ->withQuery(''); |
65 | 65 | |
66 | 66 | if ($uriConfig = config()->offsetGet('uri')) { |
67 | - if ( ! empty($uriConfig[ 'base' ])) { |
|
67 | + if ( ! empty($uriConfig['base'])) { |
|
68 | 68 | $base = (is_https() ? 'https' : 'http') . '://' . str_replace(['http://', 'https://'], '', |
69 | - $uriConfig[ 'base' ]); |
|
69 | + $uriConfig['base']); |
|
70 | 70 | $uri = new \O2System\Kernel\Http\Message\Uri($base); |
71 | 71 | } |
72 | 72 | } |
@@ -196,7 +196,7 @@ discard block |
||
196 | 196 | |
197 | 197 | $url = parse_url($uri); |
198 | 198 | |
199 | - if ( ! $url or ! isset($url[ 'scheme' ])) { |
|
199 | + if ( ! $url or ! isset($url['scheme'])) { |
|
200 | 200 | return (is_https() ? 'https://' : 'http://') . $uri; |
201 | 201 | } |
202 | 202 | |
@@ -232,15 +232,15 @@ discard block |
||
232 | 232 | } |
233 | 233 | |
234 | 234 | // IIS environment likely? Use 'refresh' for better compatibility |
235 | - if ($method === 'auto' && isset($_SERVER[ 'SERVER_SOFTWARE' ]) && strpos( |
|
236 | - $_SERVER[ 'SERVER_SOFTWARE' ], |
|
235 | + if ($method === 'auto' && isset($_SERVER['SERVER_SOFTWARE']) && strpos( |
|
236 | + $_SERVER['SERVER_SOFTWARE'], |
|
237 | 237 | 'Microsoft-IIS' |
238 | 238 | ) !== false |
239 | 239 | ) { |
240 | 240 | $method = 'refresh'; |
241 | 241 | } elseif ($method !== 'refresh' && (empty($code) OR ! is_numeric($code))) { |
242 | - if (isset($_SERVER[ 'SERVER_PROTOCOL' ], $_SERVER[ 'REQUEST_METHOD' ]) && $_SERVER[ 'SERVER_PROTOCOL' ] === 'HTTP/1.1') { |
|
243 | - $code = ($_SERVER[ 'REQUEST_METHOD' ] !== 'GET') |
|
242 | + if (isset($_SERVER['SERVER_PROTOCOL'], $_SERVER['REQUEST_METHOD']) && $_SERVER['SERVER_PROTOCOL'] === 'HTTP/1.1') { |
|
243 | + $code = ($_SERVER['REQUEST_METHOD'] !== 'GET') |
|
244 | 244 | ? 303 // reference: http://en.wikipedia.org/wiki/Post/Redirect/Get |
245 | 245 | : 307; |
246 | 246 | } else { |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | $error = new ErrorException($errorMessage, $errorSeverity, $errorFile, $errorLine, $errorContext); |
134 | 134 | |
135 | 135 | // Logged the error |
136 | - if(services()->has('logger')) { |
|
136 | + if (services()->has('logger')) { |
|
137 | 137 | logger()->error( |
138 | 138 | implode( |
139 | 139 | ' ', |
@@ -284,21 +284,21 @@ discard block |
||
284 | 284 | ]; |
285 | 285 | |
286 | 286 | $this->statusCode = $code; |
287 | - $this->reasonPhrase = $error[ 'title' ]; |
|
287 | + $this->reasonPhrase = $error['title']; |
|
288 | 288 | |
289 | 289 | if (is_string($vars)) { |
290 | 290 | $vars = ['message' => $vars]; |
291 | - } elseif (is_array($vars) and empty($vars[ 'message' ])) { |
|
292 | - $vars[ 'message' ] = $error[ 'message' ]; |
|
291 | + } elseif (is_array($vars) and empty($vars['message'])) { |
|
292 | + $vars['message'] = $error['message']; |
|
293 | 293 | } |
294 | 294 | |
295 | - if (isset($vars[ 'message' ])) { |
|
296 | - $error[ 'message' ] = $vars[ 'message' ]; |
|
295 | + if (isset($vars['message'])) { |
|
296 | + $error['message'] = $vars['message']; |
|
297 | 297 | } |
298 | 298 | |
299 | 299 | if (is_ajax() or $this->mimeType !== 'text/html') { |
300 | 300 | $this->statusCode = $code; |
301 | - $this->reasonPhrase = $error[ 'title' ]; |
|
301 | + $this->reasonPhrase = $error['title']; |
|
302 | 302 | $this->send($vars); |
303 | 303 | |
304 | 304 | exit(EXIT_ERROR); |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | exit(EXIT_ERROR); |
101 | 101 | } |
102 | 102 | |
103 | - $jsonProperties[ 'name' ] = readable( |
|
103 | + $jsonProperties['name'] = readable( |
|
104 | 104 | pathinfo($modulePath, PATHINFO_FILENAME), |
105 | 105 | true |
106 | 106 | ); |
@@ -113,10 +113,10 @@ discard block |
||
113 | 113 | ) . '\\'; |
114 | 114 | } else { |
115 | 115 | $namespace = $this->namespace; |
116 | - $jsonProperties[ 'namespace' ] = rtrim($namespace, '\\') . '\\'; |
|
116 | + $jsonProperties['namespace'] = rtrim($namespace, '\\') . '\\'; |
|
117 | 117 | } |
118 | 118 | |
119 | - $jsonProperties[ 'created' ] = date('d M Y'); |
|
119 | + $jsonProperties['created'] = date('d M Y'); |
|
120 | 120 | |
121 | 121 | loader()->addNamespace($namespace, $modulePath); |
122 | 122 |