@@ -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 | |
@@ -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 { |
@@ -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 | |
@@ -38,8 +38,8 @@ |
||
| 38 | 38 | { |
| 39 | 39 | parent::__construct('div'); |
| 40 | 40 | |
| 41 | - if (isset($attributes[ 'id' ])) { |
|
| 42 | - $this->entity->setEntityName($attributes[ 'id' ]); |
|
| 41 | + if (isset($attributes['id'])) { |
|
| 42 | + $this->entity->setEntityName($attributes['id']); |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | if (count($attributes)) { |
@@ -38,8 +38,8 @@ |
||
| 38 | 38 | { |
| 39 | 39 | parent::__construct('div'); |
| 40 | 40 | |
| 41 | - if (isset($attributes[ 'id' ])) { |
|
| 42 | - $this->entity->setEntityName($attributes[ 'id' ]); |
|
| 41 | + if (isset($attributes['id'])) { |
|
| 42 | + $this->entity->setEntityName($attributes['id']); |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | if (count($attributes)) { |
@@ -144,20 +144,20 @@ discard block |
||
| 144 | 144 | |
| 145 | 145 | if (is_dir($baseDirectory)) { |
| 146 | 146 | // initialize the namespace prefix array |
| 147 | - if (isset($this->namespaceDirs[ $namespace ]) === false) { |
|
| 148 | - $this->namespaceDirs[ $namespace ] = []; |
|
| 147 | + if (isset($this->namespaceDirs[$namespace]) === false) { |
|
| 148 | + $this->namespaceDirs[$namespace] = []; |
|
| 149 | 149 | } |
| 150 | 150 | |
| 151 | 151 | // retain the base directory for the namespace prefix |
| 152 | - if ( ! in_array($baseDirectory, $this->namespaceDirs[ $namespace ])) { |
|
| 152 | + if ( ! in_array($baseDirectory, $this->namespaceDirs[$namespace])) { |
|
| 153 | 153 | if ($prepend) { |
| 154 | - array_unshift($this->namespaceDirs[ $namespace ], $baseDirectory); |
|
| 154 | + array_unshift($this->namespaceDirs[$namespace], $baseDirectory); |
|
| 155 | 155 | } else { |
| 156 | - array_push($this->namespaceDirs[ $namespace ], $baseDirectory); |
|
| 156 | + array_push($this->namespaceDirs[$namespace], $baseDirectory); |
|
| 157 | 157 | } |
| 158 | 158 | } |
| 159 | 159 | |
| 160 | - $this->namespaceDirsMap[ $baseDirectory ] = $namespace; |
|
| 160 | + $this->namespaceDirsMap[$baseDirectory] = $namespace; |
|
| 161 | 161 | |
| 162 | 162 | // Register Namespace Language |
| 163 | 163 | language()->addFilePath($baseDirectory); |
@@ -196,9 +196,9 @@ discard block |
||
| 196 | 196 | |
| 197 | 197 | if (is_dir($publicDir) and ! in_array($publicDir, $this->publicDirs)) { |
| 198 | 198 | if (isset($offset)) { |
| 199 | - $this->publicDirs[ $offset ] = $publicDir; |
|
| 199 | + $this->publicDirs[$offset] = $publicDir; |
|
| 200 | 200 | } else { |
| 201 | - $this->publicDirs[ rtrim(str_replace(PATH_PUBLIC, '', $publicDir), '/') ] = $publicDir; |
|
| 201 | + $this->publicDirs[rtrim(str_replace(PATH_PUBLIC, '', $publicDir), '/')] = $publicDir; |
|
| 202 | 202 | } |
| 203 | 203 | } |
| 204 | 204 | } |
@@ -222,9 +222,9 @@ discard block |
||
| 222 | 222 | |
| 223 | 223 | if (is_dir($resourcesDir) and ! in_array($resourcesDir, $this->resourcesDirs)) { |
| 224 | 224 | if (isset($offset)) { |
| 225 | - $this->resourcesDirs[ $offset ] = $resourcesDir; |
|
| 225 | + $this->resourcesDirs[$offset] = $resourcesDir; |
|
| 226 | 226 | } else { |
| 227 | - $this->resourcesDirs[ rtrim(str_replace(PATH_RESOURCES, '', $resourcesDir), '/') ] = $resourcesDir; |
|
| 227 | + $this->resourcesDirs[rtrim(str_replace(PATH_RESOURCES, '', $resourcesDir), '/')] = $resourcesDir; |
|
| 228 | 228 | } |
| 229 | 229 | } |
| 230 | 230 | } |
@@ -282,7 +282,7 @@ discard block |
||
| 282 | 282 | $dir = rtrim($dir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR; |
| 283 | 283 | |
| 284 | 284 | if (array_key_exists($dir, $this->namespaceDirsMap)) { |
| 285 | - return $this->namespaceDirsMap[ $dir ]; |
|
| 285 | + return $this->namespaceDirsMap[$dir]; |
|
| 286 | 286 | } |
| 287 | 287 | |
| 288 | 288 | return false; |
@@ -327,7 +327,7 @@ discard block |
||
| 327 | 327 | $namespace = trim($namespace, '\\') . '\\'; |
| 328 | 328 | |
| 329 | 329 | if (array_key_exists($namespace, $this->namespaceDirs)) { |
| 330 | - return $this->namespaceDirs[ $namespace ]; |
|
| 330 | + return $this->namespaceDirs[$namespace]; |
|
| 331 | 331 | } |
| 332 | 332 | |
| 333 | 333 | return false; |
@@ -348,7 +348,7 @@ discard block |
||
| 348 | 348 | if (false !== ($modules = modules()->getRegistry())) { |
| 349 | 349 | foreach ($modules as $module) { |
| 350 | 350 | if ($module instanceof Module) { |
| 351 | - if (empty($this->namespaceDirs[ $module->getNamespace() ])) { |
|
| 351 | + if (empty($this->namespaceDirs[$module->getNamespace()])) { |
|
| 352 | 352 | $this->addNamespace($module->getNamespace(), $module->getRealPath()); |
| 353 | 353 | } |
| 354 | 354 | } |
@@ -416,12 +416,12 @@ discard block |
||
| 416 | 416 | public function loadMappedFile($namespace, $relativeClass) |
| 417 | 417 | { |
| 418 | 418 | // are there any base directories for this namespace prefix? |
| 419 | - if (isset($this->namespaceDirs[ $namespace ]) === false) { |
|
| 419 | + if (isset($this->namespaceDirs[$namespace]) === false) { |
|
| 420 | 420 | return false; |
| 421 | 421 | } |
| 422 | 422 | |
| 423 | 423 | // look through base directories for this namespace prefix |
| 424 | - foreach ($this->namespaceDirs[ $namespace ] as $namespaceDirectory) { |
|
| 424 | + foreach ($this->namespaceDirs[$namespace] as $namespaceDirectory) { |
|
| 425 | 425 | |
| 426 | 426 | // replace the namespace prefix with the base directory, |
| 427 | 427 | // replace namespace separators with directory separators |
@@ -504,7 +504,7 @@ discard block |
||
| 504 | 504 | } |
| 505 | 505 | |
| 506 | 506 | if ($this->requireFile($helper)) { |
| 507 | - $this->loadedHelpers[ pathinfo($helper, PATHINFO_FILENAME) ][] = $helper; |
|
| 507 | + $this->loadedHelpers[pathinfo($helper, PATHINFO_FILENAME)][] = $helper; |
|
| 508 | 508 | |
| 509 | 509 | return; |
| 510 | 510 | } |
@@ -520,17 +520,17 @@ discard block |
||
| 520 | 520 | } |
| 521 | 521 | |
| 522 | 522 | if ( ! array_key_exists($helper, $this->loadedHelpers)) { |
| 523 | - $this->loadedHelpers[ $helper ] = []; |
|
| 523 | + $this->loadedHelpers[$helper] = []; |
|
| 524 | 524 | } |
| 525 | 525 | |
| 526 | 526 | foreach ($helperDirectories as $helperDirectory) { |
| 527 | 527 | |
| 528 | 528 | $helperFilePath = $helperDirectory . studlycase($helper) . '.php'; |
| 529 | 529 | |
| 530 | - if (in_array($helperFilePath, $this->loadedHelpers[ $helper ])) { |
|
| 530 | + if (in_array($helperFilePath, $this->loadedHelpers[$helper])) { |
|
| 531 | 531 | continue; |
| 532 | 532 | } elseif ($this->requireFile($helperFilePath)) { |
| 533 | - $this->loadedHelpers[ $helper ][] = $helperFilePath; |
|
| 533 | + $this->loadedHelpers[$helper][] = $helperFilePath; |
|
| 534 | 534 | } |
| 535 | 535 | } |
| 536 | 536 | } |
@@ -70,7 +70,7 @@ |
||
| 70 | 70 | $download = false; |
| 71 | 71 | if (false !== ($key = array_search('download', $segments))) { |
| 72 | 72 | $download = true; |
| 73 | - unset($segments[ $key ]); |
|
| 73 | + unset($segments[$key]); |
|
| 74 | 74 | $segments = array_values($segments); |
| 75 | 75 | } |
| 76 | 76 | |
@@ -32,7 +32,7 @@ |
||
| 32 | 32 | */ |
| 33 | 33 | public function index() |
| 34 | 34 | { |
| 35 | - if($this->presenter->page->file instanceof SplFileInfo) { |
|
| 35 | + if ($this->presenter->page->file instanceof SplFileInfo) { |
|
| 36 | 36 | $this->view->page(presenter()->page->file->getRealPath()); |
| 37 | 37 | } |
| 38 | 38 | } |