@@ -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 | |
@@ -23,9 +23,12 @@ |
||
| 23 | 23 | ) ); |
| 24 | 24 | |
| 25 | 25 | $requestStack = self::getContainer()->get('request_stack'); |
| 26 | - try { |
|
| 26 | + try |
|
| 27 | + { |
|
| 27 | 28 | $requestStack->getSession(); |
| 28 | - } catch (SessionNotFoundException) { |
|
| 29 | + } |
|
| 30 | + catch (SessionNotFoundException) |
|
| 31 | + { |
|
| 29 | 32 | $session = self::getContainer()->get('session.factory')->createSession(); |
| 30 | 33 | $request = new Request(); |
| 31 | 34 | $request->setSession($session); |
@@ -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 | |
@@ -248,8 +248,7 @@ |
||
| 248 | 248 | $username = $token->getUser()->getUserIdentifier(); |
| 249 | 249 | $userid = $token->getUser()->getId(); |
| 250 | 250 | $context->setUserId( $userid ); |
| 251 | - $context->setGroupIds( function() use ( $context, $userid ) |
|
| 252 | - { |
|
| 251 | + $context->setGroupIds( function() use ( $context, $userid ) { |
|
| 253 | 252 | $manager = \Aimeos\MShop::create( $context, 'customer' ); |
| 254 | 253 | return $manager->get( $userid, array( 'customer/group' ) )->getGroups(); |
| 255 | 254 | } ); |
@@ -97,8 +97,7 @@ discard block |
||
| 97 | 97 | && in_array( 'ROLE_SUPER_ADMIN', (array) $token->getUser()->getRoles() ) ) |
| 98 | 98 | { |
| 99 | 99 | $helper = new \Aimeos\Base\View\Helper\Access\All( $view ); |
| 100 | - } |
|
| 101 | - else |
|
| 100 | + } else |
|
| 102 | 101 | { |
| 103 | 102 | $container = $this->container; |
| 104 | 103 | |
@@ -140,9 +139,12 @@ discard block |
||
| 140 | 139 | */ |
| 141 | 140 | protected function addCsrf( \Aimeos\Base\View\Iface $view ) |
| 142 | 141 | { |
| 143 | - try { |
|
| 142 | + try |
|
| 143 | + { |
|
| 144 | 144 | $token = $this->tokenManager->getToken( '_token' )->getValue(); |
| 145 | - } catch( \Symfony\Component\HttpFoundation\Exception\SessionNotFoundException $e ) { |
|
| 145 | + } |
|
| 146 | + catch( \Symfony\Component\HttpFoundation\Exception\SessionNotFoundException $e ) |
|
| 147 | + { |
|
| 146 | 148 | $token = ''; |
| 147 | 149 | } |
| 148 | 150 | |
@@ -258,8 +260,7 @@ discard block |
||
| 258 | 260 | { |
| 259 | 261 | $i18n = $this->container->get( 'aimeos.i18n' )->get( array( $locale ) ); |
| 260 | 262 | $translation = $i18n[$locale]; |
| 261 | - } |
|
| 262 | - else |
|
| 263 | + } else |
|
| 263 | 264 | { |
| 264 | 265 | $translation = new \Aimeos\Base\Translation\None( 'en' ); |
| 265 | 266 | } |
@@ -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 | |
@@ -71,9 +71,12 @@ |
||
| 71 | 71 | |
| 72 | 72 | $manager = \Aimeos\MShop::create( $context, 'customer' ); |
| 73 | 73 | |
| 74 | - try { |
|
| 74 | + try |
|
| 75 | + { |
|
| 75 | 76 | $item = $manager->find( $email ); |
| 76 | - } catch( \Aimeos\MShop\Exception $e ) { |
|
| 77 | + } |
|
| 78 | + catch( \Aimeos\MShop\Exception $e ) |
|
| 79 | + { |
|
| 77 | 80 | $item = $manager->create(); |
| 78 | 81 | } |
| 79 | 82 | |