@@ -1,8 +1,8 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | return [ |
4 | - Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true], |
|
5 | - Symfony\Bundle\WebServerBundle\WebServerBundle::class => ['dev' => true], |
|
6 | - Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true], |
|
7 | - Aimeos\ShopBundle\AimeosShopBundle::class => ['all' => true], |
|
4 | + Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true], |
|
5 | + Symfony\Bundle\WebServerBundle\WebServerBundle::class => ['dev' => true], |
|
6 | + Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true], |
|
7 | + Aimeos\ShopBundle\AimeosShopBundle::class => ['all' => true], |
|
8 | 8 | ]; |
9 | 9 | \ No newline at end of file |
@@ -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 | } |