aimeos / ai-controller-frontend

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

Spacing +10 added lines, -10 removed lines

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

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

Spacing +105 added lines, -105 removed lines

@@ -28,29 +28,29 @@ 
 	 * @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();
 
-		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::create( $context, 'customer' );
-		$list = $this->addItemDefaults( $list );
+		$manager = \Aimeos\MShop::create($context, 'customer');
+		$list = $this->addItemDefaults($list);
 		$passwd = $list['customer.password'];
 
 		try
 		{
-			$item = $manager->findItem( $list['customer.code'], [], true );
+			$item = $manager->findItem($list['customer.code'], [], true);
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$this->checkLimit( $list );
+			$this->checkLimit($list);
 
-			$item = $manager->createItem()->fromArray( $list )->setId( null );
+			$item = $manager->createItem()->fromArray($list)->setId(null);
 
 			/** controller/frontend/customer/groupids
 			 * List of groups new customers should be assigned to
@@ -64,14 +64,14 @@ 
 			 * @category User
 			 * @category Developer
 			 */
-			$item->setGroups( (array) $config->get( 'controller/frontend/customer/groupids', [] ) );
+			$item->setGroups((array) $config->get('controller/frontend/customer/groupids', []));
 
-			$item = $manager->saveItem( $item );
+			$item = $manager->saveItem($item);
 
 			$msg = $item->toArray();
 			// Show only generated passwords in account creation e-mails
-			$msg['customer.password'] = ( isset( $values['customer.password'] ) ? null : $passwd );
-			$context->getMessageQueue( 'mq-email', 'customer/email/account' )->add( json_encode( $msg ) );
+			$msg['customer.password'] = (isset($values['customer.password']) ? null : $passwd);
+			$context->getMessageQueue('mq-email', 'customer/email/account')->add(json_encode($msg));
 		}
 
 		return $item;
@@ -83,10 +83,10 @@ 
 	 *
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item
 	 */
-	public function createItem( array $values = [] )
+	public function createItem(array $values = [])
 	{
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'customer' );
-		return $manager->createItem()->fromArray( $values )->setId( null );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'customer');
+		return $manager->createItem()->fromArray($values)->setId(null);
 	}
 
 
@@ -96,12 +96,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::create( $this->getContext(), 'customer' );
-		$manager->deleteItem( $id );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'customer');
+		$manager->deleteItem($id);
 	}
 
 
@@ -113,15 +113,15 @@ 
 	 * @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 );
-		unset( $values['customer.id'] );
+		$this->checkUser($id);
+		unset($values['customer.id']);
 
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'customer' );
-		$item = $manager->getItem( $id, ['customer/group'], true )->fromArray( $values );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'customer');
+		$item = $manager->getItem($id, ['customer/group'], true)->fromArray($values);
 
-		return $manager->saveItem( $item );
+		return $manager->saveItem($item);
 	}
 
 
@@ -133,17 +133,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::create( $this->getContext(), 'customer' );
+		$manager = \Aimeos\MShop::create($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);
 	}
 
 
@@ -157,9 +157,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::create( $this->getContext(), 'customer' )->findItem( $code, $domains, true );
+		return \Aimeos\MShop::create($this->getContext(), 'customer')->findItem($code, $domains, true);
 	}
 
 
@@ -169,9 +169,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::create( $this->getContext(), 'customer' )->saveItem( $item );
+		return \Aimeos\MShop::create($this->getContext(), 'customer')->saveItem($item);
 	}
 
 
@@ -182,13 +182,13 @@ 
 	 * @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::create( $context, 'customer/address' );
+		$manager = \Aimeos\MShop::create($context, 'customer/address');
 
-		$item = $manager->createItem()->fromArray( $values )->setId( null )->setParentId( $context->getUserId() );
-		return $manager->saveItem( $item );
+		$item = $manager->createItem()->fromArray($values)->setId(null)->setParentId($context->getUserId());
+		return $manager->saveItem($item);
 	}
 
 
@@ -197,12 +197,12 @@ 
 	 *
 	 * @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::create( $context, 'customer/address' );
+		$manager = \Aimeos\MShop::create($context, 'customer/address');
 
-		return $manager->createItem()->fromArray( $values )->setId( null )->setParentId( $context->getUserId() );
+		return $manager->createItem()->fromArray($values)->setId(null)->setParentId($context->getUserId());
 	}
 
 
@@ -212,13 +212,13 @@ 
 	 * @param string $id Unique customer address ID
 	 * @since 2017.04
 	 */
-	public function deleteAddressItem( $id )
+	public function deleteAddressItem($id)
 	{
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'customer/address' );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'customer/address');
 
-		$this->checkUser( $manager->getItem( $id, [], true )->getParentId() );
+		$this->checkUser($manager->getItem($id, [], true)->getParentId());
 
-		$manager->deleteItem( $id );
+		$manager->deleteItem($id);
 	}
 
 
@@ -230,15 +230,15 @@ 
 	 * @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)
 	{
-		unset( $values['customer.address.id'] );
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'customer/address' );
+		unset($values['customer.address.id']);
+		$manager = \Aimeos\MShop::create($this->getContext(), 'customer/address');
 
-		$item = $manager->getItem( $id, [], true );
-		$this->checkUser( $item->getParentId() );
+		$item = $manager->getItem($id, [], true);
+		$this->checkUser($item->getParentId());
 
-		return $manager->saveItem( $item->fromArray( $values ) );
+		return $manager->saveItem($item->fromArray($values));
 	}
 
 
@@ -249,12 +249,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::create( $this->getContext(), 'customer/address' );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'customer/address');
 
-		$item = $manager->getItem( $id );
-		$this->checkUser( $item->getParentId() );
+		$item = $manager->getItem($id);
+		$this->checkUser($item->getParentId());
 
 		return $item;
 	}
@@ -266,9 +266,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::create( $this->getContext(), 'customer/address' )->saveItem( $item );
+		return \Aimeos\MShop::create($this->getContext(), 'customer/address')->saveItem($item);
 	}
 
 
@@ -279,13 +279,13 @@ 
 	 * @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::create( $context, 'customer/lists' );
+		$manager = \Aimeos\MShop::create($context, 'customer/lists');
 
-		$item = $manager->createItem()->fromArray( $values )->setId( null )->setParentId( $context->getUserId() );
-		return $manager->saveItem( $item );
+		$item = $manager->createItem()->fromArray($values)->setId(null)->setParentId($context->getUserId());
+		return $manager->saveItem($item);
 	}
 
 
@@ -298,10 +298,10 @@ 
 	public function createListsFilter()
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop::create( $context, 'customer/lists' );
+		$manager = \Aimeos\MShop::create($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;
 	}
@@ -313,13 +313,13 @@ 
 	 * @param string $id Unique customer address ID
 	 * @since 2017.06
 	 */
-	public function deleteListItem( $id )
+	public function deleteListItem($id)
 	{
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'customer/lists' );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'customer/lists');
 
-		$this->checkUser( $manager->getItem( $id )->getParentId() );
+		$this->checkUser($manager->getItem($id)->getParentId());
 
-		$manager->deleteItem( $id );
+		$manager->deleteItem($id);
 	}
 
 
@@ -331,16 +331,16 @@ 
 	 * @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::create( $context, 'customer/lists' );
+		$manager = \Aimeos\MShop::create($context, 'customer/lists');
 
-		$item = $manager->getItem( $id, [], true );
-		$this->checkUser( $item->getParentId() );
-		unset( $values['customer.lists.id'] );
+		$item = $manager->getItem($id, [], true);
+		$this->checkUser($item->getParentId());
+		unset($values['customer.lists.id']);
 
-		return $manager->saveItem( $item->fromArray( $values ) );
+		return $manager->saveItem($item->fromArray($values));
 	}
 
 
@@ -351,12 +351,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::create( $this->getContext(), 'customer/lists' );
-		$item = $manager->getItem( $id );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'customer/lists');
+		$item = $manager->getItem($id);
 
-		$this->checkUser( $item->getParentId() );
+		$this->checkUser($item->getParentId());
 
 		return $item;
 	}
@@ -370,11 +370,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::create( $this->getContext(), 'customer/lists' );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'customer/lists');
 
-		return $manager->searchItems( $filter, [], $total );
+		return $manager->searchItems($filter, [], $total);
 	}
 
 
@@ -384,33 +384,33 @@ 
 	 * @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.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;
@@ -423,7 +423,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();
@@ -444,7 +444,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
@@ -462,22 +462,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::create( $context, 'customer' );
+		$manager = \Aimeos\MShop::create($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'));
 		}
 	}
 
@@ -488,12 +488,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);
 		}
 	}
 }

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

Spacing +65 added lines, -65 removed lines

@@ -20,57 +20,57 @@ 
 	{
 		$this->context = \TestHelperFrontend::getContext();
 
-		$this->stub = $this->getMockBuilder( \Aimeos\Controller\Frontend\Product\Standard::class )
+		$this->stub = $this->getMockBuilder(\Aimeos\Controller\Frontend\Product\Standard::class)
 			->disableOriginalConstructor()
 			->getMock();
 
-		$this->object = $this->getMockBuilder( \Aimeos\Controller\Frontend\Product\Decorator\Base::class )
-			->setConstructorArgs( [$this->stub, $this->context] )
+		$this->object = $this->getMockBuilder(\Aimeos\Controller\Frontend\Product\Decorator\Base::class)
+			->setConstructorArgs([$this->stub, $this->context])
 			->getMockForAbstractClass();
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->context, $this->object, $this->stub );
+		unset($this->context, $this->object, $this->stub);
 	}
 
 
 	public function testConstructException()
 	{
-		$stub = $this->getMockBuilder( \Aimeos\Controller\Frontend\Iface::class )->getMock();
+		$stub = $this->getMockBuilder(\Aimeos\Controller\Frontend\Iface::class)->getMock();
 
-		$this->setExpectedException( \Aimeos\MW\Common\Exception::class );
+		$this->setExpectedException(\Aimeos\MW\Common\Exception::class);
 
-		$this->getMockBuilder( \Aimeos\Controller\Frontend\Product\Decorator\Base::class )
-			->setConstructorArgs( [$stub, $this->context] )
+		$this->getMockBuilder(\Aimeos\Controller\Frontend\Product\Decorator\Base::class)
+			->setConstructorArgs([$stub, $this->context])
 			->getMockForAbstractClass();
 	}
 
 
 	public function testCall()
 	{
-		$stub = $this->getMockBuilder( \Aimeos\Controller\Frontend\Product\Standard::class )
+		$stub = $this->getMockBuilder(\Aimeos\Controller\Frontend\Product\Standard::class)
 			->disableOriginalConstructor()
-			->setMethods( ['invalid'] )
+			->setMethods(['invalid'])
 			->getMock();
 
-		$object = $this->getMockBuilder( \Aimeos\Controller\Frontend\Product\Decorator\Base::class )
-			->setConstructorArgs( [$stub, $this->context] )
+		$object = $this->getMockBuilder(\Aimeos\Controller\Frontend\Product\Decorator\Base::class)
+			->setConstructorArgs([$stub, $this->context])
 			->getMockForAbstractClass();
 
-		$stub->expects( $this->once() )->method( 'invalid' )->will( $this->returnValue( true ) );
+		$stub->expects($this->once())->method('invalid')->will($this->returnValue(true));
 
-		$this->assertTrue( $object->invalid() );
+		$this->assertTrue($object->invalid());
 	}
 
 
 	public function testAggregate()
 	{
-		$this->stub->expects( $this->once() )->method( 'aggregate' )
-			->will( $this->returnValue( [] ) );
+		$this->stub->expects($this->once())->method('aggregate')
+			->will($this->returnValue([]));
 
-		$this->assertEquals( [], $this->object->aggregate( 'test' ) );
+		$this->assertEquals([], $this->object->aggregate('test'));
 	}
 
 
@@ -78,10 +78,10 @@ 
 	{
 		$expected = \Aimeos\Controller\Frontend\Product\Iface::class;
 
-		$this->stub->expects( $this->once() )->method( 'allOf' )
-			->will( $this->returnValue( $this->stub ) );
+		$this->stub->expects($this->once())->method('allOf')
+			->will($this->returnValue($this->stub));
 
-		$this->assertInstanceOf( $expected, $this->object->allOf( [1, 2] ) );
+		$this->assertInstanceOf($expected, $this->object->allOf([1, 2]));
 	}
 
 
@@ -89,10 +89,10 @@ 
 	{
 		$expected = \Aimeos\Controller\Frontend\Product\Iface::class;
 
-		$this->stub->expects( $this->once() )->method( 'category' )
-			->will( $this->returnValue( $this->stub ) );
+		$this->stub->expects($this->once())->method('category')
+			->will($this->returnValue($this->stub));
 
-		$this->assertInstanceOf( $expected, $this->object->category( 1, 'default', \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE ) );
+		$this->assertInstanceOf($expected, $this->object->category(1, 'default', \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE));
 	}
 
 
@@ -100,34 +100,34 @@ 
 	{
 		$expected = \Aimeos\Controller\Frontend\Product\Iface::class;
 
-		$this->stub->expects( $this->once() )->method( 'compare' )
-			->will( $this->returnValue( $this->stub ) );
+		$this->stub->expects($this->once())->method('compare')
+			->will($this->returnValue($this->stub));
 
-		$this->assertInstanceOf( $expected, $this->object->compare( '==', 'product.code', 'test' ) );
+		$this->assertInstanceOf($expected, $this->object->compare('==', 'product.code', 'test'));
 	}
 
 
 	public function testGet()
 	{
-		$item = \Aimeos\MShop::create( $this->context, 'product' )->createItem();
+		$item = \Aimeos\MShop::create($this->context, 'product')->createItem();
 		$expected = \Aimeos\MShop\Product\Item\Iface::class;
 
-		$this->stub->expects( $this->once() )->method( 'get' )
-			->will( $this->returnValue( $item ) );
+		$this->stub->expects($this->once())->method('get')
+			->will($this->returnValue($item));
 
-		$this->assertInstanceOf( $expected, $this->object->get( 1, ['text'] ) );
+		$this->assertInstanceOf($expected, $this->object->get(1, ['text']));
 	}
 
 
 	public function testFind()
 	{
-		$item = \Aimeos\MShop::create( $this->context, 'product' )->createItem();
+		$item = \Aimeos\MShop::create($this->context, 'product')->createItem();
 		$expected = \Aimeos\MShop\Product\Item\Iface::class;
 
-		$this->stub->expects( $this->once() )->method( 'find' )
-			->will( $this->returnValue( $item ) );
+		$this->stub->expects($this->once())->method('find')
+			->will($this->returnValue($item));
 
-		$this->assertInstanceOf( $expected, $this->object->find( 'test', ['text'] ) );
+		$this->assertInstanceOf($expected, $this->object->find('test', ['text']));
 	}
 
 
@@ -135,10 +135,10 @@ 
 	{
 		$expected = \Aimeos\Controller\Frontend\Product\Iface::class;
 
-		$this->stub->expects( $this->once() )->method( 'oneOf' )
-			->will( $this->returnValue( $this->stub ) );
+		$this->stub->expects($this->once())->method('oneOf')
+			->will($this->returnValue($this->stub));
 
-		$this->assertInstanceOf( $expected, $this->object->oneOf( [1, 2] ) );
+		$this->assertInstanceOf($expected, $this->object->oneOf([1, 2]));
 	}
 
 
@@ -146,10 +146,10 @@ 
 	{
 		$expected = \Aimeos\Controller\Frontend\Product\Iface::class;
 
-		$this->stub->expects( $this->once() )->method( 'parse' )
-			->will( $this->returnValue( $this->stub ) );
+		$this->stub->expects($this->once())->method('parse')
+			->will($this->returnValue($this->stub));
 
-		$this->assertInstanceOf( $expected, $this->object->parse( [] ) );
+		$this->assertInstanceOf($expected, $this->object->parse([]));
 	}
 
 
@@ -157,23 +157,23 @@ 
 	{
 		$expected = \Aimeos\Controller\Frontend\Product\Iface::class;
 
-		$this->stub->expects( $this->once() )->method( 'product' )
-			->will( $this->returnValue( $this->stub ) );
+		$this->stub->expects($this->once())->method('product')
+			->will($this->returnValue($this->stub));
 
-		$this->assertInstanceOf( $expected, $this->object->product( [1, 3] ) );
+		$this->assertInstanceOf($expected, $this->object->product([1, 3]));
 	}
 
 
 	public function testSearch()
 	{
-		$item = \Aimeos\MShop::create( $this->context, 'product' )->createItem();
+		$item = \Aimeos\MShop::create($this->context, 'product')->createItem();
 		$expected = \Aimeos\MShop\Product\Item\Iface::class;
 		$total = 0;
 
-		$this->stub->expects( $this->once() )->method( 'search' )
-			->will( $this->returnValue( [$item] ) );
+		$this->stub->expects($this->once())->method('search')
+			->will($this->returnValue([$item]));
 
-		$this->assertEquals( [$item], $this->object->search( ['text'], $total ) );
+		$this->assertEquals([$item], $this->object->search(['text'], $total));
 	}
 
 
@@ -181,10 +181,10 @@ 
 	{
 		$expected = \Aimeos\Controller\Frontend\Product\Iface::class;
 
-		$this->stub->expects( $this->once() )->method( 'slice' )
-			->will( $this->returnValue( $this->stub ) );
+		$this->stub->expects($this->once())->method('slice')
+			->will($this->returnValue($this->stub));
 
-		$this->assertInstanceOf( $expected, $this->object->slice( 0, 100 ) );
+		$this->assertInstanceOf($expected, $this->object->slice(0, 100));
 	}
 
 
@@ -192,10 +192,10 @@ 
 	{
 		$expected = \Aimeos\Controller\Frontend\Product\Iface::class;
 
-		$this->stub->expects( $this->once() )->method( 'sort' )
-			->will( $this->returnValue( $this->stub ) );
+		$this->stub->expects($this->once())->method('sort')
+			->will($this->returnValue($this->stub));
 
-		$this->assertInstanceOf( $expected, $this->object->sort( 'code' ) );
+		$this->assertInstanceOf($expected, $this->object->sort('code'));
 	}
 
 
@@ -203,10 +203,10 @@ 
 	{
 		$expected = \Aimeos\Controller\Frontend\Product\Iface::class;
 
-		$this->stub->expects( $this->once() )->method( 'supplier' )
-			->will( $this->returnValue( $this->stub ) );
+		$this->stub->expects($this->once())->method('supplier')
+			->will($this->returnValue($this->stub));
 
-		$this->assertInstanceOf( $expected, $this->object->supplier( [1], 'default' ) );
+		$this->assertInstanceOf($expected, $this->object->supplier([1], 'default'));
 	}
 
 
@@ -214,26 +214,26 @@ 
 	{
 		$expected = \Aimeos\Controller\Frontend\Product\Iface::class;
 
-		$this->stub->expects( $this->once() )->method( 'text' )
-			->will( $this->returnValue( $this->stub ) );
+		$this->stub->expects($this->once())->method('text')
+			->will($this->returnValue($this->stub));
 
-		$this->assertInstanceOf( $expected, $this->object->text( 'test' ) );
+		$this->assertInstanceOf($expected, $this->object->text('test'));
 	}
 
 
 	public function testGetController()
 	{
-		$result = $this->access( 'getController' )->invokeArgs( $this->object, [] );
+		$result = $this->access('getController')->invokeArgs($this->object, []);
 
-		$this->assertSame( $this->stub, $result );
+		$this->assertSame($this->stub, $result);
 	}
 
 
-	protected function access( $name )
+	protected function access($name)
 	{
-		$class = new \ReflectionClass( \Aimeos\Controller\Frontend\Product\Decorator\Base::class );
-		$method = $class->getMethod( $name );
-		$method->setAccessible( true );
+		$class = new \ReflectionClass(\Aimeos\Controller\Frontend\Product\Decorator\Base::class);
+		$method = $class->getMethod($name);
+		$method->setAccessible(true);
 
 		return $method;
 	}

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

Spacing +8 added lines, -8 removed lines

@@ -28,7 +28,7 @@ 
 	 * @param string|null $name Name of the controller implementaton (default: "Standard")
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Controller object
 	 */
-	public static function create( \Aimeos\MShop\Context\Item\Iface $context, $name = null )
+	public static function create(\Aimeos\MShop\Context\Item\Iface $context, $name = null)
 	{
 		/** controller/frontend/product/name
 		 * Class name of the used product frontend controller implementation
@@ -63,20 +63,20 @@ 
 		 * @since 2017.03
 		 * @category Developer
 		 */
-		if( $name === null ) {
-			$name = $context->getConfig()->get( 'controller/frontend/product/name', 'Standard' );
+		if ($name === null) {
+			$name = $context->getConfig()->get('controller/frontend/product/name', 'Standard');
 		}
 
-		if( ctype_alnum( $name ) === false )
+		if (ctype_alnum($name) === false)
 		{
-			$classname = is_string( $name ) ? '\\Aimeos\\Controller\\Frontend\\Product\\' . $name : '<not a string>';
-			throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+			$classname = is_string($name) ? '\\Aimeos\\Controller\\Frontend\\Product\\' . $name : '<not a string>';
+			throw new \Aimeos\Controller\Frontend\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 		}
 
 		$iface = '\\Aimeos\\Controller\\Frontend\\Product\\Iface';
 		$classname = '\\Aimeos\\Controller\\Frontend\\Product\\' . $name;
 
-		$controller = self::createController( $context, $classname, $iface );
+		$controller = self::createController($context, $classname, $iface);
 
 		/** controller/frontend/product/decorators/excludes
 		 * Excludes decorators added by the "common" option from the product frontend controllers
@@ -152,6 +152,6 @@ 
 		 * @see controller/frontend/product/decorators/excludes
 		 * @see controller/frontend/product/decorators/global
 		 */
-		return self::addControllerDecorators( $context, $controller, 'product' );
+		return self::addControllerDecorators($context, $controller, 'product');
 	}
 }

controller/frontend/src/Controller/Frontend.php

Spacing +12 added lines, -12 removed lines

@@ -27,7 +27,7 @@ 
 	 * @param boolean $value True to enable caching, false to disable it.
 	 * @return boolean Previous cache setting
 	 */
-	static public function cache( $value )
+	static public function cache($value)
 	{
 		self::$cache = (boolean) $value;
 		self::$objects = [];
@@ -49,26 +49,26 @@ 
 	 * @return \Aimeos\Controller\Frontend\Iface New frontend controller
 	 * @throws \Aimeos\Controller\Frontend\Exception If the given path is invalid or the manager wasn't found
 	 */
-	static public function create( \Aimeos\MShop\Context\Item\Iface $context, $path )
+	static public function create(\Aimeos\MShop\Context\Item\Iface $context, $path)
 	{
-		if( empty( $path ) ) {
-			throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Controller path is empty' ) );
+		if (empty($path)) {
+			throw new \Aimeos\Controller\Frontend\Exception(sprintf('Controller path is empty'));
 		}
 
-		if( self::$cache === false || !isset( self::$objects[$path] ) )
+		if (self::$cache === false || !isset(self::$objects[$path]))
 		{
-			if( ctype_alnum( $path ) === false ) {
-				throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid characters in controller name "%1$s"', $path ) );
+			if (ctype_alnum($path) === false) {
+				throw new \Aimeos\Controller\Frontend\Exception(sprintf('Invalid characters in controller name "%1$s"', $path));
 			}
 
-			$factory = '\\Aimeos\\Controller\\Frontend\\' . ucfirst( $path ) . '\\Factory';
+			$factory = '\\Aimeos\\Controller\\Frontend\\' . ucfirst($path) . '\\Factory';
 
-			if( class_exists( $factory ) === false ) {
-				throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Class "%1$s" not available', $factory ) );
+			if (class_exists($factory) === false) {
+				throw new \Aimeos\Controller\Frontend\Exception(sprintf('Class "%1$s" not available', $factory));
 			}
 
-			if( ( $controller = call_user_func_array( [$factory, 'create'], [$context] ) ) === false ) {
-				throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid factory "%1$s"', $factory ) );
+			if (($controller = call_user_func_array([$factory, 'create'], [$context])) === false) {
+				throw new \Aimeos\Controller\Frontend\Exception(sprintf('Invalid factory "%1$s"', $factory));
 			}
 
 			self::$objects[$path] = $controller;

controller/frontend/tests/Controller/FrontendTest.php

Spacing +15 added lines, -15 removed lines

@@ -13,48 +13,48 @@
 {
 	public function testCreateController()
 	{
-		$controller = \Aimeos\Controller\Frontend::create( \TestHelperFrontend::getContext(), 'basket' );
-		$this->assertInstanceOf( '\\Aimeos\\Controller\\Frontend\\Iface', $controller );
+		$controller = \Aimeos\Controller\Frontend::create(\TestHelperFrontend::getContext(), 'basket');
+		$this->assertInstanceOf('\\Aimeos\\Controller\\Frontend\\Iface', $controller);
 	}
 
 
 	public function testCreateControllerEmpty()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
-		\Aimeos\Controller\Frontend::create( \TestHelperFrontend::getContext(), '' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
+		\Aimeos\Controller\Frontend::create(\TestHelperFrontend::getContext(), '');
 	}
 
 
 	public function testCreateControllerInvalidName()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
-		\Aimeos\Controller\Frontend::create( \TestHelperFrontend::getContext(), '%^' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
+		\Aimeos\Controller\Frontend::create(\TestHelperFrontend::getContext(), '%^');
 	}
 
 
 	public function testCreateControllerNotExisting()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
-		\Aimeos\Controller\Frontend::create( \TestHelperFrontend::getContext(), 'notexist' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
+		\Aimeos\Controller\Frontend::create(\TestHelperFrontend::getContext(), 'notexist');
 	}
 
 
 	public function testCreateSubControllerNotExisting()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
-		\Aimeos\Controller\Frontend::create( \TestHelperFrontend::getContext(), 'basket/notexist' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
+		\Aimeos\Controller\Frontend::create(\TestHelperFrontend::getContext(), 'basket/notexist');
 	}
 
 
 	public function testCache()
 	{
 		$context = \TestHelperFrontend::getContext();
-		\Aimeos\Controller\Frontend::cache( true );
+		\Aimeos\Controller\Frontend::cache(true);
 
-		$controller1 = \Aimeos\Controller\Frontend::create( $context, 'basket' );
-		$controller2 = \Aimeos\Controller\Frontend::create( $context, 'basket' );
+		$controller1 = \Aimeos\Controller\Frontend::create($context, 'basket');
+		$controller2 = \Aimeos\Controller\Frontend::create($context, 'basket');
 
-		\Aimeos\Controller\Frontend::cache( false );
-		$this->assertNotSame( $controller1, $controller2 );
+		\Aimeos\Controller\Frontend::cache(false);
+		$this->assertNotSame($controller1, $controller2);
 	}
 }
\ No newline at end of file

controller/frontend/tests/TestHelperFrontend.php

Spacing +25 added lines, -25 removed lines

@@ -18,10 +18,10 @@ 
 	}
 
 
-	public static function getContext( $site = 'unittest' )
+	public static function getContext($site = 'unittest')
 	{
-		if( !isset( self::$context[$site] ) ) {
-			self::$context[$site] = self::createContext( $site );
+		if (!isset(self::$context[$site])) {
+			self::$context[$site] = self::createContext($site);
 		}
 
 		return clone self::$context[$site];
@@ -30,13 +30,13 @@ 
 
 	private static function getAimeos()
 	{
-		if( !isset( self::$aimeos ) )
+		if (!isset(self::$aimeos))
 		{
 			require_once 'Bootstrap.php';
-			spl_autoload_register( 'Aimeos\\Bootstrap::autoload' );
+			spl_autoload_register('Aimeos\\Bootstrap::autoload');
 
-			$extdir = dirname( dirname( dirname( dirname( dirname( __FILE__ ) ) ) ) );
-			self::$aimeos = new \Aimeos\Bootstrap( array( $extdir ), true );
+			$extdir = dirname(dirname(dirname(dirname(dirname(__FILE__)))));
+			self::$aimeos = new \Aimeos\Bootstrap(array($extdir), true);
 		}
 
 		return self::$aimeos;
@@ -46,7 +46,7 @@ 
 	/**
 	 * @param string $site
 	 */
-	private static function createContext( $site )
+	private static function createContext($site)
 	{
 		$ctx = new \Aimeos\MShop\Context\Item\Standard();
 		$aimeos = self::getAimeos();
@@ -56,38 +56,38 @@ 
 		$paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config';
 		$file = __DIR__ . DIRECTORY_SEPARATOR . 'confdoc.ser';
 
-		$conf = new \Aimeos\MW\Config\PHPArray( [], $paths );
-		$conf = new \Aimeos\MW\Config\Decorator\Memory( $conf );
-		$conf = new \Aimeos\MW\Config\Decorator\Documentor( $conf, $file );
-		$ctx->setConfig( $conf );
+		$conf = new \Aimeos\MW\Config\PHPArray([], $paths);
+		$conf = new \Aimeos\MW\Config\Decorator\Memory($conf);
+		$conf = new \Aimeos\MW\Config\Decorator\Documentor($conf, $file);
+		$ctx->setConfig($conf);
 
 
-		$dbm = new \Aimeos\MW\DB\Manager\PDO( $conf );
-		$ctx->setDatabaseManager( $dbm );
+		$dbm = new \Aimeos\MW\DB\Manager\PDO($conf);
+		$ctx->setDatabaseManager($dbm);
 
 
-		$mq = new \Aimeos\MW\MQueue\Manager\Standard( $conf );
-		$ctx->setMessageQueueManager( $mq );
+		$mq = new \Aimeos\MW\MQueue\Manager\Standard($conf);
+		$ctx->setMessageQueueManager($mq);
 
 
-		$logger = new \Aimeos\MW\Logger\File( 'unittest.log', \Aimeos\MW\Logger\Base::DEBUG );
-		$ctx->setLogger( $logger );
+		$logger = new \Aimeos\MW\Logger\File('unittest.log', \Aimeos\MW\Logger\Base::DEBUG);
+		$ctx->setLogger($logger);
 
 
-		$i18n = new \Aimeos\MW\Translation\None( 'de' );
-		$ctx->setI18n( array( 'de' => $i18n ) );
+		$i18n = new \Aimeos\MW\Translation\None('de');
+		$ctx->setI18n(array('de' => $i18n));
 
 
 		$session = new \Aimeos\MW\Session\None();
-		$ctx->setSession( $session );
+		$ctx->setSession($session);
 
 
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::create( $ctx );
-		$locale = $localeManager->bootstrap( $site, '', '', false );
-		$ctx->setLocale( $locale );
+		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::create($ctx);
+		$locale = $localeManager->bootstrap($site, '', '', false);
+		$ctx->setLocale($locale);
 
 
-		$ctx->setEditor( 'core:controller/frontend' );
+		$ctx->setEditor('core:controller/frontend');
 
 		return $ctx;
 	}

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

Spacing +138 added lines, -138 removed lines

@@ -16,53 +16,53 @@ 
 	protected function setUp()
 	{
 		$this->context = \TestHelperFrontend::getContext();
-		\Aimeos\MShop::cache( true );
+		\Aimeos\MShop::cache(true);
 	}
 
 
 	protected function tearDown()
 	{
-		\Aimeos\MShop::cache( false );
-		$this->context->getSession()->set( 'aimeos', [] );
+		\Aimeos\MShop::cache(false);
+		$this->context->getSession()->set('aimeos', []);
 
-		unset( $this->context );
+		unset($this->context);
 	}
 
 
 	public function testCheckLocale()
 	{
-		$object = $this->getMockBuilder( \Aimeos\Controller\Frontend\Basket\Standard::class )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( null )
+		$object = $this->getMockBuilder(\Aimeos\Controller\Frontend\Basket\Standard::class)
+			->setConstructorArgs([$this->context])
+			->setMethods(null)
 			->getMock();
 
-		$this->context->getSession()->set( 'aimeos/basket/locale', 'unittest|en|EUR' );
-		$this->access( 'checkLocale' )->invokeArgs( $object, [$this->context->getLocale(), 'unittest'] );
+		$this->context->getSession()->set('aimeos/basket/locale', 'unittest|en|EUR');
+		$this->access('checkLocale')->invokeArgs($object, [$this->context->getLocale(), 'unittest']);
 	}
 
 
 	public function testCopyAddresses()
 	{
-		$manager = \Aimeos\MShop::create( \TestHelperFrontend::getContext(), 'order/base' );
+		$manager = \Aimeos\MShop::create(\TestHelperFrontend::getContext(), 'order/base');
 		$ordBaseItem = $manager->createItem();
 
-		$address = $this->getAddress( 'Example company' );
-		$ordBaseItem->setAddress( $address, \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT );
+		$address = $this->getAddress('Example company');
+		$ordBaseItem->setAddress($address, \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT);
 
 
-		$object = $this->getMockBuilder( \Aimeos\Controller\Frontend\Basket\Standard::class )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( null )
+		$object = $this->getMockBuilder(\Aimeos\Controller\Frontend\Basket\Standard::class)
+			->setConstructorArgs([$this->context])
+			->setMethods(null)
 			->getMock();
 
-		$result = $this->access( 'copyAddresses' )->invokeArgs( $object, [$ordBaseItem, ['test'], 'unittest|en|EUR'] );
+		$result = $this->access('copyAddresses')->invokeArgs($object, [$ordBaseItem, ['test'], 'unittest|en|EUR']);
 
 
-		$this->assertEquals( ['test'], $result );
-		$this->assertEquals( 1, count( $object->get()->getAddresses() ) );
+		$this->assertEquals(['test'], $result);
+		$this->assertEquals(1, count($object->get()->getAddresses()));
 
-		$addr = $object->get()->getAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT );
-		$this->assertInstanceOf( \Aimeos\MShop\Order\Item\Base\Address\Iface::class, $addr );
+		$addr = $object->get()->getAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT);
+		$this->assertInstanceOf(\Aimeos\MShop\Order\Item\Base\Address\Iface::class, $addr);
 
 		$object->clear();
 	}
@@ -70,54 +70,54 @@ 
 
 	public function testCopyAddressesException()
 	{
-		$manager = \Aimeos\MShop::create( \TestHelperFrontend::getContext(), 'order/base' );
+		$manager = \Aimeos\MShop::create(\TestHelperFrontend::getContext(), 'order/base');
 		$ordBaseItem = $manager->createItem();
 
-		$address = $this->getAddress( 'Example company' );
-		$ordBaseItem->setAddress( $address, \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT );
+		$address = $this->getAddress('Example company');
+		$ordBaseItem->setAddress($address, \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT);
 
 
-		$object = $this->getMockBuilder( \Aimeos\Controller\Frontend\Basket\Standard::class )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( ['setAddress'] )
+		$object = $this->getMockBuilder(\Aimeos\Controller\Frontend\Basket\Standard::class)
+			->setConstructorArgs([$this->context])
+			->setMethods(['setAddress'])
 			->getMock();
 
-		$object->expects( $this->once() )->method( 'setAddress' )->will( $this->throwException( new \Exception() ) );
+		$object->expects($this->once())->method('setAddress')->will($this->throwException(new \Exception()));
 
-		$result = $this->access( 'copyAddresses' )->invokeArgs( $object, [$ordBaseItem, [], 'unittest|en|EUR'] );
+		$result = $this->access('copyAddresses')->invokeArgs($object, [$ordBaseItem, [], 'unittest|en|EUR']);
 
-		$this->assertEquals( 1, count( $result ) );
-		$this->assertArrayHasKey( 'address', $result );
+		$this->assertEquals(1, count($result));
+		$this->assertArrayHasKey('address', $result);
 	}
 
 
 	public function testCopyCoupon()
 	{
-		$manager = \Aimeos\MShop::create( \TestHelperFrontend::getContext(), 'order/base' );
+		$manager = \Aimeos\MShop::create(\TestHelperFrontend::getContext(), 'order/base');
 		$ordBaseItem = $manager->createItem();
 
-		$product = \Aimeos\MShop::create( $this->context, 'product' )->findItem( 'CNC', ['price'] );
-		$ordProdManager = \Aimeos\MShop::create( $this->context, 'order/base/product' );
-		$ordProdItem = $ordProdManager->createItem()->copyFrom( $product );
+		$product = \Aimeos\MShop::create($this->context, 'product')->findItem('CNC', ['price']);
+		$ordProdManager = \Aimeos\MShop::create($this->context, 'order/base/product');
+		$ordProdItem = $ordProdManager->createItem()->copyFrom($product);
 
-		$priceItems = $product->getRefItems( 'price' );
-		$ordProdItem->setPrice( reset( $priceItems ) );
+		$priceItems = $product->getRefItems('price');
+		$ordProdItem->setPrice(reset($priceItems));
 
-		$ordBaseItem->addProduct( $ordProdItem );
-		$ordBaseItem->addCoupon( 'OPQR', [] );
+		$ordBaseItem->addProduct($ordProdItem);
+		$ordBaseItem->addCoupon('OPQR', []);
 
 
-		$object = $this->getMockBuilder( \Aimeos\Controller\Frontend\Basket\Standard::class )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( null )
+		$object = $this->getMockBuilder(\Aimeos\Controller\Frontend\Basket\Standard::class)
+			->setConstructorArgs([$this->context])
+			->setMethods(null)
 			->getMock();
 
-		$object->addProduct( $product->getId() );
+		$object->addProduct($product->getId());
 
-		$result = $this->access( 'copyCoupons' )->invokeArgs( $object, [$ordBaseItem, ['test'], 'unittest|en|EUR'] );
+		$result = $this->access('copyCoupons')->invokeArgs($object, [$ordBaseItem, ['test'], 'unittest|en|EUR']);
 
 
-		$this->assertEquals( ['test'], $result );
+		$this->assertEquals(['test'], $result);
 
 		$object->clear();
 	}
@@ -125,48 +125,48 @@ 
 
 	public function testCopyCouponException()
 	{
-		$manager = \Aimeos\MShop::create( \TestHelperFrontend::getContext(), 'order/base' );
+		$manager = \Aimeos\MShop::create(\TestHelperFrontend::getContext(), 'order/base');
 		$ordBaseItem = $manager->createItem();
 
-		$ordBaseItem->addCoupon( '90AB', [] );
+		$ordBaseItem->addCoupon('90AB', []);
 
 
-		$object = $this->getMockBuilder( \Aimeos\Controller\Frontend\Basket\Standard::class )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( ['addCoupon'] )
+		$object = $this->getMockBuilder(\Aimeos\Controller\Frontend\Basket\Standard::class)
+			->setConstructorArgs([$this->context])
+			->setMethods(['addCoupon'])
 			->getMock();
 
-		$object->expects( $this->once() )->method( 'addCoupon' )->will( $this->throwException( new \Exception() ) );
+		$object->expects($this->once())->method('addCoupon')->will($this->throwException(new \Exception()));
 
-		$result = $this->access( 'copyCoupons' )->invokeArgs( $object, [$ordBaseItem, [], 'unittest|en|EUR'] );
+		$result = $this->access('copyCoupons')->invokeArgs($object, [$ordBaseItem, [], 'unittest|en|EUR']);
 
-		$this->assertEquals( 1, count( $result ) );
-		$this->assertArrayHasKey( 'coupon', $result );
+		$this->assertEquals(1, count($result));
+		$this->assertArrayHasKey('coupon', $result);
 	}
 
 
 	public function testCopyProduct()
 	{
-		$manager = \Aimeos\MShop::create( \TestHelperFrontend::getContext(), 'order/base' );
+		$manager = \Aimeos\MShop::create(\TestHelperFrontend::getContext(), 'order/base');
 		$ordBaseItem = $manager->createItem();
 
-		$product = \Aimeos\MShop::create( $this->context, 'product' )->findItem( 'CNC' );
-		$ordProdManager = \Aimeos\MShop::create( $this->context, 'order/base/product' );
-		$ordProdItem = $ordProdManager->createItem()->copyFrom( $product );
-		$ordBaseItem->addProduct( $ordProdItem );
+		$product = \Aimeos\MShop::create($this->context, 'product')->findItem('CNC');
+		$ordProdManager = \Aimeos\MShop::create($this->context, 'order/base/product');
+		$ordProdItem = $ordProdManager->createItem()->copyFrom($product);
+		$ordBaseItem->addProduct($ordProdItem);
 
 
-		$object = $this->getMockBuilder( \Aimeos\Controller\Frontend\Basket\Standard::class )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( null )
+		$object = $this->getMockBuilder(\Aimeos\Controller\Frontend\Basket\Standard::class)
+			->setConstructorArgs([$this->context])
+			->setMethods(null)
 			->getMock();
 
-		$result = $this->access( 'copyProducts' )->invokeArgs( $object, [$ordBaseItem, ['test'], 'unittest|en|EUR'] );
+		$result = $this->access('copyProducts')->invokeArgs($object, [$ordBaseItem, ['test'], 'unittest|en|EUR']);
 
 
-		$this->assertEquals( ['test'], $result );
-		$this->assertEquals( 1, count( $object->get()->getProducts() ) );
-		$this->assertInstanceOf( \Aimeos\MShop\Order\Item\Base\Product\Iface::class, $object->get()->getProduct( 0 ) );
+		$this->assertEquals(['test'], $result);
+		$this->assertEquals(1, count($object->get()->getProducts()));
+		$this->assertInstanceOf(\Aimeos\MShop\Order\Item\Base\Product\Iface::class, $object->get()->getProduct(0));
 
 		$object->clear();
 	}
@@ -174,58 +174,58 @@ 
 
 	public function testCopyProductException()
 	{
-		$manager = \Aimeos\MShop::create( \TestHelperFrontend::getContext(), 'order/base' );
+		$manager = \Aimeos\MShop::create(\TestHelperFrontend::getContext(), 'order/base');
 		$ordBaseItem = $manager->createItem();
 
-		$product = \Aimeos\MShop::create( $this->context, 'product' )->findItem( 'CNC' );
-		$ordProdManager = \Aimeos\MShop::create( $this->context, 'order/base/product' );
-		$ordProdItem = $ordProdManager->createItem()->copyFrom( $product );
-		$ordBaseItem->addProduct( $ordProdItem );
+		$product = \Aimeos\MShop::create($this->context, 'product')->findItem('CNC');
+		$ordProdManager = \Aimeos\MShop::create($this->context, 'order/base/product');
+		$ordProdItem = $ordProdManager->createItem()->copyFrom($product);
+		$ordBaseItem->addProduct($ordProdItem);
 
 
-		$object = $this->getMockBuilder( \Aimeos\Controller\Frontend\Basket\Standard::class )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( ['addProduct'] )
+		$object = $this->getMockBuilder(\Aimeos\Controller\Frontend\Basket\Standard::class)
+			->setConstructorArgs([$this->context])
+			->setMethods(['addProduct'])
 			->getMock();
 
-		$object->expects( $this->once() )->method( 'addProduct' )->will( $this->throwException( new \Exception() ) );
+		$object->expects($this->once())->method('addProduct')->will($this->throwException(new \Exception()));
 
-		$result = $this->access( 'copyProducts' )->invokeArgs( $object, [$ordBaseItem, [], 'unittest|en|EUR'] );
+		$result = $this->access('copyProducts')->invokeArgs($object, [$ordBaseItem, [], 'unittest|en|EUR']);
 
-		$this->assertEquals( 1, count( $result ) );
-		$this->assertArrayHasKey( 'product', $result );
+		$this->assertEquals(1, count($result));
+		$this->assertArrayHasKey('product', $result);
 	}
 
 
 	public function testCopyServices()
 	{
-		$manager = \Aimeos\MShop::create( \TestHelperFrontend::getContext(), 'order/base' );
+		$manager = \Aimeos\MShop::create(\TestHelperFrontend::getContext(), 'order/base');
 		$ordBaseItem = $manager->createItem();
 
-		$serviceManager = \Aimeos\MShop::create( $this->context, 'service' );
-		$ordServManager = \Aimeos\MShop::create( $this->context, 'order/base/service' );
+		$serviceManager = \Aimeos\MShop::create($this->context, 'service');
+		$ordServManager = \Aimeos\MShop::create($this->context, 'order/base/service');
 
-		$serviceItem = $serviceManager->findItem( 'unitcode', [], 'service', 'delivery' );
-		$ordServItem = $ordServManager->createItem()->copyFrom( $serviceItem );
+		$serviceItem = $serviceManager->findItem('unitcode', [], 'service', 'delivery');
+		$ordServItem = $ordServManager->createItem()->copyFrom($serviceItem);
 
-		$ordBaseItem->addService( $ordServItem, \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_DELIVERY );
+		$ordBaseItem->addService($ordServItem, \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_DELIVERY);
 
 
-		$object = $this->getMockBuilder( \Aimeos\Controller\Frontend\Basket\Standard::class )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( null )
+		$object = $this->getMockBuilder(\Aimeos\Controller\Frontend\Basket\Standard::class)
+			->setConstructorArgs([$this->context])
+			->setMethods(null)
 			->getMock();
 
-		$result = $this->access( 'copyServices' )->invokeArgs( $object, [$ordBaseItem, ['test'], 'unittest|en|EUR'] );
+		$result = $this->access('copyServices')->invokeArgs($object, [$ordBaseItem, ['test'], 'unittest|en|EUR']);
 
 
-		$this->assertEquals( ['test'], $result );
-		$this->assertEquals( 1, count( $object->get()->getServices() ) );
+		$this->assertEquals(['test'], $result);
+		$this->assertEquals(1, count($object->get()->getServices()));
 
-		$services = $object->get()->getService( \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_DELIVERY );
+		$services = $object->get()->getService(\Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_DELIVERY);
 
-		foreach( $services as $service ) {
-			$this->assertInstanceOf( \Aimeos\MShop\Order\Item\Base\Service\Iface::class, $service );
+		foreach ($services as $service) {
+			$this->assertInstanceOf(\Aimeos\MShop\Order\Item\Base\Service\Iface::class, $service);
 		}
 
 		$object->clear();
@@ -234,106 +234,106 @@ 
 
 	public function testCopyServicesException()
 	{
-		$manager = \Aimeos\MShop::create( \TestHelperFrontend::getContext(), 'order/base' );
+		$manager = \Aimeos\MShop::create(\TestHelperFrontend::getContext(), 'order/base');
 		$ordBaseItem = $manager->createItem();
 
-		$serviceManager = \Aimeos\MShop::create( $this->context, 'service' );
-		$ordServManager = \Aimeos\MShop::create( $this->context, 'order/base/service' );
+		$serviceManager = \Aimeos\MShop::create($this->context, 'service');
+		$ordServManager = \Aimeos\MShop::create($this->context, 'order/base/service');
 
-		$serviceItem = $serviceManager->findItem( 'unitcode', [], 'service', 'delivery' );
-		$ordServItem = $ordServManager->createItem()->copyFrom( $serviceItem );
+		$serviceItem = $serviceManager->findItem('unitcode', [], 'service', 'delivery');
+		$ordServItem = $ordServManager->createItem()->copyFrom($serviceItem);
 
-		$ordBaseItem->addService( $ordServItem, \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_DELIVERY );
+		$ordBaseItem->addService($ordServItem, \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_DELIVERY);
 
 
-		$object = $this->getMockBuilder( \Aimeos\Controller\Frontend\Basket\Standard::class )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( ['addService'] )
+		$object = $this->getMockBuilder(\Aimeos\Controller\Frontend\Basket\Standard::class)
+			->setConstructorArgs([$this->context])
+			->setMethods(['addService'])
 			->getMock();
 
-		$object->expects( $this->once() )->method( 'addService' )->will( $this->throwException( new \Exception() ) );
+		$object->expects($this->once())->method('addService')->will($this->throwException(new \Exception()));
 
-		$result = $this->access( 'copyServices' )->invokeArgs( $object, [$ordBaseItem, [], 'unittest|en|EUR'] );
+		$result = $this->access('copyServices')->invokeArgs($object, [$ordBaseItem, [], 'unittest|en|EUR']);
 
-		$this->assertEquals( 0, count( $result ) );
+		$this->assertEquals(0, count($result));
 	}
 
 
 	public function testCreateSubscriptions()
 	{
-		$baseManager = \Aimeos\MShop::create( $this->context, 'order/base' );
+		$baseManager = \Aimeos\MShop::create($this->context, 'order/base');
 
 		$search = $baseManager->createSearch();
-		$search->setConditions( $search->compare( '==', 'order.base.price', '53.50' ) );
+		$search->setConditions($search->compare('==', 'order.base.price', '53.50'));
 
-		$items = $baseManager->searchItems( $search, ['order/base/product'] );
+		$items = $baseManager->searchItems($search, ['order/base/product']);
 
-		if( ( $basket = reset( $items ) ) === false ) {
-			throw new \Exception( sprintf( 'No order base item found for price "%1$s"', '53,50' ) );
+		if (($basket = reset($items)) === false) {
+			throw new \Exception(sprintf('No order base item found for price "%1$s"', '53,50'));
 		}
 
-		$object = $this->getMockBuilder( \Aimeos\Controller\Frontend\Basket\Standard::class )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( ['getAttributes'] )
+		$object = $this->getMockBuilder(\Aimeos\Controller\Frontend\Basket\Standard::class)
+			->setConstructorArgs([$this->context])
+			->setMethods(['getAttributes'])
 			->getMock();
 
-		$stub = $this->getMockBuilder( \Aimeos\MShop\Subscription\Manager\Standard::class )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( ['saveItem'] )
+		$stub = $this->getMockBuilder(\Aimeos\MShop\Subscription\Manager\Standard::class)
+			->setConstructorArgs([$this->context])
+			->setMethods(['saveItem'])
 			->getMock();
 
-		\Aimeos\MShop::inject( 'subscription', $stub );
+		\Aimeos\MShop::inject('subscription', $stub);
 
-		$stub->expects( $this->exactly( 2 ) )->method( 'saveItem' );
+		$stub->expects($this->exactly(2))->method('saveItem');
 
-		$this->access( 'createSubscriptions' )->invokeArgs( $object, [$basket] );
+		$this->access('createSubscriptions')->invokeArgs($object, [$basket]);
 	}
 
 
 	public function testGetOrderProductAttributes()
 	{
-		$object = $this->getMockBuilder( \Aimeos\Controller\Frontend\Basket\Standard::class )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( ['getAttributes'] )
+		$object = $this->getMockBuilder(\Aimeos\Controller\Frontend\Basket\Standard::class)
+			->setConstructorArgs([$this->context])
+			->setMethods(['getAttributes'])
 			->getMock();
 
-		$list = [1 => new \Aimeos\MShop\Attribute\Item\Standard( ['attribute.code' => 'special_instructions'] )];
-		$object->expects( $this->once() )->method( 'getAttributes' )->will( $this->returnValue( $list ) );
+		$list = [1 => new \Aimeos\MShop\Attribute\Item\Standard(['attribute.code' => 'special_instructions'])];
+		$object->expects($this->once())->method('getAttributes')->will($this->returnValue($list));
 
-		$result = $this->access( 'getOrderProductAttributes' )->invokeArgs( $object, ['test', ['1'], ['1' => 'test']] );
+		$result = $this->access('getOrderProductAttributes')->invokeArgs($object, ['test', ['1'], ['1' => 'test']]);
 
-		$this->assertEquals( 1, count( $result ) );
-		$this->assertEquals( 'test', $result[0]->getValue() );
+		$this->assertEquals(1, count($result));
+		$this->assertEquals('test', $result[0]->getValue());
 	}
 
 
 	/**
 	 * @param string $company
 	 */
-	protected function getAddress( $company )
+	protected function getAddress($company)
 	{
-		$manager = \Aimeos\MShop::create( \TestHelperFrontend::getContext(), 'customer/address' );
+		$manager = \Aimeos\MShop::create(\TestHelperFrontend::getContext(), 'customer/address');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'customer.address.company', $company ) );
-		$items = $manager->searchItems( $search );
+		$search->setConditions($search->compare('==', 'customer.address.company', $company));
+		$items = $manager->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));
 		}
 
-		$ordAddrManager = \Aimeos\MShop::create( \TestHelperFrontend::getContext(), 'order/base/address' );
-		$ordAddrItem = $ordAddrManager->createItem()->copyFrom( $item );
+		$ordAddrManager = \Aimeos\MShop::create(\TestHelperFrontend::getContext(), 'order/base/address');
+		$ordAddrItem = $ordAddrManager->createItem()->copyFrom($item);
 
 		return $ordAddrItem;
 	}
 
 
-	protected function access( $name )
+	protected function access($name)
 	{
-		$class = new \ReflectionClass( \Aimeos\Controller\Frontend\Basket\Base::class );
-		$method = $class->getMethod( $name );
-		$method->setAccessible( true );
+		$class = new \ReflectionClass(\Aimeos\Controller\Frontend\Basket\Base::class);
+		$method = $class->getMethod($name);
+		$method->setAccessible(true);
 
 		return $method;
 	}

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

Spacing +244 added lines, -244 removed lines

@@ -19,111 +19,111 @@ 
 	public static function setUpBeforeClass()
 	{
 		$context = \TestHelperFrontend::getContext();
-		self::$testItem = \Aimeos\MShop::create( $context, 'product' )->findItem( 'U:TESTP' );
+		self::$testItem = \Aimeos\MShop::create($context, 'product')->findItem('U:TESTP');
 	}
 
 
 	protected function setUp()
 	{
-		\Aimeos\MShop::cache( true );
+		\Aimeos\MShop::cache(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::cache( false );
+		\Aimeos\MShop::cache(false);
 
 		$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::class, $this->object->get() );
+		$this->assertInstanceOf(\Aimeos\MShop\Order\Item\Base\Iface::class, $this->object->get());
 	}
 
 
 	public function testSave()
 	{
-		$stub = $this->getMockBuilder( \Aimeos\MShop\Order\Manager\Base\Standard::class )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( ['setSession'] )
+		$stub = $this->getMockBuilder(\Aimeos\MShop\Order\Manager\Base\Standard::class)
+			->setConstructorArgs([$this->context])
+			->setMethods(['setSession'])
 			->getMock();
 
-		\Aimeos\MShop::inject( 'order/base', $stub );
+		\Aimeos\MShop::inject('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::class, $this->object->setType( 'test' ) );
+		$this->assertInstanceOf(\Aimeos\Controller\Frontend\Basket\Iface::class, $this->object->setType('test'));
 	}
 
 
 	public function testStore()
 	{
-		$stub = $this->getMockBuilder( \Aimeos\MShop\Order\Manager\Base\Standard::class )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( ['store'] )
+		$stub = $this->getMockBuilder(\Aimeos\MShop\Order\Manager\Base\Standard::class)
+			->setConstructorArgs([$this->context])
+			->setMethods(['store'])
 			->getMock();
 
-		\Aimeos\MShop::inject( 'order/base', $stub );
+		\Aimeos\MShop::inject('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::class );
+		$this->setExpectedException(\Aimeos\Controller\Frontend\Basket\Exception::class);
 		$object->store();
 	}
 
 
 	public function testLoad()
 	{
-		$stub = $this->getMockBuilder( \Aimeos\MShop\Order\Manager\Base\Standard::class )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( ['load'] )
+		$stub = $this->getMockBuilder(\Aimeos\MShop\Order\Manager\Base\Standard::class)
+			->setConstructorArgs([$this->context])
+			->setMethods(['load'])
 			->getMock();
 
-		\Aimeos\MShop::inject( 'order/base', $stub );
+		\Aimeos\MShop::inject('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 );
 	}
 
@@ -131,338 +131,338 @@ 
 	public function testAddDeleteProduct()
 	{
 		$basket = $this->object->get();
-		$item = \Aimeos\MShop::create( $this->context, 'product' )->findItem( 'CNC' );
+		$item = \Aimeos\MShop::create($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::create( $this->context, 'attribute' );
+		$attributeManager = \Aimeos\MShop::create($this->context, 'attribute');
 
 		$search = $attributeManager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'attribute.code', 'custom' ),
-			$search->compare( '==', 'attribute.type', 'date' ),
+			$search->compare('==', 'attribute.code', 'custom'),
+			$search->compare('==', 'attribute.type', '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, 'default', [], [], [], $attrValues );
+		$this->object->addProduct(self::$testItem->getId(), 1, 'default', [], [], [], $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::create( $this->context, 'attribute' );
+		$attributeManager = \Aimeos\MShop::create($this->context, 'attribute');
 
 		$search = $attributeManager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'attribute.code', 'custom' ),
-			$search->compare( '==', 'attribute.type', 'price' ),
+			$search->compare('==', 'attribute.code', 'custom'),
+			$search->compare('==', 'attribute.type', '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, 'default', [], [], [], $attrValues );
+		$this->object->addProduct(self::$testItem->getId(), 1, 'default', [], [], [], $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::create( $this->context, 'attribute' );
+		$attributeManager = \Aimeos\MShop::create($this->context, 'attribute');
 
 		$search = $attributeManager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'attribute.code', 'custom' ),
-			$search->compare( '==', 'attribute.type', 'price' ),
+			$search->compare('==', 'attribute.code', 'custom'),
+			$search->compare('==', 'attribute.type', '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::class );
-		$this->object->addProduct( self::$testItem->getId(), 1, 'default', [], [], [], $attrValues );
+		$this->setExpectedException(\Aimeos\Controller\Frontend\Basket\Exception::class);
+		$this->object->addProduct(self::$testItem->getId(), 1, 'default', [], [], [], $attrValues);
 	}
 
 
 	public function testAddProductAttributePrice()
 	{
-		$attributeManager = \Aimeos\MShop::create( $this->context, 'attribute' );
+		$attributeManager = \Aimeos\MShop::create($this->context, 'attribute');
 
 		$search = $attributeManager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'attribute.code', 'xs' ),
-			$search->compare( '==', 'attribute.type', 'size' ),
+			$search->compare('==', 'attribute.code', 'xs'),
+			$search->compare('==', 'attribute.type', 'size'),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		$attributes = $attributeManager->searchItems( $search );
+		$attributes = $attributeManager->searchItems($search);
 
-		if( ( $attribute = reset( $attributes ) ) === false ) {
-			throw new \RuntimeException( 'Attribute not found' );
+		if (($attribute = reset($attributes)) === false) {
+			throw new \RuntimeException('Attribute not found');
 		}
 
-		$this->object->addProduct( self::$testItem->getId(), 1, 'default', [], [$attribute->getId() => 2] );
+		$this->object->addProduct(self::$testItem->getId(), 1, 'default', [], [$attribute->getId() => 2]);
 
-		$this->assertEquals( '43.90', $this->object->get()->getPrice()->getValue() );
+		$this->assertEquals('43.90', $this->object->get()->getPrice()->getValue());
 	}
 
 
 	public function testAddProductAttributeNotAssigned()
 	{
-		$attributeManager = \Aimeos\MShop::create( $this->context, 'attribute' );
+		$attributeManager = \Aimeos\MShop::create($this->context, 'attribute');
 
 		$search = $attributeManager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'attribute.code', '30' ),
-			$search->compare( '==', 'attribute.type', 'width' ),
+			$search->compare('==', 'attribute.code', '30'),
+			$search->compare('==', 'attribute.type', '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, 'default', [], $configAttrIds, $hiddenAttrIds );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
+		$this->object->addProduct(self::$testItem->getId(), 1, 'default', [], $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::create( $this->context, 'product' )->findItem( 'MNOP' );
+		$item = \Aimeos\MShop::create($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, 'default', [], array( -1 ) );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
+		$this->object->addProduct(self::$testItem->getId(), 1, 'default', [], array( -1 ));
 	}
 
 
 	public function testAddProductLowQuantityPriceException()
 	{
-		$item = \Aimeos\MShop::create( $this->context, 'product' )->findItem( 'IJKL' );
+		$item = \Aimeos\MShop::create($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::create( $this->context, 'product' )->findItem( 'IJKL' );
+		$item = \Aimeos\MShop::create($this->context, 'product')->findItem('IJKL');
 
-		$this->object->addProduct( $item->getId(), 2, 'default', [], [], [], [], 'unit_type3' );
+		$this->object->addProduct($item->getId(), 2, 'default', [], [], [], [], '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()
 	{
 		$configAttrIds = [];
-		$attributeManager = \Aimeos\MShop::create( $this->context, 'attribute' );
+		$attributeManager = \Aimeos\MShop::create($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', 'size' ),
-				) ),
-				$search->combine( '&&', array(
-					$search->compare( '==', 'attribute.code', 'white' ),
-					$search->compare( '==', 'attribute.type', 'color' ),
-				) ),
-			) )
+			$search->compare('==', 'attribute.domain', 'product'),
+			$search->combine('||', array(
+				$search->combine('&&', array(
+					$search->compare('==', 'attribute.code', 'xs'),
+					$search->compare('==', 'attribute.type', 'size'),
+				)),
+				$search->combine('&&', array(
+					$search->compare('==', 'attribute.code', 'white'),
+					$search->compare('==', 'attribute.type', 'color'),
+				)),
+			))
 		);
-		$search->setConditions( $search->combine( '&&', $conditions ) );
-		$attributes = $attributeManager->searchItems( $search );
+		$search->setConditions($search->combine('&&', $conditions));
+		$attributes = $attributeManager->searchItems($search);
 
-		if( empty( $attributes ) ) {
-			throw new \RuntimeException( 'No attributes available' );
+		if (empty($attributes)) {
+			throw new \RuntimeException('No attributes available');
 		}
 
-		foreach( $attributes as $id => $attribute ) {
+		foreach ($attributes as $id => $attribute) {
 			$configAttrIds[$id] = 1;
 		}
 
-		$item = \Aimeos\MShop::create( $this->context, 'product' )->findItem( 'U:TESTP' );
+		$item = \Aimeos\MShop::create($this->context, 'product')->findItem('U:TESTP');
 
-		$this->object->addProduct( $item->getId(), 1, 'default', [], $configAttrIds );
-		$this->object->editProduct( 0, 4 );
+		$this->object->addProduct($item->getId(), 1, 'default', [], $configAttrIds);
+		$this->object->editProduct(0, 4);
 
-		$item = $this->object->get()->getProduct( 0 );
-		$this->assertEquals( 3, count( $item->getAttributeItems() ) );
-		$this->assertEquals( 4, $item->getQuantity() );
+		$item = $this->object->get()->getProduct(0);
+		$this->assertEquals(3, count($item->getAttributeItems()));
+		$this->assertEquals(4, $item->getQuantity());
 
 
-		$this->object->editProduct( 0, 3, array( reset( $attributes )->getType() ) );
+		$this->object->editProduct(0, 3, array(reset($attributes)->getType()));
 
-		$item = $this->object->get()->getProduct( 0 );
-		$this->assertEquals( 3, $item->getQuantity() );
-		$this->assertEquals( 2, count( $item->getAttributeItems() ) );
-		$this->assertEquals( 'U:TESTP', $item->getProductCode() );
+		$item = $this->object->get()->getProduct(0);
+		$this->assertEquals(3, $item->getQuantity());
+		$this->assertEquals(2, count($item->getAttributeItems()));
+		$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::class );
-		$this->object->get()->getAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT );
+		$this->setExpectedException(\Aimeos\MShop\Order\Exception::class);
+		$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());
 	}
 
 
@@ -489,37 +489,37 @@ 
 			'order.base.address.website' => 'www.example.com',
 		);
 
-		$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());
 	}
 
 
@@ -545,121 +545,121 @@ 
 			'order.base.address.telefax' => '05554433222',
 			'order.base.address.website' => 'www.example.com',
 		);
-		$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::create( $this->context, 'service' );
-		$service = $manager->findItem( 'unitpaymentcode', [], 'service', 'payment' );
+		$manager = \Aimeos\MShop::create($this->context, 'service');
+		$service = $manager->findItem('unitpaymentcode', [], 'service', 'payment');
 
-		$this->object->addService( 'payment', $service->getId(), [] );
-		$item = $this->object->get()->getService( 'payment', 'unitpaymentcode' )->getCode();
-		$this->assertEquals( 'unitpaymentcode', $item );
+		$this->object->addService('payment', $service->getId(), []);
+		$item = $this->object->get()->getService('payment', 'unitpaymentcode')->getCode();
+		$this->assertEquals('unitpaymentcode', $item);
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Basket\\Exception' );
-		$this->object->addService( 'payment', $service->getId(), array( 'prepay' => true ) );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
+		$this->object->addService('payment', $service->getId(), array('prepay' => true));
 	}
 
 
 	public function testSetDeliveryOption()
 	{
-		$manager = \Aimeos\MShop::create( $this->context, 'service' );
-		$service = $manager->findItem( 'unitcode', [], 'service', 'delivery' );
+		$manager = \Aimeos\MShop::create($this->context, 'service');
+		$service = $manager->findItem('unitcode', [], 'service', 'delivery');
 
-		$this->object->addService( 'delivery', $service->getId(), [] );
-		$item = $this->object->get()->getService( 'delivery', 'unitcode' );
-		$this->assertEquals( 'unitcode', $item->getCode() );
+		$this->object->addService('delivery', $service->getId(), []);
+		$item = $this->object->get()->getService('delivery', 'unitcode');
+		$this->assertEquals('unitcode', $item->getCode());
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Basket\\Exception' );
-		$this->object->addService( 'delivery', $service->getId(), array( 'fast shipping' => true, 'air shipping' => false ) );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
+		$this->object->addService('delivery', $service->getId(), array('fast shipping' => true, 'air shipping' => false));
 	}
 
 
 	public function testCheckLocale()
 	{
-		$manager = \Aimeos\MShop::create( $this->context, 'service' );
-		$payment = $manager->findItem( 'unitpaymentcode', [], 'service', 'payment' );
-		$delivery = $manager->findItem( 'unitcode', [], 'service', 'delivery' );
+		$manager = \Aimeos\MShop::create($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->addService( 'payment', $payment->getId() );
-		$this->object->addService( 'delivery', $delivery->getId() );
+		$this->object->addService('payment', $payment->getId());
+		$this->object->addService('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', 'unitcode' )->getPrice()->setCurrencyId( 'CHF' );
-		$basket->getService( 'payment', 'unitpaymentcode' )->getPrice()->setCurrencyId( 'CHF' );
-		$basket->getLocale()->setCurrencyId( 'CHF' );
-		$price->setCurrencyId( 'CHF' );
+		$basket->getService('delivery', 'unitcode')->getPrice()->setCurrencyId('CHF');
+		$basket->getService('payment', 'unitpaymentcode')->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', 'unitpaymentcode' )->getPrice()->getCurrencyId() );
-		$this->assertEquals( 'EUR', $basket->getService( 'delivery', 'unitcode' )->getPrice()->getCurrencyId() );
-		$this->assertEquals( 'EUR', $basket->getLocale()->getCurrencyId() );
-		$this->assertEquals( 'EUR', $basket->getPrice()->getCurrencyId() );
+		$this->assertEquals('EUR', $basket->getService('payment', 'unitpaymentcode')->getPrice()->getCurrencyId());
+		$this->assertEquals('EUR', $basket->getService('delivery', 'unitcode')->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::create( \TestHelperFrontend::getContext(), 'Standard' );
-		$addressManager = $customer->getSubManager( 'address', 'Standard' );
+		$customer = \Aimeos\MShop\Customer\Manager\Factory::create(\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;