@@ -186,8 +186,7 @@ |
||
186 | 186 | try |
187 | 187 | { |
188 | 188 | $item = $manager->findItem( $code ); |
189 | - } |
|
190 | - catch( \Aimeos\MShop\Exception $e ) |
|
189 | + } catch( \Aimeos\MShop\Exception $e ) |
|
191 | 190 | { |
192 | 191 | $item = $manager->createItem(); |
193 | 192 | $item->setLabel( $code ); |
@@ -119,7 +119,7 @@ |
||
119 | 119 | * @param string $site Unique site code |
120 | 120 | * @param string Resource location, e.g. "product/property/type" |
121 | 121 | * @param string $lang Language code |
122 | - * @return \Aimeos\MShop\Context\Item\Iface Context item |
|
122 | + * @return \Aimeos\Admin\JsonAdm\Iface Context item |
|
123 | 123 | */ |
124 | 124 | protected function createClient( $site, $resource, $lang ) |
125 | 125 | { |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | * Returns the initial HTML view for the admin interface. |
27 | 27 | * |
28 | 28 | * @param Request $request Symfony request object |
29 | - * @return Response Generated HTML page for the admin interface |
|
29 | + * @return \Symfony\Component\HttpFoundation\Response Generated HTML page for the admin interface |
|
30 | 30 | */ |
31 | 31 | public function indexAction( Request $request ) |
32 | 32 | { |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | /** |
59 | 59 | * Checks if the used is authenticated and has the admin role |
60 | 60 | * |
61 | - * @param array $roles List of role names where at least one must match |
|
61 | + * @param string[] $roles List of role names where at least one must match |
|
62 | 62 | * @return boolean True if authenticated and is admin, false if not |
63 | 63 | */ |
64 | 64 | protected function hasRole( array $roles ) |
@@ -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 | } |