aimeos / ai-controller-frontend

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\\Common\\Iface', $controller );
+		$controller = \Aimeos\Controller\Frontend\Factory::createController(\TestHelperFrontend::getContext(), 'basket');
+		$this->assertInstanceOf('\\Aimeos\\Controller\\Frontend\\Common\\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/Service/FactoryTest.php

Spacing +27 added lines, -27 removed lines

@@ -12,20 +12,20 @@ 
 {
 	public function testCreateControllerInvalidImplementation()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
-		\Aimeos\Controller\Frontend\Service\Factory::createController( \TestHelperFrontend::getContext(), 'Invalid' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
+		\Aimeos\Controller\Frontend\Service\Factory::createController(\TestHelperFrontend::getContext(), 'Invalid');
 	}
 
 	public function testCreateControllerInvalidName()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
-		\Aimeos\Controller\Frontend\Service\Factory::createController( \TestHelperFrontend::getContext(), '%^' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
+		\Aimeos\Controller\Frontend\Service\Factory::createController(\TestHelperFrontend::getContext(), '%^');
 	}
 
 	public function testCreateControllerNotExisting()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
-		\Aimeos\Controller\Frontend\Service\Factory::createController( \TestHelperFrontend::getContext(), 'notexist' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
+		\Aimeos\Controller\Frontend\Service\Factory::createController(\TestHelperFrontend::getContext(), 'notexist');
 	}
 
 	public function testAbstractAddControllerDecoratorsWithExclude()
@@ -33,19 +33,19 @@ 
 		$context = \TestHelperFrontend::getContext();
 		$config = $context->getConfig();
 
-		$config->set( 'controller/frontend/common/decorators/default', array( 'Example' ) );
-		$config->set( 'controller/frontend/service/decorators/excludes', array( 'Example' ) );
+		$config->set('controller/frontend/common/decorators/default', array('Example'));
+		$config->set('controller/frontend/service/decorators/excludes', array('Example'));
 
-		$controller = \Aimeos\Controller\Frontend\Service\Factory::createController( $context, 'Standard' );
+		$controller = \Aimeos\Controller\Frontend\Service\Factory::createController($context, 'Standard');
 
-		$this->assertInstanceOf( '\\Aimeos\\Controller\\Frontend\\Common\\Iface', $controller );
+		$this->assertInstanceOf('\\Aimeos\\Controller\\Frontend\\Common\\Iface', $controller);
 	}
 
 	// using Factorylocal class
 	public function testAbstractAddControllerDecoratorsNoDomainException()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
-		\Aimeos\Controller\Frontend\Service\Factorylocal::createController( \TestHelperFrontend::getContext(), 'Standard', '' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
+		\Aimeos\Controller\Frontend\Service\Factorylocal::createController(\TestHelperFrontend::getContext(), 'Standard', '');
 	}
 
 	public function testAbstractAddDecorators()
@@ -53,47 +53,47 @@ 
 		$context = \TestHelperFrontend::getContext();
 		$config = $context->getConfig();
 
-		$config->set( 'controller/frontend/common/decorators/default', array( 'Example', 'Example' ) );
-		$config->set( 'controller/frontend/service/decorators/excludes', array() );
+		$config->set('controller/frontend/common/decorators/default', array('Example', 'Example'));
+		$config->set('controller/frontend/service/decorators/excludes', array());
 
-		$controller = \Aimeos\Controller\Frontend\Service\Factory::createController( $context, 'Standard' );
+		$controller = \Aimeos\Controller\Frontend\Service\Factory::createController($context, 'Standard');
 
-		$this->assertInstanceOf( '\\Aimeos\\Controller\\Frontend\\Common\\Decorator\\Iface', $controller );
+		$this->assertInstanceOf('\\Aimeos\\Controller\\Frontend\\Common\\Decorator\\Iface', $controller);
 	}
 
 	public function testAbstractAddDecoratorsExceptionWrongName()
 	{
 		$context = \TestHelperFrontend::getContext();
 		$config = $context->getConfig();
-		$config->set( 'controller/frontend/common/decorators/default', array( '$$' ) );
+		$config->set('controller/frontend/common/decorators/default', array('$$'));
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
-		\Aimeos\Controller\Frontend\Service\Factory::createController( $context, 'Standard' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
+		\Aimeos\Controller\Frontend\Service\Factory::createController($context, 'Standard');
 	}
 
 	public function testAbstractAddDecoratorsExceptionWrongClass()
 	{
 		$context = \TestHelperFrontend::getContext();
 		$config = $context->getConfig();
-		$config->set( 'controller/frontend/common/decorators/default', array( 'WrongClass' ) );
+		$config->set('controller/frontend/common/decorators/default', array('WrongClass'));
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
-		\Aimeos\Controller\Frontend\Service\Factory::createController( $context, 'Standard' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
+		\Aimeos\Controller\Frontend\Service\Factory::createController($context, 'Standard');
 	}
 
 	public function testCreateController()
 	{
 		$context = \TestHelperFrontend::getContext();
 		$config = $context->getConfig();
-		$config->set( 'controller/frontend/common/decorators/default', array() );
+		$config->set('controller/frontend/common/decorators/default', array());
 
 		$target = '\\Aimeos\\Controller\\Frontend\\Service\\Iface';
 
-		$controller = \Aimeos\Controller\Frontend\Service\Factory::createController( \TestHelperFrontend::getContext() );
-		$this->assertInstanceOf( $target, $controller );
+		$controller = \Aimeos\Controller\Frontend\Service\Factory::createController(\TestHelperFrontend::getContext());
+		$this->assertInstanceOf($target, $controller);
 
-		$controller = \Aimeos\Controller\Frontend\Service\Factory::createController( \TestHelperFrontend::getContext(), 'Standard' );
-		$this->assertInstanceOf( $target, $controller );
+		$controller = \Aimeos\Controller\Frontend\Service\Factory::createController(\TestHelperFrontend::getContext(), 'Standard');
+		$this->assertInstanceOf($target, $controller);
 	}
 
 }

controller/frontend/tests/Controller/Frontend/Service/StandardTest.php

Spacing +54 added lines, -54 removed lines

@@ -16,130 +16,130 @@ 
 
 	protected function setUp()
 	{
-		$this->object = new \Aimeos\Controller\Frontend\Service\Standard( \TestHelperFrontend::getContext() );
+		$this->object = new \Aimeos\Controller\Frontend\Service\Standard(\TestHelperFrontend::getContext());
 	}
 
 
 	public static function setUpBeforeClass()
 	{
-		$orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
-		$orderBaseMgr = $orderManager->getSubManager( 'base' );
+		$orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager(\TestHelperFrontend::getContext());
+		$orderBaseMgr = $orderManager->getSubManager('base');
 		self::$basket = $orderBaseMgr->createItem();
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object );
+		unset($this->object);
 	}
 
 
 	public function testGetServices()
 	{
-		$orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
-		$basket = $orderManager->getSubManager( 'base' )->createItem();
+		$orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager(\TestHelperFrontend::getContext());
+		$basket = $orderManager->getSubManager('base')->createItem();
 
-		$services = $this->object->getServices( 'delivery', $basket );
-		$this->assertGreaterThan( 0, count( $services ) );
+		$services = $this->object->getServices('delivery', $basket);
+		$this->assertGreaterThan(0, count($services));
 
-		foreach( $services as $service ) {
-			$this->assertInstanceOf( '\\Aimeos\\MShop\\Service\\Item\\Iface', $service );
+		foreach ($services as $service) {
+			$this->assertInstanceOf('\\Aimeos\\MShop\\Service\\Item\\Iface', $service);
 		}
 	}
 
 
 	public function testGetServicesCache()
 	{
-		$orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
-		$basket = $orderManager->getSubManager( 'base' )->createItem();
+		$orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager(\TestHelperFrontend::getContext());
+		$basket = $orderManager->getSubManager('base')->createItem();
 
-		$this->object->getServices( 'delivery', $basket );
-		$services = $this->object->getServices( 'delivery', $basket );
+		$this->object->getServices('delivery', $basket);
+		$services = $this->object->getServices('delivery', $basket);
 
-		$this->assertGreaterThan( 0, count( $services ) );
+		$this->assertGreaterThan(0, count($services));
 	}
 
 
 	public function testGetServiceAttributes()
 	{
 		$service = $this->getServiceItem();
-		$attributes = $this->object->getServiceAttributes( 'delivery', $service->getId(), self::$basket );
+		$attributes = $this->object->getServiceAttributes('delivery', $service->getId(), self::$basket);
 
-		$this->assertEquals( 0, count( $attributes ) );
+		$this->assertEquals(0, count($attributes));
 	}
 
 
 	public function testGetServiceAttributesCache()
 	{
-		$orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
-		$basket = $orderManager->getSubManager( 'base' )->createItem();
+		$orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager(\TestHelperFrontend::getContext());
+		$basket = $orderManager->getSubManager('base')->createItem();
 
-		$services = $this->object->getServices( 'delivery', $basket );
+		$services = $this->object->getServices('delivery', $basket);
 
-		if( ( $service = reset( $services ) ) === false ) {
-			throw new \Exception( 'No service item found' );
+		if (($service = reset($services)) === false) {
+			throw new \Exception('No service item found');
 		}
 
-		$attributes = $this->object->getServiceAttributes( 'delivery', $service->getId(), self::$basket );
+		$attributes = $this->object->getServiceAttributes('delivery', $service->getId(), self::$basket);
 
-		$this->assertEquals( 0, count( $attributes ) );
+		$this->assertEquals(0, count($attributes));
 	}
 
 
 	public function testGetServiceAttributesNoItems()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Service\\Exception' );
-		$this->object->getServiceAttributes( 'invalid', -1, self::$basket );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Service\\Exception');
+		$this->object->getServiceAttributes('invalid', -1, self::$basket);
 	}
 
 
 	public function testGetServicePrice()
 	{
-		$orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
-		$basket = $orderManager->getSubManager( 'base' )->createItem();
+		$orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager(\TestHelperFrontend::getContext());
+		$basket = $orderManager->getSubManager('base')->createItem();
 
 		$service = $this->getServiceItem();
-		$price = $this->object->getServicePrice( 'delivery', $service->getId(), $basket );
+		$price = $this->object->getServicePrice('delivery', $service->getId(), $basket);
 
-		$this->assertEquals( '12.95', $price->getValue() );
-		$this->assertEquals( '1.99', $price->getCosts() );
+		$this->assertEquals('12.95', $price->getValue());
+		$this->assertEquals('1.99', $price->getCosts());
 	}
 
 
 	public function testGetServicePriceCache()
 	{
-		$orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
-		$basket = $orderManager->getSubManager( 'base' )->createItem();
+		$orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager(\TestHelperFrontend::getContext());
+		$basket = $orderManager->getSubManager('base')->createItem();
 
-		$services = $this->object->getServices( 'delivery', $basket );
+		$services = $this->object->getServices('delivery', $basket);
 
-		if( ( $service = reset( $services ) ) === false ) {
-			throw new \Exception( 'No service item found' );
+		if (($service = reset($services)) === false) {
+			throw new \Exception('No service item found');
 		}
 
-		$price = $this->object->getServicePrice( 'delivery', $service->getId(), $basket );
+		$price = $this->object->getServicePrice('delivery', $service->getId(), $basket);
 
-		$this->assertEquals( '12.95', $price->getValue() );
-		$this->assertEquals( '1.99', $price->getCosts() );
+		$this->assertEquals('12.95', $price->getValue());
+		$this->assertEquals('1.99', $price->getCosts());
 	}
 
 
 	public function testGetServicePriceNoItems()
 	{
-		$orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
-		$basket = $orderManager->getSubManager( 'base' )->createItem();
+		$orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager(\TestHelperFrontend::getContext());
+		$basket = $orderManager->getSubManager('base')->createItem();
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Service\\Exception' );
-		$this->object->getServicePrice( 'invalid', -1, $basket );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Service\\Exception');
+		$this->object->getServicePrice('invalid', -1, $basket);
 	}
 
 
 	public function testCheckServiceAttributes()
 	{
 		$service = $this->getServiceItem();
-		$attributes = $this->object->checkServiceAttributes( 'delivery', $service->getId(), array() );
+		$attributes = $this->object->checkServiceAttributes('delivery', $service->getId(), array());
 
-		$this->assertEquals( array(), $attributes );
+		$this->assertEquals(array(), $attributes);
 	}
 
 
@@ -148,21 +148,21 @@ 
 	 */
 	protected function getServiceItem()
 	{
-		$serviceManager = \Aimeos\MShop\Service\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
+		$serviceManager = \Aimeos\MShop\Service\Manager\Factory::createManager(\TestHelperFrontend::getContext());
 
-		$search = $serviceManager->createSearch( true );
+		$search = $serviceManager->createSearch(true);
 		$expr = array(
 			$search->getConditions(),
-			$search->compare( '==', 'service.provider', 'Standard' ),
-			$search->compare( '==', 'service.type.domain', 'service' ),
-			$search->compare( '==', 'service.type.code', 'delivery' ),
+			$search->compare('==', 'service.provider', 'Standard'),
+			$search->compare('==', 'service.type.domain', 'service'),
+			$search->compare('==', 'service.type.code', 'delivery'),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		$services = $serviceManager->searchItems( $search );
+		$services = $serviceManager->searchItems($search);
 
-		if( ( $service = reset( $services ) ) === false ) {
-			throw new \Exception( 'No service item found' );
+		if (($service = reset($services)) === false) {
+			throw new \Exception('No service item found');
 		}
 
 		return $service;

controller/frontend/tests/Controller/Frontend/Service/Decorator/ExampleTest.php

Spacing +4 added lines, -4 removed lines

@@ -22,8 +22,8 @@ 
 	protected function setUp()
 	{
 		$context = \TestHelperFrontend::getContext();
-		$controller = \Aimeos\Controller\Frontend\Service\Factory::createController( $context, 'Standard' );
-		$this->object = new \Aimeos\Controller\Frontend\Service\Decorator\Example( $controller, $context );
+		$controller = \Aimeos\Controller\Frontend\Service\Factory::createController($context, 'Standard');
+		$this->object = new \Aimeos\Controller\Frontend\Service\Decorator\Example($controller, $context);
 	}
 
 
@@ -41,8 +41,8 @@ 
 
 	public function testCall()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Service\\Exception' );
-		$this->object->checkServiceAttributes( 'delivery', -1, array() );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Service\\Exception');
+		$this->object->checkServiceAttributes('delivery', -1, array());
 	}
 
 }

controller/frontend/tests/Controller/Frontend/Service/Factorylocal.php

Spacing +7 added lines, -7 removed lines

@@ -24,20 +24,20 @@
 	/**
 	 * @param string $name
 	 */
-	public static function createController( \Aimeos\MShop\Context\Item\Iface $context, $name = null, $domainToTest = 'service' )
+	public static function createController(\Aimeos\MShop\Context\Item\Iface $context, $name = null, $domainToTest = 'service')
 	{
-		if( $name === null ) {
-			$name = $context->getConfig()->get( 'controller/frontend/service/name', 'Standard' );
+		if ($name === null) {
+			$name = $context->getConfig()->get('controller/frontend/service/name', 'Standard');
 		}
 
-		if( ctype_alnum( $name ) === false ) {
-			throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid characters in class name "%1$s"', $name ) );
+		if (ctype_alnum($name) === false) {
+			throw new \Aimeos\Controller\Frontend\Exception(sprintf('Invalid characters in class name "%1$s"', $name));
 		}
 
 		$iface = '\\Aimeos\\Controller\\Frontend\\Service\\Iface';
 		$classname = '\\Aimeos\\Controller\\Frontend\\Service\\' . $name;
 
-		$manager = self::createControllerBase( $context, $classname, $iface );
-		return self::addControllerDecorators( $context, $manager, $domainToTest );
+		$manager = self::createControllerBase($context, $classname, $iface);
+		return self::addControllerDecorators($context, $manager, $domainToTest);
 	}
 }

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

Spacing +4 added lines, -4 removed lines

@@ -15,7 +15,7 @@ 
 
 	protected function setUp()
 	{
-		$this->object = new \Aimeos\Controller\Frontend\Exception( 'msg', 1, null, array( 'key' => 'value' ) );
+		$this->object = new \Aimeos\Controller\Frontend\Exception('msg', 1, null, array('key' => 'value'));
 	}
 
 
@@ -26,18 +26,18 @@ 
 
 	public function testGetMessage()
 	{
-		$this->assertEquals( 'msg', $this->object->getMessage() );
+		$this->assertEquals('msg', $this->object->getMessage());
 	}
 
 
 	public function testGetCode()
 	{
-		$this->assertEquals( 1, $this->object->getCode() );
+		$this->assertEquals(1, $this->object->getCode());
 	}
 
 
 	public function testGetErrorList()
 	{
-		$this->assertEquals( array( 'key' => 'value' ), $this->object->getErrorList() );
+		$this->assertEquals(array('key' => 'value'), $this->object->getErrorList());
 	}
 }

controller/frontend/tests/Controller/Frontend/Common/Factory/BaseTest.php

Spacing +12 added lines, -12 removed lines

@@ -29,33 +29,33 @@
 		$this->context = \TestHelperFrontend::getContext();
 		$config = $this->context->getConfig();
 
-		$config->set( 'controller/frontend/common/decorators/default', array() );
-		$config->set( 'controller/frontend/admin/decorators/global', array() );
-		$config->set( 'controller/frontend/admin/decorators/local', array() );
+		$config->set('controller/frontend/common/decorators/default', array());
+		$config->set('controller/frontend/admin/decorators/global', array());
+		$config->set('controller/frontend/admin/decorators/local', array());
 
 	}
 
 
 	public function testInjectController()
 	{
-		$controller = \Aimeos\Controller\Frontend\Catalog\Factory::createController( $this->context, 'Standard' );
-		\Aimeos\Controller\Frontend\Catalog\Factory::injectController( '\\Aimeos\\Controller\\Frontend\\Catalog\\Standard', $controller );
+		$controller = \Aimeos\Controller\Frontend\Catalog\Factory::createController($this->context, 'Standard');
+		\Aimeos\Controller\Frontend\Catalog\Factory::injectController('\\Aimeos\\Controller\\Frontend\\Catalog\\Standard', $controller);
 
-		$injectedController = \Aimeos\Controller\Frontend\Catalog\Factory::createController( $this->context, 'Standard' );
+		$injectedController = \Aimeos\Controller\Frontend\Catalog\Factory::createController($this->context, 'Standard');
 
-		$this->assertSame( $controller, $injectedController );
+		$this->assertSame($controller, $injectedController);
 	}
 
 
 	public function testInjectControllerReset()
 	{
-		$controller = \Aimeos\Controller\Frontend\Catalog\Factory::createController( $this->context, 'Standard' );
-		\Aimeos\Controller\Frontend\Catalog\Factory::injectController( '\\Aimeos\\Controller\\Frontend\\Catalog\\Standard', $controller );
-		\Aimeos\Controller\Frontend\Catalog\Factory::injectController( '\\Aimeos\\Controller\\Frontend\\Catalog\\Standard', null );
+		$controller = \Aimeos\Controller\Frontend\Catalog\Factory::createController($this->context, 'Standard');
+		\Aimeos\Controller\Frontend\Catalog\Factory::injectController('\\Aimeos\\Controller\\Frontend\\Catalog\\Standard', $controller);
+		\Aimeos\Controller\Frontend\Catalog\Factory::injectController('\\Aimeos\\Controller\\Frontend\\Catalog\\Standard', null);
 
-		$new = \Aimeos\Controller\Frontend\Catalog\Factory::createController( $this->context, 'Standard' );
+		$new = \Aimeos\Controller\Frontend\Catalog\Factory::createController($this->context, 'Standard');
 
-		$this->assertNotSame( $controller, $new );
+		$this->assertNotSame($controller, $new);
 	}
 
 }
\ No newline at end of file

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

Spacing +10 added lines, -10 removed lines

@@ -14,31 +14,31 @@
 	{
 		$target = '\\Aimeos\\Controller\\Frontend\\Basket\\Iface';
 
-		$controller = \Aimeos\Controller\Frontend\Basket\Factory::createController( \TestHelperFrontend::getContext() );
-		$this->assertInstanceOf( $target, $controller );
+		$controller = \Aimeos\Controller\Frontend\Basket\Factory::createController(\TestHelperFrontend::getContext());
+		$this->assertInstanceOf($target, $controller);
 
-		$controller = \Aimeos\Controller\Frontend\Basket\Factory::createController( \TestHelperFrontend::getContext(), 'Standard' );
-		$this->assertInstanceOf( $target, $controller );
+		$controller = \Aimeos\Controller\Frontend\Basket\Factory::createController(\TestHelperFrontend::getContext(), 'Standard');
+		$this->assertInstanceOf($target, $controller);
 	}
 
 
 	public function testCreateControllerInvalidImplementation()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
-		\Aimeos\Controller\Frontend\Basket\Factory::createController( \TestHelperFrontend::getContext(), 'Invalid' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
+		\Aimeos\Controller\Frontend\Basket\Factory::createController(\TestHelperFrontend::getContext(), 'Invalid');
 	}
 
 
 	public function testCreateControllerInvalidName()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
-		\Aimeos\Controller\Frontend\Basket\Factory::createController( \TestHelperFrontend::getContext(), '%^' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
+		\Aimeos\Controller\Frontend\Basket\Factory::createController(\TestHelperFrontend::getContext(), '%^');
 	}
 
 
 	public function testCreateControllerNotExisting()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
-		\Aimeos\Controller\Frontend\Basket\Factory::createController( \TestHelperFrontend::getContext(), 'notexist' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
+		\Aimeos\Controller\Frontend\Basket\Factory::createController(\TestHelperFrontend::getContext(), 'notexist');
 	}
 }

controller/frontend/tests/Controller/Frontend/Basket/StandardTest.php

Spacing +381 added lines, -381 removed lines

@@ -18,17 +18,17 @@ 
 	protected function setUp()
 	{
 		$this->context = \TestHelperFrontend::getContext();
-		$this->object = new \Aimeos\Controller\Frontend\Basket\Standard( $this->context );
+		$this->object = new \Aimeos\Controller\Frontend\Basket\Standard($this->context);
 
-		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
+		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager(\TestHelperFrontend::getContext());
 
 		$search = $productManager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', 'U:TESTP' ) );
+		$search->setConditions($search->compare('==', 'product.code', 'U:TESTP'));
 
-		$items = $productManager->searchItems( $search, array( 'text' ) );
+		$items = $productManager->searchItems($search, array('text'));
 
-		if( ( $this->testItem = reset( $items ) ) === false ) {
-			throw new \Exception( 'Product not found' );
+		if (($this->testItem = reset($items)) === false) {
+			throw new \Exception('Product not found');
 		}
 	}
 
@@ -36,9 +36,9 @@ 
 	protected function tearDown()
 	{
 		$this->object->clear();
-		$this->context->getSession()->set( 'aimeos', array() );
+		$this->context->getSession()->set('aimeos', array());
 
-		unset( $this->object, $this->testItem );
+		unset($this->object, $this->testItem);
 	}
 
 
@@ -47,584 +47,584 @@ 
 		$basket = $this->object->get();
 
 
-		$this->object->addProduct( $this->testItem->getId(), 2 );
+		$this->object->addProduct($this->testItem->getId(), 2);
 
-		$this->assertEquals( 1, count( $basket->getProducts() ) );
-		$this->assertEquals( 2, $basket->getProduct( 0 )->getQuantity() );
-		$this->assertEquals( 'U:TESTPSUB01', $basket->getProduct( 0 )->getProductCode() );
+		$this->assertEquals(1, count($basket->getProducts()));
+		$this->assertEquals(2, $basket->getProduct(0)->getQuantity());
+		$this->assertEquals('U:TESTPSUB01', $basket->getProduct(0)->getProductCode());
 
 
-		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
+		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager(\TestHelperFrontend::getContext());
 
 		$search = $productManager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', 'CNC' ) );
+		$search->setConditions($search->compare('==', 'product.code', 'CNC'));
 
-		$items = $productManager->searchItems( $search, array( 'text' ) );
+		$items = $productManager->searchItems($search, array('text'));
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \Exception( 'Product not found' );
+		if (($item = reset($items)) === false) {
+			throw new \Exception('Product not found');
 		}
 
-		$this->object->addProduct( $item->getId(), 2, array(), array(), array(), array(), array(), 'default' );
-		$item2 = $this->object->get()->getProduct( 1 );
-		$this->object->deleteProduct( 0 );
+		$this->object->addProduct($item->getId(), 2, array(), array(), array(), array(), array(), 'default');
+		$item2 = $this->object->get()->getProduct(1);
+		$this->object->deleteProduct(0);
 
-		$this->assertEquals( 1, count( $basket->getProducts() ) );
-		$this->assertEquals( $item2, $basket->getProduct( 1 ) );
-		$this->assertEquals( 'CNC', $basket->getProduct( 1 )->getProductCode() );
+		$this->assertEquals(1, count($basket->getProducts()));
+		$this->assertEquals($item2, $basket->getProduct(1));
+		$this->assertEquals('CNC', $basket->getProduct(1)->getProductCode());
 	}
 
 
 	public function testAddProductBundle()
 	{
-		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
+		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager(\TestHelperFrontend::getContext());
 
 		$search = $productManager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', 'U:BUNDLE' ) );
+		$search->setConditions($search->compare('==', 'product.code', 'U:BUNDLE'));
 
-		$items = $productManager->searchItems( $search );
+		$items = $productManager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \Exception( 'Product not found' );
+		if (($item = reset($items)) === false) {
+			throw new \Exception('Product not found');
 		}
 
 
-		$this->object->addProduct( $item->getId(), 1 );
+		$this->object->addProduct($item->getId(), 1);
 
-		$this->assertEquals( 1, count( $this->object->get()->getProducts() ) );
-		$this->assertEquals( 'U:BUNDLE', $this->object->get()->getProduct( 0 )->getProductCode() );
-		$this->assertEquals( 2, count( $this->object->get()->getProduct( 0 )->getProducts() ) );
+		$this->assertEquals(1, count($this->object->get()->getProducts()));
+		$this->assertEquals('U:BUNDLE', $this->object->get()->getProduct(0)->getProductCode());
+		$this->assertEquals(2, count($this->object->get()->getProduct(0)->getProducts()));
 	}
 
 
 	public function testAddProductVariant()
 	{
-		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
+		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager(\TestHelperFrontend::getContext());
 
 		$search = $productManager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', 'CNC' ) );
+		$search->setConditions($search->compare('==', 'product.code', 'CNC'));
 
-		$items = $productManager->searchItems( $search, array( 'text' ) );
+		$items = $productManager->searchItems($search, array('text'));
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \Exception( 'Product not found' );
+		if (($item = reset($items)) === false) {
+			throw new \Exception('Product not found');
 		}
 
-		$attributeManager = \Aimeos\MShop\Attribute\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
+		$attributeManager = \Aimeos\MShop\Attribute\Manager\Factory::createManager(\TestHelperFrontend::getContext());
 
 		$search = $attributeManager->createSearch();
-		$search->setConditions( $search->compare( '==', 'attribute.code', array( 'xs', 'white' ) ) );
+		$search->setConditions($search->compare('==', 'attribute.code', array('xs', 'white')));
 
-		$attributes = $attributeManager->searchItems( $search );
+		$attributes = $attributeManager->searchItems($search);
 
-		if( count( $attributes ) === 0 ) {
-			throw new \Exception( 'Attributes not found' );
+		if (count($attributes) === 0) {
+			throw new \Exception('Attributes not found');
 		}
 
 
-		$this->object->addProduct( $item->getId(), 1, array(), array_keys( $attributes ), array(), array(), array(), 'default' );
+		$this->object->addProduct($item->getId(), 1, array(), array_keys($attributes), array(), array(), array(), 'default');
 
-		$this->assertEquals( 1, count( $this->object->get()->getProducts() ) );
-		$this->assertEquals( 'CNC', $this->object->get()->getProduct( 0 )->getProductCode() );
+		$this->assertEquals(1, count($this->object->get()->getProducts()));
+		$this->assertEquals('CNC', $this->object->get()->getProduct(0)->getProductCode());
 	}
 
 
 	public function testAddProductVariantIncomplete()
 	{
-		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
+		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager(\TestHelperFrontend::getContext());
 
 		$search = $productManager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', 'U:TEST' ) );
+		$search->setConditions($search->compare('==', 'product.code', 'U:TEST'));
 
-		$items = $productManager->searchItems( $search, array() );
+		$items = $productManager->searchItems($search, array());
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \Exception( 'Product not found' );
+		if (($item = reset($items)) === false) {
+			throw new \Exception('Product not found');
 		}
 
-		$attributeManager = \Aimeos\MShop\Attribute\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
+		$attributeManager = \Aimeos\MShop\Attribute\Manager\Factory::createManager(\TestHelperFrontend::getContext());
 
 		$search = $attributeManager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'attribute.domain', 'product' ),
-			$search->compare( '==', 'attribute.code', '30' ),
-			$search->compare( '==', 'attribute.type.code', 'length' ),
+			$search->compare('==', 'attribute.domain', 'product'),
+			$search->compare('==', 'attribute.code', '30'),
+			$search->compare('==', 'attribute.type.code', 'length'),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		$attributes = $attributeManager->searchItems( $search );
+		$attributes = $attributeManager->searchItems($search);
 
-		if( count( $attributes ) === 0 ) {
-			throw new \Exception( 'Attributes not found' );
+		if (count($attributes) === 0) {
+			throw new \Exception('Attributes not found');
 		}
 
 
-		$this->object->addProduct( $item->getId(), 1, array(), array_keys( $attributes ) );
+		$this->object->addProduct($item->getId(), 1, array(), array_keys($attributes));
 
-		$this->assertEquals( 1, count( $this->object->get()->getProducts() ) );
-		$this->assertEquals( 'U:TESTSUB02', $this->object->get()->getProduct( 0 )->getProductCode() );
-		$this->assertEquals( 2, count( $this->object->get()->getProduct( 0 )->getAttributes() ) );
+		$this->assertEquals(1, count($this->object->get()->getProducts()));
+		$this->assertEquals('U:TESTSUB02', $this->object->get()->getProduct(0)->getProductCode());
+		$this->assertEquals(2, count($this->object->get()->getProduct(0)->getAttributes()));
 	}
 
 
 	public function testAddProductVariantNonUnique()
 	{
-		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
+		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager(\TestHelperFrontend::getContext());
 
 		$search = $productManager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', 'U:TEST' ) );
+		$search->setConditions($search->compare('==', 'product.code', 'U:TEST'));
 
-		$items = $productManager->searchItems( $search, array() );
+		$items = $productManager->searchItems($search, array());
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \Exception( 'Product not found' );
+		if (($item = reset($items)) === false) {
+			throw new \Exception('Product not found');
 		}
 
-		$attributeManager = \Aimeos\MShop\Attribute\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
+		$attributeManager = \Aimeos\MShop\Attribute\Manager\Factory::createManager(\TestHelperFrontend::getContext());
 
 		$search = $attributeManager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'attribute.domain', 'product' ),
-			$search->compare( '==', 'attribute.code', '30' ),
-			$search->compare( '==', 'attribute.type.code', 'width' ),
+			$search->compare('==', 'attribute.domain', 'product'),
+			$search->compare('==', 'attribute.code', '30'),
+			$search->compare('==', 'attribute.type.code', 'width'),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		$attributes = $attributeManager->searchItems( $search );
+		$attributes = $attributeManager->searchItems($search);
 
-		if( count( $attributes ) === 0 ) {
-			throw new \Exception( 'Attributes not found' );
+		if (count($attributes) === 0) {
+			throw new \Exception('Attributes not found');
 		}
 
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Basket\\Exception' );
-		$this->object->addProduct( $item->getId(), 1, array(), array_keys( $attributes ) );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
+		$this->object->addProduct($item->getId(), 1, array(), array_keys($attributes));
 	}
 
 
 	public function testAddProductVariantNotRequired()
 	{
-		$attributeManager = \Aimeos\MShop\Attribute\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
+		$attributeManager = \Aimeos\MShop\Attribute\Manager\Factory::createManager(\TestHelperFrontend::getContext());
 
 		$search = $attributeManager->createSearch();
-		$search->setConditions( $search->compare( '==', 'attribute.code', 'xs' ) );
+		$search->setConditions($search->compare('==', 'attribute.code', 'xs'));
 
-		$attributes = $attributeManager->searchItems( $search );
+		$attributes = $attributeManager->searchItems($search);
 
-		if( count( $attributes ) === 0 ) {
-			throw new \Exception( 'Attribute not found' );
+		if (count($attributes) === 0) {
+			throw new \Exception('Attribute not found');
 		}
 
-		$options = array( 'variant' => false );
+		$options = array('variant' => false);
 
-		$this->object->addProduct( $this->testItem->getId(), 1, $options, array_keys( $attributes ) );
+		$this->object->addProduct($this->testItem->getId(), 1, $options, array_keys($attributes));
 
-		$this->assertEquals( 1, count( $this->object->get()->getProducts() ) );
-		$this->assertEquals( 'U:TESTP', $this->object->get()->getProduct( 0 )->getProductCode() );
+		$this->assertEquals(1, count($this->object->get()->getProducts()));
+		$this->assertEquals('U:TESTP', $this->object->get()->getProduct(0)->getProductCode());
 	}
 
 
 	public function testAddProductConfigAttribute()
 	{
-		$attributeManager = \Aimeos\MShop\Attribute\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
+		$attributeManager = \Aimeos\MShop\Attribute\Manager\Factory::createManager(\TestHelperFrontend::getContext());
 
 		$search = $attributeManager->createSearch();
-		$search->setConditions( $search->compare( '==', 'attribute.code', 'xs' ) );
+		$search->setConditions($search->compare('==', 'attribute.code', 'xs'));
 
-		$attributes = $attributeManager->searchItems( $search );
+		$attributes = $attributeManager->searchItems($search);
 
-		if( empty( $attributes ) ) {
-			throw new \Exception( 'Attribute not found' );
+		if (empty($attributes)) {
+			throw new \Exception('Attribute not found');
 		}
 
-		$this->object->addProduct( $this->testItem->getId(), 1, array(), array(), array_keys( $attributes ) );
+		$this->object->addProduct($this->testItem->getId(), 1, array(), array(), array_keys($attributes));
 		$basket = $this->object->get();
 
-		$this->assertEquals( 1, count( $basket->getProducts() ) );
-		$this->assertEquals( 'U:TESTPSUB01', $basket->getProduct( 0 )->getProductCode() );
-		$this->assertEquals( 'xs', $basket->getProduct( 0 )->getAttribute( 'size', 'config' ) );
+		$this->assertEquals(1, count($basket->getProducts()));
+		$this->assertEquals('U:TESTPSUB01', $basket->getProduct(0)->getProductCode());
+		$this->assertEquals('xs', $basket->getProduct(0)->getAttribute('size', 'config'));
 	}
 
 
 	public function testAddProductHiddenAttribute()
 	{
-		$attributeManager = \Aimeos\MShop\Attribute\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
+		$attributeManager = \Aimeos\MShop\Attribute\Manager\Factory::createManager(\TestHelperFrontend::getContext());
 
 		$search = $attributeManager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'attribute.code', '29' ),
-			$search->compare( '==', 'attribute.type.code', 'width' ),
+			$search->compare('==', 'attribute.code', '29'),
+			$search->compare('==', 'attribute.type.code', 'width'),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		$attributes = $attributeManager->searchItems( $search );
+		$attributes = $attributeManager->searchItems($search);
 
-		if( empty( $attributes ) ) {
-			throw new \Exception( 'Attribute not found' );
+		if (empty($attributes)) {
+			throw new \Exception('Attribute not found');
 		}
 
-		$this->object->addProduct( $this->testItem->getId(), 1, array(), array(), array(), array_keys( $attributes ) );
+		$this->object->addProduct($this->testItem->getId(), 1, array(), array(), array(), array_keys($attributes));
 
 		$basket = $this->object->get();
-		$this->assertEquals( 1, count( $basket->getProducts() ) );
+		$this->assertEquals(1, count($basket->getProducts()));
 
-		$product = $basket->getProduct( 0 );
-		$this->assertEquals( 'U:TESTPSUB01', $product->getProductCode() );
+		$product = $basket->getProduct(0);
+		$this->assertEquals('U:TESTPSUB01', $product->getProductCode());
 
 		$attributes = $product->getAttributes();
-		$this->assertEquals( 1, count( $attributes ) );
+		$this->assertEquals(1, count($attributes));
 
-		if( ( $attribute = reset( $attributes ) ) === false ) {
-			throw new \Exception( 'No attribute' );
+		if (($attribute = reset($attributes)) === false) {
+			throw new \Exception('No attribute');
 		}
 
-		$this->assertEquals( 'hidden', $attribute->getType() );
-		$this->assertEquals( '29', $product->getAttribute( 'width', 'hidden' ) );
+		$this->assertEquals('hidden', $attribute->getType());
+		$this->assertEquals('29', $product->getAttribute('width', 'hidden'));
 	}
 
 
 	public function testAddProductCustomAttribute()
 	{
-		$attributeManager = \Aimeos\MShop\Attribute\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
+		$attributeManager = \Aimeos\MShop\Attribute\Manager\Factory::createManager(\TestHelperFrontend::getContext());
 
 		$search = $attributeManager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'attribute.code', 'custom' ),
-			$search->compare( '==', 'attribute.type.code', 'date' ),
+			$search->compare('==', 'attribute.code', 'custom'),
+			$search->compare('==', 'attribute.type.code', 'date'),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		$attributes = $attributeManager->searchItems( $search );
+		$attributes = $attributeManager->searchItems($search);
 
-		if( ( $attrItem = reset( $attributes ) ) === false ) {
-			throw new \Exception( 'Attribute not found' );
+		if (($attrItem = reset($attributes)) === false) {
+			throw new \Exception('Attribute not found');
 		}
 
-		$attrValues = array( $attrItem->getId() => '2000-01-01' );
+		$attrValues = array($attrItem->getId() => '2000-01-01');
 
-		$this->object->addProduct( $this->testItem->getId(), 1, array(), array(), array(), array(), $attrValues );
+		$this->object->addProduct($this->testItem->getId(), 1, array(), array(), array(), array(), $attrValues);
 		$basket = $this->object->get();
 
-		$this->assertEquals( 1, count( $basket->getProducts() ) );
-		$this->assertEquals( '2000-01-01', $basket->getProduct( 0 )->getAttribute( 'date', 'custom' ) );
+		$this->assertEquals(1, count($basket->getProducts()));
+		$this->assertEquals('2000-01-01', $basket->getProduct(0)->getAttribute('date', 'custom'));
 	}
 
 
 	public function testAddProductAttributeNotAssigned()
 	{
-		$attributeManager = \Aimeos\MShop\Attribute\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
+		$attributeManager = \Aimeos\MShop\Attribute\Manager\Factory::createManager(\TestHelperFrontend::getContext());
 
 		$search = $attributeManager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'attribute.code', '30' ),
-			$search->compare( '==', 'attribute.type.code', 'width' ),
+			$search->compare('==', 'attribute.code', '30'),
+			$search->compare('==', 'attribute.type.code', 'width'),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		$attribute = $attributeManager->searchItems( $search );
+		$attribute = $attributeManager->searchItems($search);
 
-		if( empty( $attribute ) ) {
-			throw new \Exception( 'Attribute not found' );
+		if (empty($attribute)) {
+			throw new \Exception('Attribute not found');
 		}
 
-		$hiddenAttrIds = array_keys( $attribute );
-		$configAttrIds = array_keys( $attribute );
+		$hiddenAttrIds = array_keys($attribute);
+		$configAttrIds = array_keys($attribute);
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Basket\\Exception' );
-		$this->object->addProduct( $this->testItem->getId(), 1, array(), array(), $configAttrIds, $hiddenAttrIds );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
+		$this->object->addProduct($this->testItem->getId(), 1, array(), array(), $configAttrIds, $hiddenAttrIds);
 	}
 
 
 	public function testAddProductNegativeQuantityException()
 	{
-		$this->setExpectedException( '\\Aimeos\\MShop\\Order\\Exception' );
-		$this->object->addProduct( $this->testItem->getId(), -1 );
+		$this->setExpectedException('\\Aimeos\\MShop\\Order\\Exception');
+		$this->object->addProduct($this->testItem->getId(), -1);
 	}
 
 
 	public function testAddProductNotEnoughStockException()
 	{
-		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
+		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager(\TestHelperFrontend::getContext());
 
 		$search = $productManager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', 'IJKL' ) );
+		$search->setConditions($search->compare('==', 'product.code', 'IJKL'));
 
-		$items = $productManager->searchItems( $search );
+		$items = $productManager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \Exception( 'Product not found' );
+		if (($item = reset($items)) === false) {
+			throw new \Exception('Product not found');
 		}
 
 		try
 		{
-			$this->object->addProduct( $item->getId(), 5, array(), array(), array(), array(), array(), 'unit_warehouse3' );
-			throw new \Exception( 'Expected exception not thrown' );
+			$this->object->addProduct($item->getId(), 5, array(), array(), array(), array(), array(), 'unit_warehouse3');
+			throw new \Exception('Expected exception not thrown');
 		}
-		catch( \Aimeos\Controller\Frontend\Basket\Exception $e )
+		catch (\Aimeos\Controller\Frontend\Basket\Exception $e)
 		{
-			$item = $this->object->get()->getProduct( 0 );
-			$this->assertEquals( 3, $item->getQuantity() );
+			$item = $this->object->get()->getProduct(0);
+			$this->assertEquals(3, $item->getQuantity());
 		}
 	}
 
 
 	public function testAddProductNoStockException()
 	{
-		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
+		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager(\TestHelperFrontend::getContext());
 
 		$search = $productManager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', 'EFGH' ) );
+		$search->setConditions($search->compare('==', 'product.code', 'EFGH'));
 
-		$items = $productManager->searchItems( $search );
+		$items = $productManager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \Exception( 'Product not found' );
+		if (($item = reset($items)) === false) {
+			throw new \Exception('Product not found');
 		}
 
 		try
 		{
-			$this->object->addProduct( $item->getId(), 5, array(), array(), array(), array(), array(), 'unit_warehouse2' );
-			throw new \Exception( 'Expected exception not thrown' );
+			$this->object->addProduct($item->getId(), 5, array(), array(), array(), array(), array(), 'unit_warehouse2');
+			throw new \Exception('Expected exception not thrown');
 		}
-		catch( \Aimeos\Controller\Frontend\Basket\Exception $e )
+		catch (\Aimeos\Controller\Frontend\Basket\Exception $e)
 		{
-			$this->assertEquals( array(), $this->object->get()->getProducts() );
+			$this->assertEquals(array(), $this->object->get()->getProducts());
 		}
 	}
 
 
 	public function testAddProductNoStockRequired()
 	{
-		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
+		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager(\TestHelperFrontend::getContext());
 
 		$search = $productManager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', 'IJKL' ) );
+		$search->setConditions($search->compare('==', 'product.code', 'IJKL'));
 
-		$items = $productManager->searchItems( $search );
+		$items = $productManager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \Exception( 'Product not found' );
+		if (($item = reset($items)) === false) {
+			throw new \Exception('Product not found');
 		}
 
-		$this->object->addProduct( $item->getId(), 5, array( 'stock' => false ) );
+		$this->object->addProduct($item->getId(), 5, array('stock' => false));
 	}
 
 
 	public function testAddProductNoStockItem()
 	{
-		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
+		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager(\TestHelperFrontend::getContext());
 
 		$search = $productManager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', 'QRST' ) );
+		$search->setConditions($search->compare('==', 'product.code', 'QRST'));
 
-		$items = $productManager->searchItems( $search );
+		$items = $productManager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \Exception( 'Product not found' );
+		if (($item = reset($items)) === false) {
+			throw new \Exception('Product not found');
 		}
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Basket\\Exception' );
-		$this->object->addProduct( $item->getId(), 1 );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
+		$this->object->addProduct($item->getId(), 1);
 	}
 
 
 	public function testAddProductNoPriceException()
 	{
-		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
+		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager(\TestHelperFrontend::getContext());
 
 		$search = $productManager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', 'MNOP' ) );
+		$search->setConditions($search->compare('==', 'product.code', 'MNOP'));
 
-		$items = $productManager->searchItems( $search );
+		$items = $productManager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \Exception( 'Product not found' );
+		if (($item = reset($items)) === false) {
+			throw new \Exception('Product not found');
 		}
 
-		$this->setExpectedException( '\\Aimeos\\MShop\\Price\\Exception' );
-		$this->object->addProduct( $item->getId(), 1 );
+		$this->setExpectedException('\\Aimeos\\MShop\\Price\\Exception');
+		$this->object->addProduct($item->getId(), 1);
 	}
 
 
 	public function testAddProductConfigAttributeException()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Basket\\Exception' );
-		$this->object->addProduct( $this->testItem->getId(), 1, array(), array(), array( -1 ) );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
+		$this->object->addProduct($this->testItem->getId(), 1, array(), array(), array( -1 ));
 	}
 
 
 	public function testAddProductEmptySelectionException()
 	{
-		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
+		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager(\TestHelperFrontend::getContext());
 		$search = $productManager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', 'U:noSel' ) );
-		$items = $productManager->searchItems( $search );
+		$search->setConditions($search->compare('==', 'product.code', 'U:noSel'));
+		$items = $productManager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \Exception( 'Product not found' );
+		if (($item = reset($items)) === false) {
+			throw new \Exception('Product not found');
 		}
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Basket\\Exception' );
-		$this->object->addProduct( $item->getId(), 1 );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
+		$this->object->addProduct($item->getId(), 1);
 	}
 
 
 	public function testAddProductSelectionWithPricelessItem()
 	{
-		$this->object->addProduct( $this->testItem->getId(), 1 );
+		$this->object->addProduct($this->testItem->getId(), 1);
 
-		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
+		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager(\TestHelperFrontend::getContext());
 		$search = $productManager->createSearch();
 
-		$search->setConditions( $search->compare( '==', 'product.code', 'U:TESTPSUB01' ) );
-		$items = $productManager->searchItems( $search );
+		$search->setConditions($search->compare('==', 'product.code', 'U:TESTPSUB01'));
+		$items = $productManager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \Exception( 'Product not found' );
+		if (($item = reset($items)) === false) {
+			throw new \Exception('Product not found');
 		}
 
-		$this->assertEquals( 'U:TESTPSUB01', $this->object->get()->getProduct( 0 )->getProductCode() );
+		$this->assertEquals('U:TESTPSUB01', $this->object->get()->getProduct(0)->getProductCode());
 	}
 
 
 	public function testAddProductLowQuantityPriceException()
 	{
-		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
+		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager(\TestHelperFrontend::getContext());
 		$search = $productManager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', 'IJKL' ) );
-		$items = $productManager->searchItems( $search );
+		$search->setConditions($search->compare('==', 'product.code', 'IJKL'));
+		$items = $productManager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \Exception( 'Product not found' );
+		if (($item = reset($items)) === false) {
+			throw new \Exception('Product not found');
 		}
 
-		$this->setExpectedException( '\\Aimeos\\MShop\\Price\\Exception' );
-		$this->object->addProduct( $item->getId(), 1 );
+		$this->setExpectedException('\\Aimeos\\MShop\\Price\\Exception');
+		$this->object->addProduct($item->getId(), 1);
 	}
 
 
 	public function testAddProductHigherQuantities()
 	{
-		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
+		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager(\TestHelperFrontend::getContext());
 		$search = $productManager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', 'IJKL' ) );
-		$items = $productManager->searchItems( $search );
+		$search->setConditions($search->compare('==', 'product.code', 'IJKL'));
+		$items = $productManager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \Exception( 'Product not found' );
+		if (($item = reset($items)) === false) {
+			throw new \Exception('Product not found');
 		}
 
-		$this->object->addProduct( $item->getId(), 2, array(), array(), array(), array(), array(), 'unit_warehouse3' );
+		$this->object->addProduct($item->getId(), 2, array(), array(), array(), array(), array(), 'unit_warehouse3');
 
-		$this->assertEquals( 2, $this->object->get()->getProduct( 0 )->getQuantity() );
-		$this->assertEquals( 'IJKL', $this->object->get()->getProduct( 0 )->getProductCode() );
+		$this->assertEquals(2, $this->object->get()->getProduct(0)->getQuantity());
+		$this->assertEquals('IJKL', $this->object->get()->getProduct(0)->getProductCode());
 	}
 
 
 	public function testDeleteProductFlagError()
 	{
-		$this->object->addProduct( $this->testItem->getId(), 2 );
+		$this->object->addProduct($this->testItem->getId(), 2);
 
-		$item = $this->object->get()->getProduct( 0 );
-		$item->setFlags( \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE );
+		$item = $this->object->get()->getProduct(0);
+		$item->setFlags(\Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE);
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Basket\\Exception' );
-		$this->object->deleteProduct( 0 );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
+		$this->object->deleteProduct(0);
 	}
 
 
 	public function testEditProduct()
 	{
-		$this->object->addProduct( $this->testItem->getId(), 1 );
+		$this->object->addProduct($this->testItem->getId(), 1);
 
-		$item = $this->object->get()->getProduct( 0 );
-		$this->assertEquals( 1, $item->getQuantity() );
+		$item = $this->object->get()->getProduct(0);
+		$this->assertEquals(1, $item->getQuantity());
 
-		$this->object->editProduct( 0, 4 );
+		$this->object->editProduct(0, 4);
 
-		$item = $this->object->get()->getProduct( 0 );
-		$this->assertEquals( 4, $item->getQuantity() );
-		$this->assertEquals( 'U:TESTPSUB01', $item->getProductCode() );
+		$item = $this->object->get()->getProduct(0);
+		$this->assertEquals(4, $item->getQuantity());
+		$this->assertEquals('U:TESTPSUB01', $item->getProductCode());
 	}
 
 
 	public function testEditProductAttributes()
 	{
-		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
+		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager(\TestHelperFrontend::getContext());
 		$search = $productManager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', 'U:TESTP' ) );
-		$items = $productManager->searchItems( $search );
+		$search->setConditions($search->compare('==', 'product.code', 'U:TESTP'));
+		$items = $productManager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \Exception( 'Product not found' );
+		if (($item = reset($items)) === false) {
+			throw new \Exception('Product not found');
 		}
 
-		$attributeManager = \Aimeos\MShop\Attribute\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
+		$attributeManager = \Aimeos\MShop\Attribute\Manager\Factory::createManager(\TestHelperFrontend::getContext());
 		$search = $attributeManager->createSearch();
 		$conditions = array(
-			$search->compare( '==', 'attribute.domain', 'product' ),
-			$search->combine( '||', array(
-				$search->combine( '&&', array(
-					$search->compare( '==', 'attribute.code', 'xs' ),
-					$search->compare( '==', 'attribute.type.code', 'size' ),
-				) ),
-				$search->combine( '&&', array(
-					$search->compare( '==', 'attribute.code', 'white' ),
-					$search->compare( '==', 'attribute.type.code', 'color' ),
-				) ),
-			) )
+			$search->compare('==', 'attribute.domain', 'product'),
+			$search->combine('||', array(
+				$search->combine('&&', array(
+					$search->compare('==', 'attribute.code', 'xs'),
+					$search->compare('==', 'attribute.type.code', 'size'),
+				)),
+				$search->combine('&&', array(
+					$search->compare('==', 'attribute.code', 'white'),
+					$search->compare('==', 'attribute.type.code', 'color'),
+				)),
+			))
 		);
-		$search->setConditions( $search->combine( '&&', $conditions ) );
-		$attributes = $attributeManager->searchItems( $search );
+		$search->setConditions($search->combine('&&', $conditions));
+		$attributes = $attributeManager->searchItems($search);
 
-		if( ( $attribute = reset( $attributes ) ) === false ) {
-			throw new \Exception( 'No attributes available' );
+		if (($attribute = reset($attributes)) === false) {
+			throw new \Exception('No attributes available');
 		}
 
 
-		$this->object->addProduct( $item->getId(), 1, array(), array(), array_keys( $attributes ) );
-		$this->object->editProduct( 0, 4 );
+		$this->object->addProduct($item->getId(), 1, array(), array(), array_keys($attributes));
+		$this->object->editProduct(0, 4);
 
-		$item = $this->object->get()->getProduct( 0 );
-		$this->assertEquals( 2, count( $item->getAttributes() ) );
-		$this->assertEquals( 4, $item->getQuantity() );
+		$item = $this->object->get()->getProduct(0);
+		$this->assertEquals(2, count($item->getAttributes()));
+		$this->assertEquals(4, $item->getQuantity());
 
 
-		$this->object->editProduct( 0, 3, array(), array( $attribute->getType() ) );
+		$this->object->editProduct(0, 3, array(), array($attribute->getType()));
 
-		$item = $this->object->get()->getProduct( 0 );
-		$this->assertEquals( 3, $item->getQuantity() );
-		$this->assertEquals( 1, count( $item->getAttributes() ) );
-		$this->assertEquals( 'U:TESTPSUB01', $item->getProductCode() );
+		$item = $this->object->get()->getProduct(0);
+		$this->assertEquals(3, $item->getQuantity());
+		$this->assertEquals(1, count($item->getAttributes()));
+		$this->assertEquals('U:TESTPSUB01', $item->getProductCode());
 	}
 
 
 	public function testEditProductNotEnoughStock()
 	{
-		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
+		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager(\TestHelperFrontend::getContext());
 		$search = $productManager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', 'IJKL' ) );
-		$items = $productManager->searchItems( $search );
+		$search->setConditions($search->compare('==', 'product.code', 'IJKL'));
+		$items = $productManager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \Exception( 'Product not found' );
+		if (($item = reset($items)) === false) {
+			throw new \Exception('Product not found');
 		}
 
-		$this->object->addProduct( $item->getId(), 2, array(), array(), array(), array(), array(), 'unit_warehouse3' );
+		$this->object->addProduct($item->getId(), 2, array(), array(), array(), array(), array(), 'unit_warehouse3');
 
-		$item = $this->object->get()->getProduct( 0 );
-		$this->assertEquals( 2, $item->getQuantity() );
+		$item = $this->object->get()->getProduct(0);
+		$this->assertEquals(2, $item->getQuantity());
 
 		try
 		{
-			$this->object->editProduct( 0, 5 );
-			throw new \Exception( 'Expected exception not thrown' );
+			$this->object->editProduct(0, 5);
+			throw new \Exception('Expected exception not thrown');
 		}
-		catch( \Aimeos\Controller\Frontend\Basket\Exception $e )
+		catch (\Aimeos\Controller\Frontend\Basket\Exception $e)
 		{
-			$item = $this->object->get()->getProduct( 0 );
-			$this->assertEquals( 3, $item->getQuantity() );
-			$this->assertEquals( 'IJKL', $item->getProductCode() );
+			$item = $this->object->get()->getProduct(0);
+			$this->assertEquals(3, $item->getQuantity());
+			$this->assertEquals('IJKL', $item->getProductCode());
 		}
 	}
 
@@ -633,128 +633,128 @@ 
 	{
 		$context = \TestHelperFrontend::getContext();
 
-		$productManager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
+		$productManager = \Aimeos\MShop\Factory::createManager($context, 'product');
 		$search = $productManager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', 'IJKL' ) );
-		$items = $productManager->searchItems( $search );
+		$search->setConditions($search->compare('==', 'product.code', 'IJKL'));
+		$items = $productManager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \Exception( 'Product not found' );
+		if (($item = reset($items)) === false) {
+			throw new \Exception('Product not found');
 		}
 
-		$orderProductManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base/product' );
+		$orderProductManager = \Aimeos\MShop\Factory::createManager($context, 'order/base/product');
 		$orderProductItem = $orderProductManager->createItem();
-		$orderProductItem->copyFrom( $item );
-		$orderProductItem->setQuantity( 2 );
-		$orderProductItem->setWarehouseCode( 'unit_warehouse3' );
+		$orderProductItem->copyFrom($item);
+		$orderProductItem->setQuantity(2);
+		$orderProductItem->setWarehouseCode('unit_warehouse3');
 
-		$pos = $this->object->get()->addProduct( $orderProductItem, 1 );
+		$pos = $this->object->get()->addProduct($orderProductItem, 1);
 
-		$item = $this->object->get()->getProduct( $pos );
-		$this->assertEquals( 2, $item->getQuantity() );
+		$item = $this->object->get()->getProduct($pos);
+		$this->assertEquals(2, $item->getQuantity());
 
 		try
 		{
-			$this->object->editProduct( $pos, 5 );
-			throw new \Exception( 'Expected exception not thrown' );
+			$this->object->editProduct($pos, 5);
+			throw new \Exception('Expected exception not thrown');
 		}
-		catch( \Aimeos\Controller\Frontend\Basket\Exception $e )
+		catch (\Aimeos\Controller\Frontend\Basket\Exception $e)
 		{
-			$this->assertEquals( 3, $this->object->get()->getProduct( $pos )->getQuantity() );
+			$this->assertEquals(3, $this->object->get()->getProduct($pos)->getQuantity());
 		}
 	}
 
 
 	public function testEditProductStockNotChecked()
 	{
-		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
+		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager(\TestHelperFrontend::getContext());
 		$search = $productManager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', 'IJKL' ) );
-		$items = $productManager->searchItems( $search );
+		$search->setConditions($search->compare('==', 'product.code', 'IJKL'));
+		$items = $productManager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \Exception( 'Product not found' );
+		if (($item = reset($items)) === false) {
+			throw new \Exception('Product not found');
 		}
 
-		$this->object->addProduct( $item->getId(), 2, array(), array(), array(), array(), array(), 'unit_warehouse3' );
+		$this->object->addProduct($item->getId(), 2, array(), array(), array(), array(), array(), 'unit_warehouse3');
 
-		$item = $this->object->get()->getProduct( 0 );
-		$this->assertEquals( 2, $item->getQuantity() );
+		$item = $this->object->get()->getProduct(0);
+		$this->assertEquals(2, $item->getQuantity());
 
-		$this->object->editProduct( 0, 5, array( 'stock' => false ) );
+		$this->object->editProduct(0, 5, array('stock' => false));
 
-		$item = $this->object->get()->getProduct( 0 );
-		$this->assertEquals( 5, $item->getQuantity() );
-		$this->assertEquals( 'IJKL', $item->getProductCode() );
+		$item = $this->object->get()->getProduct(0);
+		$this->assertEquals(5, $item->getQuantity());
+		$this->assertEquals('IJKL', $item->getProductCode());
 	}
 
 
 	public function testEditProductFlagError()
 	{
-		$this->object->addProduct( $this->testItem->getId(), 2 );
+		$this->object->addProduct($this->testItem->getId(), 2);
 
-		$item = $this->object->get()->getProduct( 0 );
-		$item->setFlags( \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE );
+		$item = $this->object->get()->getProduct(0);
+		$item->setFlags(\Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE);
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Basket\\Exception' );
-		$this->object->editProduct( 0, 4 );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
+		$this->object->editProduct(0, 4);
 	}
 
 
 	public function testAddCoupon()
 	{
-		$this->object->addProduct( $this->testItem->getId(), 2 );
-		$this->object->addCoupon( 'GHIJ' );
+		$this->object->addProduct($this->testItem->getId(), 2);
+		$this->object->addCoupon('GHIJ');
 
 		$basket = $this->object->get();
 
-		$this->assertEquals( 1, count( $basket->getCoupons() ) );
+		$this->assertEquals(1, count($basket->getCoupons()));
 	}
 
 
 	public function testAddCouponInvalidCode()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Basket\\Exception' );
-		$this->object->addCoupon( 'invalid' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
+		$this->object->addCoupon('invalid');
 	}
 
 
 	public function testAddCouponMissingRequirements()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Basket\\Exception' );
-		$this->object->addCoupon( 'OPQR' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
+		$this->object->addCoupon('OPQR');
 	}
 
 
 	public function testDeleteCoupon()
 	{
-		$this->object->addProduct( $this->testItem->getId(), 2 );
-		$this->object->addCoupon( '90AB' );
-		$this->object->deleteCoupon( '90AB' );
+		$this->object->addProduct($this->testItem->getId(), 2);
+		$this->object->addCoupon('90AB');
+		$this->object->deleteCoupon('90AB');
 
 		$basket = $this->object->get();
 
-		$this->assertEquals( 0, count( $basket->getCoupons() ) );
+		$this->assertEquals(0, count($basket->getCoupons()));
 	}
 
 
 	public function testClear()
 	{
-		$this->object->addProduct( $this->testItem->getId(), 2 );
+		$this->object->addProduct($this->testItem->getId(), 2);
 		$this->object->clear();
 
-		$this->assertEquals( 0, count( $this->object->get()->getProducts() ) );
+		$this->assertEquals(0, count($this->object->get()->getProducts()));
 	}
 
 
 	public function testSetBillingAddressByItem()
 	{
-		$item = $this->getAddress( 'Example company' );
+		$item = $this->getAddress('Example company');
 
-		$this->object->setAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT, $item );
+		$this->object->setAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT, $item);
 
-		$address = $this->object->get()->getAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT );
-		$this->assertEquals( 'Example company', $address->getCompany() );
+		$address = $this->object->get()->getAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT);
+		$this->assertEquals('Example company', $address->getCompany());
 	}
 
 
@@ -782,37 +782,37 @@ 
 			'order.base.address.flag' => 0,
 		);
 
-		$this->object->setAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT, $fixture );
+		$this->object->setAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT, $fixture);
 
-		$address = $this->object->get()->getAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT );
-		$this->assertEquals( 'Example company', $address->getCompany() );
-		$this->assertEquals( 'Dr.', $address->getTitle() );
-		$this->assertEquals( 'firstunit', $address->getFirstname() );
+		$address = $this->object->get()->getAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT);
+		$this->assertEquals('Example company', $address->getCompany());
+		$this->assertEquals('Dr.', $address->getTitle());
+		$this->assertEquals('firstunit', $address->getFirstname());
 	}
 
 
 	public function testSetBillingAddressByArrayError()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Basket\\Exception' );
-		$this->object->setAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT, array( 'error' => false ) );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
+		$this->object->setAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT, array('error' => false));
 	}
 
 
 	public function testSetBillingAddressParameterError()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Basket\\Exception' );
-		$this->object->setAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT, 'error' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
+		$this->object->setAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT, 'error');
 	}
 
 
 	public function testSetDeliveryAddressByItem()
 	{
-		$item = $this->getAddress( 'Example company' );
+		$item = $this->getAddress('Example company');
 
-		$this->object->setAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY, $item );
+		$this->object->setAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY, $item);
 
-		$address = $this->object->get()->getAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY );
-		$this->assertEquals( 'Example company', $address->getCompany() );
+		$address = $this->object->get()->getAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY);
+		$this->assertEquals('Example company', $address->getCompany());
 	}
 
 
@@ -839,113 +839,113 @@ 
 			'order.base.address.website' => 'www.example.com',
 			'order.base.address.flag' => 0,
 		);
-		$this->object->setAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY, $fixture );
+		$this->object->setAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY, $fixture);
 
-		$address = $this->object->get()->getAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY );
-		$this->assertEquals( 'Example company', $address->getCompany() );
-		$this->assertEquals( 'Dr.', $address->getTitle() );
-		$this->assertEquals( 'firstunit', $address->getFirstname() );
+		$address = $this->object->get()->getAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY);
+		$this->assertEquals('Example company', $address->getCompany());
+		$this->assertEquals('Dr.', $address->getTitle());
+		$this->assertEquals('firstunit', $address->getFirstname());
 	}
 
 
 	public function testSetDeliveryAddressByArrayError()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Basket\\Exception' );
-		$this->object->setAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY, array( 'error' => false ) );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
+		$this->object->setAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY, array('error' => false));
 	}
 
 
 	public function testSetDeliveryAddressTypeError()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Basket\\Exception' );
-		$this->object->setAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY, 'error' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
+		$this->object->setAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY, 'error');
 	}
 
 
 	public function testSetServicePayment()
 	{
-		$service = $this->getService( 'unitpaymentcode' );
+		$service = $this->getService('unitpaymentcode');
 
-		$this->object->setService( 'payment', $service->getId(), array() );
-		$this->assertEquals( 'unitpaymentcode', $this->object->get()->getService( 'payment' )->getCode() );
+		$this->object->setService('payment', $service->getId(), array());
+		$this->assertEquals('unitpaymentcode', $this->object->get()->getService('payment')->getCode());
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Basket\\Exception' );
-		$this->object->setService( 'payment', $service->getId(), array( 'prepay' => true ) );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
+		$this->object->setService('payment', $service->getId(), array('prepay' => true));
 	}
 
 
 	public function testSetDeliveryOption()
 	{
-		$service = $this->getService( 'unitcode' );
+		$service = $this->getService('unitcode');
 
-		$this->object->setService( 'delivery', $service->getId(), array() );
-		$this->assertEquals( 'unitcode', $this->object->get()->getService( 'delivery' )->getCode() );
+		$this->object->setService('delivery', $service->getId(), array());
+		$this->assertEquals('unitcode', $this->object->get()->getService('delivery')->getCode());
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Basket\\Exception' );
-		$this->object->setService( 'delivery', $service->getId(), array( 'fast shipping' => true, 'air shipping' => false ) );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
+		$this->object->setService('delivery', $service->getId(), array('fast shipping' => true, 'air shipping' => false));
 	}
 
 
 	public function testCheckLocale()
 	{
-		$this->object->addProduct( $this->testItem->getId(), 2 );
-		$this->object->addCoupon( 'OPQR' );
+		$this->object->addProduct($this->testItem->getId(), 2);
+		$this->object->addCoupon('OPQR');
 
-		$this->object->setService( 'payment', $this->getService( 'unitpaymentcode' )->getId() );
-		$this->object->setService( 'delivery', $this->getService( 'unitcode' )->getId() );
+		$this->object->setService('payment', $this->getService('unitpaymentcode')->getId());
+		$this->object->setService('delivery', $this->getService('unitcode')->getId());
 
 		$basket = $this->object->get();
 		$price = $basket->getPrice();
 
-		foreach( $basket->getProducts() as $product )
+		foreach ($basket->getProducts() as $product)
 		{
-			$this->assertEquals( 2, $product->getQuantity() );
-			$product->getPrice()->setCurrencyId( 'CHF' );
+			$this->assertEquals(2, $product->getQuantity());
+			$product->getPrice()->setCurrencyId('CHF');
 		}
 
-		$basket->getService( 'delivery' )->getPrice()->setCurrencyId( 'CHF' );
-		$basket->getService( 'payment' )->getPrice()->setCurrencyId( 'CHF' );
-		$basket->getLocale()->setCurrencyId( 'CHF' );
-		$price->setCurrencyId( 'CHF' );
+		$basket->getService('delivery')->getPrice()->setCurrencyId('CHF');
+		$basket->getService('payment')->getPrice()->setCurrencyId('CHF');
+		$basket->getLocale()->setCurrencyId('CHF');
+		$price->setCurrencyId('CHF');
 
-		$this->context->getLocale()->setCurrencyId( 'CHF' );
-		$this->object->setAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT, $this->getAddress( 'Example company' ) );
+		$this->context->getLocale()->setCurrencyId('CHF');
+		$this->object->setAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT, $this->getAddress('Example company'));
 
-		$this->context->getSession()->set( 'aimeos/basket/currency', 'CHF' );
-		$this->context->getLocale()->setCurrencyId( 'EUR' );
+		$this->context->getSession()->set('aimeos/basket/currency', 'CHF');
+		$this->context->getLocale()->setCurrencyId('EUR');
 
-		$this->context->getSession()->set( 'aimeos/basket/content-unittest-en-EUR-', null );
+		$this->context->getSession()->set('aimeos/basket/content-unittest-en-EUR-', null);
 
-		$object = new \Aimeos\Controller\Frontend\Basket\Standard( $this->context );
+		$object = new \Aimeos\Controller\Frontend\Basket\Standard($this->context);
 		$basket = $object->get();
 
-		foreach( $basket->getProducts() as $product )
+		foreach ($basket->getProducts() as $product)
 		{
-			$this->assertEquals( 'EUR', $product->getPrice()->getCurrencyId() );
-			$this->assertEquals( 2, $product->getQuantity() );
+			$this->assertEquals('EUR', $product->getPrice()->getCurrencyId());
+			$this->assertEquals(2, $product->getQuantity());
 		}
 
-		$this->assertEquals( 'EUR', $basket->getService( 'payment' )->getPrice()->getCurrencyId() );
-		$this->assertEquals( 'EUR', $basket->getService( 'delivery' )->getPrice()->getCurrencyId() );
-		$this->assertEquals( 'EUR', $basket->getLocale()->getCurrencyId() );
-		$this->assertEquals( 'EUR', $basket->getPrice()->getCurrencyId() );
+		$this->assertEquals('EUR', $basket->getService('payment')->getPrice()->getCurrencyId());
+		$this->assertEquals('EUR', $basket->getService('delivery')->getPrice()->getCurrencyId());
+		$this->assertEquals('EUR', $basket->getLocale()->getCurrencyId());
+		$this->assertEquals('EUR', $basket->getPrice()->getCurrencyId());
 	}
 
 
 	/**
 	 * @param string $company
 	 */
-	protected function getAddress( $company )
+	protected function getAddress($company)
 	{
-		$customer = \Aimeos\MShop\Customer\Manager\Factory::createManager( \TestHelperFrontend::getContext(), 'Standard' );
-		$addressManager = $customer->getSubManager( 'address', 'Standard' );
+		$customer = \Aimeos\MShop\Customer\Manager\Factory::createManager(\TestHelperFrontend::getContext(), 'Standard');
+		$addressManager = $customer->getSubManager('address', 'Standard');
 
 		$search = $addressManager->createSearch();
-		$search->setConditions( $search->compare( '==', 'customer.address.company', $company ) );
-		$items = $addressManager->searchItems( $search );
+		$search->setConditions($search->compare('==', 'customer.address.company', $company));
+		$items = $addressManager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \Exception( sprintf( 'No address item with company "%1$s" found', $company ) );
+		if (($item = reset($items)) === false) {
+			throw new \Exception(sprintf('No address item with company "%1$s" found', $company));
 		}
 
 		return $item;
@@ -955,17 +955,17 @@ 
 	/**
 	 * @param string $code
 	 */
-	protected function getService( $code )
+	protected function getService($code)
 	{
-		$serviceManager = \Aimeos\MShop\Service\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
+		$serviceManager = \Aimeos\MShop\Service\Manager\Factory::createManager(\TestHelperFrontend::getContext());
 
 		$search = $serviceManager->createSearch();
-		$search->setConditions( $search->compare( '==', 'service.code', $code ) );
+		$search->setConditions($search->compare('==', 'service.code', $code));
 
-		$result = $serviceManager->searchItems( $search, array( 'text' ) );
+		$result = $serviceManager->searchItems($search, array('text'));
 
-		if( ( $item = reset( $result ) ) === false ) {
-			throw new \Exception( sprintf( 'No service item with code "%1$s" found', $code ) );
+		if (($item = reset($result)) === false) {
+			throw new \Exception(sprintf('No service item with code "%1$s" found', $code));
 		}
 
 		return $item;

Braces +4 added lines, -8 removed lines

@@ -359,8 +359,7 @@ 
 		{
 			$this->object->addProduct( $item->getId(), 5, array(), array(), array(), array(), array(), 'unit_warehouse3' );
 			throw new \Exception( 'Expected exception not thrown' );
-		}
-		catch( \Aimeos\Controller\Frontend\Basket\Exception $e )
+		} catch( \Aimeos\Controller\Frontend\Basket\Exception $e )
 		{
 			$item = $this->object->get()->getProduct( 0 );
 			$this->assertEquals( 3, $item->getQuantity() );
@@ -385,8 +384,7 @@ 
 		{
 			$this->object->addProduct( $item->getId(), 5, array(), array(), array(), array(), array(), 'unit_warehouse2' );
 			throw new \Exception( 'Expected exception not thrown' );
-		}
-		catch( \Aimeos\Controller\Frontend\Basket\Exception $e )
+		} catch( \Aimeos\Controller\Frontend\Basket\Exception $e )
 		{
 			$this->assertEquals( array(), $this->object->get()->getProducts() );
 		}
@@ -619,8 +617,7 @@ 
 		{
 			$this->object->editProduct( 0, 5 );
 			throw new \Exception( 'Expected exception not thrown' );
-		}
-		catch( \Aimeos\Controller\Frontend\Basket\Exception $e )
+		} catch( \Aimeos\Controller\Frontend\Basket\Exception $e )
 		{
 			$item = $this->object->get()->getProduct( 0 );
 			$this->assertEquals( 3, $item->getQuantity() );
@@ -657,8 +654,7 @@ 
 		{
 			$this->object->editProduct( $pos, 5 );
 			throw new \Exception( 'Expected exception not thrown' );
-		}
-		catch( \Aimeos\Controller\Frontend\Basket\Exception $e )
+		} catch( \Aimeos\Controller\Frontend\Basket\Exception $e )
 		{
 			$this->assertEquals( 3, $this->object->get()->getProduct( $pos )->getQuantity() );
 		}