Completed
Push — master ( b5edf7...6e5860 )
by Aimeos
17:03
created
Command/AccountCommand.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -186,8 +186,7 @@
 block discarded – undo
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 );
Please login to merge, or discard this patch.
Service/View.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -82,8 +82,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 		}
Please login to merge, or discard this patch.
Controller/ExtadmController.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -154,7 +154,7 @@
 block discarded – undo
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
 	{
Please login to merge, or discard this patch.
Controller/JsonadmController.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -119,7 +119,7 @@
 block discarded – undo
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
 	{
Please login to merge, or discard this patch.
Service/Locale.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -80,8 +80,7 @@
 block discarded – undo
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
 		}
Please login to merge, or discard this patch.
Controller/JsonapiController.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -105,7 +105,7 @@
 block discarded – undo
105 105
 	 * Returns the resource controller
106 106
 	 *
107 107
 	 * @param string Resource location, e.g. "product"
108
-	 * @return \Aimeos\MShop\Context\Item\Iface Context item
108
+	 * @return \Aimeos\Client\JsonApi\Iface Context item
109 109
 	 */
110 110
 	protected function createClient( $resource )
111 111
 	{
Please login to merge, or discard this patch.