aimeos / aimeos-symfony

Controller/AdminController.php

Doc Comments +1 added lines, -1 removed lines

@@ -145,7 +145,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 )
 	{

Controller/JsonadmController.php

Doc Comments +1 added lines, -7 removed lines

@@ -28,7 +28,6 @@ 
 	 *
 	 * @param \Symfony\Component\HttpFoundation\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 \Symfony\Component\HttpFoundation\Response Response object containing the generated output
 	 */
@@ -49,7 +48,6 @@ 
 	 *
 	 * @param \Symfony\Component\HttpFoundation\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 \Symfony\Component\HttpFoundation\Response Response object containing the generated output
 	 */
@@ -70,7 +68,6 @@ 
 	 *
 	 * @param \Symfony\Component\HttpFoundation\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 \Symfony\Component\HttpFoundation\Response Response object containing the generated output
 	 */
@@ -91,7 +88,6 @@ 
 	 *
 	 * @param \Symfony\Component\HttpFoundation\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 \Symfony\Component\HttpFoundation\Response Response object containing the generated output
 	 */
@@ -112,7 +108,6 @@ 
 	 *
 	 * @param \Symfony\Component\HttpFoundation\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 \Symfony\Component\HttpFoundation\Response Response object containing the generated output
 	 */
@@ -133,7 +128,6 @@ 
 	 *
 	 * @param \Symfony\Component\HttpFoundation\Request $request Request object
 	 * @param string Resource location, e.g. "product/stock/wareshouse"
-	 * @param string $sitecode Unique site code
 	 * @return \Symfony\Component\HttpFoundation\Response Response object containing the generated output
 	 */
 	public function optionsAction( Request $request, $resource = '', $site = 'default' )
@@ -177,7 +171,7 @@ 
 	 * @param string $content Body of the HTTP response
 	 * @param integer $status HTTP status
 	 * @param array $header List of HTTP headers
-	 * @return \Illuminate\Http\Response HTTP response object
+	 * @return Response HTTP response object
 	 */
 	protected function createResponse( $content, $status, array $header )
 	{

Braces +1 added lines, -2 removed lines

@@ -210,8 +210,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();
 		}

Service/View.php

Braces +1 added lines, -2 removed lines

@@ -58,8 +58,7 @@
 
 			$i18n = $this->container->get('aimeos_i18n')->get( array( $locale ) );
 			$translation = $i18n[$locale];
-		}
-		else
+		} else
 		{
 			$translation = new \Aimeos\MW\Translation\None( 'en' );
 		}

Service/Context.php

Braces +1 added lines, -2 removed lines

@@ -107,8 +107,7 @@
 
 		if( $this->container->has( 'security.token_storage' ) ) {
 			$token = $this->container->get( 'security.token_storage' )->getToken();
-		}
-		else if( $this->container->has( 'security.context' ) ) {
+		} else if( $this->container->has( 'security.context' ) ) {
 			$token = $this->container->get( 'security.context' )->getToken();
 		}