@@ -42,8 +42,7 @@ |
||
42 | 42 | { |
43 | 43 | $options[$name] = (array) $options[$name]; |
44 | 44 | $options[$name][] = substr( $option, $pos + 1 ); |
45 | - } |
|
46 | - else |
|
45 | + } else |
|
47 | 46 | { |
48 | 47 | $options[$name] = substr( $option, $pos + 1 ); |
49 | 48 | } |
@@ -20,14 +20,12 @@ discard block |
||
20 | 20 | require 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php'; |
21 | 21 | |
22 | 22 | \Aimeos\Slim\Command\Jobs::run( $_SERVER['argv'] ); |
23 | -} |
|
24 | -catch( \Aimeos\Slim\Command\Exception $e ) |
|
23 | +} catch( \Aimeos\Slim\Command\Exception $e ) |
|
25 | 24 | { |
26 | 25 | echo $e->getMessage() . "\n"; |
27 | 26 | echo \Aimeos\Slim\Command\Jobs::usage(); |
28 | 27 | exit( 1 ); |
29 | -} |
|
30 | -catch( \Throwable $t ) |
|
28 | +} catch( \Throwable $t ) |
|
31 | 29 | { |
32 | 30 | echo "\n\nCaught PHP error while processing setup"; |
33 | 31 | echo "\n\nMessage:\n"; |
@@ -36,8 +34,7 @@ discard block |
||
36 | 34 | echo $t->getTraceAsString(); |
37 | 35 | echo "\n\n"; |
38 | 36 | exit( 1 ); |
39 | -} |
|
40 | -catch( \Exception $e ) |
|
37 | +} catch( \Exception $e ) |
|
41 | 38 | { |
42 | 39 | echo "\n\nCaught exception while processing setup"; |
43 | 40 | echo "\n\nMessage:\n"; |
@@ -19,14 +19,12 @@ discard block |
||
19 | 19 | require 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php'; |
20 | 20 | |
21 | 21 | \Aimeos\Slim\Command\Cache::run( $_SERVER['argv'] ); |
22 | -} |
|
23 | -catch( \Aimeos\Slim\Command\Exception $e ) |
|
22 | +} catch( \Aimeos\Slim\Command\Exception $e ) |
|
24 | 23 | { |
25 | 24 | echo $e->getMessage() . "\n"; |
26 | 25 | echo \Aimeos\Slim\Command\Cache::usage(); |
27 | 26 | exit( 1 ); |
28 | -} |
|
29 | -catch( \Throwable $t ) |
|
27 | +} catch( \Throwable $t ) |
|
30 | 28 | { |
31 | 29 | echo "\n\nCaught PHP error"; |
32 | 30 | echo "\n\nMessage:\n"; |
@@ -35,8 +33,7 @@ discard block |
||
35 | 33 | echo $t->getTraceAsString(); |
36 | 34 | echo "\n\n"; |
37 | 35 | exit( 1 ); |
38 | -} |
|
39 | -catch( \Exception $e ) |
|
36 | +} catch( \Exception $e ) |
|
40 | 37 | { |
41 | 38 | echo "\n\nCaught exception"; |
42 | 39 | echo "\n\nMessage:\n"; |
@@ -60,8 +60,7 @@ discard block |
||
60 | 60 | |
61 | 61 | $view = new \Aimeos\MW\View\Standard( $templatePaths, $engines ); |
62 | 62 | $this->initTwig( $view, $twig ); |
63 | - } |
|
64 | - else |
|
63 | + } else |
|
65 | 64 | { |
66 | 65 | $view = new \Aimeos\MW\View\Standard( $templatePaths ); |
67 | 66 | } |
@@ -232,8 +231,7 @@ discard block |
||
232 | 231 | { |
233 | 232 | $i18n = $this->container->get( 'aimeos.i18n' )->get( array( $locale ) ); |
234 | 233 | $translation = $i18n[$locale]; |
235 | - } |
|
236 | - else |
|
234 | + } else |
|
237 | 235 | { |
238 | 236 | $translation = new \Aimeos\MW\Translation\None( 'en' ); |
239 | 237 | } |