@@ -289,10 +289,11 @@ |
||
289 | 289 | return $context->user()?->getGroups() ?? []; |
290 | 290 | } ); |
291 | 291 | } |
292 | - catch( \Exception $e ) {} // avoid errors if user is assigned to another site |
|
292 | + catch( \Exception $e ) |
|
293 | + { |
|
294 | +} // avoid errors if user is assigned to another site |
|
293 | 295 | } |
294 | - } |
|
295 | - elseif( $this->container->has( 'request_stack' ) |
|
296 | + } elseif( $this->container->has( 'request_stack' ) |
|
296 | 297 | && ( $request = $this->container->get( 'request_stack' )->getCurrentRequest() ) !== null |
297 | 298 | ) { |
298 | 299 | $username = $request->getClientIp(); |
@@ -96,8 +96,7 @@ discard block |
||
96 | 96 | && in_array( 'ROLE_SUPER_ADMIN', (array) $user->getRoles() ) |
97 | 97 | ) { |
98 | 98 | $helper = new \Aimeos\Base\View\Helper\Access\All( $view ); |
99 | - } |
|
100 | - else |
|
99 | + } else |
|
101 | 100 | { |
102 | 101 | $helper = new \Aimeos\Base\View\Helper\Access\Standard( $view, function() use ( $context ) { |
103 | 102 | return $context->groups(); |
@@ -135,9 +134,12 @@ discard block |
||
135 | 134 | */ |
136 | 135 | protected function addCsrf( \Aimeos\Base\View\Iface $view ) |
137 | 136 | { |
138 | - try { |
|
137 | + try |
|
138 | + { |
|
139 | 139 | $token = $this->tokenManager->getToken( '_token' )->getValue(); |
140 | - } catch( \Symfony\Component\HttpFoundation\Exception\SessionNotFoundException $e ) { |
|
140 | + } |
|
141 | + catch( \Symfony\Component\HttpFoundation\Exception\SessionNotFoundException $e ) |
|
142 | + { |
|
141 | 143 | $token = ''; |
142 | 144 | } |
143 | 145 | |
@@ -253,8 +255,7 @@ discard block |
||
253 | 255 | { |
254 | 256 | $i18n = $this->container->get( 'aimeos.i18n' )->get( array( $locale ) ); |
255 | 257 | $translation = $i18n[$locale]; |
256 | - } |
|
257 | - else |
|
258 | + } else |
|
258 | 259 | { |
259 | 260 | $translation = new \Aimeos\Base\Translation\None( 'en' ); |
260 | 261 | } |
@@ -82,9 +82,12 @@ |
||
82 | 82 | |
83 | 83 | $manager = \Aimeos\MShop::create( $context, 'customer' ); |
84 | 84 | |
85 | - try { |
|
85 | + try |
|
86 | + { |
|
86 | 87 | $item = $manager->find( $email, ['group'] ); |
87 | - } catch( \Aimeos\MShop\Exception $e ) { |
|
88 | + } |
|
89 | + catch( \Aimeos\MShop\Exception $e ) |
|
90 | + { |
|
88 | 91 | $item = $manager->create(); |
89 | 92 | } |
90 | 93 |