@@ -144,8 +144,7 @@ |
||
| 144 | 144 | if($aOptions !== null) |
| 145 | 145 | { |
| 146 | 146 | $this->registerComponent($sClassName, $aOptions); |
| 147 | - } |
|
| 148 | - else // if(!isset($this->aComponents[$sClassName])) |
|
| 147 | + } else // if(!isset($this->aComponents[$sClassName])) |
|
| 149 | 148 | { |
| 150 | 149 | // The component was not found in a registered namespace. We need to parse all |
| 151 | 150 | // the directories to be able to find a component registered without a namespace. |
@@ -206,8 +206,7 @@ |
||
| 206 | 206 | return $this->make($this->get($this->getReflectionClassKey($sClassName))); |
| 207 | 207 | }); |
| 208 | 208 | } |
| 209 | - } |
|
| 210 | - catch(ReflectionException $e) |
|
| 209 | + } catch(ReflectionException $e) |
|
| 211 | 210 | { |
| 212 | 211 | throw new SetupException($this->cn()->g(Translator::class) |
| 213 | 212 | ->trans('errors.class.invalid', ['name' => $sClassName])); |
@@ -85,8 +85,7 @@ discard block |
||
| 85 | 85 | if(is_string($xOptions)) |
| 86 | 86 | { |
| 87 | 87 | $xOptions = ['include' => $xOptions]; |
| 88 | - } |
|
| 89 | - elseif(!is_array($xOptions)) |
|
| 88 | + } elseif(!is_array($xOptions)) |
|
| 90 | 89 | { |
| 91 | 90 | throw new SetupException($this->xTranslator->trans('errors.objects.invalid-declaration')); |
| 92 | 91 | } |
@@ -261,8 +260,7 @@ discard block |
||
| 261 | 260 | |
| 262 | 261 | $sError = 'errors.objects.call'; |
| 263 | 262 | $xCallableObject->call($this->xTarget); |
| 264 | - } |
|
| 265 | - catch(ReflectionException|SetupException $e) |
|
| 263 | + } catch(ReflectionException|SetupException $e) |
|
| 266 | 264 | { |
| 267 | 265 | // Unable to execute the requested class or method |
| 268 | 266 | $this->throwException($e->getMessage(), $sError, $aErrorParams); |