@@ -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 |
@@ -95,11 +95,11 @@ |
||
| 95 | 95 | |
| 96 | 96 | // try to access subtree |
| 97 | 97 | try { |
| 98 | - // create new subtree if requested subtree already has a value |
|
| 99 | - if (!is_a($tree->$key, '\Micro\Config')) { |
|
| 100 | - $tree[$key] = new Config([$tree->$key]); |
|
| 101 | - } |
|
| 102 | - $tree = $tree->$key; |
|
| 98 | + // create new subtree if requested subtree already has a value |
|
| 99 | + if (!is_a($tree->$key, '\Micro\Config')) { |
|
| 100 | + $tree[$key] = new Config([$tree->$key]); |
|
| 101 | + } |
|
| 102 | + $tree = $tree->$key; |
|
| 103 | 103 | } catch (Exception $e) { |
| 104 | 104 | // set value if last keypart or create subtree |
| 105 | 105 | if($i == (count($name) - 1)) { |
@@ -203,7 +203,7 @@ discard block |
||
| 203 | 203 | { |
| 204 | 204 | if($this->token_validation_url) { |
| 205 | 205 | $this->logger->debug('validate oauth2 token via rfc7662 token validation endpoint ['.$this->token_validation_url.']', [ |
| 206 | - 'category' => get_class($this), |
|
| 206 | + 'category' => get_class($this), |
|
| 207 | 207 | ]); |
| 208 | 208 | |
| 209 | 209 | $url = str_replace('{token}', $token, $this->token_validation_url); |
@@ -214,7 +214,7 @@ discard block |
||
| 214 | 214 | } |
| 215 | 215 | |
| 216 | 216 | $this->logger->debug('validate token via openid-connect userinfo_endpoint ['.$discovery['userinfo_endpoint'].']', [ |
| 217 | - 'category' => get_class($this), |
|
| 217 | + 'category' => get_class($this), |
|
| 218 | 218 | ]); |
| 219 | 219 | |
| 220 | 220 | $url = $discovery['userinfo_endpoint'].'?access_token='.$token; |
@@ -231,7 +231,7 @@ discard block |
||
| 231 | 231 | if($code === 200) { |
| 232 | 232 | $attributes = json_decode($result, true); |
| 233 | 233 | $this->logger->debug('successfully verified oauth2 access token via authorization server', [ |
| 234 | - 'category' => get_class($this), |
|
| 234 | + 'category' => get_class($this), |
|
| 235 | 235 | ]); |
| 236 | 236 | |
| 237 | 237 | if(!isset($attributes[$this->identity_attribute])) { |
@@ -249,7 +249,7 @@ discard block |
||
| 249 | 249 | return true; |
| 250 | 250 | } else { |
| 251 | 251 | $this->logger->error('failed verify oauth2 access token via authorization server, received status ['.$code.']', [ |
| 252 | - 'category' => get_class($this), |
|
| 252 | + 'category' => get_class($this), |
|
| 253 | 253 | ]); |
| 254 | 254 | |
| 255 | 255 | throw new Exception('failed verify oauth2 access token via authorization server'); |
@@ -274,7 +274,7 @@ discard block |
||
| 274 | 274 | } |
| 275 | 275 | |
| 276 | 276 | $this->logger->debug('fetch user attributes from userinfo_endpoint ['.$discovery['userinfo_endpoint'].']', [ |
| 277 | - 'category' => get_class($this), |
|
| 277 | + 'category' => get_class($this), |
|
| 278 | 278 | ]); |
| 279 | 279 | |
| 280 | 280 | $url = $discovery['userinfo_endpoint'].'?access_token='.$this->access_token; |
@@ -289,13 +289,13 @@ discard block |
||
| 289 | 289 | if($code === 200) { |
| 290 | 290 | $attributes = json_decode($result, true); |
| 291 | 291 | $this->logger->debug('successfully requested user attributes from userinfo_endpoint', [ |
| 292 | - 'category' => get_class($this), |
|
| 292 | + 'category' => get_class($this), |
|
| 293 | 293 | ]); |
| 294 | 294 | |
| 295 | 295 | return $this->attributes = $attributes; |
| 296 | 296 | } else { |
| 297 | 297 | $this->logger->error('failed requesting user attributes from userinfo_endpoint, status code ['.$code.']', [ |
| 298 | - 'category' => get_class($this), |
|
| 298 | + 'category' => get_class($this), |
|
| 299 | 299 | ]); |
| 300 | 300 | |
| 301 | 301 | throw new Exception('failed requesting user attribute from userinfo_endpoint'); |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | foreach($config as $name => $service) { |
| 72 | 72 | if(isset($service['name']) && $parent === null) { |
| 73 | 73 | $id = $service['name']; |
| 74 | - } else { |
|
| 74 | + } else { |
|
| 75 | 75 | if($parent === null) { |
| 76 | 76 | $id = $name; |
| 77 | 77 | } else { |
@@ -229,7 +229,7 @@ discard block |
||
| 229 | 229 | } else { |
| 230 | 230 | $type_class = $type->getName(); |
| 231 | 231 | $args[$param_name] = $this->findParentService($name, $type_class); |
| 232 | - } |
|
| 232 | + } |
|
| 233 | 233 | } |
| 234 | 234 | |
| 235 | 235 | return $this->createInstance($name, $reflection, $args); |