@@ -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 ); |
@@ -82,8 +82,7 @@ discard block |
||
82 | 82 | && in_array( 'ROLE_ADMIN', (array) $token->getUser()->getRoles() ) ) |
83 | 83 | { |
84 | 84 | $helper = new \Aimeos\MW\View\Helper\Access\All( $view ); |
85 | - } |
|
86 | - else |
|
85 | + } else |
|
87 | 86 | { |
88 | 87 | $fcn = function() use ( $container, $context ) { |
89 | 88 | return $container->get( 'aimeos_support' )->getGroups( $context ); |
@@ -221,8 +220,7 @@ discard block |
||
221 | 220 | { |
222 | 221 | $i18n = $this->container->get( 'aimeos_i18n' )->get( array( $locale ) ); |
223 | 222 | $translation = $i18n[$locale]; |
224 | - } |
|
225 | - else |
|
223 | + } else |
|
226 | 224 | { |
227 | 225 | $translation = new \Aimeos\MW\Translation\None( 'en' ); |
228 | 226 | } |
@@ -154,7 +154,7 @@ |
||
154 | 154 | /** |
155 | 155 | * Creates a list of all available translations. |
156 | 156 | * |
157 | - * @return array List of language IDs with labels |
|
157 | + * @return string List of language IDs with labels |
|
158 | 158 | */ |
159 | 159 | protected function getJsonLanguages() |
160 | 160 | { |
@@ -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 | { |
@@ -80,8 +80,7 @@ |
||
80 | 80 | $localeItem = $localeManager->bootstrap( $site, '', '', false ); |
81 | 81 | $localeItem->setLanguageId( null ); |
82 | 82 | $localeItem->setCurrencyId( null ); |
83 | - } |
|
84 | - catch( \Aimeos\MShop\Locale\Exception $e ) |
|
83 | + } catch( \Aimeos\MShop\Locale\Exception $e ) |
|
85 | 84 | { |
86 | 85 | $localeItem = $localeManager->createItem(); |
87 | 86 | } |
@@ -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 ) |