@@ -18,7 +18,7 @@ |
||
18 | 18 | * @param $className |
19 | 19 | */ |
20 | 20 | spl_autoload_register( |
21 | - function ($className) { |
|
21 | + function($className) { |
|
22 | 22 | if ($className === 'O2System\Framework') { |
23 | 23 | require __DIR__ . DIRECTORY_SEPARATOR . 'Framework.php'; |
24 | 24 | } elseif (strpos($className, 'O2System\Framework\\') === false) { |
@@ -161,10 +161,10 @@ |
||
161 | 161 | { |
162 | 162 | $extensions = ['.php', '.phtml', '.html', '.tpl']; |
163 | 163 | |
164 | - if (isset($this->config[ 'extensions' ])) { |
|
165 | - array_unshift($partialsExtensions, $this->config[ 'extension' ]); |
|
166 | - } elseif (isset($this->config[ 'extension' ])) { |
|
167 | - array_unshift($extensions, $this->config[ 'extension' ]); |
|
164 | + if (isset($this->config['extensions'])) { |
|
165 | + array_unshift($partialsExtensions, $this->config['extension']); |
|
166 | + } elseif (isset($this->config['extension'])) { |
|
167 | + array_unshift($extensions, $this->config['extension']); |
|
168 | 168 | } |
169 | 169 | |
170 | 170 | foreach ($extensions as $extension) { |
@@ -98,8 +98,8 @@ |
||
98 | 98 | |
99 | 99 | public function getNamespace() |
100 | 100 | { |
101 | - if (isset($this->properties[ 'namespace' ])) { |
|
102 | - return $this->properties[ 'namespace' ]; |
|
101 | + if (isset($this->properties['namespace'])) { |
|
102 | + return $this->properties['namespace']; |
|
103 | 103 | } |
104 | 104 | |
105 | 105 | $dir = $this->getRealPath(); |
@@ -165,7 +165,7 @@ |
||
165 | 165 | $themes = []; |
166 | 166 | foreach ($directory->getTree() as $themeName => $themeTree) { |
167 | 167 | if (($theme = $this->getTheme($themeName)) instanceof Theme) { |
168 | - $themes[ $themeName ] = $theme; |
|
168 | + $themes[$themeName] = $theme; |
|
169 | 169 | } |
170 | 170 | } |
171 | 171 |
@@ -15,16 +15,16 @@ |
||
15 | 15 | public function __construct($amount) |
16 | 16 | { |
17 | 17 | if (is_numeric($amount)) { |
18 | - $money[ 'amount' ] = (int)$amount; |
|
18 | + $money['amount'] = (int)$amount; |
|
19 | 19 | } elseif (is_array($amount)) { |
20 | 20 | $money = $amount; |
21 | 21 | } |
22 | 22 | |
23 | - (int)$storage[ 'amount' ] = 0; |
|
24 | - $storage[ 'currency' ] = config()->getItem('units')->currency; |
|
23 | + (int)$storage['amount'] = 0; |
|
24 | + $storage['currency'] = config()->getItem('units')->currency; |
|
25 | 25 | |
26 | 26 | $storage = array_merge($storage, $money); |
27 | - (int)$storage[ 'amount' ] = empty($storage[ 'amount' ]) ? 0 : abs($storage[ 'amount' ]); |
|
27 | + (int)$storage['amount'] = empty($storage['amount']) ? 0 : abs($storage['amount']); |
|
28 | 28 | |
29 | 29 | $this->storage = $storage; |
30 | 30 | } |
@@ -36,23 +36,23 @@ |
||
36 | 36 | $name = []; |
37 | 37 | |
38 | 38 | if (count($parts) == 1) { |
39 | - $name[ 'first' ] = $parts[ 0 ]; |
|
40 | - $name[ 'middle' ] = null; |
|
41 | - $name[ 'last' ] = null; |
|
39 | + $name['first'] = $parts[0]; |
|
40 | + $name['middle'] = null; |
|
41 | + $name['last'] = null; |
|
42 | 42 | } elseif (count($parts) == 2) { |
43 | - $name[ 'first' ] = $parts[ 0 ]; |
|
44 | - $name[ 'middle' ] = null; |
|
45 | - $name[ 'last' ] = $parts[ 1 ]; |
|
43 | + $name['first'] = $parts[0]; |
|
44 | + $name['middle'] = null; |
|
45 | + $name['last'] = $parts[1]; |
|
46 | 46 | } elseif (count($parts) == 3) { |
47 | - $name[ 'first' ] = $parts[ 0 ]; |
|
48 | - $name[ 'middle' ] = $parts[ 1 ]; |
|
49 | - $name[ 'last' ] = $parts[ 2 ]; |
|
47 | + $name['first'] = $parts[0]; |
|
48 | + $name['middle'] = $parts[1]; |
|
49 | + $name['last'] = $parts[2]; |
|
50 | 50 | } else { |
51 | - $name[ 'first' ] = $parts[ 0 ]; |
|
52 | - $name[ 'middle' ] = $parts[ 1 ]; |
|
51 | + $name['first'] = $parts[0]; |
|
52 | + $name['middle'] = $parts[1]; |
|
53 | 53 | |
54 | 54 | $parts = array_slice($parts, 2); |
55 | - $name[ 'last' ] = implode(' ', $parts); |
|
55 | + $name['last'] = implode(' ', $parts); |
|
56 | 56 | } |
57 | 57 | } |
58 | 58 |
@@ -94,8 +94,8 @@ discard block |
||
94 | 94 | $options = input()->get(); |
95 | 95 | |
96 | 96 | if (empty($options)) { |
97 | - $_GET[ 'host' ] = 'localhost'; |
|
98 | - $_GET[ 'port' ] = 8000; |
|
97 | + $_GET['host'] = 'localhost'; |
|
98 | + $_GET['port'] = 8000; |
|
99 | 99 | } |
100 | 100 | |
101 | 101 | parent::execute(); |
@@ -107,12 +107,12 @@ discard block |
||
107 | 107 | ->setNewLinesAfter(1) |
108 | 108 | ); |
109 | 109 | |
110 | - $_SERVER[ 'DOCUMENT_ROOT' ] = PATH_PUBLIC; |
|
110 | + $_SERVER['DOCUMENT_ROOT'] = PATH_PUBLIC; |
|
111 | 111 | |
112 | 112 | output()->write( |
113 | 113 | (new Format()) |
114 | 114 | ->setContextualClass(Format::INFO) |
115 | - ->setString(language()->getLine('CLI_SERVE_DOC_ROOT', [$_SERVER[ 'DOCUMENT_ROOT' ]])) |
|
115 | + ->setString(language()->getLine('CLI_SERVE_DOC_ROOT', [$_SERVER['DOCUMENT_ROOT']])) |
|
116 | 116 | ->setNewLinesAfter(1) |
117 | 117 | ); |
118 | 118 |
@@ -85,11 +85,11 @@ |
||
85 | 85 | $subNamespace |
86 | 86 | )) . '\\'; |
87 | 87 | |
88 | - $vars[ 'CREATE_DATETIME' ] = date('d/m/Y H:m'); |
|
89 | - $vars[ 'NAMESPACE' ] = trim($classNamespace, '\\'); |
|
90 | - $vars[ 'PACKAGE' ] = '\\' . trim($classNamespace, '\\'); |
|
91 | - $vars[ 'CLASS' ] = $className; |
|
92 | - $vars[ 'FILEPATH' ] = $filePath; |
|
88 | + $vars['CREATE_DATETIME'] = date('d/m/Y H:m'); |
|
89 | + $vars['NAMESPACE'] = trim($classNamespace, '\\'); |
|
90 | + $vars['PACKAGE'] = '\\' . trim($classNamespace, '\\'); |
|
91 | + $vars['CLASS'] = $className; |
|
92 | + $vars['FILEPATH'] = $filePath; |
|
93 | 93 | |
94 | 94 | $phpTemplate = <<<PHPTEMPLATE |
95 | 95 | <?php |
@@ -85,11 +85,11 @@ |
||
85 | 85 | $subNamespace |
86 | 86 | )) . '\\'; |
87 | 87 | |
88 | - $vars[ 'CREATE_DATETIME' ] = date('d/m/Y H:m'); |
|
89 | - $vars[ 'NAMESPACE' ] = trim($classNamespace, '\\'); |
|
90 | - $vars[ 'PACKAGE' ] = '\\' . trim($classNamespace, '\\'); |
|
91 | - $vars[ 'CLASS' ] = $className; |
|
92 | - $vars[ 'FILEPATH' ] = $filePath; |
|
88 | + $vars['CREATE_DATETIME'] = date('d/m/Y H:m'); |
|
89 | + $vars['NAMESPACE'] = trim($classNamespace, '\\'); |
|
90 | + $vars['PACKAGE'] = '\\' . trim($classNamespace, '\\'); |
|
91 | + $vars['CLASS'] = $className; |
|
92 | + $vars['FILEPATH'] = $filePath; |
|
93 | 93 | |
94 | 94 | $phpTemplate = <<<PHPTEMPLATE |
95 | 95 | <?php |