@@ -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); |
@@ -189,8 +189,7 @@ |
||
| 189 | 189 | { |
| 190 | 190 | $this->set($sClassName, fn() => $this->make($this->get($sClassKey))); |
| 191 | 191 | } |
| 192 | - } |
|
| 193 | - catch(ReflectionException $e) |
|
| 192 | + } catch(ReflectionException $e) |
|
| 194 | 193 | { |
| 195 | 194 | throw new SetupException($this->cn()->g(Translator::class) |
| 196 | 195 | ->trans('errors.class.invalid', ['name' => $sClassName])); |
@@ -198,8 +198,7 @@ |
||
| 198 | 198 | { |
| 199 | 199 | return $this->xAppContainer != null && $this->xAppContainer->has($sClass) ? |
| 200 | 200 | $this->xAppContainer->get($sClass) : $this->xLibContainer->offsetGet($sClass); |
| 201 | - } |
|
| 202 | - catch(Throwable $e) |
|
| 201 | + } catch(Throwable $e) |
|
| 203 | 202 | { |
| 204 | 203 | $xLogger = $this->g(LoggerInterface::class); |
| 205 | 204 | $xTranslator = $this->g(Translator::class); |
@@ -126,8 +126,7 @@ discard block |
||
| 126 | 126 | throw new RequestException($this->xTranslator->trans('errors.upload.access'));
|
| 127 | 127 | } |
| 128 | 128 | return $sUploadDir; |
| 129 | - } |
|
| 130 | - catch(FilesystemException $e) |
|
| 129 | + } catch(FilesystemException $e) |
|
| 131 | 130 | {
|
| 132 | 131 | $this->xLogger->error('Filesystem error.', ['message' => $e->getMessage()]);
|
| 133 | 132 | throw new RequestException($this->xTranslator->trans('errors.upload.access'));
|
@@ -235,8 +234,7 @@ discard block |
||
| 235 | 234 | $xContent = $aFiles['temp']->getStream(); |
| 236 | 235 | $aFiles['user']->filesystem()->write($sPath, $xContent); |
| 237 | 236 | } |
| 238 | - } |
|
| 239 | - catch(FilesystemException $e) |
|
| 237 | + } catch(FilesystemException $e) |
|
| 240 | 238 | {
|
| 241 | 239 | $this->xLogger->error('Filesystem error.', ['message' => $e->getMessage()]);
|
| 242 | 240 | throw new RequestException($this->xTranslator->trans('errors.upload.access'));
|