@@ -41,7 +41,7 @@ |
||
| 41 | 41 | |
| 42 | 42 | |
| 43 | 43 | public function testFilterTree() |
| 44 | - { |
|
| 44 | + { |
|
| 45 | 45 | $client = static::createClient(); |
| 46 | 46 | $crawler = $client->request( 'GET', '/unittest/de/EUR/shop/' ); |
| 47 | 47 | |
@@ -75,9 +75,12 @@ |
||
| 75 | 75 | { |
| 76 | 76 | $localeManager = \Aimeos\MShop::create( $context, 'locale' ); |
| 77 | 77 | |
| 78 | - try { |
|
| 78 | + try |
|
| 79 | + { |
|
| 79 | 80 | $localeItem = $localeManager->bootstrap( $site, '', '', false, null, true ); |
| 80 | - } catch( \Aimeos\MShop\Exception $e ) { |
|
| 81 | + } |
|
| 82 | + catch( \Aimeos\MShop\Exception $e ) |
|
| 83 | + { |
|
| 81 | 84 | $localeItem = $localeManager->create(); |
| 82 | 85 | } |
| 83 | 86 | |
@@ -235,14 +235,15 @@ |
||
| 235 | 235 | { |
| 236 | 236 | \Composer\Factory::createHttpDownloader( $event->getIO(), $config ) |
| 237 | 237 | ->get( 'https://api.github.com/graphql', $options ); |
| 238 | - } |
|
| 239 | - else |
|
| 238 | + } else |
|
| 240 | 239 | { |
| 241 | 240 | \Composer\Factory::createRemoteFilesystem( $event->getIO(), $config ) |
| 242 | 241 | ->getContents( 'github.com', 'https://api.github.com/graphql', false, $options ); |
| 243 | 242 | } |
| 244 | 243 | } |
| 245 | - catch( \Exception $e ) {} |
|
| 244 | + catch( \Exception $e ) |
|
| 245 | + { |
|
| 246 | +} |
|
| 246 | 247 | } |
| 247 | 248 | |
| 248 | 249 | |
@@ -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, ['customer/group'] ); |
| 87 | - } catch( \Aimeos\MShop\Exception $e ) { |
|
| 88 | + } |
|
| 89 | + catch( \Aimeos\MShop\Exception $e ) |
|
| 90 | + { |
|
| 88 | 91 | $item = $manager->create(); |
| 89 | 92 | } |
| 90 | 93 | |
@@ -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 | $container = $this->container; |
| 103 | 102 | |
@@ -139,9 +138,12 @@ discard block |
||
| 139 | 138 | */ |
| 140 | 139 | protected function addCsrf( \Aimeos\Base\View\Iface $view ) |
| 141 | 140 | { |
| 142 | - try { |
|
| 141 | + try |
|
| 142 | + { |
|
| 143 | 143 | $token = $this->tokenManager->getToken( '_token' )->getValue(); |
| 144 | - } catch( \Symfony\Component\HttpFoundation\Exception\SessionNotFoundException $e ) { |
|
| 144 | + } |
|
| 145 | + catch( \Symfony\Component\HttpFoundation\Exception\SessionNotFoundException $e ) |
|
| 146 | + { |
|
| 145 | 147 | $token = ''; |
| 146 | 148 | } |
| 147 | 149 | |
@@ -257,8 +259,7 @@ discard block |
||
| 257 | 259 | { |
| 258 | 260 | $i18n = $this->container->get( 'aimeos.i18n' )->get( array( $locale ) ); |
| 259 | 261 | $translation = $i18n[$locale]; |
| 260 | - } |
|
| 261 | - else |
|
| 262 | + } else |
|
| 262 | 263 | { |
| 263 | 264 | $translation = new \Aimeos\Base\Translation\None( 'en' ); |
| 264 | 265 | } |
@@ -276,8 +276,7 @@ |
||
| 276 | 276 | { |
| 277 | 277 | $userid = $user->getId(); |
| 278 | 278 | $context->setUserId( $userid ); |
| 279 | - $context->setGroupIds( function() use ( $context, $userid ) |
|
| 280 | - { |
|
| 279 | + $context->setGroupIds( function() use ( $context, $userid ) { |
|
| 281 | 280 | $manager = \Aimeos\MShop::create( $context, 'customer' ); |
| 282 | 281 | return $manager->get( $userid, array( 'customer/group' ) )->getGroups(); |
| 283 | 282 | } ); |