aimeos / ai-controller-frontend

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

Spacing +10 added lines, -10 removed lines

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

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

Spacing +33 added lines, -33 removed lines

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

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

Spacing +10 added lines, -10 removed lines

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

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

Spacing +10 added lines, -10 removed lines

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

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/src/Controller/Frontend/Basket/Standard.php

Spacing +130 added lines, -130 removed lines

@@ -33,11 +33,11 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Object storing the required instances for manaing databases
 	 *  connections, logger, session, etc.
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		parent::__construct( $context );
+		parent::__construct($context);
 
-		$this->domainManager = \Aimeos\MShop::create( $context, 'order/base' );
+		$this->domainManager = \Aimeos\MShop::create($context, 'order/base');
 	}
 
 
@@ -49,7 +49,7 @@ 
 	public function clear()
 	{
 		$this->baskets[$this->type] = $this->domainManager->createItem();
-		$this->domainManager->setSession( $this->baskets[$this->type], $this->type );
+		$this->domainManager->setSession($this->baskets[$this->type], $this->type);
 
 		return $this;
 	}
@@ -62,10 +62,10 @@ 
 	 */
 	public function get()
 	{
-		if( !isset( $this->baskets[$this->type] ) )
+		if (!isset($this->baskets[$this->type]))
 		{
-			$this->baskets[$this->type] = $this->domainManager->getSession( $this->type );
-			$this->checkLocale( $this->baskets[$this->type]->getLocale(), $this->type );
+			$this->baskets[$this->type] = $this->domainManager->getSession($this->type);
+			$this->checkLocale($this->baskets[$this->type]->getLocale(), $this->type);
 		}
 
 		return $this->baskets[$this->type];
@@ -79,8 +79,8 @@ 
 	 */
 	public function save()
 	{
-		if( isset( $this->baskets[$this->type] ) && $this->baskets[$this->type]->isModified() ) {
-			$this->domainManager->setSession( $this->baskets[$this->type], $this->type );
+		if (isset($this->baskets[$this->type]) && $this->baskets[$this->type]->isModified()) {
+			$this->domainManager->setSession($this->baskets[$this->type], $this->type);
 		}
 
 		return $this;
@@ -93,7 +93,7 @@ 
 	 * @param string $type Basket type
 	 * @return \Aimeos\Controller\Frontend\Basket\Iface Basket frontend object
 	 */
-	public function setType( $type )
+	public function setType($type)
 	{
 		$this->type = $type;
 		return $this;
@@ -127,7 +127,7 @@ 
 		 * @category Developer
 		 * @see controller/frontend/basket/limit-seconds
 		 */
-		$count = $config->get( 'controller/frontend/basket/limit-count', 5 );
+		$count = $config->get('controller/frontend/basket/limit-count', 5);
 
 		/** controller/frontend/basket/limit-seconds
 		 * Order limitation time frame in seconds
@@ -145,34 +145,34 @@ 
 		 * @category Developer
 		 * @see controller/frontend/basket/limit-count
 		 */
-		$seconds = $config->get( 'controller/frontend/basket/limit-seconds', 300 );
+		$seconds = $config->get('controller/frontend/basket/limit-seconds', 300);
 
 		$search = $this->domainManager->createSearch();
 		$expr = [
-			$search->compare( '==', 'order.base.editor', $context->getEditor() ),
-			$search->compare( '>=', 'order.base.ctime', date( 'Y-m-d H:i:s', time() - $seconds ) ),
+			$search->compare('==', 'order.base.editor', $context->getEditor()),
+			$search->compare('>=', 'order.base.ctime', date('Y-m-d H:i:s', time() - $seconds)),
 		];
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, 0 );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, 0);
 
-		$this->domainManager->searchItems( $search, [], $total );
+		$this->domainManager->searchItems($search, [], $total);
 
-		if( $total > $count )
+		if ($total > $count)
 		{
-			$msg = $context->getI18n()->dt( 'controller/frontend', 'Temporary order limit reached' );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+			$msg = $context->getI18n()->dt('controller/frontend', 'Temporary order limit reached');
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
 		}
 
 
 		$basket = $this->get()->finish();
-		$basket->setCustomerId( (string) $context->getUserId() );
+		$basket->setCustomerId((string) $context->getUserId());
 
 		$this->domainManager->begin();
-		$this->domainManager->store( $basket );
+		$this->domainManager->store($basket);
 		$this->domainManager->commit();
 
 		$this->save(); // for reusing unpaid orders, might have side effects (!)
-		$this->createSubscriptions( $basket );
+		$this->createSubscriptions($basket);
 
 		return $basket;
 	}
@@ -186,9 +186,9 @@ 
 	 * @param boolean $default True to add default criteria (user logged in), false if not
 	 * @return \Aimeos\MShop\Order\Item\Base\Iface Order base object including the given parts
 	 */
-	public function load( $id, $parts = \Aimeos\MShop\Order\Item\Base\Base::PARTS_ALL, $default = true )
+	public function load($id, $parts = \Aimeos\MShop\Order\Item\Base\Base::PARTS_ALL, $default = true)
 	{
-		return $this->domainManager->load( $id, $parts, false, $default );
+		return $this->domainManager->load($id, $parts, false, $default);
 	}
 
 
@@ -207,34 +207,34 @@ 
 	 * @param string $stocktype Unique code of the stock type to deliver the products from
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the product isn't available
 	 */
-	public function addProduct( $prodid, $quantity = 1, $stocktype = 'default', array $variantAttributeIds = [],
-		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [] )
+	public function addProduct($prodid, $quantity = 1, $stocktype = 'default', array $variantAttributeIds = [],
+		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [])
 	{
 		$attributeMap = [
-			'custom' => array_keys( $customAttributeValues ),
-			'config' => array_keys( $configAttributeIds ),
+			'custom' => array_keys($customAttributeValues),
+			'config' => array_keys($configAttributeIds),
 		];
-		$this->checkListRef( $prodid, 'attribute', $attributeMap );
+		$this->checkListRef($prodid, 'attribute', $attributeMap);
 
 
 		$context = $this->getContext();
-		$productManager = \Aimeos\MShop::create( $context, 'product' );
+		$productManager = \Aimeos\MShop::create($context, 'product');
 
-		$productItem = $productManager->getItem( $prodid, ['attribute', 'media', 'supplier', 'price', 'product', 'text'], true );
-		$prices = $productItem->getRefItems( 'price', 'default', 'default' );
-		$hidden = $productItem->getRefItems( 'attribute', null, 'hidden' );
+		$productItem = $productManager->getItem($prodid, ['attribute', 'media', 'supplier', 'price', 'product', 'text'], true);
+		$prices = $productItem->getRefItems('price', 'default', 'default');
+		$hidden = $productItem->getRefItems('attribute', null, 'hidden');
 
-		$orderBaseProductItem = \Aimeos\MShop::create( $context, 'order/base/product' )->createItem();
-		$orderBaseProductItem->copyFrom( $productItem )->setQuantity( $quantity )->setStockType( $stocktype );
+		$orderBaseProductItem = \Aimeos\MShop::create($context, 'order/base/product')->createItem();
+		$orderBaseProductItem->copyFrom($productItem)->setQuantity($quantity)->setStockType($stocktype);
 
-		$custAttr = $this->getOrderProductAttributes( 'custom', array_keys( $customAttributeValues ), $customAttributeValues );
-		$confAttr = $this->getOrderProductAttributes( 'config', array_keys( $configAttributeIds ), [], $configAttributeIds );
-		$attr = array_merge( $custAttr, $confAttr, $this->getOrderProductAttributes( 'hidden', array_keys( $hidden ) ) );
+		$custAttr = $this->getOrderProductAttributes('custom', array_keys($customAttributeValues), $customAttributeValues);
+		$confAttr = $this->getOrderProductAttributes('config', array_keys($configAttributeIds), [], $configAttributeIds);
+		$attr = array_merge($custAttr, $confAttr, $this->getOrderProductAttributes('hidden', array_keys($hidden)));
 
-		$orderBaseProductItem->setAttributeItems( $attr );
-		$orderBaseProductItem->setPrice( $this->calcPrice( $orderBaseProductItem, $prices, $quantity ) );
+		$orderBaseProductItem->setAttributeItems($attr);
+		$orderBaseProductItem->setPrice($this->calcPrice($orderBaseProductItem, $prices, $quantity));
 
-		$this->get()->addProduct( $orderBaseProductItem );
+		$this->get()->addProduct($orderBaseProductItem);
 		$this->save();
 	}
 
@@ -244,17 +244,17 @@ 
 	 *
 	 * @param integer $position Position number (key) of the order product item
 	 */
-	public function deleteProduct( $position )
+	public function deleteProduct($position)
 	{
-		$product = $this->get()->getProduct( $position );
+		$product = $this->get()->getProduct($position);
 
-		if( $product->getFlags() === \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE )
+		if ($product->getFlags() === \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE)
 		{
-			$msg = $this->getContext()->getI18n()->dt( 'controller/frontend', 'Basket item at position "%1$d" cannot be deleted manually' );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $position ) );
+			$msg = $this->getContext()->getI18n()->dt('controller/frontend', 'Basket item at position "%1$d" cannot be deleted manually');
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $position));
 		}
 
-		$this->get()->deleteProduct( $position );
+		$this->get()->deleteProduct($position);
 		$this->save();
 	}
 
@@ -266,32 +266,32 @@ 
 	 * @param integer $quantity New quantiy of the product item
 	 * @param string[] $configAttributeCodes Codes of the product config attributes that should be REMOVED
 	 */
-	public function editProduct( $position, $quantity, array $configAttributeCodes = [] )
+	public function editProduct($position, $quantity, array $configAttributeCodes = [])
 	{
-		$product = $this->get()->getProduct( $position );
+		$product = $this->get()->getProduct($position);
 
-		if( $product->getFlags() & \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE )
+		if ($product->getFlags() & \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE)
 		{
-			$msg = $this->getContext()->getI18n()->dt( 'controller/frontend', 'Basket item at position "%1$d" cannot be changed' );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $position ) );
+			$msg = $this->getContext()->getI18n()->dt('controller/frontend', 'Basket item at position "%1$d" cannot be changed');
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $position));
 		}
 
-		$product->setQuantity( $quantity );
+		$product->setQuantity($quantity);
 
 		$attributes = $product->getAttributeItems();
-		foreach( $attributes as $key => $attribute )
+		foreach ($attributes as $key => $attribute)
 		{
-			if( in_array( $attribute->getCode(), $configAttributeCodes ) ) {
-				unset( $attributes[$key] );
+			if (in_array($attribute->getCode(), $configAttributeCodes)) {
+				unset($attributes[$key]);
 			}
 		}
-		$product->setAttributeItems( $attributes );
+		$product->setAttributeItems($attributes);
 
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'product' );
-		$productItem = $manager->findItem( $product->getProductCode(), array( 'price', 'text' ), true );
-		$product->setPrice( $this->calcPrice( $product, $productItem->getRefItems( 'price', 'default' ), $quantity ) );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'product');
+		$productItem = $manager->findItem($product->getProductCode(), array('price', 'text'), true);
+		$product->setPrice($this->calcPrice($product, $productItem->getRefItems('price', 'default'), $quantity));
 
-		$this->get()->editProduct( $product, $position );
+		$this->get()->editProduct($product, $position);
 
 		$this->save();
 	}
@@ -303,7 +303,7 @@ 
 	 * @param string $code Coupon code entered by the user
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid or not allowed
 	 */
-	public function addCoupon( $code )
+	public function addCoupon($code)
 	{
 		$context = $this->getContext();
 
@@ -323,44 +323,44 @@ 
 		 * @category User
 		 * @category Developer
 		 */
-		$allowed = $context->getConfig()->get( 'controller/frontend/basket/standard/coupon/allowed', 1 );
+		$allowed = $context->getConfig()->get('controller/frontend/basket/standard/coupon/allowed', 1);
 
-		if( $allowed <= count( $this->get()->getCoupons() ) )
+		if ($allowed <= count($this->get()->getCoupons()))
 		{
-			$msg = $context->getI18n()->dt( 'controller/frontend', 'Number of coupon codes exceeds the limit' );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+			$msg = $context->getI18n()->dt('controller/frontend', 'Number of coupon codes exceeds the limit');
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
 		}
 
 
-		$manager = \Aimeos\MShop::create( $context, 'coupon' );
-		$codeManager = \Aimeos\MShop::create( $context, 'coupon/code' );
+		$manager = \Aimeos\MShop::create($context, 'coupon');
+		$codeManager = \Aimeos\MShop::create($context, 'coupon/code');
 
-		$search = $manager->createSearch( true )->setSlice( 0, 1 );
+		$search = $manager->createSearch(true)->setSlice(0, 1);
 		$expr = [
-			$search->compare( '==', 'coupon.code.code', $code ),
-			$codeManager->createSearch( true )->getConditions(),
+			$search->compare('==', 'coupon.code.code', $code),
+			$codeManager->createSearch(true)->getConditions(),
 			$search->getConditions(),
 		];
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		$result = $manager->searchItems( $search );
+		$result = $manager->searchItems($search);
 
-		if( ( $item = reset( $result ) ) === false )
+		if (($item = reset($result)) === false)
 		{
-			$msg = sprintf( $context->getI18n()->dt( 'controller/frontend', 'Coupon code "%1$s" is invalid or not available any more' ), $code );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+			$msg = sprintf($context->getI18n()->dt('controller/frontend', 'Coupon code "%1$s" is invalid or not available any more'), $code);
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
 		}
 
 
-		$provider = $manager->getProvider( $item, $code );
+		$provider = $manager->getProvider($item, $code);
 
-		if( $provider->isAvailable( $this->get() ) !== true )
+		if ($provider->isAvailable($this->get()) !== true)
 		{
-			$msg = sprintf( $context->getI18n()->dt( 'controller/frontend', 'Requirements for coupon code "%1$s" aren\'t met' ), $code );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+			$msg = sprintf($context->getI18n()->dt('controller/frontend', 'Requirements for coupon code "%1$s" aren\'t met'), $code);
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
 		}
 
-		$provider->addCoupon( $this->get() );
+		$provider->addCoupon($this->get());
 		$this->save();
 	}
 
@@ -371,24 +371,24 @@ 
 	 * @param string $code Coupon code entered by the user
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid
 	 */
-	public function deleteCoupon( $code )
+	public function deleteCoupon($code)
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop::create( $context, 'coupon' );
+		$manager = \Aimeos\MShop::create($context, 'coupon');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'coupon.code.code', $code ) );
-		$search->setSlice( 0, 1 );
+		$search->setConditions($search->compare('==', 'coupon.code.code', $code));
+		$search->setSlice(0, 1);
 
-		$result = $manager->searchItems( $search );
+		$result = $manager->searchItems($search);
 
-		if( ( $item = reset( $result ) ) === false )
+		if (($item = reset($result)) === false)
 		{
-			$msg = $context->getI18n()->dt( 'controller/frontend', 'Coupon code "%1$s" is invalid' );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $code ) );
+			$msg = $context->getI18n()->dt('controller/frontend', 'Coupon code "%1$s" is invalid');
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $code));
 		}
 
-		$manager->getProvider( $item, $code )->deleteCoupon( $this->get() );
+		$manager->getProvider($item, $code)->deleteCoupon($this->get());
 		$this->save();
 	}
 
@@ -401,28 +401,28 @@ 
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the billing or delivery address is not of any required type of
 	 * 	if one of the keys is invalid when using an array with key/value pairs
 	 */
-	public function setAddress( $type, $value )
+	public function setAddress($type, $value)
 	{
 		$context = $this->getContext();
-		$address = \Aimeos\MShop::create( $context, 'order/base/address' )->createItem();
-		$address->setType( $type );
+		$address = \Aimeos\MShop::create($context, 'order/base/address')->createItem();
+		$address->setType($type);
 
-		if( $value instanceof \Aimeos\MShop\Common\Item\Address\Iface )
+		if ($value instanceof \Aimeos\MShop\Common\Item\Address\Iface)
 		{
-			$this->get()->setAddress( $address->copyFrom( $value ), $type );
+			$this->get()->setAddress($address->copyFrom($value), $type);
 		}
-		else if( is_array( $value ) )
+		else if (is_array($value))
 		{
-			$this->get()->setAddress( $this->setAddressFromArray( $address, $value ), $type );
+			$this->get()->setAddress($this->setAddressFromArray($address, $value), $type);
 		}
-		else if( $value === null )
+		else if ($value === null)
 		{
-			$this->get()->deleteAddress( $type );
+			$this->get()->deleteAddress($type);
 		}
 		else
 		{
-			$msg = $context->getI18n()->dt( 'controller/frontend', 'Invalid value for address type "%1$s"' );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $type ) );
+			$msg = $context->getI18n()->dt('controller/frontend', 'Invalid value for address type "%1$s"');
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $type));
 		}
 
 		$this->save();
@@ -438,42 +438,42 @@ 
 	 * 	entered by the customer when choosing one of the delivery or payment options
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If there is no price to the service item attached
 	 */
-	public function addService( $type, $id, array $attributes = [] )
+	public function addService($type, $id, array $attributes = [])
 	{
 		$context = $this->getContext();
 
-		$serviceManager = \Aimeos\MShop::create( $context, 'service' );
-		$serviceItem = $serviceManager->getItem( $id, array( 'media', 'price', 'text' ) );
+		$serviceManager = \Aimeos\MShop::create($context, 'service');
+		$serviceItem = $serviceManager->getItem($id, array('media', 'price', 'text'));
 
-		$provider = $serviceManager->getProvider( $serviceItem, $serviceItem->getType() );
-		$result = $provider->checkConfigFE( $attributes );
-		$unknown = array_diff_key( $attributes, $result );
+		$provider = $serviceManager->getProvider($serviceItem, $serviceItem->getType());
+		$result = $provider->checkConfigFE($attributes);
+		$unknown = array_diff_key($attributes, $result);
 
-		if( count( $unknown ) > 0 )
+		if (count($unknown) > 0)
 		{
-			$msg = $context->getI18n()->dt( 'controller/frontend', 'Unknown attributes "%1$s"' );
-			$msg = sprintf( $msg, implode( '","', array_keys( $unknown ) ) );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+			$msg = $context->getI18n()->dt('controller/frontend', 'Unknown attributes "%1$s"');
+			$msg = sprintf($msg, implode('","', array_keys($unknown)));
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
 		}
 
-		foreach( $result as $key => $value )
+		foreach ($result as $key => $value)
 		{
-			if( $value !== null ) {
-				throw new \Aimeos\Controller\Frontend\Basket\Exception( $value );
+			if ($value !== null) {
+				throw new \Aimeos\Controller\Frontend\Basket\Exception($value);
 			}
 		}
 
-		$orderBaseServiceManager = \Aimeos\MShop::create( $context, 'order/base/service' );
+		$orderBaseServiceManager = \Aimeos\MShop::create($context, 'order/base/service');
 		$orderServiceItem = $orderBaseServiceManager->createItem();
-		$orderServiceItem->copyFrom( $serviceItem );
+		$orderServiceItem->copyFrom($serviceItem);
 
 		// remove service rebate of original price
-		$price = $provider->calcPrice( $this->get() )->setRebate( '0.00' );
-		$orderServiceItem->setPrice( $price );
+		$price = $provider->calcPrice($this->get())->setRebate('0.00');
+		$orderServiceItem->setPrice($price);
 
-		$provider->setConfigFE( $orderServiceItem, $attributes );
+		$provider->setConfigFE($orderServiceItem, $attributes);
 
-		$this->get()->addService( $orderServiceItem, $type );
+		$this->get()->addService($orderServiceItem, $type);
 		$this->save();
 	}
 
@@ -483,9 +483,9 @@ 
 	 *
 	 * @param string $type Service type code like 'payment' or 'delivery'
 	 */
-	public function deleteService( $type )
+	public function deleteService($type)
 	{
-		$this->get()->deleteService( $type );
+		$this->get()->deleteService($type);
 		$this->save();
 	}
 
@@ -499,18 +499,18 @@ 
 	 * @return \Aimeos\MShop\Order\Item\Base\Address\Iface Updated address item
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception
 	 */
-	protected function setAddressFromArray( \Aimeos\MShop\Order\Item\Base\Address\Iface $address, array $map )
+	protected function setAddressFromArray(\Aimeos\MShop\Order\Item\Base\Address\Iface $address, array $map)
 	{
-		foreach( $map as $key => $value ) {
-			$map[$key] = strip_tags( $value ); // prevent XSS
+		foreach ($map as $key => $value) {
+			$map[$key] = strip_tags($value); // prevent XSS
 		}
 
-		$address = $address->fromArray( $map );
+		$address = $address->fromArray($map);
 
-		if( count( $map ) > 0 )
+		if (count($map) > 0)
 		{
-			$msg = $this->getContext()->getI18n()->dt( 'controller/frontend', 'Invalid address properties, please check your input' );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg, 0, null, $map );
+			$msg = $this->getContext()->getI18n()->dt('controller/frontend', 'Invalid address properties, please check your input');
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg, 0, null, $map);
 		}
 
 		return $address;

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

Spacing +81 added lines, -81 removed lines

@@ -32,13 +32,13 @@ 
 	 *
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Common MShop context object
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		parent::__construct( $context );
+		parent::__construct($context);
 
-		$this->manager = \Aimeos\MShop::create( $context, 'index' );
-		$this->filter = $this->manager->createSearch( true );
-		$this->conditions[] = $this->filter->compare( '!=', 'index.catalog.id', null );
+		$this->manager = \Aimeos\MShop::create($context, 'index');
+		$this->filter = $this->manager->createSearch(true);
+		$this->conditions[] = $this->filter->compare('!=', 'index.catalog.id', null);
 
 		/** controller/frontend/order/ignore-dates
 		 * Ignore start and end dates of products
@@ -52,8 +52,8 @@ 
 		 * @since 2017.08
 		 * @category Developer
 		 */
-		if( $context->getConfig()->get( 'controller/frontend/product/ignore-dates', false ) ) {
-			$this->conditions[] = $this->filter->compare( '>', 'product.status', 0 );
+		if ($context->getConfig()->get('controller/frontend/product/ignore-dates', false)) {
+			$this->conditions[] = $this->filter->compare('>', 'product.status', 0);
 		} else {
 			$this->conditions[] = $this->filter->getConditions();
 		}
@@ -68,10 +68,10 @@ 
 	 * @return array Associative list of key values as key and the product count for this key as value
 	 * @since 2019.04
 	 */
-	public function aggregate( $key )
+	public function aggregate($key)
 	{
-		$this->filter->setConditions( $this->filter->combine( '&&', $this->conditions ) );
-		return $this->manager->aggregate( $this->filter, $key );
+		$this->filter->setConditions($this->filter->combine('&&', $this->conditions));
+		return $this->manager->aggregate($this->filter, $key);
 	}
 
 
@@ -82,12 +82,12 @@ 
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function allOf( $attrIds )
+	public function allOf($attrIds)
 	{
-		if( ( $ids = array_unique( $this->validateIds( (array) $attrIds ) ) ) !== [] )
+		if (($ids = array_unique($this->validateIds((array) $attrIds))) !== [])
 		{
-			$func = $this->filter->createFunction( 'index.attribute:all', [$ids] );
-			$this->conditions[] = $this->filter->compare( '!=', $func, null );
+			$func = $this->filter->createFunction('index.attribute:all', [$ids]);
+			$this->conditions[] = $this->filter->compare('!=', $func, null);
 		}
 
 		return $this;
@@ -103,31 +103,31 @@ 
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function category( $catIds, $listtype = 'default', $level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE )
+	public function category($catIds, $listtype = 'default', $level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE)
 	{
-		if( ( $ids = $this->validateIds( (array) $catIds ) ) !== [] )
+		if (($ids = $this->validateIds((array) $catIds)) !== [])
 		{
-			if( $level != \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE )
+			if ($level != \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE)
 			{
 				$list = [];
-				$cntl = \Aimeos\Controller\Frontend::create( $this->getContext(), 'catalog' );
+				$cntl = \Aimeos\Controller\Frontend::create($this->getContext(), 'catalog');
 
-				foreach( $ids as $catId )
+				foreach ($ids as $catId)
 				{
-					$tree = $cntl->getTree( $catId, [], $level );
-					$list = array_merge( $list, $this->getCatalogIdsFromTree( $tree ) );
+					$tree = $cntl->getTree($catId, [], $level);
+					$list = array_merge($list, $this->getCatalogIdsFromTree($tree));
 				}
 
-				$ids = array_unique( $list );
+				$ids = array_unique($list);
 			}
 
-			$func = $this->filter->createFunction( 'index.catalog:position', [$listtype, $ids] );
+			$func = $this->filter->createFunction('index.catalog:position', [$listtype, $ids]);
 
-			$this->conditions[] = $this->filter->compare( '==', 'index.catalog.id', $ids );
-			$this->conditions[] = $this->filter->compare( '>=', $func, 0 );
+			$this->conditions[] = $this->filter->compare('==', 'index.catalog.id', $ids);
+			$this->conditions[] = $this->filter->compare('>=', $func, 0);
 
-			$func = $this->filter->createFunction( 'sort:index.catalog:position', [$listtype, $ids] );
-			$this->sort = $this->filter->sort( '+', $func );
+			$func = $this->filter->createFunction('sort:index.catalog:position', [$listtype, $ids]);
+			$this->sort = $this->filter->sort('+', $func);
 		}
 
 		return $this;
@@ -143,9 +143,9 @@ 
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function compare( $operator, $key, $value )
+	public function compare($operator, $key, $value)
 	{
-		$this->conditions[] = $this->filter->compare( $operator, $key, $value );
+		$this->conditions[] = $this->filter->compare($operator, $key, $value);
 		return $this;
 	}
 
@@ -158,9 +158,9 @@ 
 	 * @return \Aimeos\MShop\Product\Item\Iface Product item including the referenced domains items
 	 * @since 2019.04
 	 */
-	public function get( $id, $domains = ['media', 'price', 'text'] )
+	public function get($id, $domains = ['media', 'price', 'text'])
 	{
-		return $this->manager->getItem( $id, $domains );
+		return $this->manager->getItem($id, $domains);
 	}
 
 
@@ -172,9 +172,9 @@ 
 	 * @return \Aimeos\MShop\Product\Item\Iface Product item including the referenced domains items
 	 * @since 2019.04
 	 */
-	public function find( $code, $domains = ['media', 'price', 'text'] )
+	public function find($code, $domains = ['media', 'price', 'text'])
 	{
-		return $this->manager->findItem( $code, $domains );
+		return $this->manager->findItem($code, $domains);
 	}
 
 
@@ -185,10 +185,10 @@ 
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function oneOf( $attrIds )
+	public function oneOf($attrIds)
 	{
-		if( ( $ids = array_unique( $this->validateIds( (array) $attrIds ) ) ) !== [] ) {
-			$this->conditions[] = $this->filter->compare( '==', 'index.attribute.id', $ids );
+		if (($ids = array_unique($this->validateIds((array) $attrIds))) !== []) {
+			$this->conditions[] = $this->filter->compare('==', 'index.attribute.id', $ids);
 		}
 
 		return $this;
@@ -202,9 +202,9 @@ 
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function parse( array $conditions )
+	public function parse(array $conditions)
 	{
-		$this->conditions[] = $this->filter->toConditions( $conditions );
+		$this->conditions[] = $this->filter->toConditions($conditions);
 		return $this;
 	}
 
@@ -216,10 +216,10 @@ 
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function product( $prodIds )
+	public function product($prodIds)
 	{
-		if( ( $ids = array_unique( $this->validateIds( (array) $prodIds ) ) ) !== [] ) {
-			$this->conditions[] = $this->filter->compare( '==', 'product.id', $ids );
+		if (($ids = array_unique($this->validateIds((array) $prodIds))) !== []) {
+			$this->conditions[] = $this->filter->compare('==', 'product.id', $ids);
 		}
 
 		return $this;
@@ -234,10 +234,10 @@ 
 	 * @return array Ordered list of product items implementing \Aimeos\MShop\Product\Item\Iface
 	 * @since 2019.04
 	 */
-	public function search( $domains = ['media', 'price', 'text'], &$total = null )
+	public function search($domains = ['media', 'price', 'text'], &$total = null)
 	{
-		$this->filter->setConditions( $this->filter->combine( '&&', $this->conditions ) );
-		return $this->manager->searchItems( $this->filter, $domains, $total );
+		$this->filter->setConditions($this->filter->combine('&&', $this->conditions));
+		return $this->manager->searchItems($this->filter, $domains, $total);
 	}
 
 
@@ -249,9 +249,9 @@ 
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function slice( $start, $limit )
+	public function slice($start, $limit)
 	{
-		$this->filter->setSlice( $start, $limit );
+		$this->filter->setSlice($start, $limit);
 		return $this;
 	}
 
@@ -263,44 +263,44 @@ 
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function sort( $key = null )
+	public function sort($key = null)
 	{
 		$direction = '+';
 
-		if( $key != null && $key[0] === '-' )
+		if ($key != null && $key[0] === '-')
 		{
-			$key = substr( $key, 1 );
+			$key = substr($key, 1);
 			$direction = '-';
 		}
 
-		switch( $key )
+		switch ($key)
 		{
 			case 'code':
-				$this->sort = $this->filter->sort( $direction, 'product.code' );
+				$this->sort = $this->filter->sort($direction, 'product.code');
 				break;
 
 			case 'ctime':
-				$this->sort = $this->filter->sort( $direction, 'product.ctime' );
+				$this->sort = $this->filter->sort($direction, 'product.ctime');
 				break;
 
 			case 'name':
 				$langid = $this->getContext()->getLocale()->getLanguageId();
 
-				$cmpfunc = $this->filter->createFunction( 'index.text:name', [$langid] );
-				$this->conditions[] = $this->filter->compare( '!=', $cmpfunc, null );
+				$cmpfunc = $this->filter->createFunction('index.text:name', [$langid]);
+				$this->conditions[] = $this->filter->compare('!=', $cmpfunc, null);
 
-				$sortfunc = $this->filter->createFunction( 'sort:index.text:name', [$langid] );
-				$this->sort = $this->filter->sort( $direction, $sortfunc );
+				$sortfunc = $this->filter->createFunction('sort:index.text:name', [$langid]);
+				$this->sort = $this->filter->sort($direction, $sortfunc);
 				break;
 
 			case 'price':
 				$currencyid = $this->getContext()->getLocale()->getCurrencyId();
 
-				$cmpfunc = $this->filter->createFunction( 'index.price:value', [$currencyid] );
-				$this->conditions[] = $this->filter->compare( '!=', $cmpfunc, null );
+				$cmpfunc = $this->filter->createFunction('index.price:value', [$currencyid]);
+				$this->conditions[] = $this->filter->compare('!=', $cmpfunc, null);
 
-				$sortfunc = $this->filter->createFunction( 'sort:index.price:value', [$currencyid] );
-				$this->sort = $this->filter->sort( $direction, $sortfunc );
+				$sortfunc = $this->filter->createFunction('sort:index.price:value', [$currencyid]);
+				$this->sort = $this->filter->sort($direction, $sortfunc);
 				break;
 
 			case null:
@@ -308,8 +308,8 @@ 
 				break;
 		}
 
-		if( $this->sort ) {
-			$this->filter->setSortations( [$this->sort] );
+		if ($this->sort) {
+			$this->filter->setSortations([$this->sort]);
 		}
 
 		return $this;
@@ -324,17 +324,17 @@ 
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function supplier( $supIds, $listtype = 'default' )
+	public function supplier($supIds, $listtype = 'default')
 	{
-		if( ( $ids = array_unique( $this->validateIds( (array) $supIds ) ) ) !== [] )
+		if (($ids = array_unique($this->validateIds((array) $supIds))) !== [])
 		{
-			$func = $this->filter->createFunction( 'index.supplier:position', [$listtype, $ids] );
+			$func = $this->filter->createFunction('index.supplier:position', [$listtype, $ids]);
 
-			$this->conditions[] = $this->filter->compare( '==', 'index.supplier.id', $ids );
-			$this->conditions[] = $this->filter->compare( '>=', $func, 0 );
+			$this->conditions[] = $this->filter->compare('==', 'index.supplier.id', $ids);
+			$this->conditions[] = $this->filter->compare('>=', $func, 0);
 
-			$func = $this->filter->createFunction( 'sort:index.supplier:position', [$listtype, $ids] );
-			$this->sort = $this->filter->sort( '+', $func );
+			$func = $this->filter->createFunction('sort:index.supplier:position', [$listtype, $ids]);
+			$this->sort = $this->filter->sort('+', $func);
 		}
 
 		return $this;
@@ -348,14 +348,14 @@ 
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function text( $text )
+	public function text($text)
 	{
-		if( $text )
+		if ($text)
 		{
 			$langid = $this->getContext()->getLocale()->getLanguageId();
-			$func = $this->filter->createFunction( 'index.text:relevance', [$langid, $text] );
+			$func = $this->filter->createFunction('index.text:relevance', [$langid, $text]);
 
-			$this->conditions[] = $this->filter->compare( '>', $func, 0 );
+			$this->conditions[] = $this->filter->compare('>', $func, 0);
 		}
 
 		return $this;
@@ -368,16 +368,16 @@ 
 	 * @param \Aimeos\MShop\Catalog\Item\Iface $item Catalog item with children
 	 * @return array List of catalog IDs
 	 */
-	protected function getCatalogIdsFromTree( \Aimeos\MShop\Catalog\Item\Iface $item )
+	protected function getCatalogIdsFromTree(\Aimeos\MShop\Catalog\Item\Iface $item)
 	{
-		if( $item->getStatus() < 1 ) {
+		if ($item->getStatus() < 1) {
 			return [];
 		}
 
-		$list = [ $item->getId() ];
+		$list = [$item->getId()];
 
-		foreach( $item->getChildren() as $child ) {
-			$list = array_merge( $list, $this->getCatalogIdsFromTree( $child ) );
+		foreach ($item->getChildren() as $child) {
+			$list = array_merge($list, $this->getCatalogIdsFromTree($child));
 		}
 
 		return $list;
@@ -390,13 +390,13 @@ 
 	 * @param array $ids List of IDs to validate
 	 * @return array List of validated IDs
 	 */
-	protected function validateIds( array $ids )
+	protected function validateIds(array $ids)
 	{
 		$list = [];
 
-		foreach( $ids as $id )
+		foreach ($ids as $id)
 		{
-			if( $id != '' && preg_match( '/^[A-Za-z0-9\-\_]+$/', $id ) === 1 ) {
+			if ($id != '' && preg_match('/^[A-Za-z0-9\-\_]+$/', $id) === 1) {
 				$list[] = (string) $id;
 			}
 		}

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

Spacing +14 added lines, -14 removed lines

@@ -26,7 +26,7 @@ 
 	 * @return array Associative list of key values as key and the product count for this key as value
 	 * @since 2019.04
 	 */
-	public function aggregate( $key );
+	public function aggregate($key);
 
 	/**
 	 * Adds attribute IDs for filtering where products must reference all IDs
@@ -35,7 +35,7 @@ 
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function allOf( $attrIds );
+	public function allOf($attrIds);
 
 	/**
 	 * Adds catalog IDs for filtering
@@ -46,7 +46,7 @@ 
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function category( $catIds, $listtype = 'default', $level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE );
+	public function category($catIds, $listtype = 'default', $level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE);
 
 	/**
 	 * Adds generic condition for filtering products
@@ -57,7 +57,7 @@ 
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function compare( $operator, $key, $value );
+	public function compare($operator, $key, $value);
 
 	/**
 	 * Returns the product for the given product ID
@@ -67,7 +67,7 @@ 
 	 * @return \Aimeos\MShop\Product\Item\Iface Product item including the referenced domains items
 	 * @since 2019.04
 	 */
-	public function get( $id, $domains = ['media', 'price', 'text'] );
+	public function get($id, $domains = ['media', 'price', 'text']);
 
 	/**
 	 * Returns the product for the given product code
@@ -77,7 +77,7 @@ 
 	 * @return \Aimeos\MShop\Product\Item\Iface Product item including the referenced domains items
 	 * @since 2019.04
 	 */
-	public function find( $code, $domains = ['media', 'price', 'text'] );
+	public function find($code, $domains = ['media', 'price', 'text']);
 
 	/**
 	 * Adds attribute IDs for filtering where products must reference at least one ID
@@ -86,7 +86,7 @@ 
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function oneOf( $attrIds );
+	public function oneOf($attrIds);
 
 	/**
 	 * Parses the given array and adds the conditions to the list of conditions
@@ -95,7 +95,7 @@ 
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function parse( array $conditions );
+	public function parse(array $conditions);
 
 	/**
 	 * Adds product IDs for filtering
@@ -104,7 +104,7 @@ 
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function product( $prodIds );
+	public function product($prodIds);
 
 	/**
 	 * Returns the products filtered by the previously assigned conditions
@@ -114,7 +114,7 @@ 
 	 * @return array Ordered list of product items implementing \Aimeos\MShop\Product\Item\Iface
 	 * @since 2019.04
 	 */
-	public function search( $domains = ['media', 'price', 'text'], &$total = null );
+	public function search($domains = ['media', 'price', 'text'], &$total = null);
 
 	/**
 	 * Sets the start value and the number of returned products for slicing the list of found products
@@ -124,7 +124,7 @@ 
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function slice( $start, $limit );
+	public function slice($start, $limit);
 
 	/**
 	 * Sets the sorting of the product list
@@ -133,7 +133,7 @@ 
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function sort( $key = null );
+	public function sort($key = null);
 
 	/**
 	 * Adds supplier IDs for filtering
@@ -143,7 +143,7 @@ 
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function supplier( $supIds, $listtype = 'default' );
+	public function supplier($supIds, $listtype = 'default');
 
 	/**
 	 * Adds input string for full text search
@@ -152,5 +152,5 @@ 
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function text( $text );
+	public function text($text);
 }