@@ -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 | } |
@@ -91,7 +91,7 @@ |
||
91 | 91 | $newValue = []; |
92 | 92 | |
93 | 93 | foreach ($value as $key => $val) { |
94 | - $newValue[ camelcase($key) ] = $val; |
|
94 | + $newValue[camelcase($key)] = $val; |
|
95 | 95 | } |
96 | 96 | |
97 | 97 | parent::offsetSet(camelcase($offset), new self($newValue)); |
@@ -52,11 +52,11 @@ discard block |
||
52 | 52 | */ |
53 | 53 | public function getOption($name, $default = null) |
54 | 54 | { |
55 | - if ( ! isset($this->options[ $name ])) { |
|
55 | + if ( ! isset($this->options[$name])) { |
|
56 | 56 | return $default; |
57 | 57 | } |
58 | 58 | |
59 | - return $this->options[ $name ]; |
|
59 | + return $this->options[$name]; |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | // ------------------------------------------------------------------------ |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | */ |
74 | 74 | public function setOption($name, $value) |
75 | 75 | { |
76 | - $this->options[ $name ] = $value; |
|
76 | + $this->options[$name] = $value; |
|
77 | 77 | |
78 | 78 | return $this; |
79 | 79 | } |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | } |
114 | 114 | } else { |
115 | 115 | $uriPath = urldecode( |
116 | - parse_url($_SERVER[ 'REQUEST_URI' ], PHP_URL_PATH) |
|
116 | + parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH) |
|
117 | 117 | ); |
118 | 118 | |
119 | 119 | $uriPathParts = explode('public/', $uriPath); |
@@ -227,8 +227,8 @@ discard block |
||
227 | 227 | ); |
228 | 228 | } elseif (preg_match("/([a-zA-Z0-9\\\]+)(@)([a-zA-Z0-9\\\]+)/", $closure, $matches)) { |
229 | 229 | $this->setController( |
230 | - (new Router\DataStructures\Controller($matches[ 1 ])) |
|
231 | - ->setRequestMethod($matches[ 3 ]), |
|
230 | + (new Router\DataStructures\Controller($matches[1])) |
|
231 | + ->setRequestMethod($matches[3]), |
|
232 | 232 | $uriSegments |
233 | 233 | ); |
234 | 234 | } elseif (is_string($closure) && $closure !== '') { |
@@ -317,10 +317,10 @@ discard block |
||
317 | 317 | $parameters = $controllerMethodParams; |
318 | 318 | } else { |
319 | 319 | foreach ($method->getParameters() as $index => $parameter) { |
320 | - if (isset($uriSegments[ $parameter->name ])) { |
|
321 | - $parameters[ $index ] = $controllerMethodParams[ $parameter->name ]; |
|
320 | + if (isset($uriSegments[$parameter->name])) { |
|
321 | + $parameters[$index] = $controllerMethodParams[$parameter->name]; |
|
322 | 322 | } else { |
323 | - $parameters[ $index ] = null; |
|
323 | + $parameters[$index] = null; |
|
324 | 324 | } |
325 | 325 | } |
326 | 326 | } |