@@ -100,8 +100,7 @@ discard block |
||
100 | 100 | || ( ( $user = \Illuminate\Support\Facades\Auth::user() ) !== null && $user->superuser ) |
101 | 101 | ) { |
102 | 102 | $helper = new \Aimeos\MW\View\Helper\Access\All( $view ); |
103 | - } |
|
104 | - else |
|
103 | + } else |
|
105 | 104 | { |
106 | 105 | $support = $this->support; |
107 | 106 | |
@@ -245,8 +244,7 @@ discard block |
||
245 | 244 | { |
246 | 245 | $i18n = $this->i18n->get( array( $locale ) ); |
247 | 246 | $translation = $i18n[$locale]; |
248 | - } |
|
249 | - else |
|
247 | + } else |
|
250 | 248 | { |
251 | 249 | $translation = new \Aimeos\MW\Translation\None( 'en' ); |
252 | 250 | } |
@@ -86,9 +86,12 @@ |
||
86 | 86 | { |
87 | 87 | $localeManager = \Aimeos\MShop::create( $context, 'locale' ); |
88 | 88 | |
89 | - try { |
|
89 | + try |
|
90 | + { |
|
90 | 91 | $localeItem = $localeManager->bootstrap( $site, '', '', false, null, true ); |
91 | - } catch( \Aimeos\MShop\Exception $e ) { |
|
92 | + } |
|
93 | + catch( \Aimeos\MShop\Exception $e ) |
|
94 | + { |
|
92 | 95 | $localeItem = $localeManager->createItem(); |
93 | 96 | } |
94 | 97 |
@@ -19,7 +19,8 @@ |
||
19 | 19 | * Aimeos shop service provider for Laravel |
20 | 20 | * @package laravel |
21 | 21 | */ |
22 | -class ShopServiceProvider extends ServiceProvider { |
|
22 | +class ShopServiceProvider extends ServiceProvider |
|
23 | +{ |
|
23 | 24 | |
24 | 25 | /** |
25 | 26 | * Indicates if loading of the provider is deferred. |
@@ -260,8 +260,7 @@ |
||
260 | 260 | { |
261 | 261 | if( ( $userid = Auth::id() ) !== null ) |
262 | 262 | { |
263 | - $context->setGroupIds( function() use ( $context, $userid ) |
|
264 | - { |
|
263 | + $context->setGroupIds( function() use ( $context, $userid ) { |
|
265 | 264 | $manager = \Aimeos\MShop::create( $context, 'customer' ); |
266 | 265 | return $manager->getItem( $userid, array( 'customer/group' ) )->getGroups(); |
267 | 266 | } ); |
@@ -69,9 +69,12 @@ |
||
69 | 69 | $this->cache[$user->id][$groups] = false; |
70 | 70 | $context = $this->context->get( false ); |
71 | 71 | |
72 | - try { |
|
72 | + try |
|
73 | + { |
|
73 | 74 | $site = \Aimeos\MShop::create( $context, 'locale/site' )->getItem( $user->siteid )->getCode(); |
74 | - } catch( \Exception $e ) { |
|
75 | + } |
|
76 | + catch( \Exception $e ) |
|
77 | + { |
|
75 | 78 | $site = ( Route::current() ? Route::input( 'site', Request::get( 'site', 'default' ) ) : 'default' ); |
76 | 79 | } |
77 | 80 |
@@ -68,9 +68,12 @@ |
||
68 | 68 | |
69 | 69 | $manager = \Aimeos\MShop::create( $context, 'customer' ); |
70 | 70 | |
71 | - try { |
|
71 | + try |
|
72 | + { |
|
72 | 73 | $item = $manager->findItem( $email ); |
73 | - } catch( \Aimeos\MShop\Exception $e ) { |
|
74 | + } |
|
75 | + catch( \Aimeos\MShop\Exception $e ) |
|
76 | + { |
|
74 | 77 | $item = $manager->createItem(); |
75 | 78 | } |
76 | 79 |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | $this->authorize( 'admin', [JsonadmController::class, ['admin', 'api']] ); |
42 | 42 | } |
43 | 43 | |
44 | - return $this->createAdmin()->delete( $request, (new Psr17Factory)->createResponse() ); |
|
44 | + return $this->createAdmin()->delete( $request, ( new Psr17Factory )->createResponse() ); |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | $this->authorize( 'admin', [JsonadmController::class, ['admin', 'api', 'editor']] ); |
58 | 58 | } |
59 | 59 | |
60 | - return $this->createAdmin()->get( $request, (new Psr17Factory)->createResponse() ); |
|
60 | + return $this->createAdmin()->get( $request, ( new Psr17Factory )->createResponse() ); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | $this->authorize( 'admin', [JsonadmController::class, ['admin', 'api']] ); |
74 | 74 | } |
75 | 75 | |
76 | - return $this->createAdmin()->patch( $request, (new Psr17Factory)->createResponse() ); |
|
76 | + return $this->createAdmin()->patch( $request, ( new Psr17Factory )->createResponse() ); |
|
77 | 77 | } |
78 | 78 | |
79 | 79 | |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | $this->authorize( 'admin', [JsonadmController::class, ['admin', 'api']] ); |
90 | 90 | } |
91 | 91 | |
92 | - return $this->createAdmin()->post( $request, (new Psr17Factory)->createResponse() ); |
|
92 | + return $this->createAdmin()->post( $request, ( new Psr17Factory )->createResponse() ); |
|
93 | 93 | } |
94 | 94 | |
95 | 95 | |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | $this->authorize( 'admin', [JsonadmController::class, ['admin', 'api']] ); |
106 | 106 | } |
107 | 107 | |
108 | - return $this->createAdmin()->put( $request, (new Psr17Factory)->createResponse() ); |
|
108 | + return $this->createAdmin()->put( $request, ( new Psr17Factory )->createResponse() ); |
|
109 | 109 | } |
110 | 110 | |
111 | 111 | |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | $this->authorize( 'admin', [JsonadmController::class, ['admin', 'api', 'editor']] ); |
122 | 122 | } |
123 | 123 | |
124 | - return $this->createAdmin()->options( $request, (new Psr17Factory)->createResponse() ); |
|
124 | + return $this->createAdmin()->options( $request, ( new Psr17Factory )->createResponse() ); |
|
125 | 125 | } |
126 | 126 | |
127 | 127 |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | */ |
34 | 34 | public function deleteAction( ServerRequestInterface $request ) |
35 | 35 | { |
36 | - return $this->createClient()->delete( $request, (new Psr17Factory)->createResponse() ); |
|
36 | + return $this->createClient()->delete( $request, ( new Psr17Factory )->createResponse() ); |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | */ |
46 | 46 | public function getAction( ServerRequestInterface $request ) |
47 | 47 | { |
48 | - return $this->createClient()->get( $request, (new Psr17Factory)->createResponse() ); |
|
48 | + return $this->createClient()->get( $request, ( new Psr17Factory )->createResponse() ); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | */ |
58 | 58 | public function patchAction( ServerRequestInterface $request ) |
59 | 59 | { |
60 | - return $this->createClient()->patch( $request, (new Psr17Factory)->createResponse() ); |
|
60 | + return $this->createClient()->patch( $request, ( new Psr17Factory )->createResponse() ); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | */ |
70 | 70 | public function postAction( ServerRequestInterface $request ) |
71 | 71 | { |
72 | - return $this->createClient()->post( $request, (new Psr17Factory)->createResponse() ); |
|
72 | + return $this->createClient()->post( $request, ( new Psr17Factory )->createResponse() ); |
|
73 | 73 | } |
74 | 74 | |
75 | 75 | |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | */ |
82 | 82 | public function putAction( ServerRequestInterface $request ) |
83 | 83 | { |
84 | - return $this->createClient()->put( $request, (new Psr17Factory)->createResponse() ); |
|
84 | + return $this->createClient()->put( $request, ( new Psr17Factory )->createResponse() ); |
|
85 | 85 | } |
86 | 86 | |
87 | 87 | |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | */ |
94 | 94 | public function optionsAction( ServerRequestInterface $request ) |
95 | 95 | { |
96 | - return $this->createClient()->options( $request, (new Psr17Factory)->createResponse() ); |
|
96 | + return $this->createClient()->options( $request, ( new Psr17Factory )->createResponse() ); |
|
97 | 97 | } |
98 | 98 | |
99 | 99 |