Completed
Push — master ( 3b07c4...73aadc )
by Aimeos
03:01
created
Service/View.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -58,8 +58,7 @@
 block discarded – undo
58 58
 
59 59
 			$i18n = $this->container->get('aimeos_i18n')->get( array( $locale ) );
60 60
 			$translation = $i18n[$locale];
61
-		}
62
-		else
61
+		} else
63 62
 		{
64 63
 			$translation = new \Aimeos\MW\Translation\None( 'en' );
65 64
 		}
Please login to merge, or discard this patch.
Service/Context.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -107,8 +107,7 @@
 block discarded – undo
107 107
 
108 108
 		if( $this->container->has( 'security.token_storage' ) ) {
109 109
 			$token = $this->container->get( 'security.token_storage' )->getToken();
110
-		}
111
-		else if( $this->container->has( 'security.context' ) ) {
110
+		} else if( $this->container->has( 'security.context' ) ) {
112 111
 			$token = $this->container->get( 'security.context' )->getToken();
113 112
 		}
114 113
 
Please login to merge, or discard this patch.
Controller/JsonadmController.php 2 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -210,8 +210,7 @@
 block discarded – undo
210 210
 			$localeItem = $localeManager->bootstrap( $sitecode, '', '', false );
211 211
 			$localeItem->setLanguageId( null );
212 212
 			$localeItem->setCurrencyId( null );
213
-		}
214
-		catch( \Aimeos\MShop\Locale\Exception $e )
213
+		} catch( \Aimeos\MShop\Locale\Exception $e )
215 214
 		{
216 215
 			$localeItem = $localeManager->createItem();
217 216
 		}
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -172,7 +172,7 @@
 block discarded – undo
172 172
 	 * @param string $content Body of the HTTP response
173 173
 	 * @param integer $status HTTP status
174 174
 	 * @param array $header List of HTTP headers
175
-	 * @return \Illuminate\Http\Response HTTP response object
175
+	 * @return Response HTTP response object
176 176
 	 */
177 177
 	protected function createResponse( $content, $status, array $header )
178 178
 	{
Please login to merge, or discard this patch.
Controller/ExtadmController.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
 	/**
89 89
 	 * Single entry point for all JSON admin requests.
90 90
 	 *
91
-	 * @param Symfony\Component\HttpFoundation\Request $request Symfony request object
91
+	 * @param Request $request Symfony request object
92 92
 	 * @return \Symfony\Component\HttpFoundation\Response 2.0 RPC message response
93 93
 	 */
94 94
 	public function doAction( Request $request )
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
 	 * Creates a list of all available translations.
150 150
 	 *
151 151
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
152
-	 * @return array List of language IDs with labels
152
+	 * @return string List of language IDs with labels
153 153
 	 */
154 154
 	protected function getJsonLanguages( \Aimeos\MShop\Context\Item\Iface $context )
155 155
 	{
Please login to merge, or discard this patch.
Controller/JqadmController.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -210,8 +210,7 @@
 block discarded – undo
210 210
 			$localeItem = $localeManager->bootstrap( $sitecode, '', '', false );
211 211
 			$localeItem->setLanguageId( null );
212 212
 			$localeItem->setCurrencyId( null );
213
-		}
214
-		catch( \Aimeos\MShop\Locale\Exception $e )
213
+		} catch( \Aimeos\MShop\Locale\Exception $e )
215 214
 		{
216 215
 			$localeItem = $localeManager->createItem();
217 216
 		}
Please login to merge, or discard this patch.