aimeos / ai-controller-frontend

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

Spacing +44 added lines, -44 removed lines

@@ -29,11 +29,11 @@ 
 	 * @param string $type Arbitrary order type (max. eight chars)
 	 * @return \Aimeos\MShop\Order\Item\Iface Created order object
 	 */
-	public function addItem( $baseId, $type )
+	public function addItem($baseId, $type)
 	{
 		$total = 0;
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'order');
 
 		/** controller/frontend/order/limit-seconds
 		 * Order limitation time frame in seconds
@@ -51,24 +51,24 @@ 
 		 * @see controller/frontend/basket/limit-count
 		 * @see controller/frontend/basket/limit-seconds
 		 */
-		$seconds = $context->getConfig()->get( 'controller/frontend/order/limit-seconds', 300 );
+		$seconds = $context->getConfig()->get('controller/frontend/order/limit-seconds', 300);
 
 		$search = $manager->createSearch();
 		$expr = [
-			$search->compare( '==', 'order.baseid', $baseId ),
-			$search->compare( '>=', 'order.ctime', date( 'Y-m-d H:i:s', time() - $seconds ) ),
+			$search->compare('==', 'order.baseid', $baseId),
+			$search->compare('>=', 'order.ctime', date('Y-m-d H:i:s', time() - $seconds)),
 		];
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, 0 );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, 0);
 
-		$manager->searchItems( $search, [], $total );
+		$manager->searchItems($search, [], $total);
 
-		if( $total > 0 ) {
-			throw new \Aimeos\Controller\Frontend\Order\Exception( sprintf( 'The order has already been created' ) );
+		if ($total > 0) {
+			throw new \Aimeos\Controller\Frontend\Order\Exception(sprintf('The order has already been created'));
 		}
 
-		$item = $manager->createItem()->setBaseId( $baseId )->setType( $type );
-		return $manager->saveItem( $item );
+		$item = $manager->createItem()->setBaseId($baseId)->setType($type);
+		return $manager->saveItem($item);
 	}
 
 
@@ -79,7 +79,7 @@ 
 	 */
 	public function createFilter()
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order' )->createSearch( true );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'order')->createSearch(true);
 	}
 
 
@@ -90,30 +90,30 @@ 
 	 * @param boolean $default Use default criteria to limit orders
 	 * @return \Aimeos\MShop\Order\Item\Iface Order object
 	 */
-	public function getItem( $id, $default = true )
+	public function getItem($id, $default = true)
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'order');
 
-		$search = $manager->createSearch( true );
+		$search = $manager->createSearch(true);
 		$expr = [
-			$search->compare( '==', 'order.id', $id ),
+			$search->compare('==', 'order.id', $id),
 			$search->getConditions(),
 		];
 
-		if( $default !== false ) {
-			$expr[] = $search->compare( '==', 'order.editor', $context->getEditor() );
+		if ($default !== false) {
+			$expr[] = $search->compare('==', 'order.editor', $context->getEditor());
 		}
 
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		$items = $manager->searchItems( $search );
+		$items = $manager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) !== false ) {
+		if (($item = reset($items)) !== false) {
 			return $item;
 		}
 
-		throw new \Aimeos\Controller\Frontend\Order\Exception( sprintf( 'No order item for ID "%1$s" found', $id ) );
+		throw new \Aimeos\Controller\Frontend\Order\Exception(sprintf('No order item for ID "%1$s" found', $id));
 	}
 
 
@@ -123,10 +123,10 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Iface $item Order object
 	 * @return \Aimeos\MShop\Order\Item\Iface Saved order item
 	 */
-	public function saveItem( \Aimeos\MShop\Order\Item\Iface $item )
+	public function saveItem(\Aimeos\MShop\Order\Item\Iface $item)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order' );
-		return $manager->saveItem( $item );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'order');
+		return $manager->saveItem($item);
 	}
 
 
@@ -137,18 +137,18 @@ 
 	 * @param integer|null &$total Variable that will contain the total number of available items
 	 * @return \Aimeos\MShop\Order\Item\Iface[] Associative list of IDs as keys and order objects as values
 	 */
-	public function searchItems( \Aimeos\MW\Criteria\Iface $filter, &$total = null )
+	public function searchItems(\Aimeos\MW\Criteria\Iface $filter, &$total = null)
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'order');
 
 		$expr = [
 			$filter->getConditions(),
-			$filter->compare( '==', 'order.base.customerid', $context->getUserId() ),
+			$filter->compare('==', 'order.base.customerid', $context->getUserId()),
 		];
-		$filter->setConditions( $filter->combine( '&&', $expr ) );
+		$filter->setConditions($filter->combine('&&', $expr));
 
-		return $manager->searchItems( $filter, [], $total );
+		return $manager->searchItems($filter, [], $total);
 	}
 
 
@@ -170,9 +170,9 @@ 
 	 *
 	 * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object
 	 */
-	public function block( \Aimeos\MShop\Order\Item\Iface $orderItem )
+	public function block(\Aimeos\MShop\Order\Item\Iface $orderItem)
 	{
-		\Aimeos\Controller\Common\Order\Factory::createController( $this->getContext() )->block( $orderItem );
+		\Aimeos\Controller\Common\Order\Factory::createController($this->getContext())->block($orderItem);
 	}
 
 
@@ -194,9 +194,9 @@ 
 	 *
 	 * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object
 	 */
-	public function unblock( \Aimeos\MShop\Order\Item\Iface $orderItem )
+	public function unblock(\Aimeos\MShop\Order\Item\Iface $orderItem)
 	{
-		\Aimeos\Controller\Common\Order\Factory::createController( $this->getContext() )->unblock( $orderItem );
+		\Aimeos\Controller\Common\Order\Factory::createController($this->getContext())->unblock($orderItem);
 	}
 
 
@@ -214,9 +214,9 @@ 
 	 *
 	 * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object
 	 */
-	public function update( \Aimeos\MShop\Order\Item\Iface $orderItem )
+	public function update(\Aimeos\MShop\Order\Item\Iface $orderItem)
 	{
-		\Aimeos\Controller\Common\Order\Factory::createController( $this->getContext() )->update( $orderItem );
+		\Aimeos\Controller\Common\Order\Factory::createController($this->getContext())->update($orderItem);
 	}
 
 
@@ -231,22 +231,22 @@ 
 	 * @return \Aimeos\MShop\Order\Item\Iface Order item that belongs to the stored basket
 	 * @deprecated 2017.04 Use store() from basket controller instead
 	 */
-	public function store( \Aimeos\MShop\Order\Item\Base\Iface $basket )
+	public function store(\Aimeos\MShop\Order\Item\Base\Iface $basket)
 	{
 		$context = $this->getContext();
 
-		$orderManager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
-		$orderBaseManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' );
+		$orderManager = \Aimeos\MShop\Factory::createManager($context, 'order');
+		$orderBaseManager = \Aimeos\MShop\Factory::createManager($context, 'order/base');
 
 
 		$orderBaseManager->begin();
-		$orderBaseManager->store( $basket );
+		$orderBaseManager->store($basket);
 		$orderBaseManager->commit();
 
 		$orderItem = $orderManager->createItem();
-		$orderItem->setBaseId( $basket->getId() );
-		$orderItem->setType( \Aimeos\MShop\Order\Item\Base::TYPE_WEB );
+		$orderItem->setBaseId($basket->getId());
+		$orderItem->setType(\Aimeos\MShop\Order\Item\Base::TYPE_WEB);
 
-		return $orderManager->saveItem( $orderItem );
+		return $orderManager->saveItem($orderItem);
 	}
 }

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

Spacing +73 added lines, -73 removed lines

@@ -18,200 +18,200 @@
 
 	protected function setUp()
 	{
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 
 		$this->context = \TestHelperFrontend::getContext();
-		$this->object = new \Aimeos\Controller\Frontend\Order\Standard( $this->context );
+		$this->object = new \Aimeos\Controller\Frontend\Order\Standard($this->context);
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object, $this->context );
+		unset($this->object, $this->context);
 
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 	}
 
 
 	public function testAddItem()
 	{
-		$manager = $this->getMockBuilder( '\\Aimeos\\MShop\\Order\\Manager\\Standard' )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( ['saveItem'] )
+		$manager = $this->getMockBuilder('\\Aimeos\\MShop\\Order\\Manager\\Standard')
+			->setConstructorArgs([$this->context])
+			->setMethods(['saveItem'])
 			->getMock();
 
-		\Aimeos\MShop\Factory::injectManager( $this->context, 'order', $manager );
+		\Aimeos\MShop\Factory::injectManager($this->context, 'order', $manager);
 
-		$manager->expects( $this->once() )->method( 'saveItem' )
-			->will( $this->returnValue( $manager->createItem() ) );
+		$manager->expects($this->once())->method('saveItem')
+			->will($this->returnValue($manager->createItem()));
 
-		$this->assertInstanceOf( '\Aimeos\MShop\Order\Item\Iface', $this->object->addItem( -1, 'test' ) );
+		$this->assertInstanceOf('\Aimeos\MShop\Order\Item\Iface', $this->object->addItem( -1, 'test' ));
 	}
 
 
 	public function testAddItemLimit()
 	{
-		$this->context->getConfig()->set( 'controller/frontend/order/limit-seconds', 86400 * 365 );
+		$this->context->getConfig()->set('controller/frontend/order/limit-seconds', 86400 * 365);
 
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'order/base' );
-		$result = $manager->searchItems( $manager->createSearch()->setSlice( 0, 1 ) );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'order/base');
+		$result = $manager->searchItems($manager->createSearch()->setSlice(0, 1));
 
-		if( ( $item = reset( $result ) ) === false ) {
-			throw new \RuntimeException( 'No order item found' );
+		if (($item = reset($result)) === false) {
+			throw new \RuntimeException('No order item found');
 		}
 
-		$this->setExpectedException( '\Aimeos\Controller\Frontend\Order\Exception' );
-		$this->object->addItem( $item->getId(), 'test' );
+		$this->setExpectedException('\Aimeos\Controller\Frontend\Order\Exception');
+		$this->object->addItem($item->getId(), 'test');
 	}
 
 
 	public function testCreateFilter()
 	{
-		$this->assertInstanceOf( '\Aimeos\MW\Criteria\Iface', $this->object->createFilter() );
+		$this->assertInstanceOf('\Aimeos\MW\Criteria\Iface', $this->object->createFilter());
 	}
 
 
 	public function testGetItem()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'customer' );
-		$customerItem = $manager->findItem( 'UTC001' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'customer');
+		$customerItem = $manager->findItem('UTC001');
 
-		$this->context->setEditor( 'core:unittest' );
+		$this->context->setEditor('core:unittest');
 
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'order' );
-		$search = $manager->createSearch()->setSlice( 0, 1 );
-		$search->setConditions( $search->compare( '==', 'order.base.customerid', $customerItem->getId() ) );
-		$result = $manager->searchItems( $search );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'order');
+		$search = $manager->createSearch()->setSlice(0, 1);
+		$search->setConditions($search->compare('==', 'order.base.customerid', $customerItem->getId()));
+		$result = $manager->searchItems($search);
 
-		if( ( $item = reset( $result ) ) === false ) {
-			throw new \RuntimeException( 'No order item found' );
+		if (($item = reset($result)) === false) {
+			throw new \RuntimeException('No order item found');
 		}
 
-		$this->assertInstanceOf( '\Aimeos\MShop\Order\Item\Iface', $this->object->getItem( $item->getId() ) );
+		$this->assertInstanceOf('\Aimeos\MShop\Order\Item\Iface', $this->object->getItem($item->getId()));
 	}
 
 
 	public function testGetItemException()
 	{
-		$this->setExpectedException( '\Aimeos\Controller\Frontend\Order\Exception' );
+		$this->setExpectedException('\Aimeos\Controller\Frontend\Order\Exception');
 		$this->object->getItem( -1 );
 	}
 
 
 	public function testSaveItem()
 	{
-		$manager = $this->getMockBuilder( '\\Aimeos\\MShop\\Order\\Manager\\Standard' )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( ['saveItem'] )
+		$manager = $this->getMockBuilder('\\Aimeos\\MShop\\Order\\Manager\\Standard')
+			->setConstructorArgs([$this->context])
+			->setMethods(['saveItem'])
 			->getMock();
 
-		\Aimeos\MShop\Factory::injectManager( $this->context, 'order', $manager );
+		\Aimeos\MShop\Factory::injectManager($this->context, 'order', $manager);
 
-		$manager->expects( $this->once() )->method( 'saveItem' )
-			->will( $this->returnValue( $manager->createItem() ) );
+		$manager->expects($this->once())->method('saveItem')
+			->will($this->returnValue($manager->createItem()));
 
-		$this->assertInstanceOf( '\Aimeos\MShop\Order\Item\Iface', $this->object->saveItem( $manager->createItem() ) );
+		$this->assertInstanceOf('\Aimeos\MShop\Order\Item\Iface', $this->object->saveItem($manager->createItem()));
 	}
 
 
 	public function testSearchItems()
 	{
-		$this->assertGreaterThan( 1, $this->object->searchItems( $this->object->createFilter() ) );
+		$this->assertGreaterThan(1, $this->object->searchItems($this->object->createFilter()));
 	}
 
 
 	public function testStore()
 	{
 		$name = 'ControllerFrontendOrderStore';
-		$this->context->getConfig()->set( 'mshop/order/manager/name', $name );
+		$this->context->getConfig()->set('mshop/order/manager/name', $name);
 
 
-		$orderManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Order\\Manager\\Standard' )
-			->setMethods( array( 'saveItem', 'getSubManager' ) )
-			->setConstructorArgs( array( $this->context ) )
+		$orderManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Order\\Manager\\Standard')
+			->setMethods(array('saveItem', 'getSubManager'))
+			->setConstructorArgs(array($this->context))
 			->getMock();
 
-		$orderBaseManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Order\\Manager\\Base\\Standard' )
-			->setMethods( array( 'store' ) )
-			->setConstructorArgs( array( $this->context ) )
+		$orderBaseManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Order\\Manager\\Base\\Standard')
+			->setMethods(array('store'))
+			->setConstructorArgs(array($this->context))
 			->getMock();
 
-		\Aimeos\MShop\Order\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub );
+		\Aimeos\MShop\Order\Manager\Factory::injectManager('\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub);
 
 
 		$orderBaseItem = $orderBaseManagerStub->createItem();
-		$orderBaseItem->setId( 1 );
+		$orderBaseItem->setId(1);
 
 
-		$orderBaseManagerStub->expects( $this->once() )->method( 'store' );
+		$orderBaseManagerStub->expects($this->once())->method('store');
 
-		$orderManagerStub->expects( $this->once() )->method( 'getSubManager' )
-			->will( $this->returnValue( $orderBaseManagerStub ) );
+		$orderManagerStub->expects($this->once())->method('getSubManager')
+			->will($this->returnValue($orderBaseManagerStub));
 
-		$orderManagerStub->expects( $this->once() )->method( 'saveItem' );
+		$orderManagerStub->expects($this->once())->method('saveItem');
 
 
-		$this->object->store( $orderBaseItem );
+		$this->object->store($orderBaseItem);
 	}
 
 
 	public function testBlock()
 	{
 		$name = 'ControllerFrontendOrderBlock';
-		$this->context->getConfig()->set( 'controller/common/order/name', $name );
+		$this->context->getConfig()->set('controller/common/order/name', $name);
 
 
-		$orderCntlStub = $this->getMockBuilder( '\\Aimeos\\Controller\\Common\\Order\\Standard' )
-			->setMethods( array( 'block' ) )
-			->setConstructorArgs( array( $this->context ) )
+		$orderCntlStub = $this->getMockBuilder('\\Aimeos\\Controller\\Common\\Order\\Standard')
+			->setMethods(array('block'))
+			->setConstructorArgs(array($this->context))
 			->getMock();
 
-		\Aimeos\Controller\Common\Order\Factory::injectController( '\\Aimeos\\Controller\\Common\\Order\\' . $name, $orderCntlStub );
+		\Aimeos\Controller\Common\Order\Factory::injectController('\\Aimeos\\Controller\\Common\\Order\\' . $name, $orderCntlStub);
 
-		$orderCntlStub->expects( $this->once() )->method( 'block' );
+		$orderCntlStub->expects($this->once())->method('block');
 
 
-		$this->object->block( \Aimeos\MShop\Factory::createManager( $this->context, 'order' )->createItem() );
+		$this->object->block(\Aimeos\MShop\Factory::createManager($this->context, 'order')->createItem());
 	}
 
 
 	public function testUnblock()
 	{
 		$name = 'ControllerFrontendOrderUnblock';
-		$this->context->getConfig()->set( 'controller/common/order/name', $name );
+		$this->context->getConfig()->set('controller/common/order/name', $name);
 
 
-		$orderCntlStub = $this->getMockBuilder( '\\Aimeos\\Controller\\Common\\Order\\Standard' )
-			->setMethods( array( 'unblock' ) )
-			->setConstructorArgs( array( $this->context ) )
+		$orderCntlStub = $this->getMockBuilder('\\Aimeos\\Controller\\Common\\Order\\Standard')
+			->setMethods(array('unblock'))
+			->setConstructorArgs(array($this->context))
 			->getMock();
 
-		\Aimeos\Controller\Common\Order\Factory::injectController( '\\Aimeos\\Controller\\Common\\Order\\' . $name, $orderCntlStub );
+		\Aimeos\Controller\Common\Order\Factory::injectController('\\Aimeos\\Controller\\Common\\Order\\' . $name, $orderCntlStub);
 
-		$orderCntlStub->expects( $this->once() )->method( 'unblock' );
+		$orderCntlStub->expects($this->once())->method('unblock');
 
 
-		$this->object->unblock( \Aimeos\MShop\Factory::createManager( $this->context, 'order' )->createItem() );
+		$this->object->unblock(\Aimeos\MShop\Factory::createManager($this->context, 'order')->createItem());
 	}
 
 
 	public function testUpdate()
 	{
 		$name = 'ControllerFrontendOrderUpdate';
-		$this->context->getConfig()->set( 'controller/common/order/name', $name );
+		$this->context->getConfig()->set('controller/common/order/name', $name);
 
 
-		$orderCntlStub = $this->getMockBuilder( '\\Aimeos\\Controller\\Common\\Order\\Standard' )
-			->setMethods( array( 'update' ) )
-			->setConstructorArgs( array( $this->context ) )
+		$orderCntlStub = $this->getMockBuilder('\\Aimeos\\Controller\\Common\\Order\\Standard')
+			->setMethods(array('update'))
+			->setConstructorArgs(array($this->context))
 			->getMock();
 
-		\Aimeos\Controller\Common\Order\Factory::injectController( '\\Aimeos\\Controller\\Common\\Order\\' . $name, $orderCntlStub );
+		\Aimeos\Controller\Common\Order\Factory::injectController('\\Aimeos\\Controller\\Common\\Order\\' . $name, $orderCntlStub);
 
-		$orderCntlStub->expects( $this->once() )->method( 'update' );
+		$orderCntlStub->expects($this->once())->method('update');
 
 
-		$this->object->update( \Aimeos\MShop\Factory::createManager( $this->context, 'order' )->createItem() );
+		$this->object->update(\Aimeos\MShop\Factory::createManager($this->context, 'order')->createItem());
 	}
 }

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

Spacing +134 added lines, -134 removed lines

@@ -28,33 +28,33 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item
 	 * @since 2017.04
 	 */
-	public function addItem( array $values )
+	public function addItem(array $values)
 	{
 		$list = [];
 		$context = $this->getContext();
 		$config = $context->getConfig();
 
 		// Show only generated passwords in account creation e-mails
-		$pass = ( isset( $values['customer.password'] ) ? false : true );
+		$pass = (isset($values['customer.password']) ? false : true);
 
-		foreach( $values as $key => $val ) {
-			$list[str_replace( 'order.base.address', 'customer', $key )] = $val;
+		foreach ($values as $key => $val) {
+			$list[str_replace('order.base.address', 'customer', $key)] = $val;
 		}
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );
-		$list = $this->addItemDefaults( $list );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer');
+		$list = $this->addItemDefaults($list);
 
 		try
 		{
-			$item = $manager->findItem( $list['customer.code'] );
+			$item = $manager->findItem($list['customer.code']);
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$this->checkLimit( $list );
+			$this->checkLimit($list);
 
 			$item = $manager->createItem();
-			$item->fromArray( $list );
-			$item->setId( null );
+			$item->fromArray($list);
+			$item->setId(null);
 
 			/** controller/frontend/customer/groupids
 			 * List of groups new customers should be assigned to
@@ -68,14 +68,14 @@ 
 			 * @category User
 			 * @category Developer
 			 */
-			$gids = $config->get( 'client/html/checkout/standard/order/account/standard/groupids', [] ); // @deprecated
-			$item->setGroups( (array) $config->get( 'controller/frontend/customer/groupids', $gids ) );
+			$gids = $config->get('client/html/checkout/standard/order/account/standard/groupids', []); // @deprecated
+			$item->setGroups((array) $config->get('controller/frontend/customer/groupids', $gids));
 
-			$item = $manager->saveItem( $item );
+			$item = $manager->saveItem($item);
 
 			$msg = $item->toArray();
-			$msg['customer.password'] = ( $pass ? $list['customer.password'] : null );
-			$context->getMessageQueue( 'mq-email', 'customer/email/account' )->add( json_encode( $msg ) );
+			$msg['customer.password'] = ($pass ? $list['customer.password'] : null);
+			$context->getMessageQueue('mq-email', 'customer/email/account')->add(json_encode($msg));
 		}
 
 		return $item;
@@ -87,14 +87,14 @@ 
 	 *
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item
 	 */
-	public function createItem( array $values = [] )
+	public function createItem(array $values = [])
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer');
 
 		$item = $manager->createItem();
-		$item->fromArray( $values );
-		$item->setId( null );
-		$item->setStatus( 1 );
+		$item->fromArray($values);
+		$item->setId(null);
+		$item->setStatus(1);
 
 		return $item;
 	}
@@ -106,12 +106,12 @@ 
 	 * @param string $id Unique customer ID
 	 * @since 2017.04
 	 */
-	public function deleteItem( $id )
+	public function deleteItem($id)
 	{
-		$this->checkUser( $id );
+		$this->checkUser($id);
 
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' );
-		$manager->deleteItem( $id );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer');
+		$manager->deleteItem($id);
 	}
 
 
@@ -123,17 +123,17 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item
 	 * @since 2017.04
 	 */
-	public function editItem( $id, array $values )
+	public function editItem($id, array $values)
 	{
-		$this->checkUser( $id );
+		$this->checkUser($id);
 
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' );
-		$item = $manager->getItem( $id, [], true );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer');
+		$item = $manager->getItem($id, [], true);
 
-		unset( $values['customer.id'] );
-		$item->fromArray( $values );
+		unset($values['customer.id']);
+		$item->fromArray($values);
 
-		return $manager->saveItem( $item );
+		return $manager->saveItem($item);
 	}
 
 
@@ -145,17 +145,17 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item including the referenced domains items
 	 * @since 2017.04
 	 */
-	public function getItem( $id = null, array $domains = [] )
+	public function getItem($id = null, array $domains = [])
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer');
 
-		if( $id == null ) {
-			return $manager->getItem( $this->getContext()->getUserId(), $domains, true );
+		if ($id == null) {
+			return $manager->getItem($this->getContext()->getUserId(), $domains, true);
 		}
 
-		$this->checkUser( $id );
+		$this->checkUser($id);
 
-		return $manager->getItem( $id, $domains, true );
+		return $manager->getItem($id, $domains, true);
 	}
 
 
@@ -169,9 +169,9 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item including the referenced domains items
 	 * @since 2017.04
 	 */
-	public function findItem( $code, array $domains = [] )
+	public function findItem($code, array $domains = [])
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' )->findItem( $code, $domains );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer')->findItem($code, $domains);
 	}
 
 
@@ -181,9 +181,9 @@ 
 	 * @param \Aimeos\MShop\Customer\Item\Iface $item Customer item
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item including the generated ID
 	 */
-	public function saveItem( \Aimeos\MShop\Customer\Item\Iface $item )
+	public function saveItem(\Aimeos\MShop\Customer\Item\Iface $item)
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' )->saveItem( $item );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer')->saveItem($item);
 	}
 
 
@@ -194,17 +194,17 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
 	 * @since 2017.04
 	 */
-	public function addAddressItem( array $values )
+	public function addAddressItem(array $values)
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/address' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/address');
 
 		$item = $manager->createItem();
-		$item->fromArray( $values );
-		$item->setId( null );
-		$item->setParentId( $context->getUserId() );
+		$item->fromArray($values);
+		$item->setId(null);
+		$item->setParentId($context->getUserId());
 
-		return $manager->saveItem( $item );
+		return $manager->saveItem($item);
 	}
 
 
@@ -213,16 +213,16 @@ 
 	 *
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
 	 */
-	public function createAddressItem( array $values = [] )
+	public function createAddressItem(array $values = [])
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/address' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/address');
 
 		$item = $manager->createItem();
-		$item->fromArray( $values );
-		$item->setId( null );
+		$item->fromArray($values);
+		$item->setId(null);
 
-		$item->setParentId( $context->getUserId() );
+		$item->setParentId($context->getUserId());
 
 		return $item;
 	}
@@ -234,13 +234,13 @@ 
 	 * @param string $id Unique customer address ID
 	 * @since 2017.04
 	 */
-	public function deleteAddressItem( $id )
+	public function deleteAddressItem($id)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/address' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/address');
 
-		$this->checkUser( $manager->getItem( $id, [], true )->getParentId() );
+		$this->checkUser($manager->getItem($id, [], true)->getParentId());
 
-		$manager->deleteItem( $id );
+		$manager->deleteItem($id);
 	}
 
 
@@ -252,17 +252,17 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
 	 * @since 2017.04
 	 */
-	public function editAddressItem( $id, array $values )
+	public function editAddressItem($id, array $values)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/address' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/address');
 
-		$item = $manager->getItem( $id, [], true );
-		$this->checkUser( $item->getParentId() );
+		$item = $manager->getItem($id, [], true);
+		$this->checkUser($item->getParentId());
 
-		unset( $values['customer.address.id'] );
-		$item->fromArray( $values );
+		unset($values['customer.address.id']);
+		$item->fromArray($values);
 
-		return $manager->saveItem( $item );
+		return $manager->saveItem($item);
 	}
 
 
@@ -273,12 +273,12 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
 	 * @since 2017.04
 	 */
-	public function getAddressItem( $id )
+	public function getAddressItem($id)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/address' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/address');
 
-		$item = $manager->getItem( $id );
-		$this->checkUser( $item->getParentId() );
+		$item = $manager->getItem($id);
+		$this->checkUser($item->getParentId());
 
 		return $item;
 	}
@@ -290,9 +290,9 @@ 
 	 * @param \Aimeos\MShop\Customer\Item\Address\Iface $item Customer address item
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item including the generated ID
 	 */
-	public function saveAddressItem( \Aimeos\MShop\Customer\Item\Address\Iface $item )
+	public function saveAddressItem(\Aimeos\MShop\Customer\Item\Address\Iface $item)
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/address' )->saveItem( $item );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/address')->saveItem($item);
 	}
 
 
@@ -303,32 +303,32 @@ 
 	 * @return \Aimeos\MShop\Common\Item\Lists\Iface Customer lists item
 	 * @since 2017.06
 	 */
-	public function addListItem( array $values )
+	public function addListItem(array $values)
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists');
 
-		if( !isset( $values['customer.lists.typeid'] ) )
+		if (!isset($values['customer.lists.typeid']))
 		{
-			if( !isset( $values['customer.lists.type'] ) ) {
-				throw new \Aimeos\Controller\Frontend\Customer\Exception( sprintf( 'No customer lists type code' ) );
+			if (!isset($values['customer.lists.type'])) {
+				throw new \Aimeos\Controller\Frontend\Customer\Exception(sprintf('No customer lists type code'));
 			}
 
-			if( !isset( $values['customer.lists.domain'] ) ) {
-				throw new \Aimeos\Controller\Frontend\Customer\Exception( sprintf( 'No customer lists domain' ) );
+			if (!isset($values['customer.lists.domain'])) {
+				throw new \Aimeos\Controller\Frontend\Customer\Exception(sprintf('No customer lists domain'));
 			}
 
-			$typeManager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists/type' );
-			$typeItem = $typeManager->findItem( $values['customer.lists.type'], [], $values['customer.lists.domain'] );
+			$typeManager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists/type');
+			$typeItem = $typeManager->findItem($values['customer.lists.type'], [], $values['customer.lists.domain']);
 			$values['customer.lists.typeid'] = $typeItem->getId();
 		}
 
 		$item = $manager->createItem();
-		$item->fromArray( $values );
-		$item->setId( null );
-		$item->setParentId( $context->getUserId() );
+		$item->fromArray($values);
+		$item->setId(null);
+		$item->setParentId($context->getUserId());
 
-		return $manager->saveItem( $item );
+		return $manager->saveItem($item);
 	}
 
 
@@ -341,10 +341,10 @@ 
 	public function createListsFilter()
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists');
 
 		$filter = $manager->createSearch();
-		$filter->setConditions( $filter->compare( '==', 'customer.lists.parentid', $context->getUserId() ) );
+		$filter->setConditions($filter->compare('==', 'customer.lists.parentid', $context->getUserId()));
 
 		return $filter;
 	}
@@ -356,13 +356,13 @@ 
 	 * @param string $id Unique customer address ID
 	 * @since 2017.06
 	 */
-	public function deleteListItem( $id )
+	public function deleteListItem($id)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/lists');
 
-		$this->checkUser( $manager->getItem( $id )->getParentId() );
+		$this->checkUser($manager->getItem($id)->getParentId());
 
-		$manager->deleteItem( $id );
+		$manager->deleteItem($id);
 	}
 
 
@@ -374,33 +374,33 @@ 
 	 * @return \Aimeos\MShop\Common\Item\Lists\Iface Customer lists item
 	 * @since 2017.06
 	 */
-	public function editListItem( $id, array $values )
+	public function editListItem($id, array $values)
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists');
 
-		$item = $manager->getItem( $id, [], true );
-		$this->checkUser( $item->getParentId() );
+		$item = $manager->getItem($id, [], true);
+		$this->checkUser($item->getParentId());
 
-		if( !isset( $values['customer.lists.typeid'] ) )
+		if (!isset($values['customer.lists.typeid']))
 		{
-			if( !isset( $values['customer.lists.type'] ) ) {
-				throw new \Aimeos\Controller\Frontend\Customer\Exception( sprintf( 'No customer lists type code' ) );
+			if (!isset($values['customer.lists.type'])) {
+				throw new \Aimeos\Controller\Frontend\Customer\Exception(sprintf('No customer lists type code'));
 			}
 
-			if( !isset( $values['customer.lists.domain'] ) ) {
-				throw new \Aimeos\Controller\Frontend\Customer\Exception( sprintf( 'No customer lists domain' ) );
+			if (!isset($values['customer.lists.domain'])) {
+				throw new \Aimeos\Controller\Frontend\Customer\Exception(sprintf('No customer lists domain'));
 			}
 
-			$typeManager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists/type' );
-			$typeItem = $typeManager->findItem( $values['customer.lists.type'], [], $values['customer.lists.domain'] );
+			$typeManager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists/type');
+			$typeItem = $typeManager->findItem($values['customer.lists.type'], [], $values['customer.lists.domain']);
 			$values['customer.lists.typeid'] = $typeItem->getId();
 		}
 
-		unset( $values['customer.lists.id'] );
-		$item->fromArray( $values );
+		unset($values['customer.lists.id']);
+		$item->fromArray($values);
 
-		return $manager->saveItem( $item );
+		return $manager->saveItem($item);
 	}
 
 
@@ -411,12 +411,12 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
 	 * @since 2017.06
 	 */
-	public function getListItem( $id )
+	public function getListItem($id)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/lists' );
-		$item = $manager->getItem( $id );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/lists');
+		$item = $manager->getItem($id);
 
-		$this->checkUser( $item->getParentId() );
+		$this->checkUser($item->getParentId());
 
 		return $item;
 	}
@@ -430,11 +430,11 @@ 
 	 * @return \Aimeos\MShop\Common\Item\Lists\Iface[] Customer list items
 	 * @since 2017.06
 	 */
-	public function searchListItems( \Aimeos\MW\Criteria\Iface $filter, &$total = null )
+	public function searchListItems(\Aimeos\MW\Criteria\Iface $filter, &$total = null)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/lists');
 
-		return $manager->searchItems( $filter, [], $total );
+		return $manager->searchItems($filter, [], $total);
 	}
 
 
@@ -444,37 +444,37 @@ 
 	 * @param string[] $values Associative list of customer keys (e.g. "customer.label") and their values
 	 * @return string[] Associative list of customer key/value pairs with default values set
 	 */
-	protected function addItemDefaults( array $values )
+	protected function addItemDefaults(array $values)
 	{
-		if( !isset( $values['customer.label'] ) || $values['customer.label'] == '' )
+		if (!isset($values['customer.label']) || $values['customer.label'] == '')
 		{
 			$label = '';
 
-			if( isset( $values['customer.lastname'] ) ) {
+			if (isset($values['customer.lastname'])) {
 				$label = $values['customer.lastname'];
 			}
 
-			if( isset( $values['customer.firstname'] ) && $values['customer.firstname'] != '' ) {
+			if (isset($values['customer.firstname']) && $values['customer.firstname'] != '') {
 				$label = $values['customer.firstname'] . ' ' . $label;
 			}
 
-			if( isset( $values['customer.company'] ) && $values['customer.company'] != '' ) {
+			if (isset($values['customer.company']) && $values['customer.company'] != '') {
 				$label .= ' (' . $values['customer.company'] . ')';
 			}
 
 			$values['customer.label'] = $label;
 		}
 
-		if( !isset( $values['customer.code'] ) && isset( $values['customer.email'] ) ) {
+		if (!isset($values['customer.code']) && isset($values['customer.email'])) {
 			$values['customer.code'] = $values['customer.email'];
 		}
 
-		if( !isset( $values['customer.status'] ) ) {
+		if (!isset($values['customer.status'])) {
 			$values['customer.status'] = 1;
 		}
 
-		if( !isset( $values['customer.password'] ) ) {
-			$values['customer.password'] = substr( md5( microtime( true ) . getmypid() . rand() ), -8 );
+		if (!isset($values['customer.password'])) {
+			$values['customer.password'] = substr(md5(microtime(true) . getmypid() . rand()), -8);
 		}
 
 		return $values;
@@ -487,7 +487,7 @@ 
 	 * @param string[] $values Associative list of customer keys (e.g. "customer.label") and their values
 	 * @throws \Aimeos\Controller\Frontend\Customer\Exception If access isn't allowed
 	 */
-	protected function checkLimit( array $values )
+	protected function checkLimit(array $values)
 	{
 		$total = 0;
 		$context = $this->getContext();
@@ -508,7 +508,7 @@ 
 		 * @category Developer
 		 * @see controller/frontend/customer/limit-seconds
 		 */
-		$count = $config->get( 'controller/frontend/customer/limit-count', 5 );
+		$count = $config->get('controller/frontend/customer/limit-count', 5);
 
 		/** controller/frontend/customer/limit-seconds
 		 * Customer account limitation time frame in seconds
@@ -526,22 +526,22 @@ 
 		 * @category Developer
 		 * @see controller/frontend/customer/limit-count
 		 */
-		$seconds = $config->get( 'controller/frontend/customer/limit-seconds', 300 );
+		$seconds = $config->get('controller/frontend/customer/limit-seconds', 300);
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer');
 
 		$search = $manager->createSearch();
 		$expr = [
-			$search->compare( '==', 'customer.editor', $context->getEditor() ),
-			$search->compare( '>=', 'customer.ctime', date( 'Y-m-d H:i:s', time() - $seconds ) ),
+			$search->compare('==', 'customer.editor', $context->getEditor()),
+			$search->compare('>=', 'customer.ctime', date('Y-m-d H:i:s', time() - $seconds)),
 		];
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, 0 );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, 0);
 
-		$manager->searchItems( $search, [], $total );
+		$manager->searchItems($search, [], $total);
 
-		if( $total > $count ) {
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Temporary limit reached' ) );
+		if ($total > $count) {
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Temporary limit reached'));
 		}
 	}
 
@@ -552,12 +552,12 @@ 
 	 * @param string $id Unique customer ID
 	 * @throws \Aimeos\Controller\Frontend\Customer\Exception If access isn't allowed
 	 */
-	protected function checkUser( $id )
+	protected function checkUser($id)
 	{
-		if( $id != $this->getContext()->getUserId() )
+		if ($id != $this->getContext()->getUserId())
 		{
-			$msg = sprintf( 'Not allowed to access customer data for ID "%1$s"', $id );
-			throw new \Aimeos\Controller\Frontend\Customer\Exception( $msg );
+			$msg = sprintf('Not allowed to access customer data for ID "%1$s"', $id);
+			throw new \Aimeos\Controller\Frontend\Customer\Exception($msg);
 		}
 	}
 }

Braces +1 added lines, -2 removed lines

@@ -47,8 +47,7 @@
 		try
 		{
 			$item = $manager->findItem( $list['customer.code'] );
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$this->checkLimit( $list );
 

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

Spacing +232 added lines, -232 removed lines

@@ -19,112 +19,112 @@ 
 	public static function setUpBeforeClass()
 	{
 		$context = \TestHelperFrontend::getContext();
-		self::$testItem = \Aimeos\MShop\Factory::createManager( $context, 'product' )->findItem( 'U:TESTP' );
+		self::$testItem = \Aimeos\MShop\Factory::createManager($context, 'product')->findItem('U:TESTP');
 	}
 
 
 	protected function setUp()
 	{
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 
 		$this->context = \TestHelperFrontend::getContext();
-		$this->object = new \Aimeos\Controller\Frontend\Basket\Standard( $this->context );
+		$this->object = new \Aimeos\Controller\Frontend\Basket\Standard($this->context);
 	}
 
 
 	protected function tearDown()
 	{
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 
 		$this->object->clear();
-		$this->context->getSession()->set( 'aimeos', [] );
+		$this->context->getSession()->set('aimeos', []);
 
-		unset( $this->context, $this->object );
+		unset($this->context, $this->object);
 	}
 
 
 	public function testClear()
 	{
-		$this->object->addProduct( self::$testItem->getId(), 2 );
+		$this->object->addProduct(self::$testItem->getId(), 2);
 		$this->object->clear();
 
-		$this->assertEquals( 0, count( $this->object->get()->getProducts() ) );
+		$this->assertEquals(0, count($this->object->get()->getProducts()));
 	}
 
 
 	public function testGet()
 	{
-		$this->assertInstanceOf( '\Aimeos\MShop\Order\Item\Base\Iface', $this->object->get() );
+		$this->assertInstanceOf('\Aimeos\MShop\Order\Item\Base\Iface', $this->object->get());
 	}
 
 
 	public function testSave()
 	{
-		$stub = $this->getMockBuilder( '\Aimeos\MShop\Order\Manager\Base\Standard' )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( ['setSession'] )
+		$stub = $this->getMockBuilder('\Aimeos\MShop\Order\Manager\Base\Standard')
+			->setConstructorArgs([$this->context])
+			->setMethods(['setSession'])
 			->getMock();
 
-		\Aimeos\MShop\Factory::injectManager( $this->context, 'order/base', $stub );
+		\Aimeos\MShop\Factory::injectManager($this->context, 'order/base', $stub);
 
-		$stub->expects( $this->exactly( 2 ) )->method( 'setSession' );
+		$stub->expects($this->exactly(2))->method('setSession');
 
-		$object = new \Aimeos\Controller\Frontend\Basket\Standard( $this->context );
-		$object->addProduct( self::$testItem->getId(), 2 );
+		$object = new \Aimeos\Controller\Frontend\Basket\Standard($this->context);
+		$object->addProduct(self::$testItem->getId(), 2);
 		$object->save();
 	}
 
 
 	public function testSetType()
 	{
-		$this->assertInstanceOf( '\Aimeos\Controller\Frontend\Basket\Iface', $this->object->setType( 'test' ) );
+		$this->assertInstanceOf('\Aimeos\Controller\Frontend\Basket\Iface', $this->object->setType('test'));
 	}
 
 
 	public function testStore()
 	{
-		$stub = $this->getMockBuilder( '\Aimeos\MShop\Order\Manager\Base\Standard' )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( ['store'] )
+		$stub = $this->getMockBuilder('\Aimeos\MShop\Order\Manager\Base\Standard')
+			->setConstructorArgs([$this->context])
+			->setMethods(['store'])
 			->getMock();
 
-		\Aimeos\MShop\Factory::injectManager( $this->context, 'order/base', $stub );
+		\Aimeos\MShop\Factory::injectManager($this->context, 'order/base', $stub);
 
-		$stub->expects( $this->once() )->method( 'store' );
+		$stub->expects($this->once())->method('store');
 
-		$object = new \Aimeos\Controller\Frontend\Basket\Standard( $this->context );
+		$object = new \Aimeos\Controller\Frontend\Basket\Standard($this->context);
 		$object->store();
 	}
 
 
 	public function testStoreLimit()
 	{
-		$this->context->setEditor( 'core:unittest' );
+		$this->context->setEditor('core:unittest');
 		$config = $this->context->getConfig();
-		$config->set( 'controller/frontend/basket/limit-count', 0 );
-		$config->set( 'controller/frontend/basket/limit-seconds', 86400 * 365 );
+		$config->set('controller/frontend/basket/limit-count', 0);
+		$config->set('controller/frontend/basket/limit-seconds', 86400 * 365);
 
-		$object = new \Aimeos\Controller\Frontend\Basket\Standard( $this->context );
+		$object = new \Aimeos\Controller\Frontend\Basket\Standard($this->context);
 
-		$this->setExpectedException( '\Aimeos\Controller\Frontend\Basket\Exception' );
+		$this->setExpectedException('\Aimeos\Controller\Frontend\Basket\Exception');
 		$object->store();
 	}
 
 
 	public function testLoad()
 	{
-		$stub = $this->getMockBuilder( '\Aimeos\MShop\Order\Manager\Base\Standard' )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( ['load'] )
+		$stub = $this->getMockBuilder('\Aimeos\MShop\Order\Manager\Base\Standard')
+			->setConstructorArgs([$this->context])
+			->setMethods(['load'])
 			->getMock();
 
-		\Aimeos\MShop\Factory::injectManager( $this->context, 'order/base', $stub );
+		\Aimeos\MShop\Factory::injectManager($this->context, 'order/base', $stub);
 
-		$stub->expects( $this->once() )->method( 'load' )
-			->will( $this->returnValue( $stub->createItem() ) );
+		$stub->expects($this->once())->method('load')
+			->will($this->returnValue($stub->createItem()));
 
-		$object = new \Aimeos\Controller\Frontend\Basket\Standard( $this->context );
+		$object = new \Aimeos\Controller\Frontend\Basket\Standard($this->context);
 		$object->load( -1 );
 	}
 
@@ -132,311 +132,311 @@ 
 	public function testAddDeleteProduct()
 	{
 		$basket = $this->object->get();
-		$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, [], [], [], [], [], 'default' );
-		$item2 = $this->object->get()->getProduct( 0 );
-		$this->object->deleteProduct( 0 );
+		$this->object->addProduct($item->getId(), 2, [], [], [], [], [], 'default');
+		$item2 = $this->object->get()->getProduct(0);
+		$this->object->deleteProduct(0);
 
-		$this->assertEquals( 0, count( $basket->getProducts() ) );
-		$this->assertEquals( 'CNC', $item2->getProductCode() );
+		$this->assertEquals(0, count($basket->getProducts()));
+		$this->assertEquals('CNC', $item2->getProductCode());
 	}
 
 
 	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 \RuntimeException( 'Attribute not found' );
+		if (($attrItem = reset($attributes)) === false) {
+			throw new \RuntimeException('Attribute not found');
 		}
 
-		$attrValues = array( $attrItem->getId() => '2000-01-01' );
+		$attrValues = array($attrItem->getId() => '2000-01-01');
 
-		$this->object->addProduct( self::$testItem->getId(), 1, [], [], [], [], $attrValues );
+		$this->object->addProduct(self::$testItem->getId(), 1, [], [], [], [], $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 testAddProductCustomPrice()
 	{
-		$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', 'price' ),
+			$search->compare('==', 'attribute.code', 'custom'),
+			$search->compare('==', 'attribute.type.code', 'price'),
 		);
-		$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 \RuntimeException( 'Attribute not found' );
+		if (($attrItem = reset($attributes)) === false) {
+			throw new \RuntimeException('Attribute not found');
 		}
 
-		$attrValues = array( $attrItem->getId() => '0.01' );
+		$attrValues = array($attrItem->getId() => '0.01');
 
-		$this->object->addProduct( self::$testItem->getId(), 1, [], [], [], [], $attrValues );
+		$this->object->addProduct(self::$testItem->getId(), 1, [], [], [], [], $attrValues);
 		$basket = $this->object->get();
 
-		$this->assertEquals( 1, count( $basket->getProducts() ) );
-		$this->assertEquals( '0.01', $basket->getProduct( 0 )->getPrice()->getValue() );
+		$this->assertEquals(1, count($basket->getProducts()));
+		$this->assertEquals('0.01', $basket->getProduct(0)->getPrice()->getValue());
 	}
 
 
 	public function testAddProductCustomPriceException()
 	{
-		$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', 'price' ),
+			$search->compare('==', 'attribute.code', 'custom'),
+			$search->compare('==', 'attribute.type.code', 'price'),
 		);
-		$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 \RuntimeException( 'Attribute not found' );
+		if (($attrItem = reset($attributes)) === false) {
+			throw new \RuntimeException('Attribute not found');
 		}
 
-		$attrValues = array( $attrItem->getId() => ',' );
+		$attrValues = array($attrItem->getId() => ',');
 
-		$this->setExpectedException( '\Aimeos\Controller\Frontend\Basket\Exception' );
-		$this->object->addProduct( self::$testItem->getId(), 1, [], [], [], [], $attrValues );
+		$this->setExpectedException('\Aimeos\Controller\Frontend\Basket\Exception');
+		$this->object->addProduct(self::$testItem->getId(), 1, [], [], [], [], $attrValues);
 	}
 
 
 	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 \RuntimeException( 'Attribute not found' );
+		if (empty($attribute)) {
+			throw new \RuntimeException('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( self::$testItem->getId(), 1, [], [], $configAttrIds, $hiddenAttrIds );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
+		$this->object->addProduct(self::$testItem->getId(), 1, [], [], $configAttrIds, $hiddenAttrIds);
 	}
 
 
 	public function testAddProductNegativeQuantityException()
 	{
-		$this->setExpectedException( '\\Aimeos\\MShop\\Order\\Exception' );
-		$this->object->addProduct( self::$testItem->getId(), -1 );
+		$this->setExpectedException('\\Aimeos\\MShop\\Order\\Exception');
+		$this->object->addProduct(self::$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( self::$testItem->getId(), 1, [], [], array( -1 ) );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
+		$this->object->addProduct(self::$testItem->getId(), 1, [], [], array( -1 ));
 	}
 
 
 	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, [], [], [], [], [], 'unit_type3' );
+		$this->object->addProduct($item->getId(), 2, [], [], [], [], [], 'unit_type3');
 
-		$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( self::$testItem->getId(), 2 );
+		$this->object->addProduct(self::$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( self::$testItem->getId(), 1 );
+		$this->object->addProduct(self::$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:TESTP', $item->getProductCode() );
+		$item = $this->object->get()->getProduct(0);
+		$this->assertEquals(4, $item->getQuantity());
+		$this->assertEquals('U:TESTP', $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 \RuntimeException( 'No attributes available' );
+		if (($attribute = reset($attributes)) === false) {
+			throw new \RuntimeException('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_keys( $attributes ) );
-		$this->object->editProduct( 0, 4 );
+		$this->object->addProduct($item->getId(), 1, [], [], 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( $attribute->getType() ) );
+		$this->object->editProduct(0, 3, [], array($attribute->getType()));
 
-		$item = $this->object->get()->getProduct( 0 );
-		$this->assertEquals( 3, $item->getQuantity() );
-		$this->assertEquals( 1, count( $item->getAttributes() ) );
-		$this->assertEquals( 'U:TESTP', $item->getProductCode() );
+		$item = $this->object->get()->getProduct(0);
+		$this->assertEquals(3, $item->getQuantity());
+		$this->assertEquals(1, count($item->getAttributes()));
+		$this->assertEquals('U:TESTP', $item->getProductCode());
 	}
 
 
 	public function testEditProductFlagError()
 	{
-		$this->object->addProduct( self::$testItem->getId(), 2 );
+		$this->object->addProduct(self::$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( self::$testItem->getId(), 2 );
-		$this->object->addCoupon( 'GHIJ' );
+		$this->object->addProduct(self::$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 testAddCouponExceedCount()
 	{
-		$this->object->addProduct( self::$testItem->getId(), 2 );
-		$this->object->addCoupon( 'GHIJ' );
+		$this->object->addProduct(self::$testItem->getId(), 2);
+		$this->object->addCoupon('GHIJ');
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Basket\\Exception' );
-		$this->object->addCoupon( 'GHIJ' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
+		$this->object->addCoupon('GHIJ');
 	}
 
 
 	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( self::$testItem->getId(), 2 );
-		$this->object->addCoupon( '90AB' );
-		$this->object->deleteCoupon( '90AB' );
+		$this->object->addProduct(self::$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 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());
 	}
 
 
@@ -464,37 +464,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());
 	}
 
 
@@ -521,119 +521,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', [], 'service', 'payment' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'service');
+		$service = $manager->findItem('unitpaymentcode', [], 'service', 'payment');
 
-		$this->object->setService( 'payment', $service->getId(), [] );
-		$this->assertEquals( 'unitpaymentcode', $this->object->get()->getService( 'payment' )->getCode() );
+		$this->object->setService('payment', $service->getId(), []);
+		$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', [], 'service', 'delivery' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'service');
+		$service = $manager->findItem('unitcode', [], 'service', 'delivery');
 
-		$this->object->setService( 'delivery', $service->getId(), [] );
-		$this->assertEquals( 'unitcode', $this->object->get()->getService( 'delivery' )->getCode() );
+		$this->object->setService('delivery', $service->getId(), []);
+		$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', [], 'service', 'payment' );
-		$delivery = $manager->findItem( 'unitcode', [], 'service', 'delivery' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'service');
+		$payment = $manager->findItem('unitpaymentcode', [], 'service', 'payment');
+		$delivery = $manager->findItem('unitcode', [], 'service', 'delivery');
 
-		$this->object->addProduct( self::$testItem->getId(), 2 );
-		$this->object->addCoupon( 'OPQR' );
+		$this->object->addProduct(self::$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 \RuntimeException( sprintf( 'No address item with company "%1$s" found', $company ) );
+		if (($item = reset($items)) === false) {
+			throw new \RuntimeException(sprintf('No address item with company "%1$s" found', $company));
 		}
 
 		return $item;

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

Braces +2 added lines, -4 removed lines

@@ -180,8 +180,7 @@ 
 		{
 			$search = $manager->createSearch();
 			$search->setConditions( $search->compare( '>', 'product.status', 0 ) );
-		}
-		else
+		} else
 		{
 			$search = $manager->createSearch( true );
 		}
@@ -275,8 +274,7 @@ 
 		{
 			$search = $manager->createSearch();
 			$search->setConditions( $search->compare( '>', 'product.status', 0 ) );
-		}
-		else
+		} else
 		{
 			$search = $manager->createSearch( true );
 		}

Doc Comments +2 added lines, -1 removed lines

@@ -302,6 +302,7 @@ 
 	 * @param \Aimeos\MW\Criteria\Iface $filter Critera object which contains the filter conditions
 	 * @param string[] $domains Domain names of items that are associated with the products and that should be fetched too
 	 * @param integer &$total Parameter where the total number of found products will be stored in
+	 * @param integer $total
 	 * @return array Ordered list of product items implementing \Aimeos\MShop\Product\Item\Iface
 	 * @since 2017.03
 	 */
@@ -315,7 +316,7 @@ 
 	 * Returns the list of catalog IDs for the given catalog tree
 	 *
 	 * @param \Aimeos\MShop\Catalog\Item\Iface $item Catalog item with children
-	 * @return array List of catalog IDs
+	 * @return string[] List of catalog IDs
 	 */
 	protected function getCatalogIdsFromTree( \Aimeos\MShop\Catalog\Item\Iface $item )
 	{

Spacing +79 added lines, -79 removed lines

@@ -31,42 +31,42 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @since 2017.03
 	 */
-	public function addFilterAttribute( \Aimeos\MW\Criteria\Iface $filter, array $attrIds, array $optIds, array $oneIds )
+	public function addFilterAttribute(\Aimeos\MW\Criteria\Iface $filter, array $attrIds, array $optIds, array $oneIds)
 	{
-		if( !empty( $attrIds ) )
+		if (!empty($attrIds))
 		{
-			$attrIds = $this->validateIds( $attrIds );
+			$attrIds = $this->validateIds($attrIds);
 
-			$func = $filter->createFunction( 'index.attributeaggregate', array( $attrIds ) );
+			$func = $filter->createFunction('index.attributeaggregate', array($attrIds));
 			$expr = array(
-				$filter->compare( '==', $func, count( $attrIds ) ),
+				$filter->compare('==', $func, count($attrIds)),
 				$filter->getConditions(),
 			);
-			$filter->setConditions( $filter->combine( '&&', $expr ) );
+			$filter->setConditions($filter->combine('&&', $expr));
 		}
 
-		if( !empty( $optIds ) )
+		if (!empty($optIds))
 		{
-			$optIds = $this->validateIds( $optIds );
+			$optIds = $this->validateIds($optIds);
 
-			$func = $filter->createFunction( 'index.attributeaggregate', array( $optIds ) );
+			$func = $filter->createFunction('index.attributeaggregate', array($optIds));
 			$expr = array(
-				$filter->compare( '>', $func, 0 ),
+				$filter->compare('>', $func, 0),
 				$filter->getConditions(),
 			);
-			$filter->setConditions( $filter->combine( '&&', $expr ) );
+			$filter->setConditions($filter->combine('&&', $expr));
 		}
 
-		foreach( $oneIds as $type => $list )
+		foreach ($oneIds as $type => $list)
 		{
-			if( ( $list = $this->validateIds( (array) $list ) ) !== [] )
+			if (($list = $this->validateIds((array) $list)) !== [])
 			{
-				$func = $filter->createFunction( 'index.attributeaggregate', array( $list ) );
+				$func = $filter->createFunction('index.attributeaggregate', array($list));
 				$expr = array(
-					$filter->compare( '>', $func, 0 ),
+					$filter->compare('>', $func, 0),
 					$filter->getConditions(),
 				);
-				$filter->setConditions( $filter->combine( '&&', $expr ) );
+				$filter->setConditions($filter->combine('&&', $expr));
 			}
 		}
 
@@ -86,38 +86,38 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @since 2017.03
 	 */
-	public function addFilterCategory( \Aimeos\MW\Criteria\Iface $filter, $catId,
-		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE, $sort = null, $direction = '+', $listtype = 'default' )
+	public function addFilterCategory(\Aimeos\MW\Criteria\Iface $filter, $catId,
+		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE, $sort = null, $direction = '+', $listtype = 'default')
 	{
-		$catIds = ( !is_array( $catId ) ? explode( ',', $catId ) : $catId );
+		$catIds = (!is_array($catId) ? explode(',', $catId) : $catId);
 
-		if( $level != \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE )
+		if ($level != \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE)
 		{
 			$list = [];
-			$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'catalog' );
+			$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'catalog');
 
-			foreach( $catIds as $catId )
+			foreach ($catIds as $catId)
 			{
-				$tree = $cntl->getCatalogTree( $catId, [], $level );
-				$list = array_merge( $list, $this->getCatalogIdsFromTree( $tree ) );
+				$tree = $cntl->getCatalogTree($catId, [], $level);
+				$list = array_merge($list, $this->getCatalogIdsFromTree($tree));
 			}
 
 			$catIds = $list;
 		}
 
-		$expr = array( $filter->compare( '==', 'index.catalog.id', array_unique( $catIds ) ) );
+		$expr = array($filter->compare('==', 'index.catalog.id', array_unique($catIds)));
 		$expr[] = $filter->getConditions();
 
-		if( $sort === 'relevance' )
+		if ($sort === 'relevance')
 		{
-			$cmpfunc = $filter->createFunction( 'index.catalog.position', array( $listtype, $catIds ) );
-			$expr[] = $filter->compare( '>=', $cmpfunc, 0 );
+			$cmpfunc = $filter->createFunction('index.catalog.position', array($listtype, $catIds));
+			$expr[] = $filter->compare('>=', $cmpfunc, 0);
 
-			$sortfunc = $filter->createFunction( 'sort:index.catalog.position', array( $listtype, $catIds ) );
-			$filter->setSortations( array( $filter->sort( $direction, $sortfunc ) ) );
+			$sortfunc = $filter->createFunction('sort:index.catalog.position', array($listtype, $catIds));
+			$filter->setSortations(array($filter->sort($direction, $sortfunc)));
 		}
 
-		$filter->setConditions( $filter->combine( '&&', $expr ) );
+		$filter->setConditions($filter->combine('&&', $expr));
 
 		return $filter;
 	}
@@ -134,13 +134,13 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @since 2017.03
 	 */
-	public function addFilterText( \Aimeos\MW\Criteria\Iface $filter, $input, $sort = null, $direction = '+', $listtype = 'default' )
+	public function addFilterText(\Aimeos\MW\Criteria\Iface $filter, $input, $sort = null, $direction = '+', $listtype = 'default')
 	{
 		$langid = $this->getContext()->getLocale()->getLanguageId();
-		$cmpfunc = $filter->createFunction( 'index.text.relevance', array( $listtype, $langid, $input ) );
-		$expr = array( $filter->compare( '>', $cmpfunc, 0 ), $filter->getConditions() );
+		$cmpfunc = $filter->createFunction('index.text.relevance', array($listtype, $langid, $input));
+		$expr = array($filter->compare('>', $cmpfunc, 0), $filter->getConditions());
 
-		return $filter->setConditions( $filter->combine( '&&', $expr ) );
+		return $filter->setConditions($filter->combine('&&', $expr));
 	}
 
 
@@ -152,9 +152,9 @@ 
 	 * @return array Associative list of key values as key and the product count for this key as value
 	 * @since 2017.03
 	 */
-	public function aggregate( \Aimeos\MW\Criteria\Iface $filter, $key )
+	public function aggregate(\Aimeos\MW\Criteria\Iface $filter, $key)
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'index' )->aggregate( $filter, $key );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'index')->aggregate($filter, $key);
 	}
 
 
@@ -169,11 +169,11 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @since 2017.03
 	 */
-	public function createFilter( $sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default' )
+	public function createFilter($sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default')
 	{
 		$sortations = [];
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'index' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'index');
 
 
 		/** controller/frontend/product/ignore-dates
@@ -188,55 +188,55 @@ 
 		 * @since 2017.10
 		 * @category Developer
 		 */
-		if( $context->getConfig()->get( 'controller/frontend/product/ignore-dates', false ) )
+		if ($context->getConfig()->get('controller/frontend/product/ignore-dates', false))
 		{
 			$search = $manager->createSearch();
-			$search->setConditions( $search->compare( '>', 'product.status', 0 ) );
+			$search->setConditions($search->compare('>', 'product.status', 0));
 		}
 		else
 		{
-			$search = $manager->createSearch( true );
+			$search = $manager->createSearch(true);
 		}
 
 
-		$expr = array( $search->compare( '!=', 'index.catalog.id', null ) );
+		$expr = array($search->compare('!=', 'index.catalog.id', null));
 
-		switch( $sort )
+		switch ($sort)
 		{
 			case 'code':
-				$sortations[] = $search->sort( $direction, 'product.code' );
+				$sortations[] = $search->sort($direction, 'product.code');
 				break;
 
 			case 'ctime':
-				$sortations[] = $search->sort( $direction, 'product.ctime' );
+				$sortations[] = $search->sort($direction, 'product.ctime');
 				break;
 
 			case 'name':
 				$langid = $context->getLocale()->getLanguageId();
 
-				$cmpfunc = $search->createFunction( 'index.text.value', array( $listtype, $langid, 'name', 'product' ) );
-				$expr[] = $search->compare( '>=', $cmpfunc, '' );
+				$cmpfunc = $search->createFunction('index.text.value', array($listtype, $langid, 'name', 'product'));
+				$expr[] = $search->compare('>=', $cmpfunc, '');
 
-				$sortfunc = $search->createFunction( 'sort:index.text.value', array( $listtype, $langid, 'name' ) );
-				$sortations[] = $search->sort( $direction, $sortfunc );
+				$sortfunc = $search->createFunction('sort:index.text.value', array($listtype, $langid, 'name'));
+				$sortations[] = $search->sort($direction, $sortfunc);
 				break;
 
 			case 'price':
 				$currencyid = $context->getLocale()->getCurrencyId();
 
-				$cmpfunc = $search->createFunction( 'index.price.value', array( $listtype, $currencyid, 'default' ) );
-				$expr[] = $search->compare( '>=', $cmpfunc, '0.00' );
+				$cmpfunc = $search->createFunction('index.price.value', array($listtype, $currencyid, 'default'));
+				$expr[] = $search->compare('>=', $cmpfunc, '0.00');
 
-				$sortfunc = $search->createFunction( 'sort:index.price.value', array( $listtype, $currencyid, 'default' ) );
-				$sortations[] = $search->sort( $direction, $sortfunc );
+				$sortfunc = $search->createFunction('sort:index.price.value', array($listtype, $currencyid, 'default'));
+				$sortations[] = $search->sort($direction, $sortfunc);
 				break;
 		}
 
 		$expr[] = $search->getConditions();
 
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSortations( $sortations );
-		$search->setSlice( $start, $size );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSortations($sortations);
+		$search->setSlice($start, $size);
 
 		return $search;
 	}
@@ -250,15 +250,15 @@ 
 	 * @return \Aimeos\MShop\Product\Item\Iface Product item including the referenced domains items
 	 * @since 2017.03
 	 */
-	public function getItem( $productId, array $domains = array( 'attribute', 'media', 'price', 'product', 'product/property', 'text' ) )
+	public function getItem($productId, array $domains = array('attribute', 'media', 'price', 'product', 'product/property', 'text'))
 	{
-		$items = $this->getItems( [$productId], $domains );
+		$items = $this->getItems([$productId], $domains);
 
-		if( ( $item = reset( $items ) ) !== false ) {
+		if (($item = reset($items)) !== false) {
 			return $item;
 		}
 
-		throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Product item with ID "%1$s" not found', $productId ) );
+		throw new \Aimeos\Controller\Frontend\Exception(sprintf('Product item with ID "%1$s" not found', $productId));
 	}
 
 
@@ -270,10 +270,10 @@ 
 	 * @return \Aimeos\MShop\Product\Item\Iface[] Associative list of product IDs as keys and product items as values
 	 * @since 2017.03
 	 */
-	public function getItems( array $productIds, array $domains = array( 'media', 'price', 'text' ) )
+	public function getItems(array $productIds, array $domains = array('media', 'price', 'text'))
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product');
 
 		/** controller/frontend/order/ignore-dates
 		 * Ignore start and end dates of products
@@ -287,24 +287,24 @@ 
 		 * @since 2017.08
 		 * @category Developer
 		 */
-		if( $context->getConfig()->get( 'controller/frontend/product/ignore-dates', false ) )
+		if ($context->getConfig()->get('controller/frontend/product/ignore-dates', false))
 		{
 			$search = $manager->createSearch();
-			$search->setConditions( $search->compare( '>', 'product.status', 0 ) );
+			$search->setConditions($search->compare('>', 'product.status', 0));
 		}
 		else
 		{
-			$search = $manager->createSearch( true );
+			$search = $manager->createSearch(true);
 		}
 
 		$expr = array(
-			$search->compare( '==', 'product.id', $productIds ),
+			$search->compare('==', 'product.id', $productIds),
 			$search->getConditions(),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, count( $productIds ) );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, count($productIds));
 
-		return $manager->searchItems( $search, $domains );
+		return $manager->searchItems($search, $domains);
 	}
 
 
@@ -317,9 +317,9 @@ 
 	 * @return array Ordered list of product items implementing \Aimeos\MShop\Product\Item\Iface
 	 * @since 2017.03
 	 */
-	public function searchItems( \Aimeos\MW\Criteria\Iface $filter, array $domains = array( 'media', 'price', 'text' ), &$total = null )
+	public function searchItems(\Aimeos\MW\Criteria\Iface $filter, array $domains = array('media', 'price', 'text'), &$total = null)
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'index' )->searchItems( $filter, $domains, $total );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'index')->searchItems($filter, $domains, $total);
 	}
 
 
@@ -329,12 +329,12 @@ 
 	 * @param \Aimeos\MShop\Catalog\Item\Iface $item Catalog item with children
 	 * @return array List of catalog IDs
 	 */
-	protected function getCatalogIdsFromTree( \Aimeos\MShop\Catalog\Item\Iface $item )
+	protected function getCatalogIdsFromTree(\Aimeos\MShop\Catalog\Item\Iface $item)
 	{
-		$list = array( $item->getId() );
+		$list = array($item->getId());
 
-		foreach( $item->getChildren() as $child ) {
-			$list = array_merge( $list, $this->getCatalogIdsFromTree( $child ) );
+		foreach ($item->getChildren() as $child) {
+			$list = array_merge($list, $this->getCatalogIdsFromTree($child));
 		}
 
 		return $list;
@@ -347,13 +347,13 @@ 
 	 * @param array $ids List of IDs to validate
 	 * @return array List of validated IDs
 	 */
-	protected function validateIds( array $ids )
+	protected function validateIds(array $ids)
 	{
 		$list = [];
 
-		foreach( $ids as $id )
+		foreach ($ids as $id)
 		{
-			if( $id != '' ) {
+			if ($id != '') {
 				$list[] = (int) $id;
 			}
 		}

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

Spacing +110 added lines, -110 removed lines

@@ -17,22 +17,22 @@ 
 	protected function setUp()
 	{
 		$this->context = \TestHelperFrontend::getContext();
-		$this->object = new \Aimeos\Controller\Frontend\Product\Standard( $this->context );
+		$this->object = new \Aimeos\Controller\Frontend\Product\Standard($this->context);
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object );
+		unset($this->object);
 	}
 
 
 	public function testAggregate()
 	{
 		$filter = $this->object->createFilter();
-		$list = $this->object->aggregate( $filter, 'index.attribute.id' );
+		$list = $this->object->aggregate($filter, 'index.attribute.id');
 
-		$this->assertGreaterThan( 0, count( $list ) );
+		$this->assertGreaterThan(0, count($list));
 	}
 
 
@@ -40,113 +40,113 @@ 
 	{
 		$filter = $this->object->createFilter();
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
-		$this->assertEquals( [], $filter->getSortations() );
-		$this->assertEquals( 0, $filter->getSliceStart() );
-		$this->assertEquals( 100, $filter->getSliceSize() );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
+		$this->assertEquals([], $filter->getSortations());
+		$this->assertEquals(0, $filter->getSliceStart());
+		$this->assertEquals(100, $filter->getSliceSize());
 	}
 
 
 	public function testCreateFilterIgnoreDates()
 	{
-		$this->context->getConfig()->set( 'controller/frontend/product/ignore-dates', true );
+		$this->context->getConfig()->set('controller/frontend/product/ignore-dates', true);
 
 		$filter = $this->object->createFilter();
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
 	}
 
 
 	public function testAddFilterAttribute()
 	{
 		$filter = $this->object->createFilter();
-		$filter = $this->object->addFilterAttribute( $filter, array( 0, 1 ), [], [] );
+		$filter = $this->object->addFilterAttribute($filter, array(0, 1), [], []);
 
 		$list = $filter->getConditions()->getExpressions();
 
-		if( !isset( $list[0] ) || !( $list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface ) ) {
-			throw new \RuntimeException( 'Wrong expression' );
+		if (!isset($list[0]) || !($list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface)) {
+			throw new \RuntimeException('Wrong expression');
 		}
 
-		$this->assertEquals( 'index.attributeaggregate([0,1])', $list[0]->getName() );
-		$this->assertEquals( 2, $list[0]->getValue() );
+		$this->assertEquals('index.attributeaggregate([0,1])', $list[0]->getName());
+		$this->assertEquals(2, $list[0]->getValue());
 	}
 
 
 	public function testAddFilterAttributeOptions()
 	{
 		$filter = $this->object->createFilter();
-		$filter = $this->object->addFilterAttribute( $filter, [], array( 1 ), [] );
+		$filter = $this->object->addFilterAttribute($filter, [], array(1), []);
 
 		$list = $filter->getConditions()->getExpressions();
 
-		if( !isset( $list[0] ) || !( $list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface ) ) {
-			throw new \RuntimeException( 'Wrong expression' );
+		if (!isset($list[0]) || !($list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface)) {
+			throw new \RuntimeException('Wrong expression');
 		}
 
-		$this->assertEquals( 'index.attributeaggregate([1])', $list[0]->getName() );
-		$this->assertEquals( 0, $list[0]->getValue() );
+		$this->assertEquals('index.attributeaggregate([1])', $list[0]->getName());
+		$this->assertEquals(0, $list[0]->getValue());
 	}
 
 
 	public function testAddFilterAttributeOne()
 	{
 		$filter = $this->object->createFilter();
-		$filter = $this->object->addFilterAttribute( $filter, [], [], array( 'test' => array( 2 ) ) );
+		$filter = $this->object->addFilterAttribute($filter, [], [], array('test' => array(2)));
 
 		$list = $filter->getConditions()->getExpressions();
 
-		if( !isset( $list[0] ) || !( $list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface ) ) {
-			throw new \RuntimeException( 'Wrong expression' );
+		if (!isset($list[0]) || !($list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface)) {
+			throw new \RuntimeException('Wrong expression');
 		}
 
-		$this->assertEquals( 'index.attributeaggregate([2])', $list[0]->getName() );
-		$this->assertEquals( 0, $list[0]->getValue() );
+		$this->assertEquals('index.attributeaggregate([2])', $list[0]->getName());
+		$this->assertEquals(0, $list[0]->getValue());
 	}
 
 
 	public function testAddFilterCategory()
 	{
 		$context = \TestHelperFrontend::getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'catalog' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'catalog');
 
-		$catId = $manager->findItem( 'root' )->getId();
+		$catId = $manager->findItem('root')->getId();
 		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_LIST;
 
 		$filter = $this->object->createFilter();
-		$filter = $this->object->addFilterCategory( $filter, $catId, $level );
+		$filter = $this->object->addFilterCategory($filter, $catId, $level);
 
 		$list = $filter->getConditions()->getExpressions();
 
-		if( !isset( $list[0] ) || !( $list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface ) ) {
-			throw new \RuntimeException( 'Wrong expression' );
+		if (!isset($list[0]) || !($list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface)) {
+			throw new \RuntimeException('Wrong expression');
 		}
 
-		$this->assertEquals( 'index.catalog.id', $list[0]->getName() );
-		$this->assertEquals( 3, count( $list[0]->getValue() ) );
-		$this->assertEquals( [], $filter->getSortations() );
+		$this->assertEquals('index.catalog.id', $list[0]->getName());
+		$this->assertEquals(3, count($list[0]->getValue()));
+		$this->assertEquals([], $filter->getSortations());
 	}
 
 
 	public function testAddFilterText()
 	{
 		$filter = $this->object->createFilter();
-		$filter = $this->object->addFilterText( $filter, 'Espresso' );
+		$filter = $this->object->addFilterText($filter, '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 \RuntimeException( 'Wrong expression' );
+		if (!isset($list[0]) || !($list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface)) {
+			throw new \RuntimeException('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( [], $filter->getSortations() );
-		$this->assertEquals( 0, $filter->getSliceStart() );
-		$this->assertEquals( 100, $filter->getSliceSize() );
+		$this->assertEquals([], $filter->getSortations());
+		$this->assertEquals(0, $filter->getSliceStart());
+		$this->assertEquals(100, $filter->getSliceSize());
 	}
 
 
@@ -155,177 +155,177 @@ 
 		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE;
 
 		$filter = $this->object->createFilter();
-		$filter = $this->object->addFilterCategory( $filter, 0, $level, 'relevance', '-', 'test' );
+		$filter = $this->object->addFilterCategory($filter, 0, $level, 'relevance', '-', '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 \RuntimeException( 'Sortation not set' );
+		if (($item = reset($sort)) === false) {
+			throw new \RuntimeException('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());
 	}
 
 
 	public function testCreateFilterSortRelevanceText()
 	{
-		$filter = $this->object->createFilter( 'relevance', '-', 1, 2, 'test' );
-		$filter = $this->object->addFilterText( $filter, 'Espresso' );
+		$filter = $this->object->createFilter('relevance', '-', 1, 2, 'test');
+		$filter = $this->object->addFilterText($filter, 'Espresso');
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
-		$this->assertEquals( [], $filter->getSortations() );
-		$this->assertEquals( 1, $filter->getSliceStart() );
-		$this->assertEquals( 2, $filter->getSliceSize() );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
+		$this->assertEquals([], $filter->getSortations());
+		$this->assertEquals(1, $filter->getSliceStart());
+		$this->assertEquals(2, $filter->getSliceSize());
 	}
 
 
 	public function testCreateFilterSortCode()
 	{
-		$filter = $this->object->createFilter( 'code' );
+		$filter = $this->object->createFilter('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 \RuntimeException( 'Sortation not set' );
+		if (($item = reset($sort)) === false) {
+			throw new \RuntimeException('Sortation not set');
 		}
 
-		$this->assertEquals( 'product.code', $item->getName() );
+		$this->assertEquals('product.code', $item->getName());
 	}
 
 
 	public function testCreateFilterSortCtime()
 	{
-		$filter = $this->object->createFilter( 'ctime' );
+		$filter = $this->object->createFilter('ctime');
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
 
 		$sort = $filter->getSortations();
-		if( ( $item = reset( $sort ) ) === false ) {
-			throw new \RuntimeException( 'Sortation not set' );
+		if (($item = reset($sort)) === false) {
+			throw new \RuntimeException('Sortation not set');
 		}
 
-		$this->assertEquals( 'product.ctime', $item->getName() );
+		$this->assertEquals('product.ctime', $item->getName());
 	}
 
 
 	public function testCreateFilterSortName()
 	{
-		$filter = $this->object->createFilter( 'name' );
+		$filter = $this->object->createFilter('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 \RuntimeException( 'Sortation not set' );
+		if (($item = reset($sort)) === false) {
+			throw new \RuntimeException('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 testCreateFilterSortPrice()
 	{
-		$filter = $this->object->createFilter( 'price' );
+		$filter = $this->object->createFilter('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 \RuntimeException( 'Sortation not set' );
+		if (($item = reset($sort)) === false) {
+			throw new \RuntimeException('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 testCreateFilterSortInvalid()
 	{
-		$filter = $this->object->createFilter( '', 'failure' );
+		$filter = $this->object->createFilter('', 'failure');
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
-		$this->assertEquals( [], $filter->getSortations() );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
+		$this->assertEquals([], $filter->getSortations());
 	}
 
 
 	public function testGetItem()
 	{
 		$context = \TestHelperFrontend::getContext();
-		$id = \Aimeos\MShop\Factory::createManager( $context, 'product' )->findItem( 'CNC' )->getId();
+		$id = \Aimeos\MShop\Factory::createManager($context, 'product')->findItem('CNC')->getId();
 
-		$result = $this->object->getItem( $id );
+		$result = $this->object->getItem($id);
 
-		$this->assertInstanceOf( '\Aimeos\MShop\Product\Item\Iface', $result );
-		$this->assertGreaterThan( 0, $result->getPropertyItems() );
-		$this->assertGreaterThan( 0, $result->getRefItems( 'attribute' ) );
-		$this->assertGreaterThan( 0, $result->getRefItems( 'media' ) );
-		$this->assertGreaterThan( 0, $result->getRefItems( 'price' ) );
-		$this->assertGreaterThan( 0, $result->getRefItems( 'product' ) );
-		$this->assertGreaterThan( 0, $result->getRefItems( 'text' ) );
+		$this->assertInstanceOf('\Aimeos\MShop\Product\Item\Iface', $result);
+		$this->assertGreaterThan(0, $result->getPropertyItems());
+		$this->assertGreaterThan(0, $result->getRefItems('attribute'));
+		$this->assertGreaterThan(0, $result->getRefItems('media'));
+		$this->assertGreaterThan(0, $result->getRefItems('price'));
+		$this->assertGreaterThan(0, $result->getRefItems('product'));
+		$this->assertGreaterThan(0, $result->getRefItems('text'));
 	}
 
 
 	public function testGetItems()
 	{
 		$context = \TestHelperFrontend::getContext();
-		$context->getConfig()->set( 'controller/frontend/product/ignore-dates', true );
+		$context->getConfig()->set('controller/frontend/product/ignore-dates', true);
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', array( 'CNC', 'CNE' ) ) );
+		$search->setConditions($search->compare('==', 'product.code', array('CNC', 'CNE')));
 
 		$ids = [];
-		foreach( $manager->searchItems( $search ) as $productItem ) {
+		foreach ($manager->searchItems($search) as $productItem) {
 			$ids[] = $productItem->getId();
 		}
 
 
-		$result = $this->object->getItems( $ids );
+		$result = $this->object->getItems($ids);
 
-		$this->assertEquals( 2, count( $result ) );
+		$this->assertEquals(2, count($result));
 
-		foreach( $result as $productItem ) {
-			$this->assertInstanceOf( '\Aimeos\MShop\Product\Item\Iface', $productItem );
+		foreach ($result as $productItem) {
+			$this->assertInstanceOf('\Aimeos\MShop\Product\Item\Iface', $productItem);
 		}
 	}
 
 
 	public function testSearchItemsCategory()
 	{
-		$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 \RuntimeException( 'Product item not found' );
+		if (($item = reset($items)) === false) {
+			throw new \RuntimeException('Product item not found');
 		}
 
-		$filter = $this->object->createFilter( 'position', '+', 1, 1 );
-		$filter = $this->object->addFilterCategory( $filter, $item->getId() );
+		$filter = $this->object->createFilter('position', '+', 1, 1);
+		$filter = $this->object->addFilterCategory($filter, $item->getId());
 
 		$total = 0;
-		$results = $this->object->searchItems( $filter, [], $total );
+		$results = $this->object->searchItems($filter, [], $total);
 
-		$this->assertEquals( 3, $total );
-		$this->assertEquals( 1, count( $results ) );
+		$this->assertEquals(3, $total);
+		$this->assertEquals(1, count($results));
 	}
 
 
 	public function testSearchItemsText()
 	{
-		$filter = $this->object->createFilter( 'relevance', '+', 0, 1, 'unittype13' );
-		$filter = $this->object->addFilterText( $filter, 'Expresso', 'relevance', '+', 'unittype13' );
+		$filter = $this->object->createFilter('relevance', '+', 0, 1, 'unittype13');
+		$filter = $this->object->addFilterText($filter, 'Expresso', 'relevance', '+', 'unittype13');
 
 		$total = 0;
-		$results = $this->object->searchItems( $filter, [], $total );
+		$results = $this->object->searchItems($filter, [], $total);
 
-		$this->assertEquals( 2, $total );
-		$this->assertEquals( 1, count( $results ) );
+		$this->assertEquals(2, $total);
+		$this->assertEquals(1, count($results));
 	}
 }