aimeos / ai-controller-frontend

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

Spacing +81 added lines, -81 removed lines

@@ -17,125 +17,125 @@ 
 
 	protected function setUp()
 	{
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 
 		$this->context = \TestHelperFrontend::getContext();
-		$this->object = new \Aimeos\Controller\Frontend\Service\Standard( $this->context );
+		$this->object = new \Aimeos\Controller\Frontend\Service\Standard($this->context);
 	}
 
 
 	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, $this->context );
+		unset($this->object, $this->context);
 
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 	}
 
 
 	public function testCheckAttributes()
 	{
-		$attributes = $this->object->checkAttributes( $this->getServiceItem()->getId(), [] );
-		$this->assertEquals( [], $attributes );
+		$attributes = $this->object->checkAttributes($this->getServiceItem()->getId(), []);
+		$this->assertEquals([], $attributes);
 	}
 
 
 	public function testGetProviders()
 	{
-		$providers = $this->object->getProviders( 'delivery' );
-		$this->assertGreaterThan( 0, count( $providers ) );
+		$providers = $this->object->getProviders('delivery');
+		$this->assertGreaterThan(0, count($providers));
 
-		foreach( $providers as $provider ) {
-			$this->assertInstanceOf( '\\Aimeos\\MShop\\Service\\Provider\\Iface', $provider );
+		foreach ($providers as $provider) {
+			$this->assertInstanceOf('\\Aimeos\\MShop\\Service\\Provider\\Iface', $provider);
 		}
 	}
 
 
 	public function testGetProvider()
 	{
-		$provider = $this->object->getProvider( $this->getServiceItem()->getId() );
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Service\\Provider\\Iface', $provider );
+		$provider = $this->object->getProvider($this->getServiceItem()->getId());
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Service\\Provider\\Iface', $provider);
 	}
 
 
 	public function testProcess()
 	{
 		$form = new \Aimeos\MShop\Common\Item\Helper\Form\Standard();
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'order' )->createItem();
-		$serviceId = \Aimeos\MShop\Factory::createManager( $this->context, 'service' )->findItem( 'unitcode' )->getId();
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'order')->createItem();
+		$serviceId = \Aimeos\MShop\Factory::createManager($this->context, 'service')->findItem('unitcode')->getId();
 
-		$provider = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Provider\\Delivery\\Standard' )
+		$provider = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Provider\\Delivery\\Standard')
 			->disableOriginalConstructor()
-			->setMethods( ['process'] )
+			->setMethods(['process'])
 			->getMock();
 
-		$manager = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Manager\\Standard' )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( ['getProvider'] )
+		$manager = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Manager\\Standard')
+			->setConstructorArgs([$this->context])
+			->setMethods(['getProvider'])
 			->getMock();
 
-		\Aimeos\MShop\Factory::injectManager( $this->context, 'service', $manager );
+		\Aimeos\MShop\Factory::injectManager($this->context, 'service', $manager);
 
-		$provider->expects( $this->once() )->method( 'process' )->will( $this->returnValue( $form ) );
-		$manager->expects( $this->once() )->method( 'getProvider' )->will( $this->returnValue( $provider ) );
+		$provider->expects($this->once())->method('process')->will($this->returnValue($form));
+		$manager->expects($this->once())->method('getProvider')->will($this->returnValue($provider));
 
 
-		$result = $this->object->process( $item, $serviceId, [], [] );
-		$this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Helper\Form\Iface', $result );
+		$result = $this->object->process($item, $serviceId, [], []);
+		$this->assertInstanceOf('\Aimeos\MShop\Common\Item\Helper\Form\Iface', $result);
 	}
 
 
 	public function testUpdateSync()
 	{
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'order' )->createItem();
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'order')->createItem();
 
-		$stream = $this->getMockBuilder( 'Psr\Http\Message\StreamInterface' )->getMock();
-		$request = $this->getMockBuilder( '\Psr\Http\Message\ServerRequestInterface' )->getMock();
-		$response = $this->getMockBuilder( '\Aimeos\MW\View\Helper\Response\Iface' )
+		$stream = $this->getMockBuilder('Psr\Http\Message\StreamInterface')->getMock();
+		$request = $this->getMockBuilder('\Psr\Http\Message\ServerRequestInterface')->getMock();
+		$response = $this->getMockBuilder('\Aimeos\MW\View\Helper\Response\Iface')
 			->getMock();
 
-		$provider = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Provider\\Delivery\\Standard' )
-			->setMethods( ['updateSync', 'query', 'isImplemented'] )
+		$provider = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Provider\\Delivery\\Standard')
+			->setMethods(['updateSync', 'query', 'isImplemented'])
 			->disableOriginalConstructor()
 			->getMock();
 
-		$manager = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Manager\\Standard' )
-			->setConstructorArgs( array( $this->context ) )
-			->setMethods( ['getProvider'] )
+		$manager = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Manager\\Standard')
+			->setConstructorArgs(array($this->context))
+			->setMethods(['getProvider'])
 			->getMock();
 
-		\Aimeos\MShop\Factory::injectManager( $this->context, 'service', $manager );
+		\Aimeos\MShop\Factory::injectManager($this->context, 'service', $manager);
 
 
-		$request->expects( $this->once() )->method( 'getQueryParams' )->will( $this->returnValue( ['code' => 'unitcode'] ) );
-		$response->expects( $this->once() )->method( 'createStreamFromString' )->will( $this->returnValue( $stream ) );
-		$manager->expects( $this->once() )->method( 'getProvider' )->will( $this->returnValue( $provider ) );
-		$provider->expects( $this->once() )->method( 'updateSync' )->will( $this->returnValue( $item ) );
-		$provider->expects( $this->once() )->method( 'isImplemented' )->will( $this->returnValue( true ) );
-		$provider->expects( $this->once() )->method( 'query' );
+		$request->expects($this->once())->method('getQueryParams')->will($this->returnValue(['code' => 'unitcode']));
+		$response->expects($this->once())->method('createStreamFromString')->will($this->returnValue($stream));
+		$manager->expects($this->once())->method('getProvider')->will($this->returnValue($provider));
+		$provider->expects($this->once())->method('updateSync')->will($this->returnValue($item));
+		$provider->expects($this->once())->method('isImplemented')->will($this->returnValue(true));
+		$provider->expects($this->once())->method('query');
 
-		$this->object->updateSync( $request, $response, [], 'paypalexpress', -1 );
+		$this->object->updateSync($request, $response, [], 'paypalexpress', -1);
 	}
 
 
 	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);
 		}
 	}
 
@@ -143,83 +143,83 @@ 
 	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 \RuntimeException( 'No service item found' );
+		if (($service = reset($services)) === false) {
+			throw new \RuntimeException('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\\MShop\\Exception' );
-		$this->object->getServiceAttributes( 'invalid', -1, self::$basket );
+		$this->setExpectedException('\\Aimeos\\MShop\\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 \RuntimeException( 'No service item found' );
+		if (($service = reset($services)) === false) {
+			throw new \RuntimeException('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\\MShop\\Exception' );
-		$this->object->getServicePrice( 'invalid', -1, $basket );
+		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
+		$this->object->getServicePrice('invalid', -1, $basket);
 	}
 
 
 	public function testCheckServiceAttributes()
 	{
 		$service = $this->getServiceItem();
-		$attributes = $this->object->checkServiceAttributes( 'delivery', $service->getId(), [] );
+		$attributes = $this->object->checkServiceAttributes('delivery', $service->getId(), []);
 
-		$this->assertEquals( [], $attributes );
+		$this->assertEquals([], $attributes);
 	}
 
 
@@ -228,7 +228,7 @@ 
 	 */
 	protected function getServiceItem()
 	{
-		$manager = \Aimeos\MShop\Service\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
-		return $manager->findItem( 'unitcode' );
+		$manager = \Aimeos\MShop\Service\Manager\Factory::createManager(\TestHelperFrontend::getContext());
+		return $manager->findItem('unitcode');
 	}
 }

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

Spacing +57 added lines, -57 removed lines

@@ -20,161 +20,161 @@
 	{
 		$this->context = \TestHelperFrontend::getContext();
 
-		$this->stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Service\Standard' )
+		$this->stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Service\Standard')
 			->disableOriginalConstructor()
 			->getMock();
 
-		$this->object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Service\Decorator\Base' )
-			->setConstructorArgs( [$this->stub, $this->context] )
+		$this->object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Service\Decorator\Base')
+			->setConstructorArgs([$this->stub, $this->context])
 			->getMockForAbstractClass();
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->context, $this->object, $this->stub );
+		unset($this->context, $this->object, $this->stub);
 	}
 
 
 	public function testConstructException()
 	{
-		$stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Iface' )->getMock();
+		$stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Iface')->getMock();
 
-		$this->setExpectedException( '\Aimeos\Controller\Frontend\Exception' );
+		$this->setExpectedException('\Aimeos\Controller\Frontend\Exception');
 
-		$this->getMockBuilder( '\Aimeos\Controller\Frontend\Service\Decorator\Base' )
-			->setConstructorArgs( [$stub, $this->context] )
+		$this->getMockBuilder('\Aimeos\Controller\Frontend\Service\Decorator\Base')
+			->setConstructorArgs([$stub, $this->context])
 			->getMockForAbstractClass();
 	}
 
 
 	public function testCall()
 	{
-		$stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Service\Standard' )
+		$stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Service\Standard')
 			->disableOriginalConstructor()
-			->setMethods( ['invalid'] )
+			->setMethods(['invalid'])
 			->getMock();
 
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Service\Decorator\Base' )
-			->setConstructorArgs( [$stub, $this->context] )
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Service\Decorator\Base')
+			->setConstructorArgs([$stub, $this->context])
 			->getMockForAbstractClass();
 
-		$stub->expects( $this->once() )->method( 'invalid' )->will( $this->returnValue( true ) );
+		$stub->expects($this->once())->method('invalid')->will($this->returnValue(true));
 
-		$this->assertTrue( $object->invalid() );
+		$this->assertTrue($object->invalid());
 	}
 
 
 	public function testCheckAttributes()
 	{
-		$this->stub->expects( $this->once() )->method( 'checkAttributes' )
-			->will( $this->returnValue( [] ) );
+		$this->stub->expects($this->once())->method('checkAttributes')
+			->will($this->returnValue([]));
 
-		$this->assertEquals( [], $this->object->checkAttributes( -1, [] ) );
+		$this->assertEquals([], $this->object->checkAttributes( -1, [] ));
 	}
 
 
 	public function testGetProvider()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'service' );
-		$provider = $manager->getProvider( $manager->findItem( 'unitcode', [], 'service', 'delivery' ) );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'service');
+		$provider = $manager->getProvider($manager->findItem('unitcode', [], 'service', 'delivery'));
 
-		$this->stub->expects( $this->once() )->method( 'getProvider' )
-			->will( $this->returnValue( $provider ) );
+		$this->stub->expects($this->once())->method('getProvider')
+			->will($this->returnValue($provider));
 
-		$this->assertSame( $provider, $this->object->getProvider( -1 ) );
+		$this->assertSame($provider, $this->object->getProvider( -1 ));
 	}
 
 
 	public function testGetProviders()
 	{
-		$this->stub->expects( $this->once() )->method( 'getProviders' )
-			->will( $this->returnValue( [] ) );
+		$this->stub->expects($this->once())->method('getProviders')
+			->will($this->returnValue([]));
 
-		$this->assertEquals( [], $this->object->getProviders( 'payment' ) );
+		$this->assertEquals([], $this->object->getProviders('payment'));
 	}
 
 
 	public function testProcess()
 	{
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'order' )->createItem();
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'order')->createItem();
 
-		$this->stub->expects( $this->once() )->method( 'process' )
-			->will( $this->returnValue( new \Aimeos\MShop\Common\Item\Helper\Form\Standard() ) );
+		$this->stub->expects($this->once())->method('process')
+			->will($this->returnValue(new \Aimeos\MShop\Common\Item\Helper\Form\Standard()));
 
-		$this->assertInstanceOf( 'Aimeos\MShop\Common\Item\Helper\Form\Iface', $this->object->process( $item, -1, [], [] ) );
+		$this->assertInstanceOf('Aimeos\MShop\Common\Item\Helper\Form\Iface', $this->object->process($item, -1, [], []));
 	}
 
 
 	public function testUpdateSync()
 	{
-		$response = $this->getMockBuilder( '\Psr\Http\Message\ResponseInterface' )->getMock();
-		$request = $this->getMockBuilder( '\Psr\Http\Message\ServerRequestInterface' )->getMock();
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'order' )->createItem();
+		$response = $this->getMockBuilder('\Psr\Http\Message\ResponseInterface')->getMock();
+		$request = $this->getMockBuilder('\Psr\Http\Message\ServerRequestInterface')->getMock();
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'order')->createItem();
 
-		$this->stub->expects( $this->once() )->method( 'updateSync' )
-			->will( $this->returnValue( $item ) );
+		$this->stub->expects($this->once())->method('updateSync')
+			->will($this->returnValue($item));
 
-		$this->assertInstanceOf( 'Aimeos\MShop\Order\Item\Iface', $this->object->updateSync( $request, $response, [], 'test', -1 ) );
+		$this->assertInstanceOf('Aimeos\MShop\Order\Item\Iface', $this->object->updateSync($request, $response, [], 'test', -1));
 	}
 
 
 	public function testGetServices()
 	{
-		$basket = \Aimeos\MShop\Factory::createManager( $this->context, 'order/base' )->createItem();
+		$basket = \Aimeos\MShop\Factory::createManager($this->context, 'order/base')->createItem();
 
-		$this->stub->expects( $this->once() )->method( 'getServices' )
-			->will( $this->returnValue( [] ) );
+		$this->stub->expects($this->once())->method('getServices')
+			->will($this->returnValue([]));
 
-		$this->assertEquals( [], $this->object->getServices( 'payment', $basket ) );
+		$this->assertEquals([], $this->object->getServices('payment', $basket));
 	}
 
 
 	public function testGetServiceAttributes()
 	{
-		$basket = \Aimeos\MShop\Factory::createManager( $this->context, 'order/base' )->createItem();
+		$basket = \Aimeos\MShop\Factory::createManager($this->context, 'order/base')->createItem();
 
-		$this->stub->expects( $this->once() )->method( 'getServiceAttributes' )
-			->will( $this->returnValue( [] ) );
+		$this->stub->expects($this->once())->method('getServiceAttributes')
+			->will($this->returnValue([]));
 
-		$this->assertEquals( [], $this->object->getServiceAttributes( 'payment', -1, $basket ) );
+		$this->assertEquals([], $this->object->getServiceAttributes('payment', -1, $basket));
 	}
 
 
 	public function testGetServicePrice()
 	{
-		$priceItem = \Aimeos\MShop\Factory::createManager( $this->context, 'price' )->createItem();
-		$basket = \Aimeos\MShop\Factory::createManager( $this->context, 'order/base' )->createItem();
+		$priceItem = \Aimeos\MShop\Factory::createManager($this->context, 'price')->createItem();
+		$basket = \Aimeos\MShop\Factory::createManager($this->context, 'order/base')->createItem();
 
-		$this->stub->expects( $this->once() )->method( 'getServicePrice' )
-			->will( $this->returnValue( $priceItem ) );
+		$this->stub->expects($this->once())->method('getServicePrice')
+			->will($this->returnValue($priceItem));
 
-		$this->assertInstanceOf( '\Aimeos\MShop\Price\Item\Iface', $this->object->getServicePrice( 'payment', -1, $basket ) );
+		$this->assertInstanceOf('\Aimeos\MShop\Price\Item\Iface', $this->object->getServicePrice('payment', -1, $basket));
 	}
 
 
 	public function testCheckServiceAttributes()
 	{
-		$this->stub->expects( $this->once() )->method( 'checkServiceAttributes' )
-			->will( $this->returnValue( [] ) );
+		$this->stub->expects($this->once())->method('checkServiceAttributes')
+			->will($this->returnValue([]));
 
-		$this->assertEquals( [], $this->object->checkServiceAttributes( 'payment', -1, [] ) );
+		$this->assertEquals([], $this->object->checkServiceAttributes('payment', -1, []));
 	}
 
 
 	public function testGetController()
 	{
-		$result = $this->access( 'getController' )->invokeArgs( $this->object, [] );
+		$result = $this->access('getController')->invokeArgs($this->object, []);
 
-		$this->assertSame( $this->stub, $result );
+		$this->assertSame($this->stub, $result);
 	}
 
 
-	protected function access( $name )
+	protected function access($name)
 	{
-		$class = new \ReflectionClass( '\Aimeos\Controller\Frontend\Service\Decorator\Base' );
-		$method = $class->getMethod( $name );
-		$method->setAccessible( true );
+		$class = new \ReflectionClass('\Aimeos\Controller\Frontend\Service\Decorator\Base');
+		$method = $class->getMethod($name);
+		$method->setAccessible(true);
 
 		return $method;
 	}

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

Spacing +5 added lines, -5 removed lines

@@ -30,7 +30,7 @@ 
 	 * @param string[] $attributes List of attribute codes as keys and strings entered by the customer as value
 	 * @return string[] List of attributes codes as keys and error messages as values for invalid or missing values
 	 */
-	public function checkAttributes( $serviceId, array $attributes );
+	public function checkAttributes($serviceId, array $attributes);
 
 	/**
 	 * Returns the service item for the given ID
@@ -39,7 +39,7 @@ 
 	 * @param array $ref List of domains for which the items referenced by the services should be fetched too
 	 * @return \Aimeos\MShop\Service\Provider\Iface Service provider object
 	 */
-	public function getProvider( $serviceId, $ref = ['media', 'price', 'text'] );
+	public function getProvider($serviceId, $ref = ['media', 'price', 'text']);
 
 	/**
 	 * Returns the service providers for the given type
@@ -48,7 +48,7 @@ 
 	 * @param array $ref List of domains for which the items referenced by the services should be fetched too
 	 * @return \Aimeos\MShop\Service\Provider\Iface[] List of service IDs as keys and service provider objects as values
 	 */
-	public function getProviders( $type = null, $ref = ['media', 'price', 'text'] );
+	public function getProviders($type = null, $ref = ['media', 'price', 'text']);
 
 	/**
 	 * Processes the service for the given order, e.g. payment and delivery services
@@ -61,7 +61,7 @@ 
 	 * @return \Aimeos\MShop\Common\Item\Helper\Form\Iface|null Form object with URL, parameters, etc.
 	 * 	or null if no form data is required
 	 */
-	public function process( \Aimeos\MShop\Order\Item\Iface $orderItem, $serviceId, array $urls, array $params );
+	public function process(\Aimeos\MShop\Order\Item\Iface $orderItem, $serviceId, array $urls, array $params);
 
 	/**
 	 * Updates the payment or delivery status for the given request
@@ -74,5 +74,5 @@ 
 	 * @param string $orderid Unique ID of the order whose payment status should be updated
 	 * @return \Aimeos\MShop\Order\Item\Iface $orderItem Order item that has been updated
 	 */
-	public function updateSync( ServerRequestInterface $request, ResponseInterface $response, array $urls, $code, $orderid );
+	public function updateSync(ServerRequestInterface $request, ResponseInterface $response, array $urls, $code, $orderid);
 }

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

Spacing +70 added lines, -70 removed lines

@@ -35,12 +35,12 @@ 
 	 * @param string[] $attributes List of attribute codes as keys and strings entered by the customer as value
 	 * @return string[] List of attributes codes as keys and error messages as values for invalid or missing values
 	 */
-	public function checkAttributes( $serviceId, array $attributes )
+	public function checkAttributes($serviceId, array $attributes)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
-		$provider = $manager->getProvider( $manager->getItem( $serviceId, [], true ) );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service');
+		$provider = $manager->getProvider($manager->getItem($serviceId, [], true));
 
-		return array_filter( $provider->checkConfigFE( $attributes ) );
+		return array_filter($provider->checkConfigFE($attributes));
 	}
 
 
@@ -51,10 +51,10 @@ 
 	 * @param string[] $ref List of domain names whose items should be fetched too
 	 * @return \Aimeos\MShop\Service\Provider\Iface Service provider object
 	 */
-	public function getProvider( $serviceId, $ref = ['media', 'price', 'text'] )
+	public function getProvider($serviceId, $ref = ['media', 'price', 'text'])
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
-		return $manager->getProvider( $manager->getItem( $serviceId, $ref, true ) );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service');
+		return $manager->getProvider($manager->getItem($serviceId, $ref, true));
 	}
 
 
@@ -65,26 +65,26 @@ 
 	 * @param string[] $ref List of domain names whose items should be fetched too
 	 * @return \Aimeos\MShop\Service\Provider\Iface[] List of service IDs as keys and service provider objects as values
 	 */
-	public function getProviders( $type = null, $ref = ['media', 'price', 'text'] )
+	public function getProviders($type = null, $ref = ['media', 'price', 'text'])
 	{
 		$list = [];
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service');
 
-		$search = $manager->createSearch( true );
-		$search->setSortations( array( $search->sort( '+', 'service.position' ) ) );
+		$search = $manager->createSearch(true);
+		$search->setSortations(array($search->sort('+', 'service.position')));
 
-		if( $type != null )
+		if ($type != null)
 		{
 			$expr = array(
 				$search->getConditions(),
-				$search->compare( '==', 'service.type.code', $type ),
-				$search->compare( '==', 'service.type.domain', 'service' ),
+				$search->compare('==', 'service.type.code', $type),
+				$search->compare('==', 'service.type.domain', 'service'),
 			);
-			$search->setConditions( $search->combine( '&&', $expr ) );
+			$search->setConditions($search->combine('&&', $expr));
 		}
 
-		foreach( $manager->searchItems( $search, $ref ) as $id => $item ) {
-			$list[$id] = $manager->getProvider( $item );
+		foreach ($manager->searchItems($search, $ref) as $id => $item) {
+			$list[$id] = $manager->getProvider($item);
 		}
 
 		return $list;
@@ -102,14 +102,14 @@ 
 	 * @return \Aimeos\MShop\Common\Item\Helper\Form\Iface|null Form object with URL, parameters, etc.
 	 * 	or null if no form data is required
 	 */
-	public function process( \Aimeos\MShop\Order\Item\Iface $orderItem, $serviceId, array $urls, array $params )
+	public function process(\Aimeos\MShop\Order\Item\Iface $orderItem, $serviceId, array $urls, array $params)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service');
 
-		$provider = $manager->getProvider( $manager->getItem( $serviceId, [], true ) );
-		$provider->injectGlobalConfigBE( $urls );
+		$provider = $manager->getProvider($manager->getItem($serviceId, [], true));
+		$provider->injectGlobalConfigBE($urls);
 
-		return $provider->process( $orderItem, $params );
+		return $provider->process($orderItem, $params);
 	}
 
 
@@ -124,38 +124,38 @@ 
 	 * @param string $orderid Unique ID of the order whose payment status should be updated
 	 * @return \Aimeos\MShop\Order\Item\Iface $orderItem Order item that has been updated
 	 */
-	public function updateSync( ServerRequestInterface $request, ResponseInterface $response, array $urls, $code, $orderid )
+	public function updateSync(ServerRequestInterface $request, ResponseInterface $response, array $urls, $code, $orderid)
 	{
 		$params = (array) $request->getAttributes() + (array) $request->getParsedBody() + (array) $request->getQueryParams();
 		$params['orderid'] = $orderid;
 
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'service' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'service');
 
-		$provider = $manager->getProvider( $manager->findItem( $code ) );
-		$provider->injectGlobalConfigBE( $urls );
+		$provider = $manager->getProvider($manager->findItem($code));
+		$provider->injectGlobalConfigBE($urls);
 
 		$body = (string) $request->getBody();
 		$output = null;
 		$headers = [];
 
-		if( ( $orderItem = $provider->updateSync( $params, $body, $output, $headers ) ) !== null )
+		if (($orderItem = $provider->updateSync($params, $body, $output, $headers)) !== null)
 		{
-			if( $orderItem->getPaymentStatus() === \Aimeos\MShop\Order\Item\Base::PAY_UNFINISHED
-				&& $provider->isImplemented( \Aimeos\MShop\Service\Provider\Payment\Base::FEAT_QUERY )
+			if ($orderItem->getPaymentStatus() === \Aimeos\MShop\Order\Item\Base::PAY_UNFINISHED
+				&& $provider->isImplemented(\Aimeos\MShop\Service\Provider\Payment\Base::FEAT_QUERY)
 			) {
-				$provider->query( $orderItem );
+				$provider->query($orderItem);
 			}
 
 			// update stock, coupons, etc.
-			\Aimeos\Controller\Frontend\Factory::createController( $context, 'order' )->update( $orderItem );
+			\Aimeos\Controller\Frontend\Factory::createController($context, 'order')->update($orderItem);
 		}
 
-		foreach( $headers as $name => $header ) {
-			$response->withHeader( $name, $header );
+		foreach ($headers as $name => $header) {
+			$response->withHeader($name, $header);
 		}
 
-		$response->withBody( $response->createStreamFromString( $output ) );
+		$response->withBody($response->createStreamFromString($output));
 
 		return $orderItem;
 	}
@@ -171,38 +171,38 @@ 
 	 * @throws \Exception If an error occurs
 	 * @deprecated Use getProviders() instead
 	 */
-	public function getServices( $type, \Aimeos\MShop\Order\Item\Base\Iface $basket, $ref = ['media', 'price', 'text'] )
+	public function getServices($type, \Aimeos\MShop\Order\Item\Base\Iface $basket, $ref = ['media', 'price', 'text'])
 	{
-		$serviceManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
+		$serviceManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service');
 
-		$search = $serviceManager->createSearch( true );
+		$search = $serviceManager->createSearch(true);
 		$expr = array(
 			$search->getConditions(),
-			$search->compare( '==', 'service.type.domain', 'service' ),
-			$search->compare( '==', 'service.type.code', $type ),
+			$search->compare('==', 'service.type.domain', 'service'),
+			$search->compare('==', 'service.type.code', $type),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSortations( array( $search->sort( '+', 'service.position' ) ) );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSortations(array($search->sort('+', 'service.position')));
 
-		$items = $serviceManager->searchItems( $search, $ref );
+		$items = $serviceManager->searchItems($search, $ref);
 
 
-		foreach( $items as $id => $service )
+		foreach ($items as $id => $service)
 		{
 			try
 			{
-				$provider = $serviceManager->getProvider( $service );
+				$provider = $serviceManager->getProvider($service);
 
-				if( $provider->isAvailable( $basket ) ) {
+				if ($provider->isAvailable($basket)) {
 					$this->providers[$type][$id] = $provider;
 				} else {
-					unset( $items[$id] );
+					unset($items[$id]);
 				}
 			}
-			catch( \Aimeos\MShop\Service\Exception $e )
+			catch (\Aimeos\MShop\Service\Exception $e)
 			{
-				$msg = sprintf( 'Unable to create provider "%1$s" for service with ID "%2$s"', $service->getCode(), $id );
-				$this->getContext()->getLogger()->log( $msg, \Aimeos\MW\Logger\Base::WARN );
+				$msg = sprintf('Unable to create provider "%1$s" for service with ID "%2$s"', $service->getCode(), $id);
+				$this->getContext()->getLogger()->log($msg, \Aimeos\MW\Logger\Base::WARN);
 			}
 		}
 
@@ -223,16 +223,16 @@ 
 	 * @throws \Exception If an error occurs
 	 * @deprecated Use getProvider() instead
 	 */
-	public function getServiceAttributes( $type, $serviceId, \Aimeos\MShop\Order\Item\Base\Iface $basket )
+	public function getServiceAttributes($type, $serviceId, \Aimeos\MShop\Order\Item\Base\Iface $basket)
 	{
-		if( isset( $this->providers[$type][$serviceId] ) ) {
-			return $this->providers[$type][$serviceId]->getConfigFE( $basket );
+		if (isset($this->providers[$type][$serviceId])) {
+			return $this->providers[$type][$serviceId]->getConfigFE($basket);
 		}
 
-		$serviceManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
-		$item = $serviceManager->getItem( $serviceId, ['price'], true );
+		$serviceManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service');
+		$item = $serviceManager->getItem($serviceId, ['price'], true);
 
-		return $serviceManager->getProvider( $item )->getConfigFE( $basket );
+		return $serviceManager->getProvider($item)->getConfigFE($basket);
 	}
 
 
@@ -248,16 +248,16 @@ 
 	 * @throws \Exception If an error occurs
 	 * @deprecated Use getProvider() instead
 	 */
-	public function getServicePrice( $type, $serviceId, \Aimeos\MShop\Order\Item\Base\Iface $basket )
+	public function getServicePrice($type, $serviceId, \Aimeos\MShop\Order\Item\Base\Iface $basket)
 	{
-		if( isset( $this->providers[$type][$serviceId] ) ) {
-			return $this->providers[$type][$serviceId]->calcPrice( $basket );
+		if (isset($this->providers[$type][$serviceId])) {
+			return $this->providers[$type][$serviceId]->calcPrice($basket);
 		}
 
-		$serviceManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
-		$item = $serviceManager->getItem( $serviceId, ['price'], true );
+		$serviceManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service');
+		$item = $serviceManager->getItem($serviceId, ['price'], true);
 
-		return $serviceManager->getProvider( $item )->calcPrice( $basket );
+		return $serviceManager->getProvider($item)->calcPrice($basket);
 	}
 
 
@@ -273,22 +273,22 @@ 
 	 * @throws \Aimeos\Controller\Frontend\Service\Exception If no active service provider for this ID is available
 	 * @deprecated Use checkAttributes() instead
 	 */
-	public function checkServiceAttributes( $type, $serviceId, array $attributes )
+	public function checkServiceAttributes($type, $serviceId, array $attributes)
 	{
-		if( !isset( $this->providers[$type][$serviceId] ) )
+		if (!isset($this->providers[$type][$serviceId]))
 		{
-			$serviceManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
-			$item = $serviceManager->getItem( $serviceId, ['price'], true );
+			$serviceManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service');
+			$item = $serviceManager->getItem($serviceId, ['price'], true);
 
-			$this->providers[$type][$serviceId] = $serviceManager->getProvider( $item );
+			$this->providers[$type][$serviceId] = $serviceManager->getProvider($item);
 		}
 
-		$errors = $this->providers[$type][$serviceId]->checkConfigFE( $attributes );
+		$errors = $this->providers[$type][$serviceId]->checkConfigFE($attributes);
 
-		foreach( $errors as $key => $msg )
+		foreach ($errors as $key => $msg)
 		{
-			if( $msg === null ) {
-				unset( $errors[$key] );
+			if ($msg === null) {
+				unset($errors[$key]);
 			}
 		}
 

controller/frontend/src/Controller/Frontend/Service/Decorator/Base.php

Spacing +26 added lines, -26 removed lines

@@ -33,18 +33,18 @@ 
 	 * @param \Aimeos\Controller\Frontend\Iface $controller Controller object
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object with required objects
 	 */
-	public function __construct( \Aimeos\Controller\Frontend\Iface $controller, \Aimeos\MShop\Context\Item\Iface $context )
+	public function __construct(\Aimeos\Controller\Frontend\Iface $controller, \Aimeos\MShop\Context\Item\Iface $context)
 	{
 		$iface = '\Aimeos\Controller\Frontend\Service\Iface';
-		if( !( $controller instanceof $iface ) )
+		if (!($controller instanceof $iface))
 		{
-			$msg = sprintf( 'Class "%1$s" does not implement interface "%2$s"', get_class( $controller ), $iface );
-			throw new \Aimeos\Controller\Frontend\Exception( $msg );
+			$msg = sprintf('Class "%1$s" does not implement interface "%2$s"', get_class($controller), $iface);
+			throw new \Aimeos\Controller\Frontend\Exception($msg);
 		}
 
 		$this->controller = $controller;
 
-		parent::__construct( $context );
+		parent::__construct($context);
 	}
 
 
@@ -56,9 +56,9 @@ 
 	 * @return mixed Returns the value of the called method
 	 * @throws \Aimeos\Controller\Frontend\Exception If method call failed
 	 */
-	public function __call( $name, array $param )
+	public function __call($name, array $param)
 	{
-		return @call_user_func_array( array( $this->controller, $name ), $param );
+		return @call_user_func_array(array($this->controller, $name), $param);
 	}
 
 
@@ -69,9 +69,9 @@ 
 	 * @param string[] $attributes List of attribute codes as keys and strings entered by the customer as value
 	 * @return string[] List of attributes codes as keys and error messages as values for invalid or missing values
 	 */
-	public function checkAttributes( $serviceId, array $attributes )
+	public function checkAttributes($serviceId, array $attributes)
 	{
-		return $this->controller->checkAttributes( $serviceId, $attributes );
+		return $this->controller->checkAttributes($serviceId, $attributes);
 	}
 
 
@@ -82,9 +82,9 @@ 
 	 * @param array $ref List of domains for which the items referenced by the services should be fetched too
 	 * @return \Aimeos\MShop\Service\Provider\Iface Service provider object
 	 */
-	public function getProvider( $serviceId, $ref = ['media', 'price', 'text'] )
+	public function getProvider($serviceId, $ref = ['media', 'price', 'text'])
 	{
-		return $this->controller->getProvider( $serviceId, $ref );
+		return $this->controller->getProvider($serviceId, $ref);
 	}
 
 
@@ -95,9 +95,9 @@ 
 	 * @param array $ref List of domains for which the items referenced by the services should be fetched too
 	 * @return \Aimeos\MShop\Service\Provider\Iface[] List of service IDs as keys and service provider objects as values
 	 */
-	public function getProviders( $type = null, $ref = ['media', 'price', 'text'] )
+	public function getProviders($type = null, $ref = ['media', 'price', 'text'])
 	{
-		return $this->controller->getProviders( $type, $ref );
+		return $this->controller->getProviders($type, $ref);
 	}
 
 
@@ -112,9 +112,9 @@ 
 	 * @return \Aimeos\MShop\Common\Item\Helper\Form\Iface|null Form object with URL, parameters, etc.
 	 * 	or null if no form data is required
 	 */
-	public function process( \Aimeos\MShop\Order\Item\Iface $orderItem, $serviceId, array $urls, array $params )
+	public function process(\Aimeos\MShop\Order\Item\Iface $orderItem, $serviceId, array $urls, array $params)
 	{
-		return $this->controller->process( $orderItem, $serviceId, $urls, $params );
+		return $this->controller->process($orderItem, $serviceId, $urls, $params);
 	}
 
 
@@ -129,9 +129,9 @@ 
 	 * @param string $orderid Unique ID of the order whose payment status should be updated
 	 * @return \Aimeos\MShop\Order\Item\Iface $orderItem Order item that has been updated
 	 */
-	public function updateSync( ServerRequestInterface $request, ResponseInterface $response, array $urls, $code, $orderid )
+	public function updateSync(ServerRequestInterface $request, ResponseInterface $response, array $urls, $code, $orderid)
 	{
-		return $this->controller->updateSync( $request, $response, $urls, $code, $orderid );
+		return $this->controller->updateSync($request, $response, $urls, $code, $orderid);
 	}
 
 
@@ -144,10 +144,10 @@ 
 	 * @return array List of service items implementing \Aimeos\MShop\Service\Item\Iface with referenced items
 	 * @deprecated Use getProviders() instead
 	 */
-	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'))
 	{
-		return $this->controller->getServices( $type, $basket, $ref );
+		return $this->controller->getServices($type, $basket, $ref);
 	}
 
 
@@ -161,9 +161,9 @@ 
 	 * @return array List of attribute definitions implementing \Aimeos\MW\Criteria\Attribute\Iface
 	 * @deprecated Use getProvider() instead
 	 */
-	public function getServiceAttributes( $type, $serviceId, \Aimeos\MShop\Order\Item\Base\Iface $basket )
+	public function getServiceAttributes($type, $serviceId, \Aimeos\MShop\Order\Item\Base\Iface $basket)
 	{
-		return $this->controller->getServiceAttributes( $type, $serviceId, $basket );
+		return $this->controller->getServiceAttributes($type, $serviceId, $basket);
 	}
 
 
@@ -179,9 +179,9 @@ 
 	 * @throws \Exception If an error occurs
 	 * @deprecated Use getProvider() instead
 	 */
-	public function getServicePrice( $type, $serviceId, \Aimeos\MShop\Order\Item\Base\Iface $basket )
+	public function getServicePrice($type, $serviceId, \Aimeos\MShop\Order\Item\Base\Iface $basket)
 	{
-		return $this->controller->getServicePrice( $type, $serviceId, $basket );
+		return $this->controller->getServicePrice($type, $serviceId, $basket);
 	}
 
 
@@ -196,9 +196,9 @@ 
 	 * 	missing
 	 * @deprecated Use checkAttributes() instead
 	 */
-	public function checkServiceAttributes( $type, $serviceId, array $attributes )
+	public function checkServiceAttributes($type, $serviceId, array $attributes)
 	{
-		return $this->controller->checkServiceAttributes( $type, $serviceId, $attributes );
+		return $this->controller->checkServiceAttributes($type, $serviceId, $attributes);
 	}
 
 

controller/frontend/src/Controller/Frontend/Basket/Decorator/Bundle.php

Spacing +33 added lines, -33 removed lines

@@ -41,14 +41,14 @@ 
 	 * @param string $stocktype Unique code of the stock type to deliver the products from
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the product isn't available
 	 */
-	public function addProduct( $prodid, $quantity = 1, array $options = [], array $variantAttributeIds = [],
+	public function addProduct($prodid, $quantity = 1, array $options = [], array $variantAttributeIds = [],
 		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [],
-		$stocktype = 'default' )
+		$stocktype = 'default')
 	{
 		$context = $this->getContext();
-		$productManager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
+		$productManager = \Aimeos\MShop\Factory::createManager($context, 'product');
 
-		if( $productManager->getItem( $prodid, [], true )->getType() !== 'bundle' )
+		if ($productManager->getItem($prodid, [], true)->getType() !== 'bundle')
 		{
 			return $this->getController()->addProduct(
 				$prodid, $quantity, $options, $variantAttributeIds, $configAttributeIds,
@@ -57,29 +57,29 @@ 
 		}
 
 		$attributeMap = [
-			'custom' => array_keys( $customAttributeValues ),
+			'custom' => array_keys($customAttributeValues),
 			'config' => $configAttributeIds,
 			'hidden' => $hiddenAttributeIds,
 		];
-		$this->checkListRef( $prodid, 'attribute', $attributeMap );
+		$this->checkListRef($prodid, 'attribute', $attributeMap);
 
 
-		$productItem = $productManager->getItem( $prodid, array( 'media', 'supplier', 'price', 'product', 'text' ), true );
-		$prices = $productItem->getRefItems( 'price', 'default', 'default' );
+		$productItem = $productManager->getItem($prodid, array('media', 'supplier', 'price', 'product', 'text'), true);
+		$prices = $productItem->getRefItems('price', 'default', 'default');
 
-		$orderBaseProductItem = \Aimeos\MShop\Factory::createManager( $context, 'order/base/product' )->createItem();
-		$orderBaseProductItem->copyFrom( $productItem )->setQuantity( $quantity )->setStockType( $stocktype );
+		$orderBaseProductItem = \Aimeos\MShop\Factory::createManager($context, 'order/base/product')->createItem();
+		$orderBaseProductItem->copyFrom($productItem)->setQuantity($quantity)->setStockType($stocktype);
 
-		$this->addBundleProducts( $orderBaseProductItem, $productItem, $variantAttributeIds, $stocktype );
+		$this->addBundleProducts($orderBaseProductItem, $productItem, $variantAttributeIds, $stocktype);
 
-		$attr = $this->getOrderProductAttributes( 'custom', array_keys( $customAttributeValues ), $customAttributeValues );
-		$attr = array_merge( $attr, $this->getOrderProductAttributes( 'config', $configAttributeIds ) );
-		$attr = array_merge( $attr, $this->getOrderProductAttributes( 'hidden', $hiddenAttributeIds ) );
+		$attr = $this->getOrderProductAttributes('custom', array_keys($customAttributeValues), $customAttributeValues);
+		$attr = array_merge($attr, $this->getOrderProductAttributes('config', $configAttributeIds));
+		$attr = array_merge($attr, $this->getOrderProductAttributes('hidden', $hiddenAttributeIds));
 
-		$orderBaseProductItem->setAttributes( $attr );
-		$orderBaseProductItem->setPrice( $this->calcPrice( $orderBaseProductItem, $prices, $quantity ) );
+		$orderBaseProductItem->setAttributes($attr);
+		$orderBaseProductItem->setPrice($this->calcPrice($orderBaseProductItem, $prices, $quantity));
 
-		$this->getController()->get()->addProduct( $orderBaseProductItem );
+		$this->getController()->get()->addProduct($orderBaseProductItem);
 		$this->getController()->save();
 	}
 
@@ -92,43 +92,43 @@ 
 	 * @param array $variantAttributeIds List of product variant attribute IDs
 	 * @param string $stocktype
 	 */
-	protected function addBundleProducts( \Aimeos\MShop\Order\Item\Base\Product\Iface $orderBaseProductItem,
-		\Aimeos\MShop\Product\Item\Iface $productItem, array $variantAttributeIds, $stocktype )
+	protected function addBundleProducts(\Aimeos\MShop\Order\Item\Base\Product\Iface $orderBaseProductItem,
+		\Aimeos\MShop\Product\Item\Iface $productItem, array $variantAttributeIds, $stocktype)
 	{
 		$quantity = $orderBaseProductItem->getQuantity();
 		$products = $subProductIds = $orderProducts = [];
-		$orderProductManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order/base/product' );
+		$orderProductManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'order/base/product');
 
-		foreach( $productItem->getRefItems( 'product', null, 'default' ) as $item ) {
+		foreach ($productItem->getRefItems('product', null, 'default') as $item) {
 			$subProductIds[] = $item->getId();
 		}
 
-		if( count( $subProductIds ) > 0 )
+		if (count($subProductIds) > 0)
 		{
-			$productManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product' );
+			$productManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product');
 
-			$search = $productManager->createSearch( true );
+			$search = $productManager->createSearch(true);
 			$expr = array(
-				$search->compare( '==', 'product.id', $subProductIds ),
+				$search->compare('==', 'product.id', $subProductIds),
 				$search->getConditions(),
 			);
-			$search->setConditions( $search->combine( '&&', $expr ) );
+			$search->setConditions($search->combine('&&', $expr));
 
-			$products = $productManager->searchItems( $search, array( 'attribute', 'media', 'price', 'text' ) );
+			$products = $productManager->searchItems($search, array('attribute', 'media', 'price', 'text'));
 		}
 
-		foreach( $products as $product )
+		foreach ($products as $product)
 		{
-			$prices = $product->getRefItems( 'price', 'default', 'default' );
+			$prices = $product->getRefItems('price', 'default', 'default');
 
 			$orderProduct = $orderProductManager->createItem();
-			$orderProduct->copyFrom( $product );
-			$orderProduct->setStockType( $stocktype );
-			$orderProduct->setPrice( $this->calcPrice( $orderProduct, $prices, $quantity ) );
+			$orderProduct->copyFrom($product);
+			$orderProduct->setStockType($stocktype);
+			$orderProduct->setPrice($this->calcPrice($orderProduct, $prices, $quantity));
 
 			$orderProducts[] = $orderProduct;
 		}
 
-		$orderBaseProductItem->setProducts( $orderProducts );
+		$orderBaseProductItem->setProducts($orderProducts);
 	}
 }

controller/frontend/src/Controller/Frontend/Basket/Decorator/Select.php

Spacing +39 added lines, -39 removed lines

@@ -41,15 +41,15 @@ 
 	 * @param string $stocktype Unique code of the stock type to deliver the products from
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the product isn't available
 	 */
-	public function addProduct( $prodid, $quantity = 1, array $options = [], array $variantAttributeIds = [],
+	public function addProduct($prodid, $quantity = 1, array $options = [], array $variantAttributeIds = [],
 		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [],
-		$stocktype = 'default' )
+		$stocktype = 'default')
 	{
 		$context = $this->getContext();
-		$productManager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
-		$productItem = $productManager->getItem( $prodid, [], true );
+		$productManager = \Aimeos\MShop\Factory::createManager($context, 'product');
+		$productItem = $productManager->getItem($prodid, [], true);
 
-		if( $productManager->getItem( $prodid, [], true )->getType() !== 'select' )
+		if ($productManager->getItem($prodid, [], true)->getType() !== 'select')
 		{
 			return $this->getController()->addProduct(
 				$prodid, $quantity, $options, $variantAttributeIds, $configAttributeIds,
@@ -57,29 +57,29 @@ 
 			);
 		}
 
-		$productItem = $productManager->getItem( $prodid, array( 'media', 'supplier', 'price', 'product', 'text' ), true );
-		$prices = $productItem->getRefItems( 'price', 'default', 'default' );
+		$productItem = $productManager->getItem($prodid, array('media', 'supplier', 'price', 'product', 'text'), true);
+		$prices = $productItem->getRefItems('price', 'default', 'default');
 
-		$orderBaseProductItem = \Aimeos\MShop\Factory::createManager( $context, 'order/base/product' )->createItem();
-		$orderBaseProductItem->copyFrom( $productItem )->setQuantity( $quantity )->setStockType( $stocktype );
+		$orderBaseProductItem = \Aimeos\MShop\Factory::createManager($context, 'order/base/product')->createItem();
+		$orderBaseProductItem->copyFrom($productItem)->setQuantity($quantity)->setStockType($stocktype);
 
-		$attr = $this->getVariantDetails( $orderBaseProductItem, $productItem, $prices, $variantAttributeIds, $options );
+		$attr = $this->getVariantDetails($orderBaseProductItem, $productItem, $prices, $variantAttributeIds, $options);
 
 		$attributeMap = [
-			'custom' => array_keys( $customAttributeValues ),
+			'custom' => array_keys($customAttributeValues),
 			'config' => $configAttributeIds,
 			'hidden' => $hiddenAttributeIds,
 		];
-		$this->checkListRef( array( $prodid, $productItem->getId() ), 'attribute', $attributeMap );
+		$this->checkListRef(array($prodid, $productItem->getId()), 'attribute', $attributeMap);
 
-		$attr = array_merge( $attr, $this->getOrderProductAttributes( 'custom', array_keys( $customAttributeValues ), $customAttributeValues ) );
-		$attr = array_merge( $attr, $this->getOrderProductAttributes( 'config', $configAttributeIds ) );
-		$attr = array_merge( $attr, $this->getOrderProductAttributes( 'hidden', $hiddenAttributeIds ) );
+		$attr = array_merge($attr, $this->getOrderProductAttributes('custom', array_keys($customAttributeValues), $customAttributeValues));
+		$attr = array_merge($attr, $this->getOrderProductAttributes('config', $configAttributeIds));
+		$attr = array_merge($attr, $this->getOrderProductAttributes('hidden', $hiddenAttributeIds));
 
-		$orderBaseProductItem->setAttributes( $attr );
-		$orderBaseProductItem->setPrice( $this->calcPrice( $orderBaseProductItem, $prices, $quantity ) );
+		$orderBaseProductItem->setAttributes($attr);
+		$orderBaseProductItem->setPrice($this->calcPrice($orderBaseProductItem, $prices, $quantity));
 
-		$this->getController()->get()->addProduct( $orderBaseProductItem );
+		$this->getController()->get()->addProduct($orderBaseProductItem);
 		$this->getController()->save();
 	}
 
@@ -95,50 +95,50 @@ 
 	 * @return \Aimeos\MShop\Order\Item\Base\Product\Attribute\Iface[] List of order product attributes
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If no product variant is found
 	 */
-	protected function getVariantDetails( \Aimeos\MShop\Order\Item\Base\Product\Iface $orderBaseProductItem,
-		\Aimeos\MShop\Product\Item\Iface &$productItem, array &$prices, array $variantAttributeIds, array $options )
+	protected function getVariantDetails(\Aimeos\MShop\Order\Item\Base\Product\Iface $orderBaseProductItem,
+		\Aimeos\MShop\Product\Item\Iface & $productItem, array &$prices, array $variantAttributeIds, array $options)
 	{
 		$attr = [];
-		$productItems = $this->getProductVariants( $productItem, $variantAttributeIds );
+		$productItems = $this->getProductVariants($productItem, $variantAttributeIds);
 
-		if( count( $productItems ) > 1 )
+		if (count($productItems) > 1)
 		{
-			$msg = sprintf( 'No unique article found for selected attributes and product ID "%1$s"', $productItem->getId() );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+			$msg = sprintf('No unique article found for selected attributes and product ID "%1$s"', $productItem->getId());
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
 		}
-		else if( ( $result = reset( $productItems ) ) !== false ) // count == 1
+		else if (($result = reset($productItems)) !== false) // count == 1
 		{
 			$productItem = $result;
-			$orderBaseProductItem->setProductCode( $productItem->getCode() );
+			$orderBaseProductItem->setProductCode($productItem->getCode());
 
-			$subprices = $productItem->getRefItems( 'price', 'default', 'default' );
+			$subprices = $productItem->getRefItems('price', 'default', 'default');
 
-			if( !empty( $subprices ) ) {
+			if (!empty($subprices)) {
 				$prices = $subprices;
 			}
 
-			$submedia = $productItem->getRefItems( 'media', 'default', 'default' );
+			$submedia = $productItem->getRefItems('media', 'default', 'default');
 
-			if( ( $mediaItem = reset( $submedia ) ) !== false ) {
-				$orderBaseProductItem->setMediaUrl( $mediaItem->getPreview() );
+			if (($mediaItem = reset($submedia)) !== false) {
+				$orderBaseProductItem->setMediaUrl($mediaItem->getPreview());
 			}
 
-			$orderProductAttrManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order/base/product/attribute' );
-			$variantAttributes = $productItem->getRefItems( 'attribute', null, 'variant' );
+			$orderProductAttrManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'order/base/product/attribute');
+			$variantAttributes = $productItem->getRefItems('attribute', null, 'variant');
 
-			foreach( $this->getAttributes( array_keys( $variantAttributes ), array( 'text' ) ) as $attrItem )
+			foreach ($this->getAttributes(array_keys($variantAttributes), array('text')) as $attrItem)
 			{
 				$orderAttributeItem = $orderProductAttrManager->createItem();
-				$orderAttributeItem->copyFrom( $attrItem );
-				$orderAttributeItem->setType( 'variant' );
+				$orderAttributeItem->copyFrom($attrItem);
+				$orderAttributeItem->setType('variant');
 
 				$attr[] = $orderAttributeItem;
 			}
 		}
-		else if( !isset( $options['variant'] ) || $options['variant'] != false ) // count == 0
+		else if (!isset($options['variant']) || $options['variant'] != false) // count == 0
 		{
-			$msg = sprintf( 'No article found for selected attributes and product ID "%1$s"', $productItem->getId() );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+			$msg = sprintf('No article found for selected attributes and product ID "%1$s"', $productItem->getId());
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
 		}
 
 		return $attr;

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

Spacing +174 added lines, -174 removed lines

@@ -31,46 +31,46 @@ 
 	 * @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);
 
 		// customers can pay what they would like to pay
-		if( ( $attr = $product->getAttributeItem( 'price', 'custom' ) ) !== null )
+		if (($attr = $product->getAttributeItem('price', 'custom')) !== null)
 		{
 			$amount = $attr->getValue();
 
-			if( preg_match( '/^[0-9]*(\.[0-9]+)?$/', $amount ) !== 1 || ((double) $amount) < 0.01 ) {
-				throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Invalid price value "%1$s"', $amount ) );
+			if (preg_match('/^[0-9]*(\.[0-9]+)?$/', $amount) !== 1 || ((double) $amount) < 0.01) {
+				throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Invalid price value "%1$s"', $amount));
 			}
 
-			$price->setValue( $amount );
+			$price->setValue($amount);
 		}
 
 		// add prices of (optional) attributes
-		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;
 	}
@@ -84,42 +84,42 @@ 
 	 * @param array $refMap Associative list of list type codes as keys and lists of reference IDs as values
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If one or more of the IDs are not associated
 	 */
-	protected function checkListRef( $prodId, $domain, array $refMap )
+	protected function checkListRef($prodId, $domain, array $refMap)
 	{
-		if( empty( $refMap ) ) {
+		if (empty($refMap)) {
 			return;
 		}
 
-		$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(),
 		);
 
-		foreach( $refMap as $listType => $refIds )
+		foreach ($refMap as $listType => $refIds)
 		{
-			if( empty( $refIds ) ) {
+			if (empty($refIds)) {
 				continue;
 			}
 
-			foreach( $refIds as $key => $refId ) {
+			foreach ($refIds as $key => $refId) {
 				$refIds[$key] = (string) $refId;
 			}
 
-			$param = array( $domain, $this->getProductListTypeItem( $domain, $listType )->getId(), $refIds );
-			$cmpfunc = $search->createFunction( 'product.contains', $param );
+			$param = array($domain, $this->getProductListTypeItem($domain, $listType)->getId(), $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, [] ) ) === 0 )
+		if (count($productManager->searchItems($search, [])) === 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);
 		}
 	}
 
@@ -134,34 +134,34 @@ 
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If one or more of the IDs are not associated
 	 * @deprecated Use checkListRef() instead
 	 */
-	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, [] ) ) === 0 )
+		if (count($productManager->searchItems($search, [])) === 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);
 		}
 	}
 
@@ -171,41 +171,41 @@ 
 	 *
 	 * @param string $type Basket type
 	 */
-	protected function checkLocale( $type )
+	protected function checkLocale($type)
 	{
 		$errors = [];
 		$context = $this->getContext();
 		$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' );
-			$basket = $manager->getSession( $type );
+			$manager = \Aimeos\MShop\Order\Manager\Factory::createManager($context)->getSubManager('base');
+			$basket = $manager->getSession($type);
 
-			$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, $type );
+			$manager->setSession($basket, $type);
 		}
 
-		$session->set( 'aimeos/basket/locale', $localeKey );
+		$session->set('aimeos/basket/locale', $localeKey);
 	}
 
 
@@ -217,20 +217,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();
 			}
 		}
@@ -247,20 +247,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();
 			}
 		}
@@ -277,11 +277,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;
 			}
 
@@ -289,7 +289,7 @@ 
 			{
 				$attrIds = [];
 
-				foreach( $product->getAttributes() as $attrItem ) {
+				foreach ($product->getAttributes() as $attrItem) {
 					$attrIds[$attrItem->getType()][] = $attrItem->getAttributeId();
 				}
 
@@ -297,23 +297,23 @@ 
 					$product->getProductId(),
 					$product->getQuantity(),
 					[],
-					$this->getValue( $attrIds, 'variant', [] ),
-					$this->getValue( $attrIds, 'config', [] ),
-					$this->getValue( $attrIds, 'hidden', [] ),
-					$this->getValue( $attrIds, 'custom', [] ),
+					$this->getValue($attrIds, 'variant', []),
+					$this->getValue($attrIds, 'config', []),
+					$this->getValue($attrIds, 'hidden', []),
+					$this->getValue($attrIds, 'custom', []),
 					$product->getStockType()
 				);
 
-				$basket->deleteProduct( $pos );
+				$basket->deleteProduct($pos);
 			}
-			catch( \Exception $e )
+			catch (\Exception $e)
 			{
 				$code = $product->getProductCode();
 				$logger = $this->getContext()->getLogger();
 				$errors['product'][$pos] = $e->getMessage();
 
 				$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);
 			}
 		}
 
@@ -328,22 +328,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 = [];
 
-				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;
@@ -362,36 +362,36 @@ 
 	 * @return array List of items implementing \Aimeos\MShop\Order\Item\Product\Attribute\Iface
 	 * @deprecated Use getOrderProductAttributes(), checkReferences() and calcPrice() instead
 	 */
-	protected function createOrderProductAttributes( \Aimeos\MShop\Price\Item\Iface $price, $prodid, $quantity,
-			array $attributeIds, $type, array $attributeValues = [] )
+	protected function createOrderProductAttributes(\Aimeos\MShop\Price\Item\Iface $price, $prodid, $quantity,
+			array $attributeIds, $type, array $attributeValues = [])
 	{
-		if( empty( $attributeIds ) ) {
+		if (empty($attributeIds)) {
 			return [];
 		}
 
-		$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 = [];
 		$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;
@@ -409,31 +409,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 [];
 		}
 
-		$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;
@@ -446,31 +446,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 [];
 		}
 
-		$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 = [];
 
-		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'));
 	}
 
 
@@ -485,23 +485,23 @@ 
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception
 	 * @deprecated Use getItem() or findItem() instead
 	 */
-	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;
@@ -516,23 +516,23 @@ 
 	 * @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 getOrderProductAttributes( $type, array $attributeIds, array $attributeValues = [] )
+	protected function getOrderProductAttributes($type, array $attributeIds, array $attributeValues = [])
 	{
-		if( empty( $attributeIds ) ) {
+		if (empty($attributeIds)) {
 			return [];
 		}
 
 		$list = [];
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order/base/product/attribute' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'order/base/product/attribute');
 
-		foreach( $this->getAttributes( $attributeIds ) as $id => $attrItem )
+		foreach ($this->getAttributes($attributeIds) as $id => $attrItem)
 		{
 			$item = $manager->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;
@@ -549,21 +549,21 @@ 
 	 * @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( empty( $this->listTypeItems ) )
+		if (empty($this->listTypeItems))
 		{
-			$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/lists/type' );
+			$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/lists/type');
 
-			foreach( $manager->searchItems( $manager->createSearch( true ) ) as $item ) {
-				$this->listTypeItems[ $item->getDomain() ][ $item->getCode() ] = $item;
+			foreach ($manager->searchItems($manager->createSearch(true)) as $item) {
+				$this->listTypeItems[$item->getDomain()][$item->getCode()] = $item;
 			}
 		}
 
-		if( !isset( $this->listTypeItems[$domain][$code] ) )
+		if (!isset($this->listTypeItems[$domain][$code]))
 		{
-			$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);
 		}
 
 		return $this->listTypeItems[$domain][$code];
@@ -578,43 +578,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 = [];
-		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 [];
 		}
 
-		$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);
 	}
 
 
@@ -626,9 +626,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];
 		}
 

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

Spacing +126 added lines, -126 removed lines

@@ -33,11 +33,11 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Object storing the required instances for manaing databases
 	 *  connections, logger, session, etc.
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		parent::__construct( $context );
+		parent::__construct($context);
 
-		$this->domainManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' );
+		$this->domainManager = \Aimeos\MShop\Factory::createManager($context, 'order/base');
 	}
 
 
@@ -49,7 +49,7 @@ 
 	public function clear()
 	{
 		$this->baskets[$this->type] = $this->domainManager->createItem();
-		$this->domainManager->setSession( $this->baskets[$this->type], $this->type );
+		$this->domainManager->setSession($this->baskets[$this->type], $this->type);
 
 		return $this;
 	}
@@ -62,10 +62,10 @@ 
 	 */
 	public function get()
 	{
-		if( !isset( $this->baskets[$this->type] ) )
+		if (!isset($this->baskets[$this->type]))
 		{
-			$this->baskets[$this->type] = $this->domainManager->getSession( $this->type );
-			$this->checkLocale( $this->type );
+			$this->baskets[$this->type] = $this->domainManager->getSession($this->type);
+			$this->checkLocale($this->type);
 		}
 
 		return $this->baskets[$this->type];
@@ -79,8 +79,8 @@ 
 	 */
 	public function save()
 	{
-		if( isset( $this->baskets[$this->type] ) && $this->baskets[$this->type]->isModified() ) {
-			$this->domainManager->setSession( $this->baskets[$this->type], $this->type );
+		if (isset($this->baskets[$this->type]) && $this->baskets[$this->type]->isModified()) {
+			$this->domainManager->setSession($this->baskets[$this->type], $this->type);
 		}
 
 		return $this;
@@ -93,7 +93,7 @@ 
 	 * @param string $type Basket type
 	 * @return \Aimeos\Controller\Frontend\Basket\Iface Basket frontend object
 	 */
-	public function setType( $type )
+	public function setType($type)
 	{
 		$this->type = $type;
 		return $this;
@@ -126,7 +126,7 @@ 
 		 * @category Developer
 		 * @see controller/frontend/basket/limit-seconds
 		 */
-		$count = $config->get( 'controller/frontend/basket/limit-count', 5 );
+		$count = $config->get('controller/frontend/basket/limit-count', 5);
 
 		/** controller/frontend/basket/limit-seconds
 		 * Order limitation time frame in seconds
@@ -144,27 +144,27 @@ 
 		 * @category Developer
 		 * @see controller/frontend/basket/limit-count
 		 */
-		$seconds = $config->get( 'controller/frontend/basket/limit-seconds', 300 );
+		$seconds = $config->get('controller/frontend/basket/limit-seconds', 300);
 
 		$search = $this->domainManager->createSearch();
 		$expr = [
-			$search->compare( '==', 'order.base.editor', $this->getContext()->getEditor() ),
-			$search->compare( '>=', 'order.base.ctime', date( 'Y-m-d H:i:s', time() - $seconds ) ),
+			$search->compare('==', 'order.base.editor', $this->getContext()->getEditor()),
+			$search->compare('>=', 'order.base.ctime', date('Y-m-d H:i:s', time() - $seconds)),
 		];
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, 0 );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, 0);
 
-		$this->domainManager->searchItems( $search, [], $total );
+		$this->domainManager->searchItems($search, [], $total);
 
-		if( $total > $count ) {
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Temporary order limit reached' ) );
+		if ($total > $count) {
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Temporary order limit reached'));
 		}
 
 
 		$basket = $this->get()->finish();
 
 		$this->domainManager->begin();
-		$this->domainManager->store( $basket );
+		$this->domainManager->store($basket);
 		$this->domainManager->commit();
 
 		return $basket;
@@ -179,9 +179,9 @@ 
 	 * @param boolean $default True to add default criteria (user logged in), false if not
 	 * @return \Aimeos\MShop\Order\Item\Base\Iface Order base object including the given parts
 	 */
-	public function load( $id, $parts = \Aimeos\MShop\Order\Manager\Base\Base::PARTS_ALL, $default = true )
+	public function load($id, $parts = \Aimeos\MShop\Order\Manager\Base\Base::PARTS_ALL, $default = true)
 	{
-		return $this->domainManager->load( $id, $parts, false, $default );
+		return $this->domainManager->load($id, $parts, false, $default);
 	}
 
 
@@ -201,34 +201,34 @@ 
 	 * @param string $stocktype Unique code of the stock type to deliver the products from
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the product isn't available
 	 */
-	public function addProduct( $prodid, $quantity = 1, array $options = [], array $variantAttributeIds = [],
+	public function addProduct($prodid, $quantity = 1, array $options = [], array $variantAttributeIds = [],
 		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [],
-		$stocktype = 'default' )
+		$stocktype = 'default')
 	{
 		$attributeMap = [
-			'custom' => array_keys( $customAttributeValues ),
+			'custom' => array_keys($customAttributeValues),
 			'config' => $configAttributeIds,
 			'hidden' => $hiddenAttributeIds,
 		];
-		$this->checkListRef( $prodid, 'attribute', $attributeMap );
+		$this->checkListRef($prodid, 'attribute', $attributeMap);
 
 
 		$context = $this->getContext();
-		$productManager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
-		$productItem = $productManager->getItem( $prodid, array( 'media', 'supplier', 'price', 'product', 'text' ), true );
-		$prices = $productItem->getRefItems( 'price', 'default', 'default' );
+		$productManager = \Aimeos\MShop\Factory::createManager($context, 'product');
+		$productItem = $productManager->getItem($prodid, array('media', 'supplier', 'price', 'product', 'text'), true);
+		$prices = $productItem->getRefItems('price', 'default', 'default');
 
-		$orderBaseProductItem = \Aimeos\MShop\Factory::createManager( $context, 'order/base/product' )->createItem();
-		$orderBaseProductItem->copyFrom( $productItem )->setQuantity( $quantity )->setStockType( $stocktype );
+		$orderBaseProductItem = \Aimeos\MShop\Factory::createManager($context, 'order/base/product')->createItem();
+		$orderBaseProductItem->copyFrom($productItem)->setQuantity($quantity)->setStockType($stocktype);
 
-		$attr = $this->getOrderProductAttributes( 'custom', array_keys( $customAttributeValues ), $customAttributeValues );
-		$attr = array_merge( $attr, $this->getOrderProductAttributes( 'config', $configAttributeIds ) );
-		$attr = array_merge( $attr, $this->getOrderProductAttributes( 'hidden', $hiddenAttributeIds ) );
+		$attr = $this->getOrderProductAttributes('custom', array_keys($customAttributeValues), $customAttributeValues);
+		$attr = array_merge($attr, $this->getOrderProductAttributes('config', $configAttributeIds));
+		$attr = array_merge($attr, $this->getOrderProductAttributes('hidden', $hiddenAttributeIds));
 
-		$orderBaseProductItem->setAttributes( $attr );
-		$orderBaseProductItem->setPrice( $this->calcPrice( $orderBaseProductItem, $prices, $quantity ) );
+		$orderBaseProductItem->setAttributes($attr);
+		$orderBaseProductItem->setPrice($this->calcPrice($orderBaseProductItem, $prices, $quantity));
 
-		$this->get()->addProduct( $orderBaseProductItem );
+		$this->get()->addProduct($orderBaseProductItem);
 		$this->save();
 	}
 
@@ -238,17 +238,17 @@ 
 	 *
 	 * @param integer $position Position number (key) of the order product item
 	 */
-	public function deleteProduct( $position )
+	public function deleteProduct($position)
 	{
-		$product = $this->get()->getProduct( $position );
+		$product = $this->get()->getProduct($position);
 
-		if( $product->getFlags() === \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE )
+		if ($product->getFlags() === \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE)
 		{
-			$msg = sprintf( 'Basket item at position "%1$d" cannot be deleted manually', $position );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+			$msg = sprintf('Basket item at position "%1$d" cannot be deleted manually', $position);
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
 		}
 
-		$this->get()->deleteProduct( $position );
+		$this->get()->deleteProduct($position);
 		$this->save();
 	}
 
@@ -262,33 +262,33 @@ 
 	 * 	The 'stock'=>false option allows adding products without being in stock.
 	 * @param string[] $configAttributeCodes Codes of the product config attributes that should be REMOVED
 	 */
-	public function editProduct( $position, $quantity, array $options = [],
-		array $configAttributeCodes = [] )
+	public function editProduct($position, $quantity, array $options = [],
+		array $configAttributeCodes = [])
 	{
-		$product = $this->get()->getProduct( $position );
+		$product = $this->get()->getProduct($position);
 
-		if( $product->getFlags() & \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE )
+		if ($product->getFlags() & \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE)
 		{
-			$msg = sprintf( 'Basket item at position "%1$d" cannot be changed', $position );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+			$msg = sprintf('Basket item at position "%1$d" cannot be changed', $position);
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
 		}
 
-		$product->setQuantity( $quantity );
+		$product->setQuantity($quantity);
 
 		$attributes = $product->getAttributes();
-		foreach( $attributes as $key => $attribute )
+		foreach ($attributes as $key => $attribute)
 		{
-			if( in_array( $attribute->getCode(), $configAttributeCodes ) ) {
-				unset( $attributes[$key] );
+			if (in_array($attribute->getCode(), $configAttributeCodes)) {
+				unset($attributes[$key]);
 			}
 		}
-		$product->setAttributes( $attributes );
+		$product->setAttributes($attributes);
 
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product' );
-		$productItem = $manager->findItem( $product->getProductCode(), array( 'price', 'text' ) );
-		$product->setPrice( $this->calcPrice( $product, $productItem->getRefItems( 'price', 'default' ), $quantity ) );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product');
+		$productItem = $manager->findItem($product->getProductCode(), array('price', 'text'));
+		$product->setPrice($this->calcPrice($product, $productItem->getRefItems('price', 'default'), $quantity));
 
-		$this->get()->editProduct( $product, $position );
+		$this->get()->editProduct($product, $position);
 
 		$this->save();
 	}
@@ -300,49 +300,49 @@ 
 	 * @param string $code Coupon code entered by the user
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid or not allowed
 	 */
-	public function addCoupon( $code )
+	public function addCoupon($code)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'coupon' );
-		$codeManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'coupon/code' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'coupon');
+		$codeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'coupon/code');
 
 
-		$search = $codeManager->createSearch( true );
+		$search = $codeManager->createSearch(true);
 		$expr = array(
-			$search->compare( '==', 'coupon.code.code', $code ),
+			$search->compare('==', 'coupon.code.code', $code),
 			$search->getConditions(),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, 1 );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, 1);
 
-		$result = $codeManager->searchItems( $search );
+		$result = $codeManager->searchItems($search);
 
-		if( ( $codeItem = reset( $result ) ) === false ) {
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Coupon code "%1$s" is invalid or not available any more', $code ) );
+		if (($codeItem = reset($result)) === false) {
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Coupon code "%1$s" is invalid or not available any more', $code));
 		}
 
 
-		$search = $manager->createSearch( true );
+		$search = $manager->createSearch(true);
 		$expr = array(
-			$search->compare( '==', 'coupon.id', $codeItem->getParentId() ),
+			$search->compare('==', 'coupon.id', $codeItem->getParentId()),
 			$search->getConditions(),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, 1 );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, 1);
 
-		$result = $manager->searchItems( $search );
+		$result = $manager->searchItems($search);
 
-		if( ( $item = reset( $result ) ) === false ) {
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Coupon for code "%1$s" is not available any more', $code ) );
+		if (($item = reset($result)) === false) {
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Coupon for code "%1$s" is not available any more', $code));
 		}
 
 
-		$provider = $manager->getProvider( $item, $code );
+		$provider = $manager->getProvider($item, $code);
 
-		if( $provider->isAvailable( $this->get() ) !== true ) {
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Requirements for coupon code "%1$s" aren\'t met', $code ) );
+		if ($provider->isAvailable($this->get()) !== true) {
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Requirements for coupon code "%1$s" aren\'t met', $code));
 		}
 
-		$provider->addCoupon( $this->get() );
+		$provider->addCoupon($this->get());
 		$this->save();
 	}
 
@@ -353,21 +353,21 @@ 
 	 * @param string $code Coupon code entered by the user
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid
 	 */
-	public function deleteCoupon( $code )
+	public function deleteCoupon($code)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'coupon' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'coupon');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'coupon.code.code', $code ) );
-		$search->setSlice( 0, 1 );
+		$search->setConditions($search->compare('==', 'coupon.code.code', $code));
+		$search->setSlice(0, 1);
 
-		$result = $manager->searchItems( $search );
+		$result = $manager->searchItems($search);
 
-		if( ( $item = reset( $result ) ) === false ) {
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Coupon code "%1$s" is invalid', $code ) );
+		if (($item = reset($result)) === false) {
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Coupon code "%1$s" is invalid', $code));
 		}
 
-		$manager->getProvider( $item, $code )->deleteCoupon( $this->get() );
+		$manager->getProvider($item, $code)->deleteCoupon($this->get());
 		$this->save();
 	}
 
@@ -380,28 +380,28 @@ 
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the billing or delivery address is not of any required type of
 	 * 	if one of the keys is invalid when using an array with key/value pairs
 	 */
-	public function setAddress( $type, $value )
+	public function setAddress($type, $value)
 	{
-		$address = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order/base/address' )->createItem();
-		$address->setType( $type );
+		$address = \Aimeos\MShop\Factory::createManager($this->getContext(), 'order/base/address')->createItem();
+		$address->setType($type);
 
-		if( $value instanceof \Aimeos\MShop\Common\Item\Address\Iface )
+		if ($value instanceof \Aimeos\MShop\Common\Item\Address\Iface)
 		{
-			$address->copyFrom( $value );
-			$this->get()->setAddress( $address, $type );
+			$address->copyFrom($value);
+			$this->get()->setAddress($address, $type);
 		}
-		else if( is_array( $value ) )
+		else if (is_array($value))
 		{
-			$this->setAddressFromArray( $address, $value );
-			$this->get()->setAddress( $address, $type );
+			$this->setAddressFromArray($address, $value);
+			$this->get()->setAddress($address, $type);
 		}
-		else if( $value === null )
+		else if ($value === null)
 		{
-			$this->get()->deleteAddress( $type );
+			$this->get()->deleteAddress($type);
 		}
 		else
 		{
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Invalid value for address type "%1$s"', $type ) );
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Invalid value for address type "%1$s"', $type));
 		}
 
 		$this->save();
@@ -417,48 +417,48 @@ 
 	 * 	entered by the customer when choosing one of the delivery or payment options
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If there is no price to the service item attached
 	 */
-	public function setService( $type, $id, array $attributes = [] )
+	public function setService($type, $id, array $attributes = [])
 	{
-		if( $id === null )
+		if ($id === null)
 		{
-			$this->get()->deleteService( $type );
+			$this->get()->deleteService($type);
 			$this->save();
 			return;
 		}
 
 		$context = $this->getContext();
 
-		$serviceManager = \Aimeos\MShop\Factory::createManager( $context, 'service' );
-		$serviceItem = $serviceManager->getItem( $id, array( 'media', 'price', 'text' ) );
+		$serviceManager = \Aimeos\MShop\Factory::createManager($context, 'service');
+		$serviceItem = $serviceManager->getItem($id, array('media', 'price', 'text'));
 
-		$provider = $serviceManager->getProvider( $serviceItem );
-		$result = $provider->checkConfigFE( $attributes );
-		$unknown = array_diff_key( $attributes, $result );
+		$provider = $serviceManager->getProvider($serviceItem);
+		$result = $provider->checkConfigFE($attributes);
+		$unknown = array_diff_key($attributes, $result);
 
-		if( count( $unknown ) > 0 )
+		if (count($unknown) > 0)
 		{
-			$msg = sprintf( 'Unknown attributes "%1$s"', implode( '","', array_keys( $unknown ) ) );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+			$msg = sprintf('Unknown attributes "%1$s"', implode('","', array_keys($unknown)));
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
 		}
 
-		foreach( $result as $key => $value )
+		foreach ($result as $key => $value)
 		{
-			if( $value !== null ) {
-				throw new \Aimeos\Controller\Frontend\Basket\Exception( $value );
+			if ($value !== null) {
+				throw new \Aimeos\Controller\Frontend\Basket\Exception($value);
 			}
 		}
 
-		$orderBaseServiceManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base/service' );
+		$orderBaseServiceManager = \Aimeos\MShop\Factory::createManager($context, 'order/base/service');
 		$orderServiceItem = $orderBaseServiceManager->createItem();
-		$orderServiceItem->copyFrom( $serviceItem );
+		$orderServiceItem->copyFrom($serviceItem);
 
 		// remove service rebate of original price
-		$price = $provider->calcPrice( $this->get() )->setRebate( '0.00' );
-		$orderServiceItem->setPrice( $price );
+		$price = $provider->calcPrice($this->get())->setRebate('0.00');
+		$orderServiceItem->setPrice($price);
 
-		$provider->setConfigFE( $orderServiceItem, $attributes );
+		$provider->setConfigFE($orderServiceItem, $attributes);
 
-		$this->get()->setService( $orderServiceItem, $type );
+		$this->get()->setService($orderServiceItem, $type);
 		$this->save();
 	}
 
@@ -471,18 +471,18 @@ 
 	 * 	an address item.
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception
 	 */
-	protected function setAddressFromArray( \Aimeos\MShop\Order\Item\Base\Address\Iface $address, array $map )
+	protected function setAddressFromArray(\Aimeos\MShop\Order\Item\Base\Address\Iface $address, array $map)
 	{
-		foreach( $map as $key => $value ) {
-			$map[$key] = strip_tags( $value ); // prevent XSS
+		foreach ($map as $key => $value) {
+			$map[$key] = strip_tags($value); // prevent XSS
 		}
 
-		$errors = $address->fromArray( $map );
+		$errors = $address->fromArray($map);
 
-		if( count( $errors ) > 0 )
+		if (count($errors) > 0)
 		{
-			$msg = sprintf( 'Invalid address properties, please check your input' );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg, 0, null, $errors );
+			$msg = sprintf('Invalid address properties, please check your input');
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg, 0, null, $errors);
 		}
 	}
 }