@@ -89,8 +89,7 @@ discard block |
||
| 89 | 89 | && in_array( 'ROLE_SUPER_ADMIN', (array) $token->getUser()->getRoles() ) ) |
| 90 | 90 | { |
| 91 | 91 | $helper = new \Aimeos\MW\View\Helper\Access\All( $view ); |
| 92 | - } |
|
| 93 | - else |
|
| 92 | + } else |
|
| 94 | 93 | { |
| 95 | 94 | $fcn = function() use ( $container, $context ) { |
| 96 | 95 | return $container->get( 'aimeos.support' )->getGroups( $context ); |
@@ -244,8 +243,7 @@ discard block |
||
| 244 | 243 | { |
| 245 | 244 | $i18n = $this->container->get( 'aimeos.i18n' )->get( array( $locale ) ); |
| 246 | 245 | $translation = $i18n[$locale]; |
| 247 | - } |
|
| 248 | - else |
|
| 246 | + } else |
|
| 249 | 247 | { |
| 250 | 248 | $translation = new \Aimeos\MW\Translation\None( 'en' ); |
| 251 | 249 | } |
@@ -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->createItem(); |
| 82 | 85 | } |
| 83 | 86 | |
@@ -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 | |
@@ -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->findItem( $email ); |
| 76 | - } catch( \Aimeos\MShop\Exception $e ) { |
|
| 77 | + } |
|
| 78 | + catch( \Aimeos\MShop\Exception $e ) |
|
| 79 | + { |
|
| 77 | 80 | $item = $manager->createItem(); |
| 78 | 81 | } |
| 79 | 82 | |
@@ -216,8 +216,7 @@ |
||
| 216 | 216 | $username = $token->getUser()->getUsername(); |
| 217 | 217 | $userid = $token->getUser()->getId(); |
| 218 | 218 | $context->setUserId( $userid ); |
| 219 | - $context->setGroupIds( function() use ( $context, $userid ) |
|
| 220 | - { |
|
| 219 | + $context->setGroupIds( function() use ( $context, $userid ) { |
|
| 221 | 220 | $manager = \Aimeos\MShop::create( $context, 'customer' ); |
| 222 | 221 | return $manager->getItem( $userid, array( 'customer/group' ) )->getGroups(); |
| 223 | 222 | } ); |