aimeos / aimeos-laravel

src/Aimeos/Shop/Controller/AdminController.php

Doc Comments +1 added lines, -1 removed lines

@@ -135,7 +135,7 @@
 	 * Creates a list of all available translations.
 	 *
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
-	 * @return array List of language IDs with labels
+	 * @return string List of language IDs with labels
 	 */
 	protected function getJsonLanguages( \Aimeos\MShop\Context\Item\Iface $context )
 	{

src/Aimeos/Shop/Controller/JsonadmController.php

Doc Comments -6 removed lines

@@ -27,7 +27,6 @@ 
 	 *
 	 * @param \Illuminate\Http\Request $request Request object
 	 * @param string Resource location, e.g. "product/stock/wareshouse"
-	 * @param string $sitecode Unique site code
 	 * @param integer|null $id Unique resource ID
 	 * @return \Illuminate\Http\Response Response object containing the generated output
 	 */
@@ -48,7 +47,6 @@ 
 	 *
 	 * @param \Illuminate\Http\Request $request Request object
 	 * @param string Resource location, e.g. "product/stock/wareshouse"
-	 * @param string $sitecode Unique site code
 	 * @param integer|null $id Unique resource ID
 	 * @return \Illuminate\Http\Response Response object containing the generated output
 	 */
@@ -69,7 +67,6 @@ 
 	 *
 	 * @param \Illuminate\Http\Request $request Request object
 	 * @param string Resource location, e.g. "product/stock/wareshouse"
-	 * @param string $sitecode Unique site code
 	 * @param integer|null $id Unique resource ID
 	 * @return \Illuminate\Http\Response Response object containing the generated output
 	 */
@@ -90,7 +87,6 @@ 
 	 *
 	 * @param \Illuminate\Http\Request $request Request object
 	 * @param string Resource location, e.g. "product/stock/wareshouse"
-	 * @param string $sitecode Unique site code
 	 * @param integer $id Unique ID of the resource
 	 * @return \Illuminate\Http\Response Response object containing the generated output
 	 */
@@ -111,7 +107,6 @@ 
 	 *
 	 * @param \Illuminate\Http\Request $request Request object
 	 * @param string Resource location, e.g. "product/stock/wareshouse"
-	 * @param string $sitecode Unique site code
 	 * @param integer|null $id Unique resource ID
 	 * @return \Illuminate\Http\Response Response object containing the generated output
 	 */
@@ -132,7 +127,6 @@ 
 	 *
 	 * @param \Illuminate\Http\Request $request Request object
 	 * @param string Resource location, e.g. "product/stock/wareshouse"
-	 * @param string $sitecode Unique site code
 	 * @return \Illuminate\Http\Response Response object containing the generated output
 	 */
 	public function optionsAction( Request $request, $site = 'default', $resource = '' )

Braces +1 added lines, -2 removed lines

@@ -207,8 +207,7 @@
 			$localeItem = $localeManager->bootstrap( $sitecode, '', '', false );
 			$localeItem->setLanguageId( null );
 			$localeItem->setCurrencyId( null );
-		}
-		catch( \Aimeos\MShop\Locale\Exception $e )
+		} catch( \Aimeos\MShop\Locale\Exception $e )
 		{
 			$localeItem = $localeManager->createItem();
 		}

src/Aimeos/Shop/Base/View.php

Braces +1 added lines, -2 removed lines

@@ -39,8 +39,7 @@
 
 			$i18n = app('\Aimeos\Shop\Base\I18n')->get( array( $locale ) );
 			$translation = $i18n[$locale];
-		}
-		else
+		} else
 		{
 			$translation = new \Aimeos\MW\Translation\None( 'en' );
 		}