@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | return; |
58 | 58 | } |
59 | 59 | |
60 | - $_POST[ $name ] = $standardInput; |
|
60 | + $_POST[$name] = $standardInput; |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | // ------------------------------------------------------------------------ |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | return; |
98 | 98 | } |
99 | 99 | |
100 | - $_POST[ $name ] = (bool)($standardInput === 'Y'); |
|
100 | + $_POST[$name] = (bool)($standardInput === 'Y'); |
|
101 | 101 | } |
102 | 102 | |
103 | 103 | // ------------------------------------------------------------------------ |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | $choices = []; |
120 | 120 | $i = 1; |
121 | 121 | foreach ($options as $value => $label) { |
122 | - $choices[ $i ] = $value; |
|
122 | + $choices[$i] = $value; |
|
123 | 123 | output()->write( |
124 | 124 | (new Format()) |
125 | 125 | ->setString('(' . $i . ') ' . language()->getLine($label)) |
@@ -166,6 +166,6 @@ discard block |
||
166 | 166 | return; |
167 | 167 | } |
168 | 168 | |
169 | - $_POST[ $name ] = $choices[ $standardInput ]; |
|
169 | + $_POST[$name] = $choices[$standardInput]; |
|
170 | 170 | } |
171 | 171 | } |
172 | 172 | \ No newline at end of file |
@@ -161,12 +161,12 @@ |
||
161 | 161 | |
162 | 162 | // set foreground color |
163 | 163 | if (array_key_exists($this->foreground, $this->foregroundColors)) { |
164 | - $coloredString .= "\033[" . $this->foregroundColors[ $this->foreground ] . "m"; |
|
164 | + $coloredString .= "\033[" . $this->foregroundColors[$this->foreground] . "m"; |
|
165 | 165 | } |
166 | 166 | |
167 | 167 | // set background color |
168 | 168 | if (array_key_exists($this->background, $this->backgroundColors)) { |
169 | - $coloredString .= "\033[" . $this->backgroundColors[ $this->background ] . "m"; |
|
169 | + $coloredString .= "\033[" . $this->backgroundColors[$this->background] . "m"; |
|
170 | 170 | } |
171 | 171 | |
172 | 172 | // combine with string and end the painting |
@@ -93,7 +93,7 @@ |
||
93 | 93 | $commander->setApp($this); |
94 | 94 | } |
95 | 95 | |
96 | - $this->commandersPool[ $commander->getCommandName() ] = $commander; |
|
96 | + $this->commandersPool[$commander->getCommandName()] = $commander; |
|
97 | 97 | } |
98 | 98 | |
99 | 99 | // ------------------------------------------------------------------------ |
@@ -25,7 +25,7 @@ |
||
25 | 25 | * @param $className |
26 | 26 | */ |
27 | 27 | spl_autoload_register( |
28 | - function ($className) { |
|
28 | + function($className) { |
|
29 | 29 | if ($className === 'O2System\Kernel') { |
30 | 30 | require __DIR__ . DIRECTORY_SEPARATOR . 'Kernel.php'; |
31 | 31 | } elseif (strpos($className, 'O2System\Kernel\\') === false) { |
@@ -114,24 +114,24 @@ |
||
114 | 114 | } |
115 | 115 | |
116 | 116 | $rules = [ |
117 | - '/^(ox)$/' => '\1\2en', // ox |
|
118 | - '/([m|l])ouse$/' => '\1ice', // mouse, louse |
|
119 | - '/(matr|vert|ind)ix|ex$/' => '\1ices', // matrix, vertex, index |
|
120 | - '/(x|ch|ss|sh)$/' => '\1es', // search, switch, fix, box, process, address |
|
121 | - '/([^aeiouy]|qu)y$/' => '\1ies', // query, ability, agency |
|
122 | - '/(hive)$/' => '\1s', // archive, hive |
|
123 | - '/(?:([^f])fe|([lr])f)$/' => '\1\2ves', // half, safe, wife |
|
124 | - '/sis$/' => 'ses', // basis, diagnosis |
|
125 | - '/([ti])um$/' => '\1a', // datum, medium |
|
126 | - '/(p)erson$/' => '\1eople', // person, salesperson |
|
127 | - '/(m)an$/' => '\1en', // man, woman, spokesman |
|
128 | - '/(c)hild$/' => '\1hildren', // child |
|
129 | - '/(buffal|tomat)o$/' => '\1\2oes', // buffalo, tomato |
|
130 | - '/(bu|campu)s$/' => '\1\2ses', // bus, campus |
|
131 | - '/(alias|status|virus)$/' => '\1es', // alias |
|
132 | - '/(octop)us$/' => '\1i', // octopus |
|
133 | - '/(ax|cris|test)is$/' => '\1es', // axis, crisis |
|
134 | - '/s$/' => 's', // no change (compatibility) |
|
117 | + '/^(ox)$/' => '\1\2en', // ox |
|
118 | + '/([m|l])ouse$/' => '\1ice', // mouse, louse |
|
119 | + '/(matr|vert|ind)ix|ex$/' => '\1ices', // matrix, vertex, index |
|
120 | + '/(x|ch|ss|sh)$/' => '\1es', // search, switch, fix, box, process, address |
|
121 | + '/([^aeiouy]|qu)y$/' => '\1ies', // query, ability, agency |
|
122 | + '/(hive)$/' => '\1s', // archive, hive |
|
123 | + '/(?:([^f])fe|([lr])f)$/' => '\1\2ves', // half, safe, wife |
|
124 | + '/sis$/' => 'ses', // basis, diagnosis |
|
125 | + '/([ti])um$/' => '\1a', // datum, medium |
|
126 | + '/(p)erson$/' => '\1eople', // person, salesperson |
|
127 | + '/(m)an$/' => '\1en', // man, woman, spokesman |
|
128 | + '/(c)hild$/' => '\1hildren', // child |
|
129 | + '/(buffal|tomat)o$/' => '\1\2oes', // buffalo, tomato |
|
130 | + '/(bu|campu)s$/' => '\1\2ses', // bus, campus |
|
131 | + '/(alias|status|virus)$/' => '\1es', // alias |
|
132 | + '/(octop)us$/' => '\1i', // octopus |
|
133 | + '/(ax|cris|test)is$/' => '\1es', // axis, crisis |
|
134 | + '/s$/' => 's', // no change (compatibility) |
|
135 | 135 | '/$/' => 's', |
136 | 136 | ]; |
137 | 137 |
@@ -43,30 +43,30 @@ discard block |
||
43 | 43 | if (is_array($name)) { |
44 | 44 | // always leave 'name' in last place, as the loop will break otherwise, due to $$item |
45 | 45 | foreach (['value', 'expire', 'domain', 'path', 'prefix', 'secure', 'httponly', 'name'] as $item) { |
46 | - if (isset($name[ $item ])) { |
|
47 | - $$item = $name[ $item ]; |
|
46 | + if (isset($name[$item])) { |
|
47 | + $$item = $name[$item]; |
|
48 | 48 | } |
49 | 49 | } |
50 | 50 | } |
51 | 51 | |
52 | 52 | if ($prefix === '' && function_exists('config')) { |
53 | - $prefix = config()->offsetGet('cookie')[ 'prefix' ]; |
|
53 | + $prefix = config()->offsetGet('cookie')['prefix']; |
|
54 | 54 | } |
55 | 55 | |
56 | 56 | if ($domain === '' && function_exists('config')) { |
57 | - $domain = config()->offsetGet('cookie')[ 'domain' ]; |
|
57 | + $domain = config()->offsetGet('cookie')['domain']; |
|
58 | 58 | } |
59 | 59 | |
60 | 60 | if ($path === '' && function_exists('config')) { |
61 | - $path = config()->offsetGet('cookie')[ 'path' ]; |
|
61 | + $path = config()->offsetGet('cookie')['path']; |
|
62 | 62 | } |
63 | 63 | |
64 | 64 | if ($secure === null && function_exists('config')) { |
65 | - $secure = config()->offsetGet('cookie')[ 'secure' ]; |
|
65 | + $secure = config()->offsetGet('cookie')['secure']; |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | if ($httponly === null && function_exists('config')) { |
69 | - $httponly = config()->offsetGet('cookie')[ 'httpOnly' ]; |
|
69 | + $httponly = config()->offsetGet('cookie')['httpOnly']; |
|
70 | 70 | } |
71 | 71 | |
72 | 72 | if ( ! is_numeric($expire) OR $expire < 0) { |
@@ -99,12 +99,12 @@ discard block |
||
99 | 99 | */ |
100 | 100 | function get_cookie($name) |
101 | 101 | { |
102 | - if (isset($_COOKIE[ $name ])) { |
|
103 | - return $_COOKIE[ $name ]; |
|
102 | + if (isset($_COOKIE[$name])) { |
|
103 | + return $_COOKIE[$name]; |
|
104 | 104 | } elseif (function_exists('config')) { |
105 | - $prefix = config()->offsetGet('cookie')[ 'prefix' ]; |
|
106 | - if (isset($_COOKIE[ $prefix . $name ])) { |
|
107 | - return $_COOKIE[ $prefix . $name ]; |
|
105 | + $prefix = config()->offsetGet('cookie')['prefix']; |
|
106 | + if (isset($_COOKIE[$prefix . $name])) { |
|
107 | + return $_COOKIE[$prefix . $name]; |
|
108 | 108 | } |
109 | 109 | } |
110 | 110 | |
@@ -128,11 +128,11 @@ discard block |
||
128 | 128 | function delete_cookie($name, $domain = '', $path = '/', $prefix = '') |
129 | 129 | { |
130 | 130 | if ($prefix === '' && function_exists('config')) { |
131 | - $prefix = config()->offsetGet('cookie')[ 'prefix' ]; |
|
131 | + $prefix = config()->offsetGet('cookie')['prefix']; |
|
132 | 132 | } |
133 | 133 | |
134 | - if (isset($_COOKIE[ $prefix . $name ])) { |
|
135 | - unset($_COOKIE[ $prefix . $name ]); |
|
134 | + if (isset($_COOKIE[$prefix . $name])) { |
|
135 | + unset($_COOKIE[$prefix . $name]); |
|
136 | 136 | } |
137 | 137 | |
138 | 138 | return set_cookie($name, '', -1, $domain, $path, $prefix); |
@@ -63,7 +63,7 @@ |
||
63 | 63 | $this->path = PATH_CACHE . 'logs' . DIRECTORY_SEPARATOR; |
64 | 64 | } else { |
65 | 65 | $this->path = dirname( |
66 | - $_SERVER[ 'SCRIPT_FILENAME' ] |
|
66 | + $_SERVER['SCRIPT_FILENAME'] |
|
67 | 67 | ) . DIRECTORY_SEPARATOR . 'cache' . DIRECTORY_SEPARATOR . 'logs' . DIRECTORY_SEPARATOR; |
68 | 68 | } |
69 | 69 |
@@ -46,12 +46,12 @@ discard block |
||
46 | 46 | $args = func_get_args(); |
47 | 47 | |
48 | 48 | if (count($args)) { |
49 | - if (kernel()->services->has($args[ 0 ])) { |
|
50 | - if (isset($args[ 1 ]) and is_array($args[ 1 ])) { |
|
51 | - return kernel()->services->get($args[ 0 ], $args[ 1 ]); |
|
49 | + if (kernel()->services->has($args[0])) { |
|
50 | + if (isset($args[1]) and is_array($args[1])) { |
|
51 | + return kernel()->services->get($args[0], $args[1]); |
|
52 | 52 | } |
53 | 53 | |
54 | - return kernel()->services->get($args[ 0 ]); |
|
54 | + return kernel()->services->get($args[0]); |
|
55 | 55 | } |
56 | 56 | |
57 | 57 | return false; |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | |
98 | 98 | if (count($args)) { |
99 | 99 | if (services()->has('language')) { |
100 | - $language =& services()->get('language'); |
|
100 | + $language = & services()->get('language'); |
|
101 | 101 | |
102 | 102 | return call_user_func_array([&$language, 'getLine'], $args); |
103 | 103 | } |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | |
126 | 126 | if (count($args)) { |
127 | 127 | if (services()->has('logger')) { |
128 | - $logger =& services('logger'); |
|
128 | + $logger = & services('logger'); |
|
129 | 129 | |
130 | 130 | return call_user_func_array([&$logger, 'log'], $args); |
131 | 131 | } |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | |
107 | 107 | if (count($this->isLoaded)) { |
108 | 108 | foreach ($this->isLoaded as $fileIndex => $filePath) { |
109 | - unset($this->isLoaded[ $fileIndex ]); |
|
109 | + unset($this->isLoaded[$fileIndex]); |
|
110 | 110 | $this->loadFile($fileIndex); |
111 | 111 | } |
112 | 112 | } |
@@ -216,7 +216,7 @@ discard block |
||
216 | 216 | |
217 | 217 | if (is_array($lines)) { |
218 | 218 | if (count($lines)) { |
219 | - $this->isLoaded[ $this->getFileIndex($filePath) ] = $filePath; |
|
219 | + $this->isLoaded[$this->getFileIndex($filePath)] = $filePath; |
|
220 | 220 | |
221 | 221 | $this->lines = array_merge($this->lines, $lines); |
222 | 222 | |
@@ -346,9 +346,9 @@ discard block |
||
346 | 346 | $lineOffset = strtoupper($line); |
347 | 347 | |
348 | 348 | if (empty($context)) { |
349 | - $lineContent = isset($this->lines[ $lineOffset ]) ? $this->lines[ $lineOffset ] : $line; |
|
349 | + $lineContent = isset($this->lines[$lineOffset]) ? $this->lines[$lineOffset] : $line; |
|
350 | 350 | } else { |
351 | - $line = isset($this->lines[ $lineOffset ]) ? $this->lines[ $lineOffset ] : $line; |
|
351 | + $line = isset($this->lines[$lineOffset]) ? $this->lines[$lineOffset] : $line; |
|
352 | 352 | array_unshift($context, $line); |
353 | 353 | |
354 | 354 | $lineContent = @call_user_func_array('sprintf', $context); |