aimeos / ai-controller-frontend

controller/frontend/src/Controller/Frontend/Service/Iface.php

Spacing +5 added lines, -5 removed lines

@@ -29,8 +29,8 @@ 
 	 * @param array $ref List of domains for which the items referenced by the services should be fetched too
 	 * @return array List of service items implementing \Aimeos\MShop\Service\Item\Iface with referenced items
 	 */
-	public function getServices( $type, \Aimeos\MShop\Order\Item\Base\Iface $basket,
-		$ref = array( 'media', 'price', 'text' ) );
+	public function getServices($type, \Aimeos\MShop\Order\Item\Base\Iface $basket,
+		$ref = array('media', 'price', 'text'));
 
 	/**
 	 * Returns the list of attribute definitions which must be used to render the input form where the customer can
@@ -41,7 +41,7 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Base\Iface $basket Basket object
 	 * @return array List of attribute definitions implementing \Aimeos\MW\Criteria\Attribute\Iface
 	 */
-	public function getServiceAttributes( $type, $serviceId, \Aimeos\MShop\Order\Item\Base\Iface $basket );
+	public function getServiceAttributes($type, $serviceId, \Aimeos\MShop\Order\Item\Base\Iface $basket);
 
 	/**
 	 * Returns the price of the service.
@@ -54,7 +54,7 @@ 
 	 * @throws \Aimeos\MShop\Exception If service provider isn't available
 	 * @throws \Exception If an error occurs
 	 */
-	public function getServicePrice( $type, $serviceId, \Aimeos\MShop\Order\Item\Base\Iface $basket );
+	public function getServicePrice($type, $serviceId, \Aimeos\MShop\Order\Item\Base\Iface $basket);
 
 	/**
 	 * Returns a list of attributes that are invalid.
@@ -66,5 +66,5 @@ 
 	 * @return array List of key/value pairs of attributes keys and an error message for values that are invalid or
 	 * 	missing
 	 */
-	public function checkServiceAttributes( $type, $serviceId, array $attributes );
+	public function checkServiceAttributes($type, $serviceId, array $attributes);
 }

controller/frontend/src/Controller/Frontend/Common/Factory/Iface.php

Spacing +1 added lines, -1 removed lines

@@ -27,5 +27,5 @@
 	 * @param string|null $name Name of the controller implementation (Default if null)
 	 * @return \Aimeos\Controller\Frontend\Common\Iface Controller object
 	 */
-	public static function createController( \Aimeos\MShop\Context\Item\Iface $context, $name = null );
+	public static function createController(\Aimeos\MShop\Context\Item\Iface $context, $name = null);
 }

controller/frontend/src/Controller/Frontend/Common/Factory/Base.php

Spacing +35 added lines, -35 removed lines

@@ -31,7 +31,7 @@ 
 	 * @param string $classname Full name of the class for which the object should be returned
 	 * @param \Aimeos\Controller\Frontend\Iface|null $controller Frontend controller object
 	 */
-	public static function injectController( $classname, \Aimeos\Controller\Frontend\Iface $controller = null )
+	public static function injectController($classname, \Aimeos\Controller\Frontend\Iface $controller = null)
 	{
 		self::$objects[$classname] = $controller;
 	}
@@ -46,29 +46,29 @@ 
 	 * @param string $classprefix Decorator class prefix, e.g. "\Aimeos\Controller\Frontend\Basket\Decorator\"
 	 * @return \Aimeos\Controller\Frontend\Common\Iface Controller object
 	 */
-	protected static function addDecorators( \Aimeos\MShop\Context\Item\Iface $context,
-		\Aimeos\Controller\Frontend\Iface $controller, array $decorators, $classprefix )
+	protected static function addDecorators(\Aimeos\MShop\Context\Item\Iface $context,
+		\Aimeos\Controller\Frontend\Iface $controller, array $decorators, $classprefix)
 	{
 		$iface = '\\Aimeos\\Controller\\Frontend\\Common\\Decorator\\Iface';
 
-		foreach( $decorators as $name )
+		foreach ($decorators as $name)
 		{
-			if( ctype_alnum( $name ) === false )
+			if (ctype_alnum($name) === false)
 			{
-				$classname = is_string( $name ) ? $classprefix . $name : '<not a string>';
-				throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+				$classname = is_string($name) ? $classprefix . $name : '<not a string>';
+				throw new \Aimeos\Controller\Frontend\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 			}
 
 			$classname = $classprefix . $name;
 
-			if( class_exists( $classname ) === false ) {
-				throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Class "%1$s" not available', $classname ) );
+			if (class_exists($classname) === false) {
+				throw new \Aimeos\Controller\Frontend\Exception(sprintf('Class "%1$s" not available', $classname));
 			}
 
-			$controller = new $classname( $controller, $context );
+			$controller = new $classname($controller, $context);
 
-			if( !( $controller instanceof $iface ) ) {
-				throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Class "%1$s" does not implement interface "%2$s"', $classname, $iface ) );
+			if (!($controller instanceof $iface)) {
+				throw new \Aimeos\Controller\Frontend\Exception(sprintf('Class "%1$s" does not implement interface "%2$s"', $classname, $iface));
 			}
 		}
 
@@ -84,14 +84,14 @@ 
 	 * @param string $domain Domain name in lower case, e.g. "product"
 	 * @return \Aimeos\Controller\Frontend\Common\Iface Controller object
 	 */
-	protected static function addControllerDecorators( \Aimeos\MShop\Context\Item\Iface $context,
-		\Aimeos\Controller\Frontend\Iface $controller, $domain )
+	protected static function addControllerDecorators(\Aimeos\MShop\Context\Item\Iface $context,
+		\Aimeos\Controller\Frontend\Iface $controller, $domain)
 	{
-		if( !is_string( $domain ) || $domain === '' ) {
-			throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid domain "%1$s"', $domain ) );
+		if (!is_string($domain) || $domain === '') {
+			throw new \Aimeos\Controller\Frontend\Exception(sprintf('Invalid domain "%1$s"', $domain));
 		}
 
-		$localClass = str_replace( ' ', '\\', ucwords( str_replace( '/', ' ', $domain ) ) );
+		$localClass = str_replace(' ', '\\', ucwords(str_replace('/', ' ', $domain)));
 		$config = $context->getConfig();
 
 		/** controller/frontend/common/decorators/default
@@ -116,26 +116,26 @@ 
 		 * @since 2014.03
 		 * @category Developer
 		 */
-		$decorators = $config->get( 'controller/frontend/common/decorators/default', array() );
-		$excludes = $config->get( 'controller/frontend/' . $domain . '/decorators/excludes', array() );
+		$decorators = $config->get('controller/frontend/common/decorators/default', array());
+		$excludes = $config->get('controller/frontend/' . $domain . '/decorators/excludes', array());
 
-		foreach( $decorators as $key => $name )
+		foreach ($decorators as $key => $name)
 		{
-			if( in_array( $name, $excludes ) ) {
-				unset( $decorators[$key] );
+			if (in_array($name, $excludes)) {
+				unset($decorators[$key]);
 			}
 		}
 
 		$classprefix = '\\Aimeos\\Controller\\Frontend\\Common\\Decorator\\';
-		$controller = self::addDecorators( $context, $controller, $decorators, $classprefix );
+		$controller = self::addDecorators($context, $controller, $decorators, $classprefix);
 
 		$classprefix = '\\Aimeos\\Controller\\Frontend\\Common\\Decorator\\';
-		$decorators = $config->get( 'controller/frontend/' . $domain . '/decorators/global', array() );
-		$controller = self::addDecorators( $context, $controller, $decorators, $classprefix );
+		$decorators = $config->get('controller/frontend/' . $domain . '/decorators/global', array());
+		$controller = self::addDecorators($context, $controller, $decorators, $classprefix);
 
-		$classprefix = '\\Aimeos\\Controller\\Frontend\\' . ucfirst( $localClass ) . '\\Decorator\\';
-		$decorators = $config->get( 'controller/frontend/' . $domain . '/decorators/local', array() );
-		$controller = self::addDecorators( $context, $controller, $decorators, $classprefix );
+		$classprefix = '\\Aimeos\\Controller\\Frontend\\' . ucfirst($localClass) . '\\Decorator\\';
+		$decorators = $config->get('controller/frontend/' . $domain . '/decorators/local', array());
+		$controller = self::addDecorators($context, $controller, $decorators, $classprefix);
 
 		return $controller;
 	}
@@ -149,20 +149,20 @@ 
 	 * @param string $interface Name of the controller interface
 	 * @return \Aimeos\Controller\Frontend\Common\Iface Controller object
 	 */
-	protected static function createControllerBase( \Aimeos\MShop\Context\Item\Iface $context, $classname, $interface )
+	protected static function createControllerBase(\Aimeos\MShop\Context\Item\Iface $context, $classname, $interface)
 	{
-		if( isset( self::$objects[$classname] ) ) {
+		if (isset(self::$objects[$classname])) {
 			return self::$objects[$classname];
 		}
 
-		if( class_exists( $classname ) === false ) {
-			throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Class "%1$s" not available', $classname ) );
+		if (class_exists($classname) === false) {
+			throw new \Aimeos\Controller\Frontend\Exception(sprintf('Class "%1$s" not available', $classname));
 		}
 
-		$controller = new $classname( $context );
+		$controller = new $classname($context);
 
-		if( !( $controller instanceof $interface ) ) {
-			throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Class "%1$s" does not implement interface "%2$s"', $classname, $interface ) );
+		if (!($controller instanceof $interface)) {
+			throw new \Aimeos\Controller\Frontend\Exception(sprintf('Class "%1$s" does not implement interface "%2$s"', $classname, $interface));
 		}
 
 		return $controller;

controller/frontend/src/Controller/Frontend/Exception.php

Spacing +2 added lines, -2 removed lines

@@ -32,9 +32,9 @@
 	 * @param \Exception $previous The previous exception used for the exception chaining.
 	 * @param array $list The associative list of errors and their messages when several errors occured
 	 */
-	public function __construct( $msg = '', $code = 0, \Exception $previous = null, array $list = array() )
+	public function __construct($msg = '', $code = 0, \Exception $previous = null, array $list = array())
 	{
-		parent::__construct( $msg, $code, $previous );
+		parent::__construct($msg, $code, $previous);
 
 		$this->list = $list;
 	}

controller/frontend/src/Controller/Frontend/Order/Standard.php

Spacing +13 added lines, -13 removed lines

@@ -32,22 +32,22 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Base\Iface $basket Basket object to be stored
 	 * @return \Aimeos\MShop\Order\Item\Iface Order item that belongs to the stored basket
 	 */
-	public function store( \Aimeos\MShop\Order\Item\Base\Iface $basket )
+	public function store(\Aimeos\MShop\Order\Item\Base\Iface $basket)
 	{
 		$context = $this->getContext();
 
-		$orderManager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
-		$orderBaseManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' );
+		$orderManager = \Aimeos\MShop\Factory::createManager($context, 'order');
+		$orderBaseManager = \Aimeos\MShop\Factory::createManager($context, 'order/base');
 
 
 		$orderBaseManager->begin();
-		$orderBaseManager->store( $basket );
+		$orderBaseManager->store($basket);
 		$orderBaseManager->commit();
 
 		$orderItem = $orderManager->createItem();
-		$orderItem->setBaseId( $basket->getId() );
-		$orderItem->setType( \Aimeos\MShop\Order\Item\Base::TYPE_WEB );
-		$orderManager->saveItem( $orderItem );
+		$orderItem->setBaseId($basket->getId());
+		$orderItem->setType(\Aimeos\MShop\Order\Item\Base::TYPE_WEB);
+		$orderManager->saveItem($orderItem);
 
 
 		return $orderItem;
@@ -72,9 +72,9 @@ 
 	 *
 	 * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object
 	 */
-	public function block( \Aimeos\MShop\Order\Item\Iface $orderItem )
+	public function block(\Aimeos\MShop\Order\Item\Iface $orderItem)
 	{
-		\Aimeos\Controller\Common\Order\Factory::createController( $this->getContext() )->block( $orderItem );
+		\Aimeos\Controller\Common\Order\Factory::createController($this->getContext())->block($orderItem);
 	}
 
 
@@ -96,9 +96,9 @@ 
 	 *
 	 * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object
 	 */
-	public function unblock( \Aimeos\MShop\Order\Item\Iface $orderItem )
+	public function unblock(\Aimeos\MShop\Order\Item\Iface $orderItem)
 	{
-		\Aimeos\Controller\Common\Order\Factory::createController( $this->getContext() )->unblock( $orderItem );
+		\Aimeos\Controller\Common\Order\Factory::createController($this->getContext())->unblock($orderItem);
 	}
 
 
@@ -116,8 +116,8 @@ 
 	 *
 	 * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object
 	 */
-	public function update( \Aimeos\MShop\Order\Item\Iface $orderItem )
+	public function update(\Aimeos\MShop\Order\Item\Iface $orderItem)
 	{
-		\Aimeos\Controller\Common\Order\Factory::createController( $this->getContext() )->update( $orderItem );
+		\Aimeos\Controller\Common\Order\Factory::createController($this->getContext())->update($orderItem);
 	}
 }

controller/frontend/src/Controller/Frontend/Order/Iface.php

Spacing +4 added lines, -4 removed lines

@@ -31,7 +31,7 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Base\Iface $basket Basket object to be stored
 	 * @return \Aimeos\MShop\Order\Item\Iface Order item that belongs to the stored basket
 	 */
-	public function store( \Aimeos\MShop\Order\Item\Base\Iface $basket );
+	public function store(\Aimeos\MShop\Order\Item\Base\Iface $basket);
 
 
 	/**
@@ -53,7 +53,7 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object
 	 * @return void
 	 */
-	public function block( \Aimeos\MShop\Order\Item\Iface $orderItem );
+	public function block(\Aimeos\MShop\Order\Item\Iface $orderItem);
 
 
 	/**
@@ -75,7 +75,7 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object
 	 * @return void
 	 */
-	public function unblock( \Aimeos\MShop\Order\Item\Iface $orderItem );
+	public function unblock(\Aimeos\MShop\Order\Item\Iface $orderItem);
 
 
 	/**
@@ -93,5 +93,5 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object
 	 * @return void
 	 */
-	public function update( \Aimeos\MShop\Order\Item\Iface $orderItem );
+	public function update(\Aimeos\MShop\Order\Item\Iface $orderItem);
 }

controller/frontend/tests/Controller/Frontend/FactoryTest.php

Spacing +33 added lines, -33 removed lines

@@ -17,92 +17,92 @@
 {
 	public function testCreateController()
 	{
-		$controller = \Aimeos\Controller\Frontend\Factory::createController( \TestHelperFrontend::getContext(), 'basket' );
-		$this->assertInstanceOf( '\\Aimeos\\Controller\\Frontend\\Iface', $controller );
+		$controller = \Aimeos\Controller\Frontend\Factory::createController(\TestHelperFrontend::getContext(), 'basket');
+		$this->assertInstanceOf('\\Aimeos\\Controller\\Frontend\\Iface', $controller);
 	}
 
 
 	public function testCreateControllerEmpty()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
-		\Aimeos\Controller\Frontend\Factory::createController( \TestHelperFrontend::getContext(), "\t\n" );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
+		\Aimeos\Controller\Frontend\Factory::createController(\TestHelperFrontend::getContext(), "\t\n");
 	}
 
 
 	public function testCreateControllerInvalidName()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
-		\Aimeos\Controller\Frontend\Factory::createController( \TestHelperFrontend::getContext(), '%^' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
+		\Aimeos\Controller\Frontend\Factory::createController(\TestHelperFrontend::getContext(), '%^');
 	}
 
 
 	public function testCreateControllerNotExisting()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
-		\Aimeos\Controller\Frontend\Factory::createController( \TestHelperFrontend::getContext(), 'notexist' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
+		\Aimeos\Controller\Frontend\Factory::createController(\TestHelperFrontend::getContext(), 'notexist');
 	}
 
 
 	public function testCreateSubControllerNotExisting()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
-		\Aimeos\Controller\Frontend\Factory::createController( \TestHelperFrontend::getContext(), 'basket/notexist' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
+		\Aimeos\Controller\Frontend\Factory::createController(\TestHelperFrontend::getContext(), 'basket/notexist');
 	}
 
 
 	public function testClear()
 	{
-		$cache = \Aimeos\Controller\Frontend\Factory::setCache( true );
+		$cache = \Aimeos\Controller\Frontend\Factory::setCache(true);
 
 		$context = \TestHelperFrontend::getContext();
 
-		$controller1 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
+		$controller1 = \Aimeos\Controller\Frontend\Factory::createController($context, 'basket');
 		\Aimeos\Controller\Frontend\Factory::clear();
-		$controller2 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
+		$controller2 = \Aimeos\Controller\Frontend\Factory::createController($context, 'basket');
 
-		\Aimeos\Controller\Frontend\Factory::setCache( $cache );
+		\Aimeos\Controller\Frontend\Factory::setCache($cache);
 
-		$this->assertNotSame( $controller1, $controller2 );
+		$this->assertNotSame($controller1, $controller2);
 	}
 
 
 	public function testClearSite()
 	{
-		$cache = \Aimeos\Controller\Frontend\Factory::setCache( true );
+		$cache = \Aimeos\Controller\Frontend\Factory::setCache(true);
 
 		$context = \TestHelperFrontend::getContext();
 
-		$basket1 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
-		$catalog1 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'catalog' );
-		\Aimeos\Controller\Frontend\Factory::clear( (string) $context );
+		$basket1 = \Aimeos\Controller\Frontend\Factory::createController($context, 'basket');
+		$catalog1 = \Aimeos\Controller\Frontend\Factory::createController($context, 'catalog');
+		\Aimeos\Controller\Frontend\Factory::clear((string) $context);
 
-		$basket2 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
-		$catalog2 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'catalog' );
+		$basket2 = \Aimeos\Controller\Frontend\Factory::createController($context, 'basket');
+		$catalog2 = \Aimeos\Controller\Frontend\Factory::createController($context, 'catalog');
 
-		\Aimeos\Controller\Frontend\Factory::setCache( $cache );
+		\Aimeos\Controller\Frontend\Factory::setCache($cache);
 
-		$this->assertNotSame( $basket1, $basket2 );
-		$this->assertNotSame( $catalog1, $catalog2 );
+		$this->assertNotSame($basket1, $basket2);
+		$this->assertNotSame($catalog1, $catalog2);
 	}
 
 
 	public function testClearSpecific()
 	{
-		$cache = \Aimeos\Controller\Frontend\Factory::setCache( true );
+		$cache = \Aimeos\Controller\Frontend\Factory::setCache(true);
 
 		$context = \TestHelperFrontend::getContext();
 
-		$basket1 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
-		$catalog1 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'catalog' );
-		\Aimeos\Controller\Frontend\Factory::clear( (string) $context, 'basket' );
+		$basket1 = \Aimeos\Controller\Frontend\Factory::createController($context, 'basket');
+		$catalog1 = \Aimeos\Controller\Frontend\Factory::createController($context, 'catalog');
+		\Aimeos\Controller\Frontend\Factory::clear((string) $context, 'basket');
 
-		$basket2 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
-		$catalog2 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'catalog' );
+		$basket2 = \Aimeos\Controller\Frontend\Factory::createController($context, 'basket');
+		$catalog2 = \Aimeos\Controller\Frontend\Factory::createController($context, 'catalog');
 
-		\Aimeos\Controller\Frontend\Factory::setCache( $cache );
+		\Aimeos\Controller\Frontend\Factory::setCache($cache);
 
-		$this->assertNotSame( $basket1, $basket2 );
-		$this->assertSame( $catalog1, $catalog2 );
+		$this->assertNotSame($basket1, $basket2);
+		$this->assertSame($catalog1, $catalog2);
 	}
 
 }
\ No newline at end of file

controller/frontend/tests/Controller/Frontend/Basket/Decorator/CategoryTest.php

Spacing +11 added lines, -11 removed lines

@@ -12,35 +12,35 @@
 	protected function setUp()
 	{
 		$this->context = \TestHelperFrontend::getContext();
-		$object = new \Aimeos\Controller\Frontend\Basket\Standard( $this->context );
-		$this->object = new \Aimeos\Controller\Frontend\Basket\Decorator\Category( $object, $this->context );
+		$object = new \Aimeos\Controller\Frontend\Basket\Standard($this->context);
+		$this->object = new \Aimeos\Controller\Frontend\Basket\Decorator\Category($object, $this->context);
 	}
 
 
 	protected function tearDown()
 	{
 		$this->object->clear();
-		$this->context->getSession()->set( 'aimeos', array() );
+		$this->context->getSession()->set('aimeos', array());
 
-		unset( $this->object );
+		unset($this->object);
 	}
 
 
 	public function testAddProductWithCategory()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'product' );
-		$item = $manager->findItem( 'CNE' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'product');
+		$item = $manager->findItem('CNE');
 
-		$this->object->addProduct( $item->getId(), 5 );
+		$this->object->addProduct($item->getId(), 5);
 	}
 
 
 	public function testAddProductNoCategory()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'product' );
-		$item = $manager->findItem( 'ABCD' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'product');
+		$item = $manager->findItem('ABCD');
 
-		$this->setExpectedException( '\Aimeos\Controller\Frontend\Basket\Exception' );
-		$this->object->addProduct( $item->getId(), 5 );
+		$this->setExpectedException('\Aimeos\Controller\Frontend\Basket\Exception');
+		$this->object->addProduct($item->getId(), 5);
 	}
 }

controller/frontend/src/Controller/Frontend/Basket/Base.php

Braces +4 added lines, -8 removed lines

@@ -160,8 +160,7 @@ 
 			{
 				$this->setAddress( $type, $item->toArray() );
 				$basket->deleteAddress( $type );
-			}
-			catch( \Exception $e )
+			} catch( \Exception $e )
 			{
 				$logger = $this->getContext()->getLogger();
 				$str = 'Error migrating address with type "%1$s" in basket to locale "%2$s": %3$s';
@@ -190,8 +189,7 @@ 
 			{
 				$this->addCoupon( $code );
 				$basket->deleteCoupon( $code, true );
-			}
-			catch( \Exception $e )
+			} catch( \Exception $e )
 			{
 				$logger = $this->getContext()->getLogger();
 				$str = 'Error migrating coupon with code "%1$s" in basket to locale "%2$s": %3$s';
@@ -240,8 +238,7 @@ 
 				);
 
 				$basket->deleteProduct( $pos );
-			}
-			catch( \Exception $e )
+			} catch( \Exception $e )
 			{
 				$code = $product->getProductCode();
 				$logger = $this->getContext()->getLogger();
@@ -276,8 +273,7 @@ 
 
 				$this->setService( $type, $item->getServiceId(), $attributes );
 				$basket->deleteService( $type );
-			}
-			catch( \Exception $e ) { ; } // Don't notify the user as appropriate services can be added automatically
+			} catch( \Exception $e ) { ; } // Don't notify the user as appropriate services can be added automatically
 		}
 
 		return $errors;

Spacing +148 added lines, -148 removed lines

@@ -31,32 +31,32 @@ 
 	 * @param integer $quantity New product quantity
 	 * @return \Aimeos\MShop\Price\Item\Iface Price item with calculated price
 	 */
-	protected function calcPrice( \Aimeos\MShop\Order\Item\Base\Product\Iface $product, array $prices, $quantity )
+	protected function calcPrice(\Aimeos\MShop\Order\Item\Base\Product\Iface $product, array $prices, $quantity)
 	{
 		$context = $this->getContext();
 
-		if( empty( $prices ) )
+		if (empty($prices))
 		{
-			$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product' );
-			$prices = $manager->getItem( $product->getProductId(), array( 'price' ) )->getRefItems( 'price', 'default' );
+			$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product');
+			$prices = $manager->getItem($product->getProductId(), array('price'))->getRefItems('price', 'default');
 		}
 
-		$priceManager = \Aimeos\MShop\Factory::createManager( $context, 'price' );
-		$price = $priceManager->getLowestPrice( $prices, $quantity );
+		$priceManager = \Aimeos\MShop\Factory::createManager($context, 'price');
+		$price = $priceManager->getLowestPrice($prices, $quantity);
 
-		foreach( $this->getAttributeItems( $product->getAttributes() ) as $attrItem )
+		foreach ($this->getAttributeItems($product->getAttributes()) as $attrItem)
 		{
-			$prices = $attrItem->getRefItems( 'price', 'default' );
+			$prices = $attrItem->getRefItems('price', 'default');
 
-			if( count( $prices ) > 0 )
+			if (count($prices) > 0)
 			{
-				$attrPrice = $priceManager->getLowestPrice( $prices, $quantity );
-				$price->addItem( $attrPrice );
+				$attrPrice = $priceManager->getLowestPrice($prices, $quantity);
+				$price->addItem($attrPrice);
 			}
 		}
 
 		// remove product rebate of original price in favor to rebates granted for the order
-		$price->setRebate( '0.00' );
+		$price->setRebate('0.00');
 
 		return $price;
 	}
@@ -71,34 +71,34 @@ 
 	 * @param array $refIds List of IDs that must be associated to the product
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If one or more of the IDs are not associated
 	 */
-	protected function checkReferences( $prodId, $domain, $listTypeId, array $refIds )
+	protected function checkReferences($prodId, $domain, $listTypeId, array $refIds)
 	{
-		$productManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product' );
-		$search = $productManager->createSearch( true );
+		$productManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product');
+		$search = $productManager->createSearch(true);
 
 		$expr = array(
-			$search->compare( '==', 'product.id', $prodId ),
+			$search->compare('==', 'product.id', $prodId),
 			$search->getConditions(),
 		);
 
-		if( count( $refIds ) > 0 )
+		if (count($refIds) > 0)
 		{
-			foreach( $refIds as $key => $refId ) {
+			foreach ($refIds as $key => $refId) {
 				$refIds[$key] = (string) $refId;
 			}
 
-			$param = array( $domain, $listTypeId, $refIds );
-			$cmpfunc = $search->createFunction( 'product.contains', $param );
+			$param = array($domain, $listTypeId, $refIds);
+			$cmpfunc = $search->createFunction('product.contains', $param);
 
-			$expr[] = $search->compare( '==', $cmpfunc, count( $refIds ) );
+			$expr[] = $search->compare('==', $cmpfunc, count($refIds));
 		}
 
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		if( count( $productManager->searchItems( $search, array() ) ) === 0 )
+		if (count($productManager->searchItems($search, array())) === 0)
 		{
-			$msg = sprintf( 'Invalid "%1$s" references for product with ID %2$s', $domain, json_encode( $prodId ) );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+			$msg = sprintf('Invalid "%1$s" references for product with ID %2$s', $domain, json_encode($prodId));
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
 		}
 	}
 
@@ -113,34 +113,34 @@ 
 		$session = $context->getSession();
 		$locale = $this->get()->getLocale();
 
-		$localeStr = $session->get( 'aimeos/basket/locale' );
+		$localeStr = $session->get('aimeos/basket/locale');
 		$localeKey = $locale->getSite()->getCode() . '|' . $locale->getLanguageId() . '|' . $locale->getCurrencyId();
 
-		if( $localeStr !== null && $localeStr !== $localeKey )
+		if ($localeStr !== null && $localeStr !== $localeKey)
 		{
-			$locParts = explode( '|', $localeStr );
-			$locSite = ( isset( $locParts[0] ) ? $locParts[0] : '' );
-			$locLanguage = ( isset( $locParts[1] ) ? $locParts[1] : '' );
-			$locCurrency = ( isset( $locParts[2] ) ? $locParts[2] : '' );
+			$locParts = explode('|', $localeStr);
+			$locSite = (isset($locParts[0]) ? $locParts[0] : '');
+			$locLanguage = (isset($locParts[1]) ? $locParts[1] : '');
+			$locCurrency = (isset($locParts[2]) ? $locParts[2] : '');
 
-			$localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
-			$locale = $localeManager->bootstrap( $locSite, $locLanguage, $locCurrency, false );
+			$localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale');
+			$locale = $localeManager->bootstrap($locSite, $locLanguage, $locCurrency, false);
 
 			$context = clone $context;
-			$context->setLocale( $locale );
+			$context->setLocale($locale);
 
-			$manager = \Aimeos\MShop\Order\Manager\Factory::createManager( $context )->getSubManager( 'base' );
+			$manager = \Aimeos\MShop\Order\Manager\Factory::createManager($context)->getSubManager('base');
 			$basket = $manager->getSession();
 
-			$this->copyAddresses( $basket, $errors, $localeKey );
-			$this->copyServices( $basket, $errors );
-			$this->copyProducts( $basket, $errors, $localeKey );
-			$this->copyCoupons( $basket, $errors, $localeKey );
+			$this->copyAddresses($basket, $errors, $localeKey);
+			$this->copyServices($basket, $errors);
+			$this->copyProducts($basket, $errors, $localeKey);
+			$this->copyCoupons($basket, $errors, $localeKey);
 
-			$manager->setSession( $basket );
+			$manager->setSession($basket);
 		}
 
-		$session->set( 'aimeos/basket/locale', $localeKey );
+		$session->set('aimeos/basket/locale', $localeKey);
 	}
 
 
@@ -152,20 +152,20 @@ 
 	 * @param string $localeKey Unique identifier of the site, language and currency
 	 * @return array Associative list of errors occured
 	 */
-	protected function copyAddresses( \Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey )
+	protected function copyAddresses(\Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey)
 	{
-		foreach( $basket->getAddresses() as $type => $item )
+		foreach ($basket->getAddresses() as $type => $item)
 		{
 			try
 			{
-				$this->setAddress( $type, $item->toArray() );
-				$basket->deleteAddress( $type );
+				$this->setAddress($type, $item->toArray());
+				$basket->deleteAddress($type);
 			}
-			catch( \Exception $e )
+			catch (\Exception $e)
 			{
 				$logger = $this->getContext()->getLogger();
 				$str = 'Error migrating address with type "%1$s" in basket to locale "%2$s": %3$s';
-				$logger->log( sprintf( $str, $type, $localeKey, $e->getMessage() ), \Aimeos\MW\Logger\Base::INFO );
+				$logger->log(sprintf($str, $type, $localeKey, $e->getMessage()), \Aimeos\MW\Logger\Base::INFO);
 				$errors['address'][$type] = $e->getMessage();
 			}
 		}
@@ -182,20 +182,20 @@ 
 	 * @param string $localeKey Unique identifier of the site, language and currency
 	 * @return array Associative list of errors occured
 	 */
-	protected function copyCoupons( \Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey )
+	protected function copyCoupons(\Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey)
 	{
-		foreach( $basket->getCoupons() as $code => $list )
+		foreach ($basket->getCoupons() as $code => $list)
 		{
 			try
 			{
-				$this->addCoupon( $code );
-				$basket->deleteCoupon( $code, true );
+				$this->addCoupon($code);
+				$basket->deleteCoupon($code, true);
 			}
-			catch( \Exception $e )
+			catch (\Exception $e)
 			{
 				$logger = $this->getContext()->getLogger();
 				$str = 'Error migrating coupon with code "%1$s" in basket to locale "%2$s": %3$s';
-				$logger->log( sprintf( $str, $code, $localeKey, $e->getMessage() ), \Aimeos\MW\Logger\Base::INFO );
+				$logger->log(sprintf($str, $code, $localeKey, $e->getMessage()), \Aimeos\MW\Logger\Base::INFO);
 				$errors['coupon'][$code] = $e->getMessage();
 			}
 		}
@@ -212,11 +212,11 @@ 
 	 * @param string $localeKey Unique identifier of the site, language and currency
 	 * @return array Associative list of errors occured
 	 */
-	protected function copyProducts( \Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey )
+	protected function copyProducts(\Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey)
 	{
-		foreach( $basket->getProducts() as $pos => $product )
+		foreach ($basket->getProducts() as $pos => $product)
 		{
-			if( $product->getFlags() & \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE ) {
+			if ($product->getFlags() & \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE) {
 				continue;
 			}
 
@@ -224,7 +224,7 @@ 
 			{
 				$attrIds = array();
 
-				foreach( $product->getAttributes() as $attrItem ) {
+				foreach ($product->getAttributes() as $attrItem) {
 					$attrIds[$attrItem->getType()][] = $attrItem->getAttributeId();
 				}
 
@@ -232,21 +232,21 @@ 
 						$product->getProductId(),
 						$product->getQuantity(),
 						array(),
-						$this->getValue( $attrIds, 'variant', array() ),
-						$this->getValue( $attrIds, 'config', array() ),
-						$this->getValue( $attrIds, 'hidden', array() ),
-						$this->getValue( $attrIds, 'custom', array() ),
+						$this->getValue($attrIds, 'variant', array()),
+						$this->getValue($attrIds, 'config', array()),
+						$this->getValue($attrIds, 'hidden', array()),
+						$this->getValue($attrIds, 'custom', array()),
 						$product->getStockType()
 				);
 
-				$basket->deleteProduct( $pos );
+				$basket->deleteProduct($pos);
 			}
-			catch( \Exception $e )
+			catch (\Exception $e)
 			{
 				$code = $product->getProductCode();
 				$logger = $this->getContext()->getLogger();
 				$str = 'Error migrating product with code "%1$s" in basket to locale "%2$s": %3$s';
-				$logger->log( sprintf( $str, $code, $localeKey, $e->getMessage() ), \Aimeos\MW\Logger\Base::INFO );
+				$logger->log(sprintf($str, $code, $localeKey, $e->getMessage()), \Aimeos\MW\Logger\Base::INFO);
 				$errors['product'][$pos] = $e->getMessage();
 			}
 		}
@@ -262,22 +262,22 @@ 
 	 * @param array $errors Associative list of previous errors
 	 * @return array Associative list of errors occured
 	 */
-	protected function copyServices( \Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors )
+	protected function copyServices(\Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors)
 	{
-		foreach( $basket->getServices() as $type => $item )
+		foreach ($basket->getServices() as $type => $item)
 		{
 			try
 			{
 				$attributes = array();
 
-				foreach( $item->getAttributes() as $attrItem ) {
+				foreach ($item->getAttributes() as $attrItem) {
 					$attributes[$attrItem->getCode()] = $attrItem->getValue();
 				}
 
-				$this->setService( $type, $item->getServiceId(), $attributes );
-				$basket->deleteService( $type );
+				$this->setService($type, $item->getServiceId(), $attributes);
+				$basket->deleteService($type);
 			}
-			catch( \Exception $e ) { ; } // Don't notify the user as appropriate services can be added automatically
+			catch (\Exception $e) {; } // Don't notify the user as appropriate services can be added automatically
 		}
 
 		return $errors;
@@ -295,36 +295,36 @@ 
 	 * @param array $attributeValues Associative list of attribute IDs as keys and their codes as values
 	 * @return array List of items implementing \Aimeos\MShop\Order\Item\Product\Attribute\Iface
 	 */
-	protected function createOrderProductAttributes( \Aimeos\MShop\Price\Item\Iface $price, $prodid, $quantity,
-			array $attributeIds, $type, array $attributeValues = array() )
+	protected function createOrderProductAttributes(\Aimeos\MShop\Price\Item\Iface $price, $prodid, $quantity,
+			array $attributeIds, $type, array $attributeValues = array())
 	{
-		if( empty( $attributeIds ) ) {
+		if (empty($attributeIds)) {
 			return array();
 		}
 
-		$attrTypeId = $this->getProductListTypeItem( 'attribute', $type )->getId();
-		$this->checkReferences( $prodid, 'attribute', $attrTypeId, $attributeIds );
+		$attrTypeId = $this->getProductListTypeItem('attribute', $type)->getId();
+		$this->checkReferences($prodid, 'attribute', $attrTypeId, $attributeIds);
 
 		$list = array();
 		$context = $this->getContext();
 
-		$priceManager = \Aimeos\MShop\Factory::createManager( $context, 'price' );
-		$orderProductAttributeManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base/product/attribute' );
+		$priceManager = \Aimeos\MShop\Factory::createManager($context, 'price');
+		$orderProductAttributeManager = \Aimeos\MShop\Factory::createManager($context, 'order/base/product/attribute');
 
-		foreach( $this->getAttributes( $attributeIds ) as $id => $attrItem )
+		foreach ($this->getAttributes($attributeIds) as $id => $attrItem)
 		{
-			$prices = $attrItem->getRefItems( 'price', 'default', 'default' );
+			$prices = $attrItem->getRefItems('price', 'default', 'default');
 
-			if( !empty( $prices ) ) {
-				$price->addItem( $priceManager->getLowestPrice( $prices, $quantity ) );
+			if (!empty($prices)) {
+				$price->addItem($priceManager->getLowestPrice($prices, $quantity));
 			}
 
 			$item = $orderProductAttributeManager->createItem();
-			$item->copyFrom( $attrItem );
-			$item->setType( $type );
+			$item->copyFrom($attrItem);
+			$item->setType($type);
 
-			if( isset( $attributeValues[$id] ) ) {
-				$item->setValue( $attributeValues[$id] );
+			if (isset($attributeValues[$id])) {
+				$item->setValue($attributeValues[$id]);
 			}
 
 			$list[] = $item;
@@ -342,31 +342,31 @@ 
 	 * @return array List of items implementing \Aimeos\MShop\Attribute\Item\Iface
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the actual attribute number doesn't match the expected one
 	 */
-	protected function getAttributes( array $attributeIds, array $domains = array( 'price', 'text' ) )
+	protected function getAttributes(array $attributeIds, array $domains = array('price', 'text'))
 	{
-		if( empty( $attributeIds ) ) {
+		if (empty($attributeIds)) {
 			return array();
 		}
 
-		$attributeManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'attribute' );
+		$attributeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'attribute');
 
-		$search = $attributeManager->createSearch( true );
+		$search = $attributeManager->createSearch(true);
 		$expr = array(
-				$search->compare( '==', 'attribute.id', $attributeIds ),
+				$search->compare('==', 'attribute.id', $attributeIds),
 				$search->getConditions(),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, 0x7fffffff );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, 0x7fffffff);
 
-		$attrItems = $attributeManager->searchItems( $search, $domains );
+		$attrItems = $attributeManager->searchItems($search, $domains);
 
-		if( count( $attrItems ) !== count( $attributeIds ) )
+		if (count($attrItems) !== count($attributeIds))
 		{
-			$expected = implode( ',', $attributeIds );
-			$actual = implode( ',', array_keys( $attrItems ) );
-			$msg = sprintf( 'Available attribute IDs "%1$s" do not match the given attribute IDs "%2$s"', $actual, $expected );
+			$expected = implode(',', $attributeIds);
+			$actual = implode(',', array_keys($attrItems));
+			$msg = sprintf('Available attribute IDs "%1$s" do not match the given attribute IDs "%2$s"', $actual, $expected);
 
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
 		}
 
 		return $attrItems;
@@ -379,31 +379,31 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Base\Product\Attribute\Item[] $orderAttributes List of order product attribute items
 	 * @return \Aimeos\MShop\Attribute\Item\Iface[] Associative list of attribute IDs as key and attribute items as values
 	 */
-	protected function getAttributeItems( array $orderAttributes )
+	protected function getAttributeItems(array $orderAttributes)
 	{
-		if( empty( $orderAttributes ) ) {
+		if (empty($orderAttributes)) {
 			return array();
 		}
 
-		$attributeManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'attribute' );
-		$search = $attributeManager->createSearch( true );
+		$attributeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'attribute');
+		$search = $attributeManager->createSearch(true);
 		$expr = array();
 
-		foreach( $orderAttributes as $item )
+		foreach ($orderAttributes as $item)
 		{
 			$tmp = array(
-				$search->compare( '==', 'attribute.domain', 'product' ),
-				$search->compare( '==', 'attribute.code', $item->getValue() ),
-				$search->compare( '==', 'attribute.type.domain', 'product' ),
-				$search->compare( '==', 'attribute.type.code', $item->getCode() ),
-				$search->compare( '>', 'attribute.type.status', 0 ),
+				$search->compare('==', 'attribute.domain', 'product'),
+				$search->compare('==', 'attribute.code', $item->getValue()),
+				$search->compare('==', 'attribute.type.domain', 'product'),
+				$search->compare('==', 'attribute.type.code', $item->getCode()),
+				$search->compare('>', 'attribute.type.status', 0),
 				$search->getConditions(),
 			);
-			$expr[] = $search->combine( '&&', $tmp );
+			$expr[] = $search->combine('&&', $tmp);
 		}
 
-		$search->setConditions( $search->combine( '||', $expr ) );
-		return $attributeManager->searchItems( $search, array( 'price' ) );
+		$search->setConditions($search->combine('||', $expr));
+		return $attributeManager->searchItems($search, array('price'));
 	}
 
 
@@ -417,23 +417,23 @@ 
 	 * @return \Aimeos\MShop\Common\Item\Iface Domain item object
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception
 	 */
-	protected function getDomainItem( $domain, $key, $value, array $ref )
+	protected function getDomainItem($domain, $key, $value, array $ref)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $domain );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $domain);
 
-		$search = $manager->createSearch( true );
+		$search = $manager->createSearch(true);
 		$expr = array(
-				$search->compare( '==', $key, $value ),
+				$search->compare('==', $key, $value),
 				$search->getConditions(),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		$result = $manager->searchItems( $search, $ref );
+		$result = $manager->searchItems($search, $ref);
 
-		if( ( $item = reset( $result ) ) === false )
+		if (($item = reset($result)) === false)
 		{
-			$msg = sprintf( 'No item for "%1$s" (%2$s) found', $value, $key );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+			$msg = sprintf('No item for "%1$s" (%2$s) found', $value, $key);
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
 		}
 
 		return $item;
@@ -447,26 +447,26 @@ 
 	 * @param string $code Code of the list type
 	 * @return \Aimeos\MShop\Common\Item\Type\Iface List type item
 	 */
-	protected function getProductListTypeItem( $domain, $code )
+	protected function getProductListTypeItem($domain, $code)
 	{
-		if( !isset( $this->listTypeAttributes[$domain][$code] ) )
+		if (!isset($this->listTypeAttributes[$domain][$code]))
 		{
-			$listTypeManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/lists/type' );
+			$listTypeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/lists/type');
 
-			$listTypeSearch = $listTypeManager->createSearch( true );
+			$listTypeSearch = $listTypeManager->createSearch(true);
 			$expr = array(
-				$listTypeSearch->compare( '==', 'product.lists.type.domain', $domain ),
-				$listTypeSearch->compare( '==', 'product.lists.type.code', $code ),
+				$listTypeSearch->compare('==', 'product.lists.type.domain', $domain),
+				$listTypeSearch->compare('==', 'product.lists.type.code', $code),
 				$listTypeSearch->getConditions(),
 			);
-			$listTypeSearch->setConditions( $listTypeSearch->combine( '&&', $expr ) );
+			$listTypeSearch->setConditions($listTypeSearch->combine('&&', $expr));
 
-			$listTypeItems = $listTypeManager->searchItems( $listTypeSearch );
+			$listTypeItems = $listTypeManager->searchItems($listTypeSearch);
 
-			if( ( $listTypeItem = reset( $listTypeItems ) ) === false )
+			if (($listTypeItem = reset($listTypeItems)) === false)
 			{
-				$msg = sprintf( 'List type for domain "%1$s" and code "%2$s" not found', $domain, $code );
-				throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+				$msg = sprintf('List type for domain "%1$s" and code "%2$s" not found', $domain, $code);
+				throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
 			}
 
 			$this->listTypeAttributes[$domain][$code] = $listTypeItem;
@@ -484,43 +484,43 @@ 
 	 * @param array $domains Names of the domain items that should be fetched too
 	 * @return array List of products matching the given attributes
 	 */
-	protected function getProductVariants( \Aimeos\MShop\Product\Item\Iface $productItem, array $variantAttributeIds,
-			array $domains = array( 'attribute', 'media', 'price', 'text' ) )
+	protected function getProductVariants(\Aimeos\MShop\Product\Item\Iface $productItem, array $variantAttributeIds,
+			array $domains = array('attribute', 'media', 'price', 'text'))
 	{
 		$subProductIds = array();
-		foreach( $productItem->getRefItems( 'product', 'default', 'default' ) as $item ) {
+		foreach ($productItem->getRefItems('product', 'default', 'default') as $item) {
 			$subProductIds[] = $item->getId();
 		}
 
-		if( count( $subProductIds ) === 0 ) {
+		if (count($subProductIds) === 0) {
 			return array();
 		}
 
-		$productManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product' );
-		$search = $productManager->createSearch( true );
+		$productManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product');
+		$search = $productManager->createSearch(true);
 
 		$expr = array(
-			$search->compare( '==', 'product.id', $subProductIds ),
+			$search->compare('==', 'product.id', $subProductIds),
 			$search->getConditions(),
 		);
 
-		if( count( $variantAttributeIds ) > 0 )
+		if (count($variantAttributeIds) > 0)
 		{
-			foreach( $variantAttributeIds as $key => $id ) {
+			foreach ($variantAttributeIds as $key => $id) {
 				$variantAttributeIds[$key] = (string) $id;
 			}
 
-			$listTypeItem = $this->getProductListTypeItem( 'attribute', 'variant' );
+			$listTypeItem = $this->getProductListTypeItem('attribute', 'variant');
 
-			$param = array( 'attribute', $listTypeItem->getId(), $variantAttributeIds );
-			$cmpfunc = $search->createFunction( 'product.contains', $param );
+			$param = array('attribute', $listTypeItem->getId(), $variantAttributeIds);
+			$cmpfunc = $search->createFunction('product.contains', $param);
 
-			$expr[] = $search->compare( '==', $cmpfunc, count( $variantAttributeIds ) );
+			$expr[] = $search->compare('==', $cmpfunc, count($variantAttributeIds));
 		}
 
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		return $productManager->searchItems( $search, $domains );
+		return $productManager->searchItems($search, $domains);
 	}
 
 
@@ -532,9 +532,9 @@ 
 	 * @param mixed $default Default value if no value is available for the given name
 	 * @return mixed Value from the array or default value
 	 */
-	protected function getValue( array $values, $name, $default = null )
+	protected function getValue(array $values, $name, $default = null)
 	{
-		if( isset( $values[$name] ) ) {
+		if (isset($values[$name])) {
 			return $values[$name];
 		}