aimeos / ai-controller-frontend

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

Spacing +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@ 
 	 *
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Common MShop context object
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context)
 	{
 		$this->context = $context;
 	}
@@ -41,7 +41,7 @@ 
 	 * @param array $param List of method parameter
 	 * @return boolean Returns always false
 	 */
-	public function __call( $name, array $param )
+	public function __call($name, array $param)
 	{
 		return false;
 	}

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

Spacing +33 added lines, -33 removed lines

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

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

Spacing +11 added lines, -11 removed lines

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

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

Spacing +124 added lines, -124 removed lines

@@ -15,63 +15,63 @@ 
 
 	protected function setUp()
 	{
-		$this->object = new \Aimeos\Controller\Frontend\Catalog\Standard( \TestHelperFrontend::getContext() );
+		$this->object = new \Aimeos\Controller\Frontend\Catalog\Standard(\TestHelperFrontend::getContext());
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object );
+		unset($this->object);
 	}
 
 
 	public function testCreateManager()
 	{
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->createManager( 'product' ) );
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->createManager('product'));
 	}
 
 
 	public function testCreateCatalogFilter()
 	{
-		$filter = $this->object->createCatalogFilter( true );
+		$filter = $this->object->createCatalogFilter(true);
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Expression\\Compare\\Iface', $filter->getConditions() );
-		$this->assertEquals( 'catalog.status', $filter->getConditions()->getName() );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Expression\\Compare\\Iface', $filter->getConditions());
+		$this->assertEquals('catalog.status', $filter->getConditions()->getName());
 	}
 
 
 	public function testGetCatalogPath()
 	{
-		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
-		$item = $manager->getTree( null, array(), \Aimeos\MW\Tree\Manager\Base::LEVEL_LIST );
+		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager(\TestHelperFrontend::getContext());
+		$item = $manager->getTree(null, array(), \Aimeos\MW\Tree\Manager\Base::LEVEL_LIST);
 
 		$list = array();
-		foreach( $this->object->getCatalogPath( $item->getChild( 0 )->getId(), array( 'text' ) ) as $item ) {
+		foreach ($this->object->getCatalogPath($item->getChild(0)->getId(), array('text')) as $item) {
 			$list[$item->getCode()] = $item;
 		}
 
-		$this->assertEquals( 2, count( $list ) );
-		$this->assertArrayHasKey( 'root', $list );
-		$this->assertArrayHasKey( 'categories', $list );
+		$this->assertEquals(2, count($list));
+		$this->assertArrayHasKey('root', $list);
+		$this->assertArrayHasKey('categories', $list);
 	}
 
 
 	public function testGetCatalogTree()
 	{
-		$item = $this->object->getCatalogTree( null, array( 'text' ), \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE );
+		$item = $this->object->getCatalogTree(null, array('text'), \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE);
 
-		$this->assertEquals( 'Root', $item->getName() );
-		$this->assertEquals( 0, count( $item->getChildren() ) );
+		$this->assertEquals('Root', $item->getName());
+		$this->assertEquals(0, count($item->getChildren()));
 	}
 
 
 	public function testAggregateIndex()
 	{
 		$filter = $this->object->createIndexFilter();
-		$list = $this->object->aggregateIndex( $filter, 'index.attribute.id' );
+		$list = $this->object->aggregateIndex($filter, 'index.attribute.id');
 
-		$this->assertGreaterThan( 0, count( $list ) );
+		$this->assertGreaterThan(0, count($list));
 	}
 
 
@@ -79,279 +79,279 @@ 
 	{
 		$filter = $this->object->createIndexFilter();
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
-		$this->assertEquals( array(), $filter->getSortations() );
-		$this->assertEquals( 0, $filter->getSliceStart() );
-		$this->assertEquals( 100, $filter->getSliceSize() );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
+		$this->assertEquals(array(), $filter->getSortations());
+		$this->assertEquals(0, $filter->getSliceStart());
+		$this->assertEquals(100, $filter->getSliceSize());
 	}
 
 
 	public function testCreateIndexFilterCategory()
 	{
-		$filter = $this->object->createIndexFilterCategory( 0 );
+		$filter = $this->object->createIndexFilterCategory(0);
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
 
 		$list = $filter->getConditions()->getExpressions();
 
 
-		if( !isset( $list[0] ) || !( $list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface ) ) {
-			throw new \Exception( 'Wrong expression' );
+		if (!isset($list[0]) || !($list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface)) {
+			throw new \Exception('Wrong expression');
 		}
-		$this->assertEquals( 'index.catalog.id', $list[0]->getName() );
-		$this->assertEquals( 0, $list[0]->getValue() );
+		$this->assertEquals('index.catalog.id', $list[0]->getName());
+		$this->assertEquals(0, $list[0]->getValue());
 
 
-		$this->assertEquals( array(), $filter->getSortations() );
-		$this->assertEquals( 0, $filter->getSliceStart() );
-		$this->assertEquals( 100, $filter->getSliceSize() );
+		$this->assertEquals(array(), $filter->getSortations());
+		$this->assertEquals(0, $filter->getSliceStart());
+		$this->assertEquals(100, $filter->getSliceSize());
 	}
 
 
 	public function testCreateIndexFilterCategoryPosition()
 	{
-		$filter = $this->object->createIndexFilterCategory( 0, 'relevance', '-', 1, 2, 'test' );
+		$filter = $this->object->createIndexFilterCategory(0, 'relevance', '-', 1, 2, 'test');
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
 
 		$sort = $filter->getSortations();
-		if( ( $item = reset( $sort ) ) === false ) {
-			throw new \Exception( 'Sortation not set' );
+		if (($item = reset($sort)) === false) {
+			throw new \Exception('Sortation not set');
 		}
 
-		$this->assertEquals( 'sort:index.catalog.position("test",0)', $item->getName() );
-		$this->assertEquals( '-', $item->getOperator() );
+		$this->assertEquals('sort:index.catalog.position("test",0)', $item->getName());
+		$this->assertEquals('-', $item->getOperator());
 
-		$this->assertEquals( 1, $filter->getSliceStart() );
-		$this->assertEquals( 2, $filter->getSliceSize() );
+		$this->assertEquals(1, $filter->getSliceStart());
+		$this->assertEquals(2, $filter->getSliceSize());
 	}
 
 
 	public function testCreateIndexFilterCategoryCode()
 	{
-		$filter = $this->object->createIndexFilterCategory( 0, 'code' );
+		$filter = $this->object->createIndexFilterCategory(0, 'code');
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
 
 		$sort = $filter->getSortations();
-		if( ( $item = reset( $sort ) ) === false ) {
-			throw new \Exception( 'Sortation not set' );
+		if (($item = reset($sort)) === false) {
+			throw new \Exception('Sortation not set');
 		}
 
-		$this->assertStringStartsWith( 'product.code', $item->getName() );
+		$this->assertStringStartsWith('product.code', $item->getName());
 	}
 
 
 	public function testCreateIndexFilterCategoryName()
 	{
-		$filter = $this->object->createIndexFilterCategory( 0, 'name' );
+		$filter = $this->object->createIndexFilterCategory(0, 'name');
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
 
 		$sort = $filter->getSortations();
-		if( ( $item = reset( $sort ) ) === false ) {
-			throw new \Exception( 'Sortation not set' );
+		if (($item = reset($sort)) === false) {
+			throw new \Exception('Sortation not set');
 		}
 
-		$this->assertEquals( 'sort:index.text.value("default","de","name")', $item->getName() );
+		$this->assertEquals('sort:index.text.value("default","de","name")', $item->getName());
 	}
 
 
 	public function testCreateIndexFilterCategoryPrice()
 	{
-		$filter = $this->object->createIndexFilterCategory( 0, 'price' );
+		$filter = $this->object->createIndexFilterCategory(0, 'price');
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
 
 		$sort = $filter->getSortations();
-		if( ( $item = reset( $sort ) ) === false ) {
-			throw new \Exception( 'Sortation not set' );
+		if (($item = reset($sort)) === false) {
+			throw new \Exception('Sortation not set');
 		}
 
-		$this->assertStringStartsWith( 'sort:index.price.value("default","EUR","default")', $item->getName() );
+		$this->assertStringStartsWith('sort:index.price.value("default","EUR","default")', $item->getName());
 	}
 
 
 	public function testCreateIndexFilterCategoryInvalidSortation()
 	{
-		$filter = $this->object->createIndexFilterCategory( 0, 'failure' );
+		$filter = $this->object->createIndexFilterCategory(0, 'failure');
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
-		$this->assertEquals( array(), $filter->getSortations() );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
+		$this->assertEquals(array(), $filter->getSortations());
 	}
 
 
 	public function testAddIndexFilterCategory()
 	{
 		$filter = $this->object->createIndexFilter();
-		$filter = $this->object->addIndexFilterCategory( $filter, 0 );
+		$filter = $this->object->addIndexFilterCategory($filter, 0);
 
 		$list = $filter->getConditions()->getExpressions();
 
-		if( !isset( $list[0] ) || !( $list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface ) ) {
-			throw new \Exception( 'Wrong expression' );
+		if (!isset($list[0]) || !($list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface)) {
+			throw new \Exception('Wrong expression');
 		}
 
-		$this->assertEquals( 'index.catalog.id', $list[0]->getName() );
-		$this->assertEquals( 0, $list[0]->getValue() );
-		$this->assertEquals( array(), $filter->getSortations() );
+		$this->assertEquals('index.catalog.id', $list[0]->getName());
+		$this->assertEquals(0, $list[0]->getValue());
+		$this->assertEquals(array(), $filter->getSortations());
 	}
 
 
 	public function testCreateIndexFilterText()
 	{
-		$filter = $this->object->createIndexFilterText( 'Espresso' );
+		$filter = $this->object->createIndexFilterText('Espresso');
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
 
 		$list = $filter->getConditions()->getExpressions();
 
 
-		if( !isset( $list[0] ) || !( $list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface ) ) {
-			throw new \Exception( 'Wrong expression' );
+		if (!isset($list[0]) || !($list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface)) {
+			throw new \Exception('Wrong expression');
 		}
-		$this->assertEquals( 'index.text.relevance("default","de","Espresso")', $list[0]->getName() );
-		$this->assertEquals( 0, $list[0]->getValue() );
+		$this->assertEquals('index.text.relevance("default","de","Espresso")', $list[0]->getName());
+		$this->assertEquals(0, $list[0]->getValue());
 
 
-		$this->assertEquals( array(), $filter->getSortations() );
-		$this->assertEquals( 0, $filter->getSliceStart() );
-		$this->assertEquals( 100, $filter->getSliceSize() );
+		$this->assertEquals(array(), $filter->getSortations());
+		$this->assertEquals(0, $filter->getSliceStart());
+		$this->assertEquals(100, $filter->getSliceSize());
 	}
 
 
 	public function testCreateIndexFilterTextRelevance()
 	{
-		$filter = $this->object->createIndexFilterText( 'Espresso', 'relevance', '-', 1, 2, 'test' );
+		$filter = $this->object->createIndexFilterText('Espresso', 'relevance', '-', 1, 2, 'test');
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
-		$this->assertEquals( array(), $filter->getSortations() );
-		$this->assertEquals( 1, $filter->getSliceStart() );
-		$this->assertEquals( 2, $filter->getSliceSize() );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
+		$this->assertEquals(array(), $filter->getSortations());
+		$this->assertEquals(1, $filter->getSliceStart());
+		$this->assertEquals(2, $filter->getSliceSize());
 	}
 
 
 	public function testCreateIndexFilterTextCode()
 	{
-		$filter = $this->object->createIndexFilterText( 'Espresso', 'code' );
+		$filter = $this->object->createIndexFilterText('Espresso', 'code');
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
 
 		$sort = $filter->getSortations();
-		if( ( $item = reset( $sort ) ) === false ) {
-			throw new \Exception( 'Sortation not set' );
+		if (($item = reset($sort)) === false) {
+			throw new \Exception('Sortation not set');
 		}
 
-		$this->assertEquals( 'product.code', $item->getName() );
+		$this->assertEquals('product.code', $item->getName());
 	}
 
 
 	public function testCreateIndexFilterTextName()
 	{
-		$filter = $this->object->createIndexFilterText( 'Espresso', 'name' );
+		$filter = $this->object->createIndexFilterText('Espresso', 'name');
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
 
 		$sort = $filter->getSortations();
-		if( ( $item = reset( $sort ) ) === false ) {
-			throw new \Exception( 'Sortation not set' );
+		if (($item = reset($sort)) === false) {
+			throw new \Exception('Sortation not set');
 		}
 
-		$this->assertEquals( 'sort:index.text.value("default","de","name")', $item->getName() );
+		$this->assertEquals('sort:index.text.value("default","de","name")', $item->getName());
 	}
 
 
 	public function testCreateIndexFilterTextPrice()
 	{
-		$filter = $this->object->createIndexFilterCategory( 'Espresso', 'price' );
+		$filter = $this->object->createIndexFilterCategory('Espresso', 'price');
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
 
 		$sort = $filter->getSortations();
-		if( ( $item = reset( $sort ) ) === false ) {
-			throw new \Exception( 'Sortation not set' );
+		if (($item = reset($sort)) === false) {
+			throw new \Exception('Sortation not set');
 		}
 
-		$this->assertStringStartsWith( 'sort:index.price.value("default","EUR","default")', $item->getName() );
+		$this->assertStringStartsWith('sort:index.price.value("default","EUR","default")', $item->getName());
 	}
 
 
 	public function testCreateIndexFilterTextInvalidSortation()
 	{
-		$filter = $this->object->createIndexFilterText( '', 'failure' );
+		$filter = $this->object->createIndexFilterText('', 'failure');
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
-		$this->assertEquals( array(), $filter->getSortations() );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
+		$this->assertEquals(array(), $filter->getSortations());
 	}
 
 
 	public function testAddIndexFilterText()
 	{
-		$filter = $this->object->createIndexFilterText( 'Espresso' );
-		$filter = $this->object->addIndexFilterText( $filter, 'Espresso' );
+		$filter = $this->object->createIndexFilterText('Espresso');
+		$filter = $this->object->addIndexFilterText($filter, 'Espresso');
 
 		$list = $filter->getConditions()->getExpressions();
 
-		if( !isset( $list[0] ) || !( $list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface ) ) {
-			throw new \Exception( 'Wrong expression' );
+		if (!isset($list[0]) || !($list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface)) {
+			throw new \Exception('Wrong expression');
 		}
 
-		$this->assertEquals( 'index.text.relevance("default","de","Espresso")', $list[0]->getName() );
-		$this->assertEquals( 0, $list[0]->getValue() );
-		$this->assertEquals( array(), $filter->getSortations() );
+		$this->assertEquals('index.text.relevance("default","de","Espresso")', $list[0]->getName());
+		$this->assertEquals(0, $list[0]->getValue());
+		$this->assertEquals(array(), $filter->getSortations());
 	}
 
 
 	public function testGetIndexItemsCategory()
 	{
-		$catalogManager = \Aimeos\MShop\Catalog\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
+		$catalogManager = \Aimeos\MShop\Catalog\Manager\Factory::createManager(\TestHelperFrontend::getContext());
 		$search = $catalogManager->createSearch();
 
-		$search->setConditions( $search->compare( '==', 'catalog.code', 'new' ) );
-		$search->setSlice( 0, 1 );
-		$items = $catalogManager->searchItems( $search );
+		$search->setConditions($search->compare('==', 'catalog.code', 'new'));
+		$search->setSlice(0, 1);
+		$items = $catalogManager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \Exception( 'Catalog item not found' );
+		if (($item = reset($items)) === false) {
+			throw new \Exception('Catalog item not found');
 		}
 
 		$total = 0;
-		$filter = $this->object->createIndexFilterCategory( $item->getId(), 'position', '+', 1, 1 );
-		$results = $this->object->getIndexItems( $filter, array(), $total );
+		$filter = $this->object->createIndexFilterCategory($item->getId(), 'position', '+', 1, 1);
+		$results = $this->object->getIndexItems($filter, array(), $total);
 
-		$this->assertEquals( 3, $total );
-		$this->assertEquals( 1, count( $results ) );
+		$this->assertEquals(3, $total);
+		$this->assertEquals(1, count($results));
 	}
 
 
 	public function testGetIndexItemsText()
 	{
 		$total = 0;
-		$filter = $this->object->createIndexFilterText( 'Expresso', 'relevance', '+', 0, 1, 'unittype13' );
-		$results = $this->object->getIndexItems( $filter, array(), $total );
+		$filter = $this->object->createIndexFilterText('Expresso', 'relevance', '+', 0, 1, 'unittype13');
+		$results = $this->object->getIndexItems($filter, array(), $total);
 
-		$this->assertEquals( 1, $total );
-		$this->assertEquals( 1, count( $results ) );
+		$this->assertEquals(1, $total);
+		$this->assertEquals(1, count($results));
 	}
 
 
 	public function testCreateTextFilter()
 	{
-		$filter = $this->object->createTextFilter( 'Expresso', 'name', '+', 0, 1 );
+		$filter = $this->object->createTextFilter('Expresso', 'name', '+', 0, 1);
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Expression\\Combine\\Iface', $filter->getConditions() );
-		$this->assertEquals( 3, count( $filter->getConditions()->getExpressions() ) );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Expression\\Combine\\Iface', $filter->getConditions());
+		$this->assertEquals(3, count($filter->getConditions()->getExpressions()));
 	}
 
 
 	public function testGetTextListName()
 	{
-		$filter = $this->object->createTextFilter( 'Cafe Noire', 'relevance', '-', 0, 25, 'unittype19', 'name' );
-		$results = $this->object->getTextList( $filter );
+		$filter = $this->object->createTextFilter('Cafe Noire', 'relevance', '-', 0, 25, 'unittype19', 'name');
+		$results = $this->object->getTextList($filter);
 
-		$this->assertEquals( 1, count( $results ) );
-		$this->assertContains( 'Cafe Noire Cappuccino', $results );
+		$this->assertEquals(1, count($results));
+		$this->assertContains('Cafe Noire Cappuccino', $results);
 	}
 
 }

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

Spacing +11 added lines, -11 removed lines

@@ -41,26 +41,26 @@
 	 * @param string $warehouse Unique code of the warehouse 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(), array $variantAttributeIds = array(),
+	public function addProduct($prodid, $quantity = 1, array $options = array(), array $variantAttributeIds = array(),
 		array $configAttributeIds = array(), array $hiddenAttributeIds = array(), array $customAttributeValues = array(),
-		$warehouse = 'default' )
+		$warehouse = 'default')
 	{
-		$catalogListManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog/lists' );
+		$catalogListManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog/lists');
 
-		$search = $catalogListManager->createSearch( true );
+		$search = $catalogListManager->createSearch(true);
 		$expr = array(
-			$search->compare( '==', 'catalog.lists.refid', $prodid ),
+			$search->compare('==', 'catalog.lists.refid', $prodid),
 			$search->getConditions()
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, 1 );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, 1);
 
-		$result = $catalogListManager->searchItems( $search );
+		$result = $catalogListManager->searchItems($search);
 
-		if( reset( $result ) === false )
+		if (reset($result) === false)
 		{
-			$msg = sprintf( 'Adding product with ID "%1$s" is not allowed', $prodid );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+			$msg = sprintf('Adding product with ID "%1$s" is not allowed', $prodid);
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
 		}
 
 		$this->getController()->addProduct(

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

Spacing +260 added lines, -260 removed lines

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

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

Braces +9 added lines, -10 removed lines

@@ -283,17 +283,14 @@ 
 		{
 			$address->copyFrom( $value );
 			$this->basket->setAddress( $address, $type );
-		}
-		else if( is_array( $value ) )
+		} else if( is_array( $value ) )
 		{
 			$this->setAddressFromArray( $address, $value );
 			$this->basket->setAddress( $address, $type );
-		}
-		else if( $value === null )
+		} else if( $value === null )
 		{
 			$this->basket->deleteAddress( $type );
-		}
-		else
+		} else
 		{
 			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Invalid value for address type "%1$s"', $type ) );
 		}
@@ -519,10 +516,11 @@ 
 		{
 			$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() );
 
 			$subprices = $productItem->getRefItems( 'price', 'default', 'default' );
@@ -542,10 +540,11 @@ 
 
 				$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 );
 		}
 

Spacing +202 added lines, -202 removed lines

@@ -30,11 +30,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');
 		$this->basket = $this->domainManager->getSession();
 
 		$this->checkLocale();
@@ -47,7 +47,7 @@ 
 	public function clear()
 	{
 		$this->basket = $this->domainManager->createItem();
-		$this->domainManager->setSession( $this->basket );
+		$this->domainManager->setSession($this->basket);
 	}
 
 
@@ -82,48 +82,48 @@ 
 	 * @param string $warehouse Unique code of the warehouse 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(), array $variantAttributeIds = array(),
+	public function addProduct($prodid, $quantity = 1, array $options = array(), array $variantAttributeIds = array(),
 		array $configAttributeIds = array(), array $hiddenAttributeIds = array(), array $customAttributeValues = array(),
-		$warehouse = 'default' )
+		$warehouse = 'default')
 	{
 		$context = $this->getContext();
 
-		$productItem = $this->getDomainItem( 'product', 'product.id', $prodid, array( 'media', 'supplier', 'price', 'product', 'text' ) );
+		$productItem = $this->getDomainItem('product', 'product.id', $prodid, array('media', 'supplier', 'price', 'product', 'text'));
 
-		$orderBaseProductItem = \Aimeos\MShop\Factory::createManager( $context, 'order/base/product' )->createItem();
-		$orderBaseProductItem->copyFrom( $productItem );
-		$orderBaseProductItem->setQuantity( $quantity );
-		$orderBaseProductItem->setWarehouseCode( $warehouse );
+		$orderBaseProductItem = \Aimeos\MShop\Factory::createManager($context, 'order/base/product')->createItem();
+		$orderBaseProductItem->copyFrom($productItem);
+		$orderBaseProductItem->setQuantity($quantity);
+		$orderBaseProductItem->setWarehouseCode($warehouse);
 
 		$attr = array();
-		$prices = $productItem->getRefItems( 'price', 'default', 'default' );
+		$prices = $productItem->getRefItems('price', 'default', 'default');
 
-		switch( $productItem->getType() )
+		switch ($productItem->getType())
 		{
 			case 'select':
-				$attr = $this->getVariantDetails( $orderBaseProductItem, $productItem, $prices, $variantAttributeIds, $options );
+				$attr = $this->getVariantDetails($orderBaseProductItem, $productItem, $prices, $variantAttributeIds, $options);
 				break;
 			case 'bundle':
-				$this->addBundleProducts( $orderBaseProductItem, $productItem, $variantAttributeIds, $warehouse );
+				$this->addBundleProducts($orderBaseProductItem, $productItem, $variantAttributeIds, $warehouse);
 				break;
 		}
 
-		$priceManager = \Aimeos\MShop\Factory::createManager( $context, 'price' );
-		$price = $priceManager->getLowestPrice( $prices, $quantity );
+		$priceManager = \Aimeos\MShop\Factory::createManager($context, 'price');
+		$price = $priceManager->getLowestPrice($prices, $quantity);
 
-		$attr = array_merge( $attr, $this->createOrderProductAttributes( $price, $prodid, $quantity, $configAttributeIds, 'config' ) );
-		$attr = array_merge( $attr, $this->createOrderProductAttributes( $price, $prodid, $quantity, $hiddenAttributeIds, 'hidden' ) );
-		$attr = array_merge( $attr, $this->createOrderProductAttributes( $price, $prodid, $quantity, array_keys( $customAttributeValues ), 'custom', $customAttributeValues ) );
+		$attr = array_merge($attr, $this->createOrderProductAttributes($price, $prodid, $quantity, $configAttributeIds, 'config'));
+		$attr = array_merge($attr, $this->createOrderProductAttributes($price, $prodid, $quantity, $hiddenAttributeIds, 'hidden'));
+		$attr = array_merge($attr, $this->createOrderProductAttributes($price, $prodid, $quantity, array_keys($customAttributeValues), 'custom', $customAttributeValues));
 
 		// remove product rebate of original price in favor to rebates granted for the order
-		$price->setRebate( '0.00' );
+		$price->setRebate('0.00');
 
-		$orderBaseProductItem->setPrice( $price );
-		$orderBaseProductItem->setAttributes( $attr );
+		$orderBaseProductItem->setPrice($price);
+		$orderBaseProductItem->setAttributes($attr);
 
-		$this->addProductInStock( $orderBaseProductItem, $productItem->getId(), $quantity, $options, $warehouse );
+		$this->addProductInStock($orderBaseProductItem, $productItem->getId(), $quantity, $options, $warehouse);
 
-		$this->domainManager->setSession( $this->basket );
+		$this->domainManager->setSession($this->basket);
 	}
 
 
@@ -132,18 +132,18 @@ 
 	 *
 	 * @param integer $position Position number (key) of the order product item
 	 */
-	public function deleteProduct( $position )
+	public function deleteProduct($position)
 	{
-		$product = $this->basket->getProduct( $position );
+		$product = $this->basket->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->basket->deleteProduct( $position );
-		$this->domainManager->setSession( $this->basket );
+		$this->basket->deleteProduct($position);
+		$this->domainManager->setSession($this->basket);
 	}
 
 
@@ -156,35 +156,35 @@ 
 	 * 	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(),
-		array $configAttributeCodes = array() )
+	public function editProduct($position, $quantity, array $options = array(),
+		array $configAttributeCodes = array())
 	{
-		$product = $this->basket->getProduct( $position );
-		$product->setQuantity( $quantity ); // Enforce check immediately
+		$product = $this->basket->getProduct($position);
+		$product->setQuantity($quantity); // Enforce check immediately
 
-		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);
 		}
 
 		$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);
 
-		$productItem = $this->getDomainItem( 'product', 'product.code', $product->getProductCode(), array( 'price', 'text' ) );
-		$prices = $productItem->getRefItems( 'price', 'default' );
+		$productItem = $this->getDomainItem('product', 'product.code', $product->getProductCode(), array('price', 'text'));
+		$prices = $productItem->getRefItems('price', 'default');
 
-		$product->setPrice( $this->calcPrice( $product, $prices, $quantity ) );
+		$product->setPrice($this->calcPrice($product, $prices, $quantity));
 
-		$this->editProductInStock( $product, $productItem, $quantity, $position, $options );
+		$this->editProductInStock($product, $productItem, $quantity, $position, $options);
 
-		$this->domainManager->setSession( $this->basket );
+		$this->domainManager->setSession($this->basket);
 	}
 
 
@@ -194,50 +194,50 @@ 
 	 * @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->basket ) !== true ) {
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Requirements for coupon code "%1$s" aren\'t met', $code ) );
+		if ($provider->isAvailable($this->basket) !== true) {
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Requirements for coupon code "%1$s" aren\'t met', $code));
 		}
 
-		$provider->addCoupon( $this->basket );
-		$this->domainManager->setSession( $this->basket );
+		$provider->addCoupon($this->basket);
+		$this->domainManager->setSession($this->basket);
 	}
 
 
@@ -247,22 +247,22 @@ 
 	 * @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->basket );
-		$this->domainManager->setSession( $this->basket );
+		$manager->getProvider($item, $code)->deleteCoupon($this->basket);
+		$this->domainManager->setSession($this->basket);
 	}
 
 
@@ -274,31 +274,31 @@ 
 	 * @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->basket->setAddress( $address, $type );
+			$address->copyFrom($value);
+			$this->basket->setAddress($address, $type);
 		}
-		else if( is_array( $value ) )
+		else if (is_array($value))
 		{
-			$this->setAddressFromArray( $address, $value );
-			$this->basket->setAddress( $address, $type );
+			$this->setAddressFromArray($address, $value);
+			$this->basket->setAddress($address, $type);
 		}
-		else if( $value === null )
+		else if ($value === null)
 		{
-			$this->basket->deleteAddress( $type );
+			$this->basket->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->domainManager->setSession( $this->basket );
+		$this->domainManager->setSession($this->basket);
 	}
 
 
@@ -311,43 +311,43 @@ 
 	 * 	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 = array() )
+	public function setService($type, $id, array $attributes = array())
 	{
 		$context = $this->getContext();
 
-		$serviceManager = \Aimeos\MShop\Factory::createManager( $context, 'service' );
-		$serviceItem = $this->getDomainItem( 'service', 'service.id', $id, array( 'media', 'price', 'text' ) );
+		$serviceManager = \Aimeos\MShop\Factory::createManager($context, 'service');
+		$serviceItem = $this->getDomainItem('service', 'service.id', $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);
 
-		$price = $provider->calcPrice( $this->basket );
+		$price = $provider->calcPrice($this->basket);
 		// remove service rebate of original price
-		$price->setRebate( '0.00' );
-		$orderServiceItem->setPrice( $price );
+		$price->setRebate('0.00');
+		$orderServiceItem->setPrice($price);
 
-		$provider->setConfigFE( $orderServiceItem, $attributes );
+		$provider->setConfigFE($orderServiceItem, $attributes);
 
-		$this->basket->setService( $orderServiceItem, $type );
-		$this->domainManager->setSession( $this->basket );
+		$this->basket->setService($orderServiceItem, $type);
+		$this->domainManager->setSession($this->basket);
 	}
 
 
@@ -359,44 +359,44 @@ 
 	 * @param array $variantAttributeIds List of product variant attribute IDs
 	 * @param string $warehouse
 	 */
-	protected function addBundleProducts( \Aimeos\MShop\Order\Item\Base\Product\Iface $orderBaseProductItem,
-		\Aimeos\MShop\Product\Item\Iface $productItem, array $variantAttributeIds, $warehouse )
+	protected function addBundleProducts(\Aimeos\MShop\Order\Item\Base\Product\Iface $orderBaseProductItem,
+		\Aimeos\MShop\Product\Item\Iface $productItem, array $variantAttributeIds, $warehouse)
 	{
 		$quantity = $orderBaseProductItem->getQuantity();
 		$products = $subProductIds = $orderProducts = array();
-		$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->setWarehouseCode( $warehouse );
-			$orderProduct->setPrice( $this->calcPrice( $orderProduct, $prices, $quantity ) );
+			$orderProduct->copyFrom($product);
+			$orderProduct->setWarehouseCode($warehouse);
+			$orderProduct->setPrice($this->calcPrice($orderProduct, $prices, $quantity));
 
 			$orderProducts[] = $orderProduct;
 		}
 
-		$orderBaseProductItem->setProducts( $orderProducts );
+		$orderBaseProductItem->setProducts($orderProducts);
 	}
 
 
@@ -410,32 +410,32 @@ 
 	 * @param string $warehouse Warehouse code for retrieving the stock level
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If there's not enough stock available
 	 */
-	protected function addProductInStock( \Aimeos\MShop\Order\Item\Base\Product\Iface $orderBaseProductItem,
-			$productId, $quantity, array $options, $warehouse )
+	protected function addProductInStock(\Aimeos\MShop\Order\Item\Base\Product\Iface $orderBaseProductItem,
+			$productId, $quantity, array $options, $warehouse)
 	{
 		$stocklevel = null;
-		if( !isset( $options['stock'] ) || $options['stock'] != false ) {
-			$stocklevel = $this->getStockLevel( $productId, $warehouse );
+		if (!isset($options['stock']) || $options['stock'] != false) {
+			$stocklevel = $this->getStockLevel($productId, $warehouse);
 		}
 
-		if( $stocklevel === null || $stocklevel > 0 )
+		if ($stocklevel === null || $stocklevel > 0)
 		{
-			$position = $this->get()->addProduct( $orderBaseProductItem );
-			$orderBaseProductItem = clone $this->get()->getProduct( $position );
+			$position = $this->get()->addProduct($orderBaseProductItem);
+			$orderBaseProductItem = clone $this->get()->getProduct($position);
 			$quantity = $orderBaseProductItem->getQuantity();
 
-			if( $stocklevel > 0 && $stocklevel < $quantity )
+			if ($stocklevel > 0 && $stocklevel < $quantity)
 			{
-				$this->get()->deleteProduct( $position );
-				$orderBaseProductItem->setQuantity( $stocklevel );
-				$this->get()->addProduct( $orderBaseProductItem, $position );
+				$this->get()->deleteProduct($position);
+				$orderBaseProductItem->setQuantity($stocklevel);
+				$this->get()->addProduct($orderBaseProductItem, $position);
 			}
 		}
 
-		if( $stocklevel !== null && $stocklevel < $quantity )
+		if ($stocklevel !== null && $stocklevel < $quantity)
 		{
-			$msg = sprintf( 'There are not enough products "%1$s" in stock', $orderBaseProductItem->getName() );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+			$msg = sprintf('There are not enough products "%1$s" in stock', $orderBaseProductItem->getName());
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
 		}
 	}
 
@@ -451,36 +451,36 @@ 
 	 * @param array $attributeValues Associative list of attribute IDs as keys and their codes as values
 	 * @return array List of items implementing \Aimeos\MShop\Order\Item\Product\Attribute\Iface
 	 */
-	protected function createOrderProductAttributes( \Aimeos\MShop\Price\Item\Iface $price, $prodid, $quantity,
-			array $attributeIds, $type, array $attributeValues = array() )
+	protected function createOrderProductAttributes(\Aimeos\MShop\Price\Item\Iface $price, $prodid, $quantity,
+			array $attributeIds, $type, array $attributeValues = array())
 	{
-		if( empty( $attributeIds ) ) {
+		if (empty($attributeIds)) {
 			return array();
 		}
 
-		$attrTypeId = $this->getProductListTypeItem( 'attribute', $type )->getId();
-		$this->checkReferences( $prodid, 'attribute', $attrTypeId, $attributeIds );
+		$attrTypeId = $this->getProductListTypeItem('attribute', $type)->getId();
+		$this->checkReferences($prodid, 'attribute', $attrTypeId, $attributeIds);
 
 		$list = array();
 		$context = $this->getContext();
 
-		$priceManager = \Aimeos\MShop\Factory::createManager( $context, 'price' );
-		$orderProductAttributeManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base/product/attribute' );
+		$priceManager = \Aimeos\MShop\Factory::createManager($context, 'price');
+		$orderProductAttributeManager = \Aimeos\MShop\Factory::createManager($context, 'order/base/product/attribute');
 
-		foreach( $this->getAttributes( $attributeIds ) as $id => $attrItem )
+		foreach ($this->getAttributes($attributeIds) as $id => $attrItem)
 		{
-			$prices = $attrItem->getRefItems( 'price', 'default', 'default' );
+			$prices = $attrItem->getRefItems('price', 'default', 'default');
 
-			if( !empty( $prices ) ) {
-				$price->addItem( $priceManager->getLowestPrice( $prices, $quantity ) );
+			if (!empty($prices)) {
+				$price->addItem($priceManager->getLowestPrice($prices, $quantity));
 			}
 
 			$item = $orderProductAttributeManager->createItem();
-			$item->copyFrom( $attrItem );
-			$item->setType( $type );
+			$item->copyFrom($attrItem);
+			$item->setType($type);
 
-			if( isset( $attributeValues[$id] ) ) {
-				$item->setValue( $attributeValues[$id] );
+			if (isset($attributeValues[$id])) {
+				$item->setValue($attributeValues[$id]);
 			}
 
 			$list[] = $item;
@@ -500,26 +500,26 @@ 
 	 * @param array Associative list of options
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If there's not enough stock available
 	 */
-	protected function editProductInStock( \Aimeos\MShop\Order\Item\Base\Product\Iface $product,
-			\Aimeos\MShop\Product\Item\Iface $productItem, $quantity, $position, array $options )
+	protected function editProductInStock(\Aimeos\MShop\Order\Item\Base\Product\Iface $product,
+			\Aimeos\MShop\Product\Item\Iface $productItem, $quantity, $position, array $options)
 	{
 		$stocklevel = null;
-		if( !isset( $options['stock'] ) || $options['stock'] != false ) {
-			$stocklevel = $this->getStockLevel( $productItem->getId(), $product->getWarehouseCode() );
+		if (!isset($options['stock']) || $options['stock'] != false) {
+			$stocklevel = $this->getStockLevel($productItem->getId(), $product->getWarehouseCode());
 		}
 
-		$product->setQuantity( ( $stocklevel !== null && $stocklevel > 0 ? min( $stocklevel, $quantity ) : $quantity ) );
+		$product->setQuantity(($stocklevel !== null && $stocklevel > 0 ? min($stocklevel, $quantity) : $quantity));
 
-		$this->get()->deleteProduct( $position );
+		$this->get()->deleteProduct($position);
 
-		if( $stocklevel === null || $stocklevel > 0 ) {
-			$this->get()->addProduct( $product, $position );
+		if ($stocklevel === null || $stocklevel > 0) {
+			$this->get()->addProduct($product, $position);
 		}
 
-		if( $stocklevel !== null && $stocklevel < $quantity )
+		if ($stocklevel !== null && $stocklevel < $quantity)
 		{
-			$msg = sprintf( 'There are not enough products "%1$s" in stock', $productItem->getName() );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+			$msg = sprintf('There are not enough products "%1$s" in stock', $productItem->getName());
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
 		}
 	}
 
@@ -534,23 +534,23 @@ 
 	 * @return \Aimeos\MShop\Common\Item\Iface Domain item object
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception
 	 */
-	protected function getDomainItem( $domain, $key, $value, array $ref )
+	protected function getDomainItem($domain, $key, $value, array $ref)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $domain );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $domain);
 
-		$search = $manager->createSearch( true );
+		$search = $manager->createSearch(true);
 		$expr = array(
-				$search->compare( '==', $key, $value ),
+				$search->compare('==', $key, $value),
 				$search->getConditions(),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		$result = $manager->searchItems( $search, $ref );
+		$result = $manager->searchItems($search, $ref);
 
-		if( ( $item = reset( $result ) ) === false )
+		if (($item = reset($result)) === false)
 		{
-			$msg = sprintf( 'No item for "%1$s" (%2$s) found', $value, $key );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+			$msg = sprintf('No item for "%1$s" (%2$s) found', $value, $key);
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
 		}
 
 		return $item;
@@ -568,44 +568,44 @@ 
 	 * @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 = array();
-		$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( count( $subprices ) > 0 ) {
+			if (count($subprices) > 0) {
 				$prices = $subprices;
 			}
 
-			$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;
@@ -620,18 +620,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);
 		}
 	}
 }

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

Braces +4 added lines, -8 removed lines

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

Spacing +147 added lines, -147 removed lines

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

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

Spacing +14 added lines, -14 removed lines

@@ -61,9 +61,9 @@ 
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the product isn't available
 	 * @return void
 	 */
-	public function addProduct( $prodid, $quantity = 1, array $options = array(), array $variantAttributeIds = array(),
+	public function addProduct($prodid, $quantity = 1, array $options = array(), array $variantAttributeIds = array(),
 		array $configAttributeIds = array(), array $hiddenAttributeIds = array(), array $customAttributeValues = array(),
-		$warehouse = 'default' )
+		$warehouse = 'default')
 	{
 		$this->getController()->addProduct(
 			$prodid, $quantity, $options, $variantAttributeIds, $configAttributeIds,
@@ -78,9 +78,9 @@ 
 	 * @param integer $position Position number (key) of the order product item
 	 * @return void
 	 */
-	public function deleteProduct( $position )
+	public function deleteProduct($position)
 	{
-		$this->getController()->deleteProduct( $position );
+		$this->getController()->deleteProduct($position);
 	}
 
 
@@ -92,9 +92,9 @@ 
 	 * @param array $configAttributeCodes Codes of the product config attributes that should be REMOVED
 	 * @return void
 	 */
-	public function editProduct( $position, $quantity, array $configAttributeCodes = array() )
+	public function editProduct($position, $quantity, array $configAttributeCodes = array())
 	{
-		$this->getController()->editProduct( $position, $quantity, $configAttributeCodes );
+		$this->getController()->editProduct($position, $quantity, $configAttributeCodes);
 	}
 
 
@@ -105,9 +105,9 @@ 
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid or not allowed
 	 * @return void
 	 */
-	public function addCoupon( $code )
+	public function addCoupon($code)
 	{
-		$this->getController()->addCoupon( $code );
+		$this->getController()->addCoupon($code);
 	}
 
 
@@ -118,9 +118,9 @@ 
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid
 	 * @return void
 	 */
-	public function deleteCoupon( $code )
+	public function deleteCoupon($code)
 	{
-		$this->getController()->deleteCoupon( $code );
+		$this->getController()->deleteCoupon($code);
 	}
 
 
@@ -133,9 +133,9 @@ 
 	 * 	if one of the keys is invalid when using an array with key/value pairs
 	 * @return void
 	 */
-	public function setAddress( $type, $value )
+	public function setAddress($type, $value)
 	{
-		$this->getController()->setAddress( $type, $value );
+		$this->getController()->setAddress($type, $value);
 	}
 
 
@@ -149,8 +149,8 @@ 
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If there is no price to the service item attached
 	 * @return void
 	 */
-	public function setService( $type, $id, array $attributes = array() )
+	public function setService($type, $id, array $attributes = array())
 	{
-		$this->getController()->setService( $type, $id, $attributes );
+		$this->getController()->setService($type, $id, $attributes);
 	}
 }