@@ -81,8 +81,7 @@ |
||
| 81 | 81 | { |
| 82 | 82 | // Recursively read the translations in the array |
| 83 | 83 | $this->_loadTranslations($sLanguage, $sKey, $xTranslation); |
| 84 | - } |
|
| 85 | - else |
|
| 84 | + } else |
|
| 86 | 85 | { |
| 87 | 86 | // Save this translation |
| 88 | 87 | $this->aTranslations[$sLanguage][$sKey] = $xTranslation; |
@@ -36,8 +36,7 @@ discard block |
||
| 36 | 36 | try |
| 37 | 37 | { |
| 38 | 38 | return file_get_contents($sPath); |
| 39 | - } |
|
| 40 | - catch(Exception $e) |
|
| 39 | + } catch(Exception $e) |
|
| 41 | 40 | { |
| 42 | 41 | return false; |
| 43 | 42 | } |
@@ -55,8 +54,7 @@ discard block |
||
| 55 | 54 | try |
| 56 | 55 | { |
| 57 | 56 | return Minifier::minify($sCode); |
| 58 | - } |
|
| 59 | - catch(Exception $e) |
|
| 57 | + } catch(Exception $e) |
|
| 60 | 58 | { |
| 61 | 59 | return false; |
| 62 | 60 | } |
@@ -232,8 +232,7 @@ |
||
| 232 | 232 | } |
| 233 | 233 | |
| 234 | 234 | return $this->xMetadata; |
| 235 | - } |
|
| 236 | - catch(AnnotationException $e) |
|
| 235 | + } catch(AnnotationException $e) |
|
| 237 | 236 | { |
| 238 | 237 | throw new SetupException($e->getMessage()); |
| 239 | 238 | } |
@@ -138,8 +138,7 @@ discard block |
||
| 138 | 138 | throw new RequestException($this->xTranslator->trans('errors.upload.access'));
|
| 139 | 139 | } |
| 140 | 140 | return $sUploadDir; |
| 141 | - } |
|
| 142 | - catch(FilesystemException $e) |
|
| 141 | + } catch(FilesystemException $e) |
|
| 143 | 142 | {
|
| 144 | 143 | $this->xLogger->error('Filesystem error.', ['message' => $e->getMessage()]);
|
| 145 | 144 | throw new RequestException($this->xTranslator->trans('errors.upload.access'));
|
@@ -238,8 +237,7 @@ discard block |
||
| 238 | 237 | {
|
| 239 | 238 | $aFiles['user']->filesystem()->write($aFiles['user']->path(), $aFiles['temp']->getStream()); |
| 240 | 239 | } |
| 241 | - } |
|
| 242 | - catch(FilesystemException $e) |
|
| 240 | + } catch(FilesystemException $e) |
|
| 243 | 241 | {
|
| 244 | 242 | $this->xLogger->error('Filesystem error.', ['message' => $e->getMessage()]);
|
| 245 | 243 | throw new RequestException($this->xTranslator->trans('errors.upload.access'));
|
@@ -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); |