aimeos / ai-controller-frontend

controller/frontend/tests/TestHelperFrontend.php

Spacing +27 added lines, -27 removed lines

@@ -15,15 +15,15 @@ 
 	public static function bootstrap()
 	{
 		self::getAimeos();
-		\Aimeos\MShop\Factory::setCache( false );
-		\Aimeos\Controller\Frontend\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
+		\Aimeos\Controller\Frontend\Factory::setCache(false);
 	}
 
 
-	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];
@@ -32,13 +32,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;
@@ -48,7 +48,7 @@ 
 	/**
 	 * @param string $site
 	 */
-	private static function createContext( $site )
+	private static function createContext($site)
 	{
 		$ctx = new \Aimeos\MShop\Context\Item\Standard();
 		$aimeos = self::getAimeos();
@@ -58,38 +58,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::createManager( $ctx );
-		$locale = $localeManager->bootstrap( $site, '', '', false );
-		$ctx->setLocale( $locale );
+		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($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/Customer/StandardTest.php

Spacing +70 added lines, -70 removed lines

@@ -18,121 +18,121 @@ 
 	protected function setUp()
 	{
 		$this->context = \TestHelperFrontend::getContext();
-		$this->object = new \Aimeos\Controller\Frontend\Customer\Standard( $this->context );
+		$this->object = new \Aimeos\Controller\Frontend\Customer\Standard($this->context);
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->context, $this->object );
+		unset($this->context, $this->object);
 	}
 
 
 	public function testAddEditSaveDeleteItem()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'customer' );
-		$id = $manager->findItem( 'UTC001' )->getId();
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'customer');
+		$id = $manager->findItem('UTC001')->getId();
 
-		$this->context->setUserId( $id );
-		$item = $this->object->addItem( ['customer.code' => 'unittest-ctnl', 'customer.status' => 1] );
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Iface', $item );
+		$this->context->setUserId($id);
+		$item = $this->object->addItem(['customer.code' => 'unittest-ctnl', 'customer.status' => 1]);
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Iface', $item);
 
-		$this->context->setUserId( $item->getId() );
-		$item = $this->object->editItem( $item->getId(), ['customer.code' => 'unittest-ctnl2'] );
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Iface', $item );
+		$this->context->setUserId($item->getId());
+		$item = $this->object->editItem($item->getId(), ['customer.code' => 'unittest-ctnl2']);
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Iface', $item);
 
-		$item->setStatus( 0 );
-		$item = $this->object->saveItem( $item );
-		$this->assertEquals( 0, $item->getStatus() );
+		$item->setStatus(0);
+		$item = $this->object->saveItem($item);
+		$this->assertEquals(0, $item->getStatus());
 
-		$this->object->deleteItem( $item->getId() );
+		$this->object->deleteItem($item->getId());
 
-		$this->setExpectedException( '\Aimeos\MShop\Exception' );
-		$manager->findItem( 'unittest-ctnl' );
+		$this->setExpectedException('\Aimeos\MShop\Exception');
+		$manager->findItem('unittest-ctnl');
 	}
 
 
 	public function testAddExistingItem()
 	{
-		$item = $this->object->addItem( ['customer.code' => 'UTC001'] );
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Iface', $item );
+		$item = $this->object->addItem(['customer.code' => 'UTC001']);
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Iface', $item);
 	}
 
 
 	public function testCreateItem()
 	{
 		$result = $this->object->createItem();
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Iface', $result );
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Iface', $result);
 	}
 
 
 	public function testGetItem()
 	{
-		$id = \Aimeos\MShop\Factory::createManager( $this->context, 'customer' )->findItem( 'UTC001' )->getId();
-		$this->context->setUserId( $id );
+		$id = \Aimeos\MShop\Factory::createManager($this->context, 'customer')->findItem('UTC001')->getId();
+		$this->context->setUserId($id);
 
-		$result = $this->object->getItem( $id, ['customer/address', 'text'] );
+		$result = $this->object->getItem($id, ['customer/address', 'text']);
 
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Iface', $result );
-		$this->assertEquals( 1, count( $result->getRefItems( 'text' ) ) );
-		$this->assertEquals( 1, count( $result->getAddressItems() ) );
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Iface', $result);
+		$this->assertEquals(1, count($result->getRefItems('text')));
+		$this->assertEquals(1, count($result->getAddressItems()));
 	}
 
 
 	public function testFindItem()
 	{
-		$result = $this->object->findItem( 'UTC001' );
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Iface', $result );
+		$result = $this->object->findItem('UTC001');
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Iface', $result);
 	}
 
 
 	public function testAddEditSaveDeleteAddressItem()
 	{
-		$customer = \Aimeos\MShop\Factory::createManager( $this->context, 'customer' )->findItem( 'UTC001' );
-		$this->context->setUserId( $customer->getId() );
+		$customer = \Aimeos\MShop\Factory::createManager($this->context, 'customer')->findItem('UTC001');
+		$this->context->setUserId($customer->getId());
 
-		$item = $this->object->addAddressItem( ['customer.address.lastname' => 'unittest-ctnl'] );
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Address\Iface', $item );
+		$item = $this->object->addAddressItem(['customer.address.lastname' => 'unittest-ctnl']);
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Address\Iface', $item);
 
-		$item = $this->object->editAddressItem( $item->getId(), ['customer.address.lastname' => 'unittest-ctnl2'] );
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Address\Iface', $item );
+		$item = $this->object->editAddressItem($item->getId(), ['customer.address.lastname' => 'unittest-ctnl2']);
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Address\Iface', $item);
 
-		$item->setLastName( 'test' );
-		$this->object->saveAddressItem( $item );
-		$this->assertEquals( 'test', $item->getLastName() );
+		$item->setLastName('test');
+		$this->object->saveAddressItem($item);
+		$this->assertEquals('test', $item->getLastName());
 
-		$this->object->deleteAddressItem( $item->getId() );
+		$this->object->deleteAddressItem($item->getId());
 	}
 
 
 	public function testCreateAddressItem()
 	{
 		$result = $this->object->createAddressItem();
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Address\Iface', $result );
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Address\Iface', $result);
 	}
 
 
 	public function testGetAddressItem()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'customer/address' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'customer/address');
 		$search = $manager->createSearch();
-		$search->setSlice( 0, 1 );
-		$result = $manager->searchItems( $search );
+		$search->setSlice(0, 1);
+		$result = $manager->searchItems($search);
 
-		if( ( $item = reset( $result ) ) === false ) {
-			throw new \RuntimeException( 'No customer address available' );
+		if (($item = reset($result)) === false) {
+			throw new \RuntimeException('No customer address available');
 		}
 
-		$this->context->setUserId( $item->getParentId() );
-		$result = $this->object->getAddressItem( $item->getId() );
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Address\Iface', $result );
+		$this->context->setUserId($item->getParentId());
+		$result = $this->object->getAddressItem($item->getId());
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Address\Iface', $result);
 	}
 
 
 	public function testAddEditDeleteListItem()
 	{
-		$customer = \Aimeos\MShop\Factory::createManager( $this->context, 'customer' )->findItem( 'UTC001' );
-		$this->context->setUserId( $customer->getId() );
+		$customer = \Aimeos\MShop\Factory::createManager($this->context, 'customer')->findItem('UTC001');
+		$this->context->setUserId($customer->getId());
 
 		$values = [
 			'customer.lists.type' => 'favorite',
@@ -140,8 +140,8 @@ 
 			'customer.lists.refid' => '-1'
 		];
 
-		$item = $this->object->addListItem( $values );
-		$this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Lists\Iface', $item );
+		$item = $this->object->addListItem($values);
+		$this->assertInstanceOf('\Aimeos\MShop\Common\Item\Lists\Iface', $item);
 
 		$values = [
 			'customer.lists.type' => 'favorite',
@@ -149,46 +149,46 @@ 
 			'customer.lists.refid' => '-2'
 		];
 
-		$item = $this->object->editListItem( $item->getId(), $values );
-		$this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Lists\Iface', $item );
+		$item = $this->object->editListItem($item->getId(), $values);
+		$this->assertInstanceOf('\Aimeos\MShop\Common\Item\Lists\Iface', $item);
 
-		$this->object->deleteListItem( $item->getId() );
+		$this->object->deleteListItem($item->getId());
 
-		$this->setExpectedException( '\Aimeos\MShop\Exception' );
-		$this->object->getListItem( $item->getId() );
+		$this->setExpectedException('\Aimeos\MShop\Exception');
+		$this->object->getListItem($item->getId());
 	}
 
 
 	public function testGetListItem()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'customer/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'customer/lists');
 		$search = $manager->createSearch();
-		$search->setSlice( 0, 1 );
-		$result = $manager->searchItems( $search );
+		$search->setSlice(0, 1);
+		$result = $manager->searchItems($search);
 
-		if( ( $item = reset( $result ) ) === false ) {
-			throw new \RuntimeException( 'No customer lists item available' );
+		if (($item = reset($result)) === false) {
+			throw new \RuntimeException('No customer lists item available');
 		}
 
-		$this->context->setUserId( $item->getParentId() );
-		$result = $this->object->getListItem( $item->getId() );
-		$this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Lists\Iface', $result );
+		$this->context->setUserId($item->getParentId());
+		$result = $this->object->getListItem($item->getId());
+		$this->assertInstanceOf('\Aimeos\MShop\Common\Item\Lists\Iface', $result);
 	}
 
 
 	public function testSearchListItem()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'customer' );
-		$customer = $manager->findItem( 'UTC001' );
-		$this->context->setUserId( $customer->getId() );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'customer');
+		$customer = $manager->findItem('UTC001');
+		$this->context->setUserId($customer->getId());
 
 		$filter = $this->object->createListsFilter();
-		$result = $this->object->searchListItems( $filter );
+		$result = $this->object->searchListItems($filter);
 
-		foreach( $result as $item )
+		foreach ($result as $item)
 		{
-			$this->assertEquals( $customer->getId(), $item->getParentId() );
-			$this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Lists\Iface', $item );
+			$this->assertEquals($customer->getId(), $item->getParentId());
+			$this->assertInstanceOf('\Aimeos\MShop\Common\Item\Lists\Iface', $item);
 		}
 	}
 }

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

Braces +1 added lines, -2 removed lines

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

Spacing +133 added lines, -133 removed lines

@@ -28,33 +28,33 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item
 	 * @since 2017.04
 	 */
-	public function addItem( array $values )
+	public function addItem(array $values)
 	{
 		$list = [];
 		$context = $this->getContext();
 		$config = $context->getConfig();
 
 		// Show only generated passwords in account creation e-mails
-		$pass = ( isset( $values['customer.password'] ) ? false : true );
+		$pass = (isset($values['customer.password']) ? false : true);
 
-		foreach( $values as $key => $val ) {
-			$list[str_replace( 'order.base.address', 'customer', $key )] = $val;
+		foreach ($values as $key => $val) {
+			$list[str_replace('order.base.address', 'customer', $key)] = $val;
 		}
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );
-		$list = $this->addItemDefaults( $list );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer');
+		$list = $this->addItemDefaults($list);
 
 		try
 		{
-			$item = $manager->findItem( $list['customer.code'] );
+			$item = $manager->findItem($list['customer.code']);
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$this->checkLimit( $list );
+			$this->checkLimit($list);
 
 			$item = $manager->createItem();
-			$item->fromArray( $list );
-			$item->setId( null );
+			$item->fromArray($list);
+			$item->setId(null);
 
 			/** controller/frontend/customer/groupids
 			 * List of groups new customers should be assigned to
@@ -68,13 +68,13 @@ 
 			 * @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();
-			$msg['customer.password'] = ( $pass ? $list['customer.password'] : null );
-			$context->getMessageQueue( 'mq-email', 'customer/email/account' )->add( json_encode( $msg ) );
+			$msg['customer.password'] = ($pass ? $list['customer.password'] : null);
+			$context->getMessageQueue('mq-email', 'customer/email/account')->add(json_encode($msg));
 		}
 
 		return $item;
@@ -86,14 +86,14 @@ 
 	 *
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item
 	 */
-	public function createItem( array $values = [] )
+	public function createItem(array $values = [])
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer');
 
 		$item = $manager->createItem();
-		$item->fromArray( $values );
-		$item->setId( null );
-		$item->setStatus( 1 );
+		$item->fromArray($values);
+		$item->setId(null);
+		$item->setStatus(1);
 
 		return $item;
 	}
@@ -105,12 +105,12 @@ 
 	 * @param string $id Unique customer ID
 	 * @since 2017.04
 	 */
-	public function deleteItem( $id )
+	public function deleteItem($id)
 	{
-		$this->checkUser( $id );
+		$this->checkUser($id);
 
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' );
-		$manager->deleteItem( $id );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer');
+		$manager->deleteItem($id);
 	}
 
 
@@ -122,17 +122,17 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item
 	 * @since 2017.04
 	 */
-	public function editItem( $id, array $values )
+	public function editItem($id, array $values)
 	{
-		$this->checkUser( $id );
+		$this->checkUser($id);
 
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' );
-		$item = $manager->getItem( $id, ['customer/group'], true );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer');
+		$item = $manager->getItem($id, ['customer/group'], true);
 
-		unset( $values['customer.id'] );
-		$item->fromArray( $values );
+		unset($values['customer.id']);
+		$item->fromArray($values);
 
-		return $manager->saveItem( $item );
+		return $manager->saveItem($item);
 	}
 
 
@@ -144,17 +144,17 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item including the referenced domains items
 	 * @since 2017.04
 	 */
-	public function getItem( $id = null, array $domains = [] )
+	public function getItem($id = null, array $domains = [])
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer');
 
-		if( $id == null ) {
-			return $manager->getItem( $this->getContext()->getUserId(), $domains, true );
+		if ($id == null) {
+			return $manager->getItem($this->getContext()->getUserId(), $domains, true);
 		}
 
-		$this->checkUser( $id );
+		$this->checkUser($id);
 
-		return $manager->getItem( $id, $domains, true );
+		return $manager->getItem($id, $domains, true);
 	}
 
 
@@ -168,9 +168,9 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item including the referenced domains items
 	 * @since 2017.04
 	 */
-	public function findItem( $code, array $domains = [] )
+	public function findItem($code, array $domains = [])
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' )->findItem( $code, $domains );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer')->findItem($code, $domains);
 	}
 
 
@@ -180,9 +180,9 @@ 
 	 * @param \Aimeos\MShop\Customer\Item\Iface $item Customer item
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item including the generated ID
 	 */
-	public function saveItem( \Aimeos\MShop\Customer\Item\Iface $item )
+	public function saveItem(\Aimeos\MShop\Customer\Item\Iface $item)
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' )->saveItem( $item );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer')->saveItem($item);
 	}
 
 
@@ -193,17 +193,17 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
 	 * @since 2017.04
 	 */
-	public function addAddressItem( array $values )
+	public function addAddressItem(array $values)
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/address' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/address');
 
 		$item = $manager->createItem();
-		$item->fromArray( $values );
-		$item->setId( null );
-		$item->setParentId( $context->getUserId() );
+		$item->fromArray($values);
+		$item->setId(null);
+		$item->setParentId($context->getUserId());
 
-		return $manager->saveItem( $item );
+		return $manager->saveItem($item);
 	}
 
 
@@ -212,16 +212,16 @@ 
 	 *
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
 	 */
-	public function createAddressItem( array $values = [] )
+	public function createAddressItem(array $values = [])
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/address' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/address');
 
 		$item = $manager->createItem();
-		$item->fromArray( $values );
-		$item->setId( null );
+		$item->fromArray($values);
+		$item->setId(null);
 
-		$item->setParentId( $context->getUserId() );
+		$item->setParentId($context->getUserId());
 
 		return $item;
 	}
@@ -233,13 +233,13 @@ 
 	 * @param string $id Unique customer address ID
 	 * @since 2017.04
 	 */
-	public function deleteAddressItem( $id )
+	public function deleteAddressItem($id)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/address' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/address');
 
-		$this->checkUser( $manager->getItem( $id, [], true )->getParentId() );
+		$this->checkUser($manager->getItem($id, [], true)->getParentId());
 
-		$manager->deleteItem( $id );
+		$manager->deleteItem($id);
 	}
 
 
@@ -251,17 +251,17 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
 	 * @since 2017.04
 	 */
-	public function editAddressItem( $id, array $values )
+	public function editAddressItem($id, array $values)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/address' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/address');
 
-		$item = $manager->getItem( $id, [], true );
-		$this->checkUser( $item->getParentId() );
+		$item = $manager->getItem($id, [], true);
+		$this->checkUser($item->getParentId());
 
-		unset( $values['customer.address.id'] );
-		$item->fromArray( $values );
+		unset($values['customer.address.id']);
+		$item->fromArray($values);
 
-		return $manager->saveItem( $item );
+		return $manager->saveItem($item);
 	}
 
 
@@ -272,12 +272,12 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
 	 * @since 2017.04
 	 */
-	public function getAddressItem( $id )
+	public function getAddressItem($id)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/address' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/address');
 
-		$item = $manager->getItem( $id );
-		$this->checkUser( $item->getParentId() );
+		$item = $manager->getItem($id);
+		$this->checkUser($item->getParentId());
 
 		return $item;
 	}
@@ -289,9 +289,9 @@ 
 	 * @param \Aimeos\MShop\Customer\Item\Address\Iface $item Customer address item
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item including the generated ID
 	 */
-	public function saveAddressItem( \Aimeos\MShop\Customer\Item\Address\Iface $item )
+	public function saveAddressItem(\Aimeos\MShop\Customer\Item\Address\Iface $item)
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/address' )->saveItem( $item );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/address')->saveItem($item);
 	}
 
 
@@ -302,32 +302,32 @@ 
 	 * @return \Aimeos\MShop\Common\Item\Lists\Iface Customer lists item
 	 * @since 2017.06
 	 */
-	public function addListItem( array $values )
+	public function addListItem(array $values)
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists');
 
-		if( !isset( $values['customer.lists.typeid'] ) )
+		if (!isset($values['customer.lists.typeid']))
 		{
-			if( !isset( $values['customer.lists.type'] ) ) {
-				throw new \Aimeos\Controller\Frontend\Customer\Exception( sprintf( 'No customer lists type code' ) );
+			if (!isset($values['customer.lists.type'])) {
+				throw new \Aimeos\Controller\Frontend\Customer\Exception(sprintf('No customer lists type code'));
 			}
 
-			if( !isset( $values['customer.lists.domain'] ) ) {
-				throw new \Aimeos\Controller\Frontend\Customer\Exception( sprintf( 'No customer lists domain' ) );
+			if (!isset($values['customer.lists.domain'])) {
+				throw new \Aimeos\Controller\Frontend\Customer\Exception(sprintf('No customer lists domain'));
 			}
 
-			$typeManager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists/type' );
-			$typeItem = $typeManager->findItem( $values['customer.lists.type'], [], $values['customer.lists.domain'] );
+			$typeManager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists/type');
+			$typeItem = $typeManager->findItem($values['customer.lists.type'], [], $values['customer.lists.domain']);
 			$values['customer.lists.typeid'] = $typeItem->getId();
 		}
 
 		$item = $manager->createItem();
-		$item->fromArray( $values );
-		$item->setId( null );
-		$item->setParentId( $context->getUserId() );
+		$item->fromArray($values);
+		$item->setId(null);
+		$item->setParentId($context->getUserId());
 
-		return $manager->saveItem( $item );
+		return $manager->saveItem($item);
 	}
 
 
@@ -340,10 +340,10 @@ 
 	public function createListsFilter()
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists');
 
 		$filter = $manager->createSearch();
-		$filter->setConditions( $filter->compare( '==', 'customer.lists.parentid', $context->getUserId() ) );
+		$filter->setConditions($filter->compare('==', 'customer.lists.parentid', $context->getUserId()));
 
 		return $filter;
 	}
@@ -355,13 +355,13 @@ 
 	 * @param string $id Unique customer address ID
 	 * @since 2017.06
 	 */
-	public function deleteListItem( $id )
+	public function deleteListItem($id)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/lists');
 
-		$this->checkUser( $manager->getItem( $id )->getParentId() );
+		$this->checkUser($manager->getItem($id)->getParentId());
 
-		$manager->deleteItem( $id );
+		$manager->deleteItem($id);
 	}
 
 
@@ -373,33 +373,33 @@ 
 	 * @return \Aimeos\MShop\Common\Item\Lists\Iface Customer lists item
 	 * @since 2017.06
 	 */
-	public function editListItem( $id, array $values )
+	public function editListItem($id, array $values)
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists');
 
-		$item = $manager->getItem( $id, [], true );
-		$this->checkUser( $item->getParentId() );
+		$item = $manager->getItem($id, [], true);
+		$this->checkUser($item->getParentId());
 
-		if( !isset( $values['customer.lists.typeid'] ) )
+		if (!isset($values['customer.lists.typeid']))
 		{
-			if( !isset( $values['customer.lists.type'] ) ) {
-				throw new \Aimeos\Controller\Frontend\Customer\Exception( sprintf( 'No customer lists type code' ) );
+			if (!isset($values['customer.lists.type'])) {
+				throw new \Aimeos\Controller\Frontend\Customer\Exception(sprintf('No customer lists type code'));
 			}
 
-			if( !isset( $values['customer.lists.domain'] ) ) {
-				throw new \Aimeos\Controller\Frontend\Customer\Exception( sprintf( 'No customer lists domain' ) );
+			if (!isset($values['customer.lists.domain'])) {
+				throw new \Aimeos\Controller\Frontend\Customer\Exception(sprintf('No customer lists domain'));
 			}
 
-			$typeManager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists/type' );
-			$typeItem = $typeManager->findItem( $values['customer.lists.type'], [], $values['customer.lists.domain'] );
+			$typeManager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists/type');
+			$typeItem = $typeManager->findItem($values['customer.lists.type'], [], $values['customer.lists.domain']);
 			$values['customer.lists.typeid'] = $typeItem->getId();
 		}
 
-		unset( $values['customer.lists.id'] );
-		$item->fromArray( $values );
+		unset($values['customer.lists.id']);
+		$item->fromArray($values);
 
-		return $manager->saveItem( $item );
+		return $manager->saveItem($item);
 	}
 
 
@@ -410,12 +410,12 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
 	 * @since 2017.06
 	 */
-	public function getListItem( $id )
+	public function getListItem($id)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/lists' );
-		$item = $manager->getItem( $id );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/lists');
+		$item = $manager->getItem($id);
 
-		$this->checkUser( $item->getParentId() );
+		$this->checkUser($item->getParentId());
 
 		return $item;
 	}
@@ -429,11 +429,11 @@ 
 	 * @return \Aimeos\MShop\Common\Item\Lists\Iface[] Customer list items
 	 * @since 2017.06
 	 */
-	public function searchListItems( \Aimeos\MW\Criteria\Iface $filter, &$total = null )
+	public function searchListItems(\Aimeos\MW\Criteria\Iface $filter, &$total = null)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/lists');
 
-		return $manager->searchItems( $filter, [], $total );
+		return $manager->searchItems($filter, [], $total);
 	}
 
 
@@ -443,37 +443,37 @@ 
 	 * @param string[] $values Associative list of customer keys (e.g. "customer.label") and their values
 	 * @return string[] Associative list of customer key/value pairs with default values set
 	 */
-	protected function addItemDefaults( array $values )
+	protected function addItemDefaults(array $values)
 	{
-		if( !isset( $values['customer.label'] ) || $values['customer.label'] == '' )
+		if (!isset($values['customer.label']) || $values['customer.label'] == '')
 		{
 			$label = '';
 
-			if( isset( $values['customer.lastname'] ) ) {
+			if (isset($values['customer.lastname'])) {
 				$label = $values['customer.lastname'];
 			}
 
-			if( isset( $values['customer.firstname'] ) && $values['customer.firstname'] != '' ) {
+			if (isset($values['customer.firstname']) && $values['customer.firstname'] != '') {
 				$label = $values['customer.firstname'] . ' ' . $label;
 			}
 
-			if( isset( $values['customer.company'] ) && $values['customer.company'] != '' ) {
+			if (isset($values['customer.company']) && $values['customer.company'] != '') {
 				$label .= ' (' . $values['customer.company'] . ')';
 			}
 
 			$values['customer.label'] = $label;
 		}
 
-		if( !isset( $values['customer.code'] ) && isset( $values['customer.email'] ) ) {
+		if (!isset($values['customer.code']) && isset($values['customer.email'])) {
 			$values['customer.code'] = $values['customer.email'];
 		}
 
-		if( !isset( $values['customer.status'] ) ) {
+		if (!isset($values['customer.status'])) {
 			$values['customer.status'] = 1;
 		}
 
-		if( !isset( $values['customer.password'] ) ) {
-			$values['customer.password'] = substr( md5( microtime( true ) . getmypid() . rand() ), -8 );
+		if (!isset($values['customer.password'])) {
+			$values['customer.password'] = substr(md5(microtime(true) . getmypid() . rand()), -8);
 		}
 
 		return $values;
@@ -486,7 +486,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();
@@ -507,7 +507,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
@@ -525,22 +525,22 @@ 
 		 * @category Developer
 		 * @see controller/frontend/customer/limit-count
 		 */
-		$seconds = $config->get( 'controller/frontend/customer/limit-seconds', 300 );
+		$seconds = $config->get('controller/frontend/customer/limit-seconds', 300);
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer');
 
 		$search = $manager->createSearch();
 		$expr = [
-			$search->compare( '==', 'customer.editor', $context->getEditor() ),
-			$search->compare( '>=', 'customer.ctime', date( 'Y-m-d H:i:s', time() - $seconds ) ),
+			$search->compare('==', 'customer.editor', $context->getEditor()),
+			$search->compare('>=', 'customer.ctime', date('Y-m-d H:i:s', time() - $seconds)),
 		];
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, 0 );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, 0);
 
-		$manager->searchItems( $search, [], $total );
+		$manager->searchItems($search, [], $total);
 
-		if( $total > $count ) {
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Temporary limit reached' ) );
+		if ($total > $count) {
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Temporary limit reached'));
 		}
 	}
 
@@ -551,12 +551,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/Product/Standard.php

Braces +2 added lines, -4 removed lines

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

Doc Comments +2 added lines, -1 removed lines

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

Spacing +79 added lines, -79 removed lines

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

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

Spacing +110 added lines, -110 removed lines

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

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

Braces +3 added lines, -6 removed lines

@@ -431,17 +431,14 @@
 		{
 			$address->copyFrom( $value );
 			$this->get()->setAddress( $address, $type );
-		}
-		else if( is_array( $value ) )
+		} else if( is_array( $value ) )
 		{
 			$this->setAddressFromArray( $address, $value );
 			$this->get()->setAddress( $address, $type );
-		}
-		else if( $value === null )
+		} else if( $value === null )
 		{
 			$this->get()->deleteAddress( $type );
-		}
-		else
+		} else
 		{
 			$msg = $context->getI18n()->dt( 'controller/frontend', 'Invalid value for address type "%1$s"' );
 			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $type ) );

Doc Comments -1 removed lines

@@ -150,7 +150,6 @@
 	 * Adds the delivery/payment service item based on the service ID.
 	 *
 	 * @param string $type Service type code like 'payment' or 'delivery'
-	 * @param string $id|null Unique ID of the service item or null to remove it
 	 * @param array $attributes Associative list of key/value pairs containing the attributes selected or
 	 * 	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

Spacing +138 added lines, -138 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\Factory::createManager( $context, 'order/base' );
+		$this->domainManager = \Aimeos\MShop\Factory::createManager($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->type );
+			$this->baskets[$this->type] = $this->domainManager->getSession($this->type);
+			$this->checkLocale($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,30 +145,30 @@ 
 		 * @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();
 
 		return $basket;
@@ -183,9 +183,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);
 	}
 
 
@@ -204,33 +204,33 @@ 
 	 * @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),
 			'hidden' => $hiddenAttributeIds,
 		];
-		$this->checkListRef( $prodid, 'attribute', $attributeMap );
+		$this->checkListRef($prodid, 'attribute', $attributeMap);
 
 
 		$context = $this->getContext();
-		$productManager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
-		$productItem = $productManager->getItem( $prodid, array( 'media', 'supplier', 'price', 'product', 'text' ), true );
-		$prices = $productItem->getRefItems( 'price', 'default', 'default' );
+		$productManager = \Aimeos\MShop\Factory::createManager($context, 'product');
+		$productItem = $productManager->getItem($prodid, array('media', 'supplier', 'price', 'product', 'text'), true);
+		$prices = $productItem->getRefItems('price', 'default', 'default');
 
-		$orderBaseProductItem = \Aimeos\MShop\Factory::createManager( $context, 'order/base/product' )->createItem();
-		$orderBaseProductItem->copyFrom( $productItem )->setQuantity( $quantity )->setStockType( $stocktype );
+		$orderBaseProductItem = \Aimeos\MShop\Factory::createManager($context, 'order/base/product')->createItem();
+		$orderBaseProductItem->copyFrom($productItem)->setQuantity($quantity)->setStockType($stocktype);
 
-		$attr = $this->getOrderProductAttributes( 'custom', array_keys( $customAttributeValues ), $customAttributeValues );
-		$attr = array_merge( $attr, $this->getOrderProductAttributes( 'config', array_keys( $configAttributeIds ), [], $configAttributeIds ) );
-		$attr = array_merge( $attr, $this->getOrderProductAttributes( 'hidden', $hiddenAttributeIds ) );
+		$attr = $this->getOrderProductAttributes('custom', array_keys($customAttributeValues), $customAttributeValues);
+		$attr = array_merge($attr, $this->getOrderProductAttributes('config', array_keys($configAttributeIds), [], $configAttributeIds));
+		$attr = array_merge($attr, $this->getOrderProductAttributes('hidden', $hiddenAttributeIds));
 
-		$orderBaseProductItem->setAttributes( $attr );
-		$orderBaseProductItem->setPrice( $this->calcPrice( $orderBaseProductItem, $prices, $quantity ) );
+		$orderBaseProductItem->setAttributes($attr);
+		$orderBaseProductItem->setPrice($this->calcPrice($orderBaseProductItem, $prices, $quantity));
 
-		$this->get()->addProduct( $orderBaseProductItem );
+		$this->get()->addProduct($orderBaseProductItem);
 		$this->save();
 	}
 
@@ -240,17 +240,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();
 	}
 
@@ -262,32 +262,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->getAttributes();
-		foreach( $attributes as $key => $attribute )
+		foreach ($attributes as $key => $attribute)
 		{
-			if( in_array( $attribute->getCode(), $configAttributeCodes ) ) {
-				unset( $attributes[$key] );
+			if (in_array($attribute->getCode(), $configAttributeCodes)) {
+				unset($attributes[$key]);
 			}
 		}
-		$product->setAttributes( $attributes );
+		$product->setAttributes($attributes);
 
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product' );
-		$productItem = $manager->findItem( $product->getProductCode(), array( 'price', 'text' ) );
-		$product->setPrice( $this->calcPrice( $product, $productItem->getRefItems( 'price', 'default' ), $quantity ) );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product');
+		$productItem = $manager->findItem($product->getProductCode(), array('price', 'text'));
+		$product->setPrice($this->calcPrice($product, $productItem->getRefItems('price', 'default'), $quantity));
 
-		$this->get()->editProduct( $product, $position );
+		$this->get()->editProduct($product, $position);
 
 		$this->save();
 	}
@@ -299,7 +299,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();
 
@@ -319,62 +319,62 @@ 
 		 * @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\Factory::createManager( $this->getContext(), 'coupon' );
-		$codeManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'coupon/code' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'coupon');
+		$codeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'coupon/code');
 
 
-		$search = $codeManager->createSearch( true );
+		$search = $codeManager->createSearch(true);
 		$expr = array(
-			$search->compare( '==', 'coupon.code.code', $code ),
+			$search->compare('==', 'coupon.code.code', $code),
 			$search->getConditions(),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, 1 );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, 1);
 
-		$result = $codeManager->searchItems( $search );
+		$result = $codeManager->searchItems($search);
 
-		if( ( $codeItem = reset( $result ) ) === false )
+		if (($codeItem = 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);
 		}
 
 
-		$search = $manager->createSearch( true );
+		$search = $manager->createSearch(true);
 		$expr = array(
-			$search->compare( '==', 'coupon.id', $codeItem->getParentId() ),
+			$search->compare('==', 'coupon.id', $codeItem->getParentId()),
 			$search->getConditions(),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, 1 );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, 1);
 
-		$result = $manager->searchItems( $search );
+		$result = $manager->searchItems($search);
 
-		if( ( $item = reset( $result ) ) === false )
+		if (($item = reset($result)) === false)
 		{
-			$msg = sprintf( $context->getI18n()->dt( 'controller/frontend', 'Coupon for code "%1$s" is not available any more' ), $code );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+			$msg = sprintf($context->getI18n()->dt('controller/frontend', 'Coupon for code "%1$s" is not available any more'), $code);
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
 		}
 
 
-		$provider = $manager->getProvider( $item, $codeItem->getCode() );
+		$provider = $manager->getProvider($item, $codeItem->getCode());
 
-		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();
 	}
 
@@ -385,24 +385,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\Factory::createManager( $context, 'coupon' );
+		$manager = \Aimeos\MShop\Factory::createManager($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();
 	}
 
@@ -415,30 +415,30 @@ 
 	 * @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\Factory::createManager( $context, 'order/base/address' )->createItem();
-		$address->setType( $type );
+		$address = \Aimeos\MShop\Factory::createManager($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)
 		{
-			$address->copyFrom( $value );
-			$this->get()->setAddress( $address, $type );
+			$address->copyFrom($value);
+			$this->get()->setAddress($address, $type);
 		}
-		else if( is_array( $value ) )
+		else if (is_array($value))
 		{
-			$this->setAddressFromArray( $address, $value );
-			$this->get()->setAddress( $address, $type );
+			$this->setAddressFromArray($address, $value);
+			$this->get()->setAddress($address, $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();
@@ -454,42 +454,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\Factory::createManager( $context, 'service' );
-		$serviceItem = $serviceManager->getItem( $id, array( 'media', 'price', 'text' ) );
+		$serviceManager = \Aimeos\MShop\Factory::createManager($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\Factory::createManager( $context, 'order/base/service' );
+		$orderBaseServiceManager = \Aimeos\MShop\Factory::createManager($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();
 	}
 
@@ -499,9 +499,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();
 	}
 
@@ -514,18 +514,18 @@ 
 	 * 	an address item.
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception
 	 */
-	protected function setAddressFromArray( \Aimeos\MShop\Order\Item\Base\Address\Iface $address, array $map )
+	protected function setAddressFromArray(\Aimeos\MShop\Order\Item\Base\Address\Iface $address, array $map)
 	{
-		foreach( $map as $key => $value ) {
-			$map[$key] = strip_tags( $value ); // prevent XSS
+		foreach ($map as $key => $value) {
+			$map[$key] = strip_tags($value); // prevent XSS
 		}
 
-		$errors = $address->fromArray( $map );
+		$errors = $address->fromArray($map);
 
-		if( count( $errors ) > 0 )
+		if (count($errors) > 0)
 		{
-			$msg = $this->getContext()->getI18n()->dt( 'controller/frontend', 'Invalid address properties, please check your input' );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg, 0, null, $errors );
+			$msg = $this->getContext()->getI18n()->dt('controller/frontend', 'Invalid address properties, please check your input');
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg, 0, null, $errors);
 		}
 	}
 }

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

Doc Comments -1 removed lines

@@ -150,7 +150,6 @@
 	 * Adds the delivery/payment service item based on the service ID.
 	 *
 	 * @param string $type Service type code like 'payment' or 'delivery'
-	 * @param string $id|null Unique ID of the service item or null to remove it
 	 * @param array $attributes Associative list of key/value pairs containing the attributes selected or
 	 * 	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

Spacing +11 added lines, -11 removed lines

@@ -50,7 +50,7 @@ 
 	 * @param string $type Basket type
 	 * @return \Aimeos\Controller\Frontend\Basket\Iface Basket frontend object
 	 */
-	public function setType( $type );
+	public function setType($type);
 
 
 	/**
@@ -69,7 +69,7 @@ 
 	 * @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);
 
 
 	/**
@@ -88,8 +88,8 @@ 
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the product isn't available
 	 * @return void
 	 */
-	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 = []);
 
 
 	/**
@@ -98,7 +98,7 @@ 
 	 * @param integer $position Position number (key) of the order product item
 	 * @return void
 	 */
-	public function deleteProduct( $position );
+	public function deleteProduct($position);
 
 
 	/**
@@ -109,7 +109,7 @@ 
 	 * @param array $configAttributeCodes Codes of the product config attributes that should be REMOVED
 	 * @return void
 	 */
-	public function editProduct( $position, $quantity, array $configAttributeCodes = [] );
+	public function editProduct($position, $quantity, array $configAttributeCodes = []);
 
 
 	/**
@@ -119,7 +119,7 @@ 
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid or not allowed
 	 * @return void
 	 */
-	public function addCoupon( $code );
+	public function addCoupon($code);
 
 
 	/**
@@ -129,7 +129,7 @@ 
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid
 	 * @return void
 	 */
-	public function deleteCoupon( $code );
+	public function deleteCoupon($code);
 
 
 	/**
@@ -141,7 +141,7 @@ 
 	 * 	if one of the keys is invalid when using an array with key/value pairs
 	 * @return void
 	 */
-	public function setAddress( $type, $value );
+	public function setAddress($type, $value);
 
 
 	/**
@@ -153,7 +153,7 @@ 
 	 * 	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 = []);
 
 
 	/**
@@ -161,5 +161,5 @@ 
 	 *
 	 * @param string $type Service type code like 'payment' or 'delivery'
 	 */
-	public function deleteService( $type );
+	public function deleteService($type);
 }

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

Spacing +45 added lines, -45 removed lines

@@ -20,54 +20,54 @@ 
 	{
 		$this->context = \TestHelperFrontend::getContext();
 
-		$this->stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' )
+		$this->stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard')
 			->disableOriginalConstructor()
 			->getMock();
 
-		$this->object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Decorator\Base' )
-			->setConstructorArgs( [$this->stub, $this->context] )
+		$this->object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Decorator\Base')
+			->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' )->getMock();
+		$stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Iface')->getMock();
 
-		$this->setExpectedException( '\Aimeos\Controller\Frontend\Exception' );
+		$this->setExpectedException('\Aimeos\Controller\Frontend\Exception');
 
-		$this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Decorator\Base' )
-			->setConstructorArgs( [$stub, $this->context] )
+		$this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Decorator\Base')
+			->setConstructorArgs([$stub, $this->context])
 			->getMockForAbstractClass();
 	}
 
 
 	public function testCall()
 	{
-		$stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' )
+		$stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard')
 			->disableOriginalConstructor()
-			->setMethods( ['invalid'] )
+			->setMethods(['invalid'])
 			->getMock();
 
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Decorator\Base' )
-			->setConstructorArgs( [$stub, $this->context] )
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Decorator\Base')
+			->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 testClear()
 	{
-		$this->stub->expects( $this->once() )->method( 'clear' );
+		$this->stub->expects($this->once())->method('clear');
 
 		$this->object->clear();
 	}
@@ -76,18 +76,18 @@ 
 	public function testGet()
 	{
 		$context = \TestHelperFrontend::getContext();
-		$order = \Aimeos\MShop\Factory::createManager( $context, 'order/base' )->createItem();
+		$order = \Aimeos\MShop\Factory::createManager($context, 'order/base')->createItem();
 
-		$this->stub->expects( $this->once() )->method( 'get' )
-			->will( $this->returnValue( $order ) );
+		$this->stub->expects($this->once())->method('get')
+			->will($this->returnValue($order));
 
-		$this->assertInstanceOf( '\Aimeos\MShop\Order\Item\Base\Iface', $this->object->get() );
+		$this->assertInstanceOf('\Aimeos\MShop\Order\Item\Base\Iface', $this->object->get());
 	}
 
 
 	public function testSave()
 	{
-		$this->stub->expects( $this->once() )->method( 'save' );
+		$this->stub->expects($this->once())->method('save');
 
 		$this->object->save();
 	}
@@ -95,15 +95,15 @@ 
 
 	public function testSetType()
 	{
-		$this->stub->expects( $this->once() )->method( 'setType' );
+		$this->stub->expects($this->once())->method('setType');
 
-		$this->object->setType( 'test' );
+		$this->object->setType('test');
 	}
 
 
 	public function testStore()
 	{
-		$this->stub->expects( $this->once() )->method( 'store' );
+		$this->stub->expects($this->once())->method('store');
 
 		$this->object->store();
 	}
@@ -111,7 +111,7 @@ 
 
 	public function testLoad()
 	{
-		$this->stub->expects( $this->once() )->method( 'load' );
+		$this->stub->expects($this->once())->method('load');
 
 		$this->object->load( -1 );
 	}
@@ -119,7 +119,7 @@ 
 
 	public function testAddProduct()
 	{
-		$this->stub->expects( $this->once() )->method( 'addProduct' );
+		$this->stub->expects($this->once())->method('addProduct');
 
 		$this->object->addProduct( -1 );
 	}
@@ -127,73 +127,73 @@ 
 
 	public function testDeleteProduct()
 	{
-		$this->stub->expects( $this->once() )->method( 'deleteProduct' );
+		$this->stub->expects($this->once())->method('deleteProduct');
 
-		$this->object->deleteProduct( 0 );
+		$this->object->deleteProduct(0);
 	}
 
 
 	public function testEditProduct()
 	{
-		$this->stub->expects( $this->once() )->method( 'editProduct' );
+		$this->stub->expects($this->once())->method('editProduct');
 
-		$this->object->editProduct( 0, 1 );
+		$this->object->editProduct(0, 1);
 	}
 
 
 	public function testAddCoupon()
 	{
-		$this->stub->expects( $this->once() )->method( 'addCoupon' );
+		$this->stub->expects($this->once())->method('addCoupon');
 
-		$this->object->addCoupon( 'test' );
+		$this->object->addCoupon('test');
 	}
 
 
 	public function testDeleteCoupon()
 	{
-		$this->stub->expects( $this->once() )->method( 'deleteCoupon' );
+		$this->stub->expects($this->once())->method('deleteCoupon');
 
-		$this->object->deleteCoupon( 'test' );
+		$this->object->deleteCoupon('test');
 	}
 
 
 	public function testSetAddress()
 	{
-		$this->stub->expects( $this->once() )->method( 'setAddress' );
+		$this->stub->expects($this->once())->method('setAddress');
 
-		$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);
 	}
 
 
 	public function testAddService()
 	{
-		$this->stub->expects( $this->once() )->method( 'addService' );
+		$this->stub->expects($this->once())->method('addService');
 
-		$this->object->addService( \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT, -1 );
+		$this->object->addService(\Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT, -1);
 	}
 
 
 	public function testDeleteService()
 	{
-		$this->stub->expects( $this->once() )->method( 'deleteService' );
+		$this->stub->expects($this->once())->method('deleteService');
 
-		$this->object->deleteService( \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT );
+		$this->object->deleteService(\Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT);
 	}
 
 
 	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\Basket\Decorator\Base' );
-		$method = $class->getMethod( $name );
-		$method->setAccessible( true );
+		$class = new \ReflectionClass('\Aimeos\Controller\Frontend\Basket\Decorator\Base');
+		$method = $class->getMethod($name);
+		$method->setAccessible(true);
 
 		return $method;
 	}

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

Doc Comments +2 added lines, -7 removed lines

@@ -61,7 +61,7 @@ 
 
 	/**
 	 * Empties the basket and removing all products, addresses, services, etc.
-	 * @return void
+	 * @return Base
 	 */
 	public function clear()
 	{
@@ -134,11 +134,6 @@ 
 	 *
 	 * @param string $prodid ID of the base product to add
 	 * @param integer $quantity Amount of products that should by added
-	 * @param array $options Possible options are: 'stock'=>true|false and 'variant'=>true|false
-	 * 	The 'stock'=>false option allows adding products without being in stock.
-	 * 	The 'variant'=>false option allows adding the selection product to the basket
-	 * 	instead of the specific sub-product if the variant-building attribute IDs
-	 * 	doesn't match a specific sub-product or if the attribute IDs are missing.
 	 * @param array $variantAttributeIds List of variant-building attribute IDs that identify a specific product
 	 * 	in a selection products
 	 * @param array $configAttributeIds  List of attribute IDs that doesn't identify a specific product in a
@@ -257,7 +252,7 @@ 
 	/**
 	 * Returns the frontend controller
 	 *
-	 * @return \Aimeos\Controller\Frontend\Basket\Iface Frontend controller object
+	 * @return \Aimeos\Controller\Frontend\Iface Frontend controller object
 	 */
 	protected function getController()
 	{

Spacing +27 added lines, -27 removed lines

@@ -30,18 +30,18 @@ 
 	 * @param \Aimeos\Controller\Frontend\Iface $controller Controller object
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object with required objects
 	 */
-	public function __construct( \Aimeos\Controller\Frontend\Iface $controller, \Aimeos\MShop\Context\Item\Iface $context )
+	public function __construct(\Aimeos\Controller\Frontend\Iface $controller, \Aimeos\MShop\Context\Item\Iface $context)
 	{
 		$iface = '\Aimeos\Controller\Frontend\Basket\Iface';
-		if( !( $controller instanceof $iface ) )
+		if (!($controller instanceof $iface))
 		{
-			$msg = sprintf( 'Class "%1$s" does not implement interface "%2$s"', get_class( $controller ), $iface );
-			throw new \Aimeos\Controller\Frontend\Exception( $msg );
+			$msg = sprintf('Class "%1$s" does not implement interface "%2$s"', get_class($controller), $iface);
+			throw new \Aimeos\Controller\Frontend\Exception($msg);
 		}
 
 		$this->controller = $controller;
 
-		parent::__construct( $context );
+		parent::__construct($context);
 	}
 
 
@@ -53,9 +53,9 @@ 
 	 * @return mixed Returns the value of the called method
 	 * @throws \Aimeos\Controller\Frontend\Exception If method call failed
 	 */
-	public function __call( $name, array $param )
+	public function __call($name, array $param)
 	{
-		return @call_user_func_array( array( $this->controller, $name ), $param );
+		return @call_user_func_array(array($this->controller, $name), $param);
 	}
 
 
@@ -97,9 +97,9 @@ 
 	 * @param string $type Basket type
 	 * @return \Aimeos\Controller\Frontend\Basket\Iface Basket frontend object
 	 */
-	public function setType( $type )
+	public function setType($type)
 	{
-		$this->controller->setType( $type );
+		$this->controller->setType($type);
 		return $this;
 	}
 
@@ -123,9 +123,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->controller->load( $id, $parts, $default );
+		return $this->controller->load($id, $parts, $default);
 	}
 
 
@@ -150,8 +150,8 @@ 
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the product isn't available
 	 * @return void
 	 */
-	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 = [])
 	{
 		$this->controller->addProduct(
 			$prodid, $quantity, $stocktype, $variantAttributeIds,
@@ -166,9 +166,9 @@ 
 	 * @param integer $position Position number (key) of the order product item
 	 * @return void
 	 */
-	public function deleteProduct( $position )
+	public function deleteProduct($position)
 	{
-		$this->controller->deleteProduct( $position );
+		$this->controller->deleteProduct($position);
 	}
 
 
@@ -180,9 +180,9 @@ 
 	 * @param array $configAttributeCodes Codes of the product config attributes that should be REMOVED
 	 * @return void
 	 */
-	public function editProduct( $position, $quantity, array $configAttributeCodes = [] )
+	public function editProduct($position, $quantity, array $configAttributeCodes = [])
 	{
-		$this->controller->editProduct( $position, $quantity, $configAttributeCodes );
+		$this->controller->editProduct($position, $quantity, $configAttributeCodes);
 	}
 
 
@@ -193,9 +193,9 @@ 
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid or not allowed
 	 * @return void
 	 */
-	public function addCoupon( $code )
+	public function addCoupon($code)
 	{
-		$this->controller->addCoupon( $code );
+		$this->controller->addCoupon($code);
 	}
 
 
@@ -206,9 +206,9 @@ 
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid
 	 * @return void
 	 */
-	public function deleteCoupon( $code )
+	public function deleteCoupon($code)
 	{
-		$this->controller->deleteCoupon( $code );
+		$this->controller->deleteCoupon($code);
 	}
 
 
@@ -221,9 +221,9 @@ 
 	 * 	if one of the keys is invalid when using an array with key/value pairs
 	 * @return void
 	 */
-	public function setAddress( $type, $value )
+	public function setAddress($type, $value)
 	{
-		$this->controller->setAddress( $type, $value );
+		$this->controller->setAddress($type, $value);
 	}
 
 
@@ -237,9 +237,9 @@ 
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If there is no price to the service item attached
 	 * @return void
 	 */
-	public function addService( $type, $id, array $attributes = [] )
+	public function addService($type, $id, array $attributes = [])
 	{
-		$this->controller->addService( $type, $id, $attributes );
+		$this->controller->addService($type, $id, $attributes);
 	}
 
 
@@ -248,9 +248,9 @@ 
 	 *
 	 * @param string $type Service type code like 'payment' or 'delivery'
 	 */
-	public function deleteService( $type )
+	public function deleteService($type)
 	{
-		$this->controller->deleteService( $type );
+		$this->controller->deleteService($type);
 	}