aimeos / ai-controller-frontend

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

Spacing +9 added lines, -9 removed lines

@@ -27,10 +27,10 @@ 
 	 * @param array $ref List of domains for which the items referenced by the services should be fetched too
 	 * @return array List of service items implementing \Aimeos\MShop\Service\Item\Iface with referenced items
 	 */
-	public function getServices( $type, \Aimeos\MShop\Order\Item\Base\Iface $basket,
-		$ref = array( 'media', 'price', 'text' ) )
+	public function getServices($type, \Aimeos\MShop\Order\Item\Base\Iface $basket,
+		$ref = array('media', 'price', 'text'))
 	{
-		return $this->getController()->getServices( $type, $basket, $ref );
+		return $this->getController()->getServices($type, $basket, $ref);
 	}
 
 
@@ -43,9 +43,9 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Base\Iface $basket Basket object
 	 * @return array List of attribute definitions implementing \Aimeos\MW\Criteria\Attribute\Iface
 	 */
-	public function getServiceAttributes( $type, $serviceId, \Aimeos\MShop\Order\Item\Base\Iface $basket )
+	public function getServiceAttributes($type, $serviceId, \Aimeos\MShop\Order\Item\Base\Iface $basket)
 	{
-		return $this->getController()->getServiceAttributes( $type, $serviceId, $basket );
+		return $this->getController()->getServiceAttributes($type, $serviceId, $basket);
 	}
 
 
@@ -60,9 +60,9 @@ 
 	 * @throws \Aimeos\MShop\Exception If service provider isn't available
 	 * @throws \Exception If an error occurs
 	 */
-	public function getServicePrice( $type, $serviceId, \Aimeos\MShop\Order\Item\Base\Iface $basket )
+	public function getServicePrice($type, $serviceId, \Aimeos\MShop\Order\Item\Base\Iface $basket)
 	{
-		return $this->getController()->getServicePrice( $type, $serviceId, $basket );
+		return $this->getController()->getServicePrice($type, $serviceId, $basket);
 	}
 
 
@@ -76,8 +76,8 @@ 
 	 * @return array List of key/value pairs of attributes keys and an error message for values that are invalid or
 	 * 	missing
 	 */
-	public function checkServiceAttributes( $type, $serviceId, array $attributes )
+	public function checkServiceAttributes($type, $serviceId, array $attributes)
 	{
-		return $this->getController()->checkServiceAttributes( $type, $serviceId, $attributes );
+		return $this->getController()->checkServiceAttributes($type, $serviceId, $attributes);
 	}
 }

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

Spacing +8 added lines, -8 removed lines

@@ -29,9 +29,9 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Base\Iface $basket Basket object to be stored
 	 * @return \Aimeos\MShop\Order\Item\Iface Order item that belongs to the stored basket
 	 */
-	public function store( \Aimeos\MShop\Order\Item\Base\Iface $basket )
+	public function store(\Aimeos\MShop\Order\Item\Base\Iface $basket)
 	{
-		return $this->getController()->store( $basket );
+		return $this->getController()->store($basket);
 	}
 
 
@@ -54,9 +54,9 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object
 	 * @return void
 	 */
-	public function block( \Aimeos\MShop\Order\Item\Iface $orderItem )
+	public function block(\Aimeos\MShop\Order\Item\Iface $orderItem)
 	{
-		$this->getController()->block( $orderItem );
+		$this->getController()->block($orderItem);
 	}
 
 
@@ -79,9 +79,9 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object
 	 * @return void
 	 */
-	public function unblock( \Aimeos\MShop\Order\Item\Iface $orderItem )
+	public function unblock(\Aimeos\MShop\Order\Item\Iface $orderItem)
 	{
-		$this->getController()->unblock( $orderItem );
+		$this->getController()->unblock($orderItem);
 	}
 
 
@@ -100,8 +100,8 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object
 	 * @return void
 	 */
-	public function update( \Aimeos\MShop\Order\Item\Iface $orderItem )
+	public function update(\Aimeos\MShop\Order\Item\Iface $orderItem)
 	{
-		$this->getController()->update( $orderItem );
+		$this->getController()->update($orderItem);
 	}
 }

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( 2, $total );
-		$this->assertEquals( 1, count( $results ) );
+		$this->assertEquals(2, $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/Standard.php

Spacing +205 added lines, -205 removed lines

@@ -32,11 +32,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();
@@ -49,7 +49,7 @@ 
 	public function clear()
 	{
 		$this->basket = $this->domainManager->createItem();
-		$this->domainManager->setSession( $this->basket );
+		$this->domainManager->setSession($this->basket);
 	}
 
 
@@ -69,8 +69,8 @@ 
 	 */
 	public function save()
 	{
-		if( $this->basket->isModified() ) {
-			$this->domainManager->setSession( $this->basket );
+		if ($this->basket->isModified()) {
+			$this->domainManager->setSession($this->basket);
 		}
 	}
 
@@ -95,48 +95,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);
 	}
 
 
@@ -145,18 +145,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);
 	}
 
 
@@ -169,35 +169,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);
 	}
 
 
@@ -207,50 +207,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);
 	}
 
 
@@ -260,22 +260,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);
 	}
 
 
@@ -287,31 +287,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);
 	}
 
 
@@ -324,43 +324,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);
 	}
 
 
@@ -372,44 +372,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);
 	}
 
 
@@ -423,37 +423,37 @@ 
 	 * @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 );
+			$position = $this->get()->addProduct($orderBaseProductItem);
 
 			try
 			{
-				$orderBaseProductItem = clone $this->get()->getProduct( $position );
+				$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);
 				}
 			}
-			catch( \Aimeos\MShop\Order\Exception $e ) {} // hide error if product position changed by plugin
+			catch (\Aimeos\MShop\Order\Exception $e) {} // hide error if product position changed by plugin
 		}
 
-		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);
 		}
 	}
 
@@ -469,36 +469,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;
@@ -518,26 +518,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);
 		}
 	}
 
@@ -552,23 +552,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;
@@ -586,44 +586,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;
@@ -638,18 +638,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);
 		}
 	}
 }

Braces +10 added lines, -12 removed lines

@@ -296,17 +296,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 ) );
 		}
@@ -446,8 +443,7 @@ 
 					$orderBaseProductItem->setQuantity( $stocklevel );
 					$this->get()->addProduct( $orderBaseProductItem, $position );
 				}
-			}
-			catch( \Aimeos\MShop\Order\Exception $e ) {} // hide error if product position changed by plugin
+			} catch( \Aimeos\MShop\Order\Exception $e ) {} // hide error if product position changed by plugin
 		}
 
 		if( $stocklevel !== null && $stocklevel < $quantity )
@@ -596,10 +592,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' );
@@ -619,10 +616,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 );
 		}