@@ -220,7 +220,7 @@ |
||
| 220 | 220 | /** |
| 221 | 221 | * Set clas |
| 222 | 222 | * |
| 223 | - * @param string|object $class |
|
| 223 | + * @param string $class |
|
| 224 | 224 | * @return Route |
| 225 | 225 | */ |
| 226 | 226 | public function setClass($class): Route |
@@ -118,12 +118,12 @@ |
||
| 118 | 118 | * @param ContainerInterface $container |
| 119 | 119 | * @return array |
| 120 | 120 | */ |
| 121 | - public function getCallable(?ContainerInterface $container=null): array |
|
| 121 | + public function getCallable(?ContainerInterface $container = null) : array |
|
| 122 | 122 | { |
| 123 | 123 | if (is_object($this->class)) { |
| 124 | 124 | $instance = $this->class; |
| 125 | 125 | } else { |
| 126 | - if($container === null) { |
|
| 126 | + if ($container === null) { |
|
| 127 | 127 | $instance = new $this->class(); |
| 128 | 128 | } else { |
| 129 | 129 | $instance = $container->get($this->class); |
@@ -82,7 +82,7 @@ |
||
| 82 | 82 | |
| 83 | 83 | switch ($value['type']) { |
| 84 | 84 | case 'array': |
| 85 | - $arr = (array)$data[$value['attr']]; |
|
| 85 | + $arr = (array)$data[$value['attr']]; |
|
| 86 | 86 | unset($arr['count']); |
| 87 | 87 | $attrs[$attr] = $arr; |
| 88 | 88 | break; |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | */ |
| 110 | 110 | public function removeHeader(string $header): Response |
| 111 | 111 | { |
| 112 | - if(isset($this->headers[$header])) { |
|
| 112 | + if (isset($this->headers[$header])) { |
|
| 113 | 113 | unset($this->headers[$header]); |
| 114 | 114 | } |
| 115 | 115 | |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | $this->terminate(); |
| 213 | 213 | } |
| 214 | 214 | |
| 215 | - if($this->body instanceof Closure) { |
|
| 215 | + if ($this->body instanceof Closure) { |
|
| 216 | 216 | $body = $this->body->call($this); |
| 217 | 217 | } else { |
| 218 | 218 | $body = $this->body; |
@@ -368,14 +368,14 @@ discard block |
||
| 368 | 368 | * @param string $format |
| 369 | 369 | * @return Response |
| 370 | 370 | */ |
| 371 | - public function setOutputFormat(?string $format=null): Response |
|
| 371 | + public function setOutputFormat(?string $format = null) : Response |
|
| 372 | 372 | { |
| 373 | - if($format === null) { |
|
| 373 | + if ($format === null) { |
|
| 374 | 374 | $this->output_format = null; |
| 375 | 375 | return $this->removeHeader('Content-Type'); |
| 376 | 376 | } |
| 377 | 377 | |
| 378 | - if(!array_key_exists($format, self::OUTPUT_FORMATS)) { |
|
| 378 | + if (!array_key_exists($format, self::OUTPUT_FORMATS)) { |
|
| 379 | 379 | throw new Exception('invalid output format given'); |
| 380 | 380 | } |
| 381 | 381 | |
@@ -68,12 +68,12 @@ discard block |
||
| 68 | 68 | * @param array $request |
| 69 | 69 | * @return void |
| 70 | 70 | */ |
| 71 | - public function __construct(LoggerInterface $logger, ?array $request=null, ?ContainerInterface $container=null) |
|
| 71 | + public function __construct(LoggerInterface $logger, ? array $request = null, ?ContainerInterface $container = null) |
|
| 72 | 72 | { |
| 73 | 73 | $this->logger = $logger; |
| 74 | 74 | $this->container = $container; |
| 75 | 75 | |
| 76 | - if($request === null) { |
|
| 76 | + if ($request === null) { |
|
| 77 | 77 | $request = $_SERVER; |
| 78 | 78 | } |
| 79 | 79 | |
@@ -286,7 +286,7 @@ discard block |
||
| 286 | 286 | 'code' => $exception->getCode() |
| 287 | 287 | ]; |
| 288 | 288 | |
| 289 | - if(defined("$class::HTTP_CODE")) { |
|
| 289 | + if (defined("$class::HTTP_CODE")) { |
|
| 290 | 290 | $http_code = $class::HTTP_CODE; |
| 291 | 291 | } else { |
| 292 | 292 | $http_code = 500; |
@@ -60,7 +60,6 @@ |
||
| 60 | 60 | /** |
| 61 | 61 | * map Array |
| 62 | 62 | * |
| 63 | - * @param array $config |
|
| 64 | 63 | * @return Config |
| 65 | 64 | */ |
| 66 | 65 | protected function mapArray(array $array): Config |
@@ -66,8 +66,8 @@ |
||
| 66 | 66 | protected function mapArray(array $array): Config |
| 67 | 67 | { |
| 68 | 68 | $config = new Config(); |
| 69 | - foreach($array as $key => $value) { |
|
| 70 | - if(is_array($value)) { |
|
| 69 | + foreach ($array as $key => $value) { |
|
| 70 | + if (is_array($value)) { |
|
| 71 | 71 | $config[$key] = $this->mapArray($value); |
| 72 | 72 | } else { |
| 73 | 73 | $config[$key] = $value; |
@@ -84,7 +84,7 @@ |
||
| 84 | 84 | * construct |
| 85 | 85 | * |
| 86 | 86 | * @param Iterable $config |
| 87 | - * @param Logger $logger |
|
| 87 | + * @param LoggerInterface $logger |
|
| 88 | 88 | * @return resource |
| 89 | 89 | */ |
| 90 | 90 | public function __construct(LoggerInterface $logger, ?Iterable $config=null) |
@@ -87,7 +87,7 @@ |
||
| 87 | 87 | * @param Logger $logger |
| 88 | 88 | * @return resource |
| 89 | 89 | */ |
| 90 | - public function __construct(LoggerInterface $logger, ?Iterable $config=null) |
|
| 90 | + public function __construct(LoggerInterface $logger, ?Iterable $config = null) |
|
| 91 | 91 | { |
| 92 | 92 | $this->setOptions($config); |
| 93 | 93 | $this->logger = $logger; |
@@ -42,9 +42,9 @@ discard block |
||
| 42 | 42 | * @param string $config |
| 43 | 43 | * @return void |
| 44 | 44 | */ |
| 45 | - public function __construct(?ConfigInterface $config=null) |
|
| 45 | + public function __construct(?ConfigInterface $config = null) |
|
| 46 | 46 | { |
| 47 | - if($config !== null) { |
|
| 47 | + if ($config !== null) { |
|
| 48 | 48 | $this->_store = $config->map()->children(); |
| 49 | 49 | } |
| 50 | 50 | } |
@@ -69,8 +69,8 @@ discard block |
||
| 69 | 69 | */ |
| 70 | 70 | public function merge(Config $from): Config |
| 71 | 71 | { |
| 72 | - foreach($from as $key => $value) { |
|
| 73 | - if(isset($this->_store[$key]) && $this->_store[$key] instanceof Config) { |
|
| 72 | + foreach ($from as $key => $value) { |
|
| 73 | + if (isset($this->_store[$key]) && $this->_store[$key] instanceof Config) { |
|
| 74 | 74 | $this->_store[$key]->merge($value); |
| 75 | 75 | } else { |
| 76 | 76 | $this->_store[$key] = $value; |
@@ -191,7 +191,7 @@ |
||
| 191 | 191 | } |
| 192 | 192 | |
| 193 | 193 | $args[$param_name] = $this->findParentService($name, $type_class, $config, $parents); |
| 194 | - } |
|
| 194 | + } |
|
| 195 | 195 | } |
| 196 | 196 | |
| 197 | 197 | return $this->createInstance($name, $reflection, $args, $config, $parents); |
@@ -214,8 +214,7 @@ discard block |
||
| 214 | 214 | if(isset($services[$name])) { |
| 215 | 215 | $service = $services[$name]; |
| 216 | 216 | if(isset($services['service'])) { |
| 217 | - $services = $services['service']; } |
|
| 218 | - else { |
|
| 217 | + $services = $services['service']; } else { |
|
| 219 | 218 | break; |
| 220 | 219 | } |
| 221 | 220 | } else { |
@@ -255,7 +254,7 @@ discard block |
||
| 255 | 254 | } |
| 256 | 255 | if(count($parents) === 0) { |
| 257 | 256 | $loop[$name]['instance'] = $instance; |
| 258 | - } else { |
|
| 257 | + } else { |
|
| 259 | 258 | $loop['service'][$name]['instance'] = $instance; |
| 260 | 259 | } |
| 261 | 260 | |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | * |
| 49 | 49 | * @param array $config |
| 50 | 50 | */ |
| 51 | - public function __construct(Iterable $config=[]) |
|
| 51 | + public function __construct(Iterable $config = []) |
|
| 52 | 52 | { |
| 53 | 53 | $this->config = $config; |
| 54 | 54 | $container = $this; |
@@ -66,10 +66,10 @@ discard block |
||
| 66 | 66 | */ |
| 67 | 67 | public function get($name) |
| 68 | 68 | { |
| 69 | - if($this->has($name)) { |
|
| 69 | + if ($this->has($name)) { |
|
| 70 | 70 | return $this->service[$name]['instance']; |
| 71 | 71 | } else { |
| 72 | - if(isset($this->registry[$name])) { |
|
| 72 | + if (isset($this->registry[$name])) { |
|
| 73 | 73 | $this->service[$name]['instance'] = $this->registry[$name]->call($this); |
| 74 | 74 | unset($this->registry[$name]); |
| 75 | 75 | return $this->service[$name]['instance']; |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | */ |
| 89 | 89 | public function getNew(string $name) |
| 90 | 90 | { |
| 91 | - if(isset($this->registry[$name])) { |
|
| 91 | + if (isset($this->registry[$name])) { |
|
| 92 | 92 | return $this->registry[$name]->call($this); |
| 93 | 93 | } else { |
| 94 | 94 | return $this->autoWire($name); |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | */ |
| 106 | 106 | public function add(string $name, Closure $service): Container |
| 107 | 107 | { |
| 108 | - if($this->has($name)) { |
|
| 108 | + if ($this->has($name)) { |
|
| 109 | 109 | throw new Exception('service '.$name.' is already registered'); |
| 110 | 110 | } |
| 111 | 111 | |
@@ -133,18 +133,18 @@ discard block |
||
| 133 | 133 | * @param array $parents |
| 134 | 134 | * @return mixed |
| 135 | 135 | */ |
| 136 | - protected function autoWire(string $name, $config=null, array $parents=[]) |
|
| 136 | + protected function autoWire(string $name, $config = null, array $parents = []) |
|
| 137 | 137 | { |
| 138 | - if($config === null) { |
|
| 138 | + if ($config === null) { |
|
| 139 | 139 | $config = $this->config; |
| 140 | 140 | } |
| 141 | 141 | |
| 142 | 142 | $class = $name; |
| 143 | 143 | $sub_config = $config; |
| 144 | - if(isset($config[$name])) { |
|
| 145 | - if(isset($config[$name]['use'])) { |
|
| 144 | + if (isset($config[$name])) { |
|
| 145 | + if (isset($config[$name]['use'])) { |
|
| 146 | 146 | $class = $config[$name]['use']; |
| 147 | - } elseif(isset($config[$name]['name'])) { |
|
| 147 | + } elseif (isset($config[$name]['name'])) { |
|
| 148 | 148 | $class = $config[$name]['name']; |
| 149 | 149 | } |
| 150 | 150 | |
@@ -155,29 +155,29 @@ discard block |
||
| 155 | 155 | |
| 156 | 156 | try { |
| 157 | 157 | $reflection = new ReflectionClass($class); |
| 158 | - } catch(\Exception $e) { |
|
| 158 | + } catch (\Exception $e) { |
|
| 159 | 159 | throw new Exception($class.' can not be resolved to an existing class'); |
| 160 | 160 | } |
| 161 | 161 | |
| 162 | 162 | $constructor = $reflection->getConstructor(); |
| 163 | 163 | |
| 164 | - if($constructor === null) { |
|
| 164 | + if ($constructor === null) { |
|
| 165 | 165 | return new $class(); |
| 166 | 166 | } else { |
| 167 | 167 | $params = $constructor->getParameters(); |
| 168 | 168 | $args = []; |
| 169 | 169 | |
| 170 | - foreach($params as $param) { |
|
| 170 | + foreach ($params as $param) { |
|
| 171 | 171 | $type = $param->getClass(); |
| 172 | 172 | $param_name = $param->getName(); |
| 173 | 173 | |
| 174 | - if($type === null) { |
|
| 174 | + if ($type === null) { |
|
| 175 | 175 | try { |
| 176 | 176 | $args[$param_name] = $this->getParam($name, $param_name, $sub_config); |
| 177 | - } catch(Exception $e) { |
|
| 178 | - if($param->isDefaultValueAvailable()) { |
|
| 177 | + } catch (Exception $e) { |
|
| 178 | + if ($param->isDefaultValueAvailable()) { |
|
| 179 | 179 | $args[$param_name] = $param->getDefaultValue(); |
| 180 | - } elseif($param->allowsNull()) { |
|
| 180 | + } elseif ($param->allowsNull()) { |
|
| 181 | 181 | $args[$param_name] = null; |
| 182 | 182 | } else { |
| 183 | 183 | throw $e; |
@@ -186,7 +186,7 @@ discard block |
||
| 186 | 186 | } else { |
| 187 | 187 | $type_class = $type->getName(); |
| 188 | 188 | |
| 189 | - if($type_class === $name) { |
|
| 189 | + if ($type_class === $name) { |
|
| 190 | 190 | throw new Exception('class '.$type_class.' can not depend on itself'); |
| 191 | 191 | } |
| 192 | 192 | |
@@ -210,10 +210,10 @@ discard block |
||
| 210 | 210 | { |
| 211 | 211 | $service = null; |
| 212 | 212 | $services = $this->service; |
| 213 | - foreach(array_reverse($parents) as $name => $parent) { |
|
| 214 | - if(isset($services[$name])) { |
|
| 213 | + foreach (array_reverse($parents) as $name => $parent) { |
|
| 214 | + if (isset($services[$name])) { |
|
| 215 | 215 | $service = $services[$name]; |
| 216 | - if(isset($services['service'])) { |
|
| 216 | + if (isset($services['service'])) { |
|
| 217 | 217 | $services = $services['service']; } |
| 218 | 218 | else { |
| 219 | 219 | break; |
@@ -223,12 +223,12 @@ discard block |
||
| 223 | 223 | } |
| 224 | 224 | } |
| 225 | 225 | |
| 226 | - if($service !== null) { |
|
| 226 | + if ($service !== null) { |
|
| 227 | 227 | return $service['instance']; |
| 228 | 228 | } |
| 229 | 229 | |
| 230 | - foreach(array_reverse($parents) as $parent) { |
|
| 231 | - if(isset($parent['service'][$class])) { |
|
| 230 | + foreach (array_reverse($parents) as $parent) { |
|
| 231 | + if (isset($parent['service'][$class])) { |
|
| 232 | 232 | return $this->autoWire($class, $parent['service'], $parents); |
| 233 | 233 | } |
| 234 | 234 | } |
@@ -245,17 +245,17 @@ discard block |
||
| 245 | 245 | * @param array $args |
| 246 | 246 | * @return mixed |
| 247 | 247 | */ |
| 248 | - protected function createInstance(string $name, ReflectionClass $class, array $args, Iterable $config, $parents=[]) |
|
| 248 | + protected function createInstance(string $name, ReflectionClass $class, array $args, Iterable $config, $parents = []) |
|
| 249 | 249 | { |
| 250 | 250 | $instance = $class->newInstanceArgs($args); |
| 251 | 251 | |
| 252 | 252 | $loop = &$this->service; |
| 253 | - foreach($parents as $p => $parent) { |
|
| 253 | + foreach ($parents as $p => $parent) { |
|
| 254 | 254 | $loop = &$loop[$p]; |
| 255 | 255 | } |
| 256 | - if(count($parents) === 0) { |
|
| 256 | + if (count($parents) === 0) { |
|
| 257 | 257 | $loop[$name]['instance'] = $instance; |
| 258 | - } else { |
|
| 258 | + } else { |
|
| 259 | 259 | $loop['service'][$name]['instance'] = $instance; |
| 260 | 260 | } |
| 261 | 261 | |
@@ -265,15 +265,15 @@ discard block |
||
| 265 | 265 | |
| 266 | 266 | array_unshift($parents, $name); |
| 267 | 267 | |
| 268 | - if($instance instanceof AdapterAwareInterface) { |
|
| 269 | - if(isset($config['adapter'])) { |
|
| 268 | + if ($instance instanceof AdapterAwareInterface) { |
|
| 269 | + if (isset($config['adapter'])) { |
|
| 270 | 270 | $adapters = $config['adapter']; |
| 271 | 271 | } else { |
| 272 | 272 | $adapters = $instance->getDefaultAdapter(); |
| 273 | 273 | } |
| 274 | 274 | |
| 275 | - foreach($adapters as $adapter => $service) { |
|
| 276 | - if(isset($service['enabled']) && $service['enabled'] === '0') { |
|
| 275 | + foreach ($adapters as $adapter => $service) { |
|
| 276 | + if (isset($service['enabled']) && $service['enabled'] === '0') { |
|
| 277 | 277 | continue; |
| 278 | 278 | } |
| 279 | 279 | |
@@ -282,7 +282,7 @@ discard block |
||
| 282 | 282 | $class = $adapter; |
| 283 | 283 | $adapter_instance = $this->autoWire($class, $adapters, $parents); |
| 284 | 284 | |
| 285 | - if(isset($service['expose']) && $service['expose']) { |
|
| 285 | + if (isset($service['expose']) && $service['expose']) { |
|
| 286 | 286 | $this->service[$adapter]['instance'] = $adapter_instance; |
| 287 | 287 | } |
| 288 | 288 | |
@@ -302,22 +302,22 @@ discard block |
||
| 302 | 302 | */ |
| 303 | 303 | protected function parseParam($param) |
| 304 | 304 | { |
| 305 | - if(is_iterable($param)) { |
|
| 306 | - foreach($param as $key => $value) { |
|
| 305 | + if (is_iterable($param)) { |
|
| 306 | + foreach ($param as $key => $value) { |
|
| 307 | 307 | $param[$key] = $this->parseParam($value); |
| 308 | 308 | } |
| 309 | 309 | |
| 310 | 310 | return $param; |
| 311 | - } elseif(is_string($param)) { |
|
| 312 | - if(preg_match('#\{ENV\(([A-Za-z0-9_]+)(?:(,?)(.*))\)\}#', $param, $match)) { |
|
| 313 | - if(count($match) !== 4) { |
|
| 311 | + } elseif (is_string($param)) { |
|
| 312 | + if (preg_match('#\{ENV\(([A-Za-z0-9_]+)(?:(,?)(.*))\)\}#', $param, $match)) { |
|
| 313 | + if (count($match) !== 4) { |
|
| 314 | 314 | return $param; |
| 315 | 315 | } |
| 316 | 316 | |
| 317 | 317 | $env = getenv($match[1]); |
| 318 | - if($env === false && !empty($match[3])) { |
|
| 318 | + if ($env === false && !empty($match[3])) { |
|
| 319 | 319 | return str_replace($match[0], $match[3], $param); |
| 320 | - } elseif($env === false) { |
|
| 320 | + } elseif ($env === false) { |
|
| 321 | 321 | throw new Exception('env variable '.$match[1].' required but it is neither set not a default value exists'); |
| 322 | 322 | } else { |
| 323 | 323 | return str_replace($match[0], $env, $param); |
@@ -340,13 +340,13 @@ discard block |
||
| 340 | 340 | * @param string $param |
| 341 | 341 | * @return mixed |
| 342 | 342 | */ |
| 343 | - public function getParam(string $name, string $param, ?Iterable $config=null) |
|
| 343 | + public function getParam(string $name, string $param, ?Iterable $config = null) |
|
| 344 | 344 | { |
| 345 | - if($config === null) { |
|
| 345 | + if ($config === null) { |
|
| 346 | 346 | $config = $this->config; |
| 347 | 347 | } |
| 348 | 348 | |
| 349 | - if(!isset($config[$name]['options'][$param])) { |
|
| 349 | + if (!isset($config[$name]['options'][$param])) { |
|
| 350 | 350 | throw new Exception('no configuration available for required service parameter '.$param); |
| 351 | 351 | } |
| 352 | 352 | |
@@ -45,7 +45,7 @@ |
||
| 45 | 45 | * |
| 46 | 46 | * @return AdapterInterface |
| 47 | 47 | */ |
| 48 | - public function setOptions(? Iterable $config = null): AdapterInterface |
|
| 48 | + public function setOptions(? Iterable $config = null) : AdapterInterface |
|
| 49 | 49 | { |
| 50 | 50 | if ($config === null) { |
| 51 | 51 | return $this; |