aimeos / ai-controller-frontend

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

Braces +4 added lines, -8 removed lines

@@ -233,8 +233,7 @@ 
 			{
 				$this->setAddress( $type, $item->toArray() );
 				$basket->deleteAddress( $type );
-			}
-			catch( \Exception $e )
+			} catch( \Exception $e )
 			{
 				$logger = $this->getContext()->getLogger();
 				$errors['address'][$type] = $e->getMessage();
@@ -264,8 +263,7 @@ 
 			{
 				$this->addCoupon( $code );
 				$basket->deleteCoupon( $code, true );
-			}
-			catch( \Exception $e )
+			} catch( \Exception $e )
 			{
 				$logger = $this->getContext()->getLogger();
 				$errors['coupon'][$code] = $e->getMessage();
@@ -314,8 +312,7 @@ 
 				);
 
 				$basket->deleteProduct( $pos );
-			}
-			catch( \Exception $e )
+			} catch( \Exception $e )
 			{
 				$code = $product->getProductCode();
 				$logger = $this->getContext()->getLogger();
@@ -353,8 +350,7 @@ 
 
 					$this->addService( $type, $item->getServiceId(), $attributes );
 					$basket->deleteService( $type );
-				}
-				catch( \Exception $e ) { ; } // Don't notify the user as appropriate services can be added automatically
+				} catch( \Exception $e ) { ; } // Don't notify the user as appropriate services can be added automatically
 			}
 		}
 

Spacing +146 added lines, -146 removed lines

@@ -31,52 +31,52 @@ 
 	 * @param integer $quantity New product quantity
 	 * @return \Aimeos\MShop\Price\Item\Iface Price item with calculated price
 	 */
-	protected function calcPrice( \Aimeos\MShop\Order\Item\Base\Product\Iface $product, array $prices, $quantity )
+	protected function calcPrice(\Aimeos\MShop\Order\Item\Base\Product\Iface $product, array $prices, $quantity)
 	{
 		$context = $this->getContext();
 
-		if( empty( $prices ) )
+		if (empty($prices))
 		{
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
-			$prices = $manager->getItem( $product->getProductId(), array( 'price' ) )->getRefItems( 'price', 'default' );
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'product');
+			$prices = $manager->getItem($product->getProductId(), array('price'))->getRefItems('price', 'default');
 		}
 
 
-		$priceManager = \Aimeos\MShop\Factory::createManager( $context, 'price' );
-		$price = $priceManager->getLowestPrice( $prices, $quantity );
+		$priceManager = \Aimeos\MShop\Factory::createManager($context, 'price');
+		$price = $priceManager->getLowestPrice($prices, $quantity);
 
 		// customers can pay what they would like to pay
-		if( ( $attr = $product->getAttributeItem( 'price', 'custom' ) ) !== null )
+		if (($attr = $product->getAttributeItem('price', 'custom')) !== null)
 		{
 			$amount = $attr->getValue();
 
-			if( preg_match( '/^[0-9]*(\.[0-9]+)?$/', $amount ) !== 1 || ((double) $amount) < 0.01 )
+			if (preg_match('/^[0-9]*(\.[0-9]+)?$/', $amount) !== 1 || ((double) $amount) < 0.01)
 			{
-				$msg = $context->getI18n()->dt( 'controller/frontend', 'Invalid price value "%1$s"' );
-				throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $amount ) );
+				$msg = $context->getI18n()->dt('controller/frontend', 'Invalid price value "%1$s"');
+				throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $amount));
 			}
 
-			$price->setValue( $amount );
+			$price->setValue($amount);
 		}
 
 		$orderAttributes = $product->getAttributeItems();
-		$attrItems = $this->getAttributeItems( $orderAttributes );
+		$attrItems = $this->getAttributeItems($orderAttributes);
 
 		// add prices of (optional) attributes
-		foreach( $orderAttributes as $orderAttrItem )
+		foreach ($orderAttributes as $orderAttrItem)
 		{
 			$attrId = $orderAttrItem->getAttributeId();
 
-			if( isset( $attrItems[$attrId] )
-				&& ( $prices = $attrItems[$attrId]->getRefItems( 'price', 'default' ) ) !== []
+			if (isset($attrItems[$attrId])
+				&& ($prices = $attrItems[$attrId]->getRefItems('price', 'default')) !== []
 			) {
-				$attrPrice = $priceManager->getLowestPrice( $prices, $orderAttrItem->getQuantity() );
-				$price->addItem( $attrPrice, $orderAttrItem->getQuantity() );
+				$attrPrice = $priceManager->getLowestPrice($prices, $orderAttrItem->getQuantity());
+				$price->addItem($attrPrice, $orderAttrItem->getQuantity());
 			}
 		}
 
 		// remove product rebate of original price in favor to rebates granted for the order
-		$price->setRebate( '0.00' );
+		$price->setRebate('0.00');
 
 		return $price;
 	}
@@ -90,36 +90,36 @@ 
 	 * @param array $refMap Associative list of list type codes as keys and lists of reference IDs as values
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If one or more of the IDs are not associated
 	 */
-	protected function checkListRef( $prodId, $domain, array $refMap )
+	protected function checkListRef($prodId, $domain, array $refMap)
 	{
-		if( empty( $refMap ) ) {
+		if (empty($refMap)) {
 			return;
 		}
 
 		$context = $this->getContext();
-		$productManager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
-		$search = $productManager->createSearch( true );
+		$productManager = \Aimeos\MShop\Factory::createManager($context, 'product');
+		$search = $productManager->createSearch(true);
 
 		$expr = array(
-			$search->compare( '==', 'product.id', $prodId ),
+			$search->compare('==', 'product.id', $prodId),
 			$search->getConditions(),
 		);
 
-		foreach( $refMap as $listType => $refIds )
+		foreach ($refMap as $listType => $refIds)
 		{
-			foreach( $refIds as $key => $refId )
+			foreach ($refIds as $key => $refId)
 			{
-				$cmpfunc = $search->createFunction( 'product:has', [$domain, $listType, (string) $refId] );
-				$expr[] = $search->compare( '!=', $cmpfunc, null );
+				$cmpfunc = $search->createFunction('product:has', [$domain, $listType, (string) $refId]);
+				$expr[] = $search->compare('!=', $cmpfunc, null);
 			}
 		}
 
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		if( count( $productManager->searchItems( $search, [] ) ) === 0 )
+		if (count($productManager->searchItems($search, [])) === 0)
 		{
-			$msg = $context->getI18n()->dt( 'controller/frontend', 'Invalid "%1$s" references for product with ID %2$s' );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $domain, json_encode( $prodId ) ) );
+			$msg = $context->getI18n()->dt('controller/frontend', 'Invalid "%1$s" references for product with ID %2$s');
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $domain, json_encode($prodId)));
 		}
 	}
 
@@ -130,40 +130,40 @@ 
 	 * @param \Aimeos\MShop\Locale\Item\Iface $locale Locale object from current basket
 	 * @param string $type Basket type
 	 */
-	protected function checkLocale( \Aimeos\MShop\Locale\Item\Iface $locale, $type )
+	protected function checkLocale(\Aimeos\MShop\Locale\Item\Iface $locale, $type)
 	{
 		$errors = [];
 		$context = $this->getContext();
 		$session = $context->getSession();
 
-		$localeStr = $session->get( 'aimeos/basket/locale' );
+		$localeStr = $session->get('aimeos/basket/locale');
 		$localeKey = $locale->getSite()->getCode() . '|' . $locale->getLanguageId() . '|' . $locale->getCurrencyId();
 
-		if( $localeStr !== null && $localeStr !== $localeKey )
+		if ($localeStr !== null && $localeStr !== $localeKey)
 		{
-			$locParts = explode( '|', $localeStr );
-			$locSite = ( isset( $locParts[0] ) ? $locParts[0] : '' );
-			$locLanguage = ( isset( $locParts[1] ) ? $locParts[1] : '' );
-			$locCurrency = ( isset( $locParts[2] ) ? $locParts[2] : '' );
+			$locParts = explode('|', $localeStr);
+			$locSite = (isset($locParts[0]) ? $locParts[0] : '');
+			$locLanguage = (isset($locParts[1]) ? $locParts[1] : '');
+			$locCurrency = (isset($locParts[2]) ? $locParts[2] : '');
 
-			$localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
-			$locale = $localeManager->bootstrap( $locSite, $locLanguage, $locCurrency, false );
+			$localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale');
+			$locale = $localeManager->bootstrap($locSite, $locLanguage, $locCurrency, false);
 
 			$context = clone $context;
-			$context->setLocale( $locale );
+			$context->setLocale($locale);
 
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' );
-			$basket = $manager->getSession( $type );
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'order/base');
+			$basket = $manager->getSession($type);
 
-			$this->copyAddresses( $basket, $errors, $localeKey );
-			$this->copyServices( $basket, $errors );
-			$this->copyProducts( $basket, $errors, $localeKey );
-			$this->copyCoupons( $basket, $errors, $localeKey );
+			$this->copyAddresses($basket, $errors, $localeKey);
+			$this->copyServices($basket, $errors);
+			$this->copyProducts($basket, $errors, $localeKey);
+			$this->copyCoupons($basket, $errors, $localeKey);
 
-			$manager->setSession( $basket, $type );
+			$manager->setSession($basket, $type);
 		}
 
-		$session->set( 'aimeos/basket/locale', $localeKey );
+		$session->set('aimeos/basket/locale', $localeKey);
 	}
 
 
@@ -175,22 +175,22 @@ 
 	 * @param string $localeKey Unique identifier of the site, language and currency
 	 * @return array Associative list of errors occured
 	 */
-	protected function copyAddresses( \Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey )
+	protected function copyAddresses(\Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey)
 	{
-		foreach( $basket->getAddresses() as $type => $item )
+		foreach ($basket->getAddresses() as $type => $item)
 		{
 			try
 			{
-				$this->setAddress( $type, $item->toArray() );
-				$basket->deleteAddress( $type );
+				$this->setAddress($type, $item->toArray());
+				$basket->deleteAddress($type);
 			}
-			catch( \Exception $e )
+			catch (\Exception $e)
 			{
 				$logger = $this->getContext()->getLogger();
 				$errors['address'][$type] = $e->getMessage();
 
 				$str = 'Error migrating address with type "%1$s" in basket to locale "%2$s": %3$s';
-				$logger->log( sprintf( $str, $type, $localeKey, $e->getMessage() ), \Aimeos\MW\Logger\Base::INFO );
+				$logger->log(sprintf($str, $type, $localeKey, $e->getMessage()), \Aimeos\MW\Logger\Base::INFO);
 			}
 		}
 
@@ -206,22 +206,22 @@ 
 	 * @param string $localeKey Unique identifier of the site, language and currency
 	 * @return array Associative list of errors occured
 	 */
-	protected function copyCoupons( \Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey )
+	protected function copyCoupons(\Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey)
 	{
-		foreach( $basket->getCoupons() as $code => $list )
+		foreach ($basket->getCoupons() as $code => $list)
 		{
 			try
 			{
-				$this->addCoupon( $code );
-				$basket->deleteCoupon( $code, true );
+				$this->addCoupon($code);
+				$basket->deleteCoupon($code, true);
 			}
-			catch( \Exception $e )
+			catch (\Exception $e)
 			{
 				$logger = $this->getContext()->getLogger();
 				$errors['coupon'][$code] = $e->getMessage();
 
 				$str = 'Error migrating coupon with code "%1$s" in basket to locale "%2$s": %3$s';
-				$logger->log( sprintf( $str, $code, $localeKey, $e->getMessage() ), \Aimeos\MW\Logger\Base::INFO );
+				$logger->log(sprintf($str, $code, $localeKey, $e->getMessage()), \Aimeos\MW\Logger\Base::INFO);
 			}
 		}
 
@@ -237,11 +237,11 @@ 
 	 * @param string $localeKey Unique identifier of the site, language and currency
 	 * @return array Associative list of errors occured
 	 */
-	protected function copyProducts( \Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey )
+	protected function copyProducts(\Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey)
 	{
-		foreach( $basket->getProducts() as $pos => $product )
+		foreach ($basket->getProducts() as $pos => $product)
 		{
-			if( $product->getFlags() & \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE ) {
+			if ($product->getFlags() & \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE) {
 				continue;
 			}
 
@@ -249,9 +249,9 @@ 
 			{
 				$variantIds = $configIds = $customIds = [];
 
-				foreach( $product->getAttributeItems() as $attrItem )
+				foreach ($product->getAttributeItems() as $attrItem)
 				{
-					switch( $attrItem->getType() )
+					switch ($attrItem->getType())
 					{
 						case 'variant': $variantIds[] = $attrItem->getAttributeId(); break;
 						case 'config': $configIds[$attrItem->getAttributeId()] = $attrItem->getQuantity(); break;
@@ -264,16 +264,16 @@ 
 					$variantIds, $configIds, [], $customIds
 				);
 
-				$basket->deleteProduct( $pos );
+				$basket->deleteProduct($pos);
 			}
-			catch( \Exception $e )
+			catch (\Exception $e)
 			{
 				$code = $product->getProductCode();
 				$logger = $this->getContext()->getLogger();
 				$errors['product'][$pos] = $e->getMessage();
 
 				$str = 'Error migrating product with code "%1$s" in basket to locale "%2$s": %3$s';
-				$logger->log( sprintf( $str, $code, $localeKey, $e->getMessage() ), \Aimeos\MW\Logger\Base::INFO );
+				$logger->log(sprintf($str, $code, $localeKey, $e->getMessage()), \Aimeos\MW\Logger\Base::INFO);
 			}
 		}
 
@@ -288,24 +288,24 @@ 
 	 * @param array $errors Associative list of previous errors
 	 * @return array Associative list of errors occured
 	 */
-	protected function copyServices( \Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors )
+	protected function copyServices(\Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors)
 	{
-		foreach( $basket->getServices() as $type => $list )
+		foreach ($basket->getServices() as $type => $list)
 		{
-			foreach( $list as $item )
+			foreach ($list as $item)
 			{
 				try
 				{
 					$attributes = [];
 
-					foreach( $item->getAttributeItems() as $attrItem ) {
+					foreach ($item->getAttributeItems() as $attrItem) {
 						$attributes[$attrItem->getCode()] = $attrItem->getValue();
 					}
 
-					$this->addService( $type, $item->getServiceId(), $attributes );
-					$basket->deleteService( $type );
+					$this->addService($type, $item->getServiceId(), $attributes);
+					$basket->deleteService($type);
 				}
-				catch( \Exception $e ) { ; } // Don't notify the user as appropriate services can be added automatically
+				catch (\Exception $e) {; } // Don't notify the user as appropriate services can be added automatically
 			}
 		}
 
@@ -318,28 +318,28 @@ 
 	 *
 	 * @param \Aimeos\MShop\Order\Item\Base\Iface $basket Basket object
 	 */
-	protected function createSubscriptions( \Aimeos\MShop\Order\Item\Base\Iface $basket )
+	protected function createSubscriptions(\Aimeos\MShop\Order\Item\Base\Iface $basket)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'subscription' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'subscription');
 
-		foreach( $basket->getProducts() as $orderProduct )
+		foreach ($basket->getProducts() as $orderProduct)
 		{
-			if( ( $interval = $orderProduct->getAttribute( 'interval', 'config' ) ) !== null )
+			if (($interval = $orderProduct->getAttribute('interval', 'config')) !== null)
 			{
 				$item = $manager->createItem();
-				$item->setOrderBaseId( $basket->getId() );
-				$item->setOrderProductId( $orderProduct->getId() );
-				$item->setInterval( $interval );
-				$item->setStatus( 1 );
-
-				if( ( $end = $orderProduct->getAttribute( 'intervalend', 'custom' ) ) !== null
-					|| ( $end = $orderProduct->getAttribute( 'intervalend', 'config' ) ) !== null
-					|| ( $end = $orderProduct->getAttribute( 'intervalend', 'hidden' ) ) !== null
+				$item->setOrderBaseId($basket->getId());
+				$item->setOrderProductId($orderProduct->getId());
+				$item->setInterval($interval);
+				$item->setStatus(1);
+
+				if (($end = $orderProduct->getAttribute('intervalend', 'custom')) !== null
+					|| ($end = $orderProduct->getAttribute('intervalend', 'config')) !== null
+					|| ($end = $orderProduct->getAttribute('intervalend', 'hidden')) !== null
 				) {
-					$item->setDateEnd( $end );
+					$item->setDateEnd($end);
 				}
 
-				$manager->saveItem( $item, false );
+				$manager->saveItem($item, false);
 			}
 		}
 	}
@@ -353,32 +353,32 @@ 
 	 * @return array List of items implementing \Aimeos\MShop\Attribute\Item\Iface
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the actual attribute number doesn't match the expected one
 	 */
-	protected function getAttributes( array $attributeIds, array $domains = array( 'price', 'text' ) )
+	protected function getAttributes(array $attributeIds, array $domains = array('price', 'text'))
 	{
-		if( empty( $attributeIds ) ) {
+		if (empty($attributeIds)) {
 			return [];
 		}
 
-		$attributeManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'attribute' );
+		$attributeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'attribute');
 
-		$search = $attributeManager->createSearch( true );
+		$search = $attributeManager->createSearch(true);
 		$expr = array(
-			$search->compare( '==', 'attribute.id', $attributeIds ),
+			$search->compare('==', 'attribute.id', $attributeIds),
 			$search->getConditions(),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, count( $attributeIds ) );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, count($attributeIds));
 
-		$attrItems = $attributeManager->searchItems( $search, $domains );
+		$attrItems = $attributeManager->searchItems($search, $domains);
 
-		if( count( $attrItems ) !== count( $attributeIds ) )
+		if (count($attrItems) !== count($attributeIds))
 		{
 			$i18n = $this->getContext()->getI18n();
-			$expected = implode( ',', $attributeIds );
-			$actual = implode( ',', array_keys( $attrItems ) );
-			$msg = $i18n->dt( 'controller/frontend', 'Available attribute IDs "%1$s" do not match the given attribute IDs "%2$s"' );
+			$expected = implode(',', $attributeIds);
+			$actual = implode(',', array_keys($attrItems));
+			$msg = $i18n->dt('controller/frontend', 'Available attribute IDs "%1$s" do not match the given attribute IDs "%2$s"');
 
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $actual, $expected ) );
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $actual, $expected));
 		}
 
 		return $attrItems;
@@ -391,30 +391,30 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Base\Product\Attribute\Item[] $orderAttributes List of order product attribute items
 	 * @return \Aimeos\MShop\Attribute\Item\Iface[] Associative list of attribute IDs as key and attribute items as values
 	 */
-	protected function getAttributeItems( array $orderAttributes )
+	protected function getAttributeItems(array $orderAttributes)
 	{
-		if( empty( $orderAttributes ) ) {
+		if (empty($orderAttributes)) {
 			return [];
 		}
 
-		$attributeManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'attribute' );
-		$search = $attributeManager->createSearch( true );
+		$attributeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'attribute');
+		$search = $attributeManager->createSearch(true);
 		$expr = [];
 
-		foreach( $orderAttributes as $item )
+		foreach ($orderAttributes as $item)
 		{
 			$tmp = array(
-				$search->compare( '==', 'attribute.domain', 'product' ),
-				$search->compare( '==', 'attribute.code', $item->getValue() ),
-				$search->compare( '==', 'attribute.type', $item->getCode() ),
-				$search->compare( '>', 'attribute.status', 0 ),
+				$search->compare('==', 'attribute.domain', 'product'),
+				$search->compare('==', 'attribute.code', $item->getValue()),
+				$search->compare('==', 'attribute.type', $item->getCode()),
+				$search->compare('>', 'attribute.status', 0),
 				$search->getConditions(),
 			);
-			$expr[] = $search->combine( '&&', $tmp );
+			$expr[] = $search->combine('&&', $tmp);
 		}
 
-		$search->setConditions( $search->combine( '||', $expr ) );
-		return $attributeManager->searchItems( $search, array( 'price' ) );
+		$search->setConditions($search->combine('||', $expr));
+		return $attributeManager->searchItems($search, array('price'));
 	}
 
 
@@ -427,24 +427,24 @@ 
 	 * @param array $quantities Associative list of attribute IDs as keys and their quantities as values
 	 * @return array List of items implementing \Aimeos\MShop\Order\Item\Product\Attribute\Iface
 	 */
-	protected function getOrderProductAttributes( $type, array $ids, array $values = [], array $quantities = [] )
+	protected function getOrderProductAttributes($type, array $ids, array $values = [], array $quantities = [])
 	{
-		if( empty( $ids ) ) {
+		if (empty($ids)) {
 			return [];
 		}
 
 		$list = [];
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order/base/product/attribute' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'order/base/product/attribute');
 
-		foreach( $this->getAttributes( $ids ) as $id => $attrItem )
+		foreach ($this->getAttributes($ids) as $id => $attrItem)
 		{
 			$item = $manager->createItem();
-			$item->copyFrom( $attrItem );
-			$item->setType( $type );
-			$item->setQuantity( isset( $quantities[$id] ) ? $quantities[$id] : 1 );
+			$item->copyFrom($attrItem);
+			$item->setType($type);
+			$item->setQuantity(isset($quantities[$id]) ? $quantities[$id] : 1);
 
-			if( isset( $values[$id] ) ) {
-				$item->setValue( $values[$id] );
+			if (isset($values[$id])) {
+				$item->setValue($values[$id]);
 			}
 
 			$list[] = $item;
@@ -461,23 +461,23 @@ 
 	 * @param string $code Code of the list type
 	 * @return \Aimeos\MShop\Common\Item\Type\Iface List type item
 	 */
-	protected function getProductListTypeItem( $domain, $code )
+	protected function getProductListTypeItem($domain, $code)
 	{
 		$context = $this->getContext();
 
-		if( empty( $this->listTypeItems ) )
+		if (empty($this->listTypeItems))
 		{
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists/type' );
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'product/lists/type');
 
-			foreach( $manager->searchItems( $manager->createSearch( true ) ) as $item ) {
-				$this->listTypeItems[ $item->getDomain() ][ $item->getCode() ] = $item;
+			foreach ($manager->searchItems($manager->createSearch(true)) as $item) {
+				$this->listTypeItems[$item->getDomain()][$item->getCode()] = $item;
 			}
 		}
 
-		if( !isset( $this->listTypeItems[$domain][$code] ) )
+		if (!isset($this->listTypeItems[$domain][$code]))
 		{
-			$msg = $context->getI18n()->dt( 'controller/frontend', 'List type for domain "%1$s" and code "%2$s" not found' );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $domain, $code ) );
+			$msg = $context->getI18n()->dt('controller/frontend', 'List type for domain "%1$s" and code "%2$s" not found');
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $domain, $code));
 		}
 
 		return $this->listTypeItems[$domain][$code];
@@ -492,35 +492,35 @@ 
 	 * @param array $domains Names of the domain items that should be fetched too
 	 * @return array List of products matching the given attributes
 	 */
-	protected function getProductVariants( \Aimeos\MShop\Product\Item\Iface $productItem, array $variantAttributeIds,
-			array $domains = array( 'attribute', 'media', 'price', 'text' ) )
+	protected function getProductVariants(\Aimeos\MShop\Product\Item\Iface $productItem, array $variantAttributeIds,
+			array $domains = array('attribute', 'media', 'price', 'text'))
 	{
 		$subProductIds = [];
-		foreach( $productItem->getRefItems( 'product', 'default', 'default' ) as $item ) {
+		foreach ($productItem->getRefItems('product', 'default', 'default') as $item) {
 			$subProductIds[] = $item->getId();
 		}
 
-		if( count( $subProductIds ) === 0 ) {
+		if (count($subProductIds) === 0) {
 			return [];
 		}
 
-		$productManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product' );
-		$search = $productManager->createSearch( true );
+		$productManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product');
+		$search = $productManager->createSearch(true);
 
 		$expr = array(
-			$search->compare( '==', 'product.id', $subProductIds ),
+			$search->compare('==', 'product.id', $subProductIds),
 			$search->getConditions(),
 		);
 
-		foreach( $variantAttributeIds as $id )
+		foreach ($variantAttributeIds as $id)
 		{
-			$cmpfunc = $search->createFunction( 'product:has', ['attribute', 'variant', (string) $id] );
-			$expr[] = $search->compare( '!=', $cmpfunc, null );
+			$cmpfunc = $search->createFunction('product:has', ['attribute', 'variant', (string) $id]);
+			$expr[] = $search->compare('!=', $cmpfunc, null);
 		}
 
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		return $productManager->searchItems( $search, $domains );
+		return $productManager->searchItems($search, $domains);
 	}
 
 
@@ -532,9 +532,9 @@ 
 	 * @param mixed $default Default value if no value is available for the given name
 	 * @return mixed Value from the array or default value
 	 */
-	protected function getValue( array $values, $name, $default = null )
+	protected function getValue(array $values, $name, $default = null)
 	{
-		if( isset( $values[$name] ) ) {
+		if (isset($values[$name])) {
 			return $values[$name];
 		}
 

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

Spacing +37 added lines, -37 removed lines

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

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

Spacing +6 added lines, -6 removed lines

@@ -30,7 +30,7 @@ 
 	 * @param string[] $attributes List of attribute codes as keys and strings entered by the customer as value
 	 * @return string[] List of attributes codes as keys and error messages as values for invalid or missing values
 	 */
-	public function checkAttributes( $serviceId, array $attributes );
+	public function checkAttributes($serviceId, array $attributes);
 
 	/**
 	 * Returns the service item for the given ID
@@ -39,7 +39,7 @@ 
 	 * @param array $ref List of domains for which the items referenced by the services should be fetched too
 	 * @return \Aimeos\MShop\Service\Provider\Iface Service provider object
 	 */
-	public function getProvider( $serviceId, $ref = ['media', 'price', 'text'] );
+	public function getProvider($serviceId, $ref = ['media', 'price', 'text']);
 
 	/**
 	 * Returns the service providers for the given type
@@ -48,7 +48,7 @@ 
 	 * @param array $ref List of domains for which the items referenced by the services should be fetched too
 	 * @return \Aimeos\MShop\Service\Provider\Iface[] List of service IDs as keys and service provider objects as values
 	 */
-	public function getProviders( $type = null, $ref = ['media', 'price', 'text'] );
+	public function getProviders($type = null, $ref = ['media', 'price', 'text']);
 
 	/**
 	 * Processes the service for the given order, e.g. payment and delivery services
@@ -61,7 +61,7 @@ 
 	 * @return \Aimeos\MShop\Common\Item\Helper\Form\Iface|null Form object with URL, parameters, etc.
 	 * 	or null if no form data is required
 	 */
-	public function process( \Aimeos\MShop\Order\Item\Iface $orderItem, $serviceId, array $urls, array $params );
+	public function process(\Aimeos\MShop\Order\Item\Iface $orderItem, $serviceId, array $urls, array $params);
 
 
 	/**
@@ -72,7 +72,7 @@ 
 	 * @param string $code Unique code of the service used for the current order
 	 * @return \Psr\Http\Message\ResponseInterface Response object
 	 */
-	public function updatePush( ServerRequestInterface $request, ResponseInterface $response, $code );
+	public function updatePush(ServerRequestInterface $request, ResponseInterface $response, $code);
 
 
 	/**
@@ -83,5 +83,5 @@ 
 	 * @param string $orderid ID of the order whose payment status should be updated
 	 * @return \Aimeos\MShop\Order\Item\Iface $orderItem Order item that has been updated
 	 */
-	public function updateSync( ServerRequestInterface $request, $code, $orderid );
+	public function updateSync(ServerRequestInterface $request, $code, $orderid);
 }

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

Spacing +7 added lines, -7 removed lines

@@ -27,7 +27,7 @@ 
 	 * @param string $type Arbitrary order type (max. eight chars)
 	 * @return \Aimeos\MShop\Order\Item\Iface Created order object
 	 */
-	public function addItem( $baseId, $type );
+	public function addItem($baseId, $type);
 
 
 	/**
@@ -45,7 +45,7 @@ 
 	 * @param boolean $default Use default criteria to limit orders
 	 * @return \Aimeos\MShop\Order\Item\Iface Order object
 	 */
-	public function getItem( $id, $default = true );
+	public function getItem($id, $default = true);
 
 
 	/**
@@ -54,7 +54,7 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Iface $item Order object
 	 * @return \Aimeos\MShop\Order\Item\Iface Saved order item
 	 */
-	public function saveItem( \Aimeos\MShop\Order\Item\Iface $item );
+	public function saveItem(\Aimeos\MShop\Order\Item\Iface $item);
 
 
 	/**
@@ -64,7 +64,7 @@ 
 	 * @param integer &$total|null Variable that will contain the total number of available items
 	 * @return \Aimeos\MShop\Order\Item\Iface[] Associative list of IDs as keys and order objects as values
 	 */
-	public function searchItems( \Aimeos\MW\Criteria\Iface $filter, &$total = null );
+	public function searchItems(\Aimeos\MW\Criteria\Iface $filter, &$total = null);
 
 
 	/**
@@ -86,7 +86,7 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object
 	 * @return void
 	 */
-	public function block( \Aimeos\MShop\Order\Item\Iface $orderItem );
+	public function block(\Aimeos\MShop\Order\Item\Iface $orderItem);
 
 
 	/**
@@ -108,7 +108,7 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object
 	 * @return void
 	 */
-	public function unblock( \Aimeos\MShop\Order\Item\Iface $orderItem );
+	public function unblock(\Aimeos\MShop\Order\Item\Iface $orderItem);
 
 
 	/**
@@ -126,5 +126,5 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object
 	 * @return void
 	 */
-	public function update( \Aimeos\MShop\Order\Item\Iface $orderItem );
+	public function update(\Aimeos\MShop\Order\Item\Iface $orderItem);
 }

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'], [], true );
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$this->checkLimit( $list );
 

Spacing +119 added lines, -119 removed lines

@@ -28,29 +28,29 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item
 	 * @since 2017.04
 	 */
-	public function addItem( array $values )
+	public function addItem(array $values)
 	{
 		$list = [];
 		$context = $this->getContext();
 		$config = $context->getConfig();
 
-		foreach( $values as $key => $val ) {
-			$list[str_replace( 'order.base.address', 'customer', $key )] = $val;
+		foreach ($values as $key => $val) {
+			$list[str_replace('order.base.address', 'customer', $key)] = $val;
 		}
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );
-		$list = $this->addItemDefaults( $list );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer');
+		$list = $this->addItemDefaults($list);
 		$passwd = $list['customer.password'];
 
 		try
 		{
-			$item = $manager->findItem( $list['customer.code'], [], true );
+			$item = $manager->findItem($list['customer.code'], [], true);
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$this->checkLimit( $list );
+			$this->checkLimit($list);
 
-			$item = $manager->createItem()->fromArray( $list )->setId( null );
+			$item = $manager->createItem()->fromArray($list)->setId(null);
 
 			/** controller/frontend/customer/groupids
 			 * List of groups new customers should be assigned to
@@ -64,14 +64,14 @@ 
 			 * @category User
 			 * @category Developer
 			 */
-			$item->setGroups( (array) $config->get( 'controller/frontend/customer/groupids', [] ) );
+			$item->setGroups((array) $config->get('controller/frontend/customer/groupids', []));
 
-			$item = $manager->saveItem( $item );
+			$item = $manager->saveItem($item);
 
 			$msg = $item->toArray();
 			// Show only generated passwords in account creation e-mails
-			$msg['customer.password'] = ( isset( $values['customer.password'] ) ? null : $passwd );
-			$context->getMessageQueue( 'mq-email', 'customer/email/account' )->add( json_encode( $msg ) );
+			$msg['customer.password'] = (isset($values['customer.password']) ? null : $passwd);
+			$context->getMessageQueue('mq-email', 'customer/email/account')->add(json_encode($msg));
 		}
 
 		return $item;
@@ -83,10 +83,10 @@ 
 	 *
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item
 	 */
-	public function createItem( array $values = [] )
+	public function createItem(array $values = [])
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' );
-		return $manager->createItem()->fromArray( $values )->setId( null );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer');
+		return $manager->createItem()->fromArray($values)->setId(null);
 	}
 
 
@@ -96,12 +96,12 @@ 
 	 * @param string $id Unique customer ID
 	 * @since 2017.04
 	 */
-	public function deleteItem( $id )
+	public function deleteItem($id)
 	{
-		$this->checkUser( $id );
+		$this->checkUser($id);
 
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' );
-		$manager->deleteItem( $id );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer');
+		$manager->deleteItem($id);
 	}
 
 
@@ -113,15 +113,15 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item
 	 * @since 2017.04
 	 */
-	public function editItem( $id, array $values )
+	public function editItem($id, array $values)
 	{
-		$this->checkUser( $id );
-		unset( $values['customer.id'] );
+		$this->checkUser($id);
+		unset($values['customer.id']);
 
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' );
-		$item = $manager->getItem( $id, ['customer/group'], true )->fromArray( $values );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer');
+		$item = $manager->getItem($id, ['customer/group'], true)->fromArray($values);
 
-		return $manager->saveItem( $item );
+		return $manager->saveItem($item);
 	}
 
 
@@ -133,17 +133,17 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item including the referenced domains items
 	 * @since 2017.04
 	 */
-	public function getItem( $id = null, array $domains = [] )
+	public function getItem($id = null, array $domains = [])
 	{
-		$manager = \Aimeos\MShop\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);
 	}
 
 
@@ -157,9 +157,9 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item including the referenced domains items
 	 * @since 2017.04
 	 */
-	public function findItem( $code, array $domains = [] )
+	public function findItem($code, array $domains = [])
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' )->findItem( $code, $domains, true );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer')->findItem($code, $domains, true);
 	}
 
 
@@ -169,9 +169,9 @@ 
 	 * @param \Aimeos\MShop\Customer\Item\Iface $item Customer item
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item including the generated ID
 	 */
-	public function saveItem( \Aimeos\MShop\Customer\Item\Iface $item )
+	public function saveItem(\Aimeos\MShop\Customer\Item\Iface $item)
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' )->saveItem( $item );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer')->saveItem($item);
 	}
 
 
@@ -182,13 +182,13 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
 	 * @since 2017.04
 	 */
-	public function addAddressItem( array $values )
+	public function addAddressItem(array $values)
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/address' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/address');
 
-		$item = $manager->createItem()->fromArray( $values )->setId( null )->setParentId( $context->getUserId() );
-		return $manager->saveItem( $item );
+		$item = $manager->createItem()->fromArray($values)->setId(null)->setParentId($context->getUserId());
+		return $manager->saveItem($item);
 	}
 
 
@@ -197,12 +197,12 @@ 
 	 *
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
 	 */
-	public function createAddressItem( array $values = [] )
+	public function createAddressItem(array $values = [])
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/address' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/address');
 
-		return $manager->createItem()->fromArray( $values )->setId( null )->setParentId( $context->getUserId() );
+		return $manager->createItem()->fromArray($values)->setId(null)->setParentId($context->getUserId());
 	}
 
 
@@ -212,13 +212,13 @@ 
 	 * @param string $id Unique customer address ID
 	 * @since 2017.04
 	 */
-	public function deleteAddressItem( $id )
+	public function deleteAddressItem($id)
 	{
-		$manager = \Aimeos\MShop\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);
 	}
 
 
@@ -230,15 +230,15 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
 	 * @since 2017.04
 	 */
-	public function editAddressItem( $id, array $values )
+	public function editAddressItem($id, array $values)
 	{
-		unset( $values['customer.address.id'] );
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/address' );
+		unset($values['customer.address.id']);
+		$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());
 
-		return $manager->saveItem( $item->fromArray( $values ) );
+		return $manager->saveItem($item->fromArray($values));
 	}
 
 
@@ -249,12 +249,12 @@ 
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
 	 * @since 2017.04
 	 */
-	public function getAddressItem( $id )
+	public function getAddressItem($id)
 	{
-		$manager = \Aimeos\MShop\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;
 	}
@@ -266,9 +266,9 @@ 
 	 * @param \Aimeos\MShop\Customer\Item\Address\Iface $item Customer address item
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item including the generated ID
 	 */
-	public function saveAddressItem( \Aimeos\MShop\Customer\Item\Address\Iface $item )
+	public function saveAddressItem(\Aimeos\MShop\Customer\Item\Address\Iface $item)
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/address' )->saveItem( $item );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/address')->saveItem($item);
 	}
 
 
@@ -279,28 +279,28 @@ 
 	 * @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()->fromArray( $values )->setId( null )->setParentId( $context->getUserId() );
-		return $manager->saveItem( $item );
+		$item = $manager->createItem()->fromArray($values)->setId(null)->setParentId($context->getUserId());
+		return $manager->saveItem($item);
 	}
 
 
@@ -313,10 +313,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;
 	}
@@ -328,13 +328,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);
 	}
 
 
@@ -346,31 +346,31 @@ 
 	 * @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() );
-		unset( $values['customer.lists.id'] );
+		$item = $manager->getItem($id, [], true);
+		$this->checkUser($item->getParentId());
+		unset($values['customer.lists.id']);
 
-		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'], true );
+			$typeManager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists/type');
+			$typeItem = $typeManager->findItem($values['customer.lists.type'], [], $values['customer.lists.domain'], true);
 			$values['customer.lists.typeid'] = $typeItem->getId();
 		}
 
-		return $manager->saveItem( $item->fromArray( $values ) );
+		return $manager->saveItem($item->fromArray($values));
 	}
 
 
@@ -381,12 +381,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;
 	}
@@ -400,11 +400,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);
 	}
 
 
@@ -414,33 +414,33 @@ 
 	 * @param string[] $values Associative list of customer keys (e.g. "customer.label") and their values
 	 * @return string[] Associative list of customer key/value pairs with default values set
 	 */
-	protected function addItemDefaults( array $values )
+	protected function addItemDefaults(array $values)
 	{
-		if( !isset( $values['customer.label'] ) || $values['customer.label'] == '' )
+		if (!isset($values['customer.label']) || $values['customer.label'] == '')
 		{
 			$label = '';
 
-			if( isset( $values['customer.lastname'] ) ) {
+			if (isset($values['customer.lastname'])) {
 				$label = $values['customer.lastname'];
 			}
 
-			if( isset( $values['customer.firstname'] ) && $values['customer.firstname'] != '' ) {
+			if (isset($values['customer.firstname']) && $values['customer.firstname'] != '') {
 				$label = $values['customer.firstname'] . ' ' . $label;
 			}
 
-			if( isset( $values['customer.company'] ) && $values['customer.company'] != '' ) {
+			if (isset($values['customer.company']) && $values['customer.company'] != '') {
 				$label .= ' (' . $values['customer.company'] . ')';
 			}
 
 			$values['customer.label'] = $label;
 		}
 
-		if( !isset( $values['customer.code'] ) && isset( $values['customer.email'] ) ) {
+		if (!isset($values['customer.code']) && isset($values['customer.email'])) {
 			$values['customer.code'] = $values['customer.email'];
 		}
 
-		if( !isset( $values['customer.password'] ) ) {
-			$values['customer.password'] = substr( md5( microtime( true ) . getmypid() . rand() ), -8 );
+		if (!isset($values['customer.password'])) {
+			$values['customer.password'] = substr(md5(microtime(true) . getmypid() . rand()), -8);
 		}
 
 		return $values;
@@ -453,7 +453,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();
@@ -474,7 +474,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
@@ -492,22 +492,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'));
 		}
 	}
 
@@ -518,12 +518,12 @@ 
 	 * @param string $id Unique customer ID
 	 * @throws \Aimeos\Controller\Frontend\Customer\Exception If access isn't allowed
 	 */
-	protected function checkUser( $id )
+	protected function checkUser($id)
 	{
-		if( $id != $this->getContext()->getUserId() )
+		if ($id != $this->getContext()->getUserId())
 		{
-			$msg = sprintf( 'Not allowed to access customer data for ID "%1$s"', $id );
-			throw new \Aimeos\Controller\Frontend\Customer\Exception( $msg );
+			$msg = sprintf('Not allowed to access customer data for ID "%1$s"', $id);
+			throw new \Aimeos\Controller\Frontend\Customer\Exception($msg);
 		}
 	}
 }

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

Spacing +11 added lines, -11 removed lines

@@ -19,13 +19,13 @@ 
 	protected function setUp()
 	{
 		$this->context = \TestHelperFrontend::getContext();
-		$this->object = new \Aimeos\Controller\Frontend\Catalog\Standard( $this->context );
+		$this->object = new \Aimeos\Controller\Frontend\Catalog\Standard($this->context);
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object, $this->context );
+		unset($this->object, $this->context);
 	}
 
 
@@ -33,19 +33,19 @@ 
 	{
 		$filter = $this->object->createFilter();
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
 	}
 
 
 	public function testGetPath()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'catalog' );
-		$items = $this->object->getPath( $manager->findItem( 'cafe' )->getId() );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'catalog');
+		$items = $this->object->getPath($manager->findItem('cafe')->getId());
 
-		$this->assertEquals( 3, count( $items ) );
+		$this->assertEquals(3, count($items));
 
-		foreach( $items as $item ) {
-			$this->assertInstanceOf( '\\Aimeos\\MShop\\Catalog\\Item\\Iface', $item );
+		foreach ($items as $item) {
+			$this->assertInstanceOf('\\Aimeos\\MShop\\Catalog\\Item\\Iface', $item);
 		}
 	}
 
@@ -54,10 +54,10 @@ 
 	{
 		$tree = $this->object->getTree();
 
-		$this->assertEquals( 2, count( $tree->getChildren() ) );
+		$this->assertEquals(2, count($tree->getChildren()));
 
-		foreach( $tree->getChildren() as $item ) {
-			$this->assertInstanceOf( '\\Aimeos\\MShop\\Catalog\\Item\\Iface', $item );
+		foreach ($tree->getChildren() as $item) {
+			$this->assertInstanceOf('\\Aimeos\\MShop\\Catalog\\Item\\Iface', $item);
 		}
 	}
 }

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

Spacing +3 added lines, -3 removed lines

@@ -37,7 +37,7 @@ 
 	 * @return array Associative list of items implementing \Aimeos\MShop\Catalog\Item\Iface with their IDs as keys
 	 * @since 2017.03
 	 */
-	public function getPath( $id, array $domains = array( 'text', 'media' ) );
+	public function getPath($id, array $domains = array('text', 'media'));
 
 
 	/**
@@ -51,6 +51,6 @@ 
 	 * @return \Aimeos\MShop\Catalog\Item\Iface Catalog node, maybe with children depending on the level constant
 	 * @since 2017.03
 	 */
-	public function getTree( $id = null, array $domains = array( 'text', 'media' ),
-		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE, \Aimeos\MW\Criteria\Iface $search = null );
+	public function getTree($id = null, array $domains = array('text', 'media'),
+		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE, \Aimeos\MW\Criteria\Iface $search = null);
 }

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

Spacing +6 added lines, -6 removed lines

@@ -30,7 +30,7 @@ 
 	 */
 	public function createFilter()
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog' )->createSearch( true );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog')->createSearch(true);
 	}
 
 
@@ -42,9 +42,9 @@ 
 	 * @return array Associative list of items implementing \Aimeos\MShop\Catalog\Item\Iface with their IDs as keys
 	 * @since 2017.03
 	 */
-	public function getPath( $id, array $domains = array( 'text', 'media' ) )
+	public function getPath($id, array $domains = array('text', 'media'))
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog' )->getPath( $id, $domains );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog')->getPath($id, $domains);
 	}
 
 
@@ -59,9 +59,9 @@ 
 	 * @return \Aimeos\MShop\Catalog\Item\Iface Catalog node, maybe with children depending on the level constant
 	 * @since 2017.03
 	 */
-	public function getTree( $id = null, array $domains = array( 'text', 'media' ),
-		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE, \Aimeos\MW\Criteria\Iface $search = null )
+	public function getTree($id = null, array $domains = array('text', 'media'),
+		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE, \Aimeos\MW\Criteria\Iface $search = null)
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog' )->getTree( $id, $domains, $level, $search );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog')->getTree($id, $domains, $level, $search);
 	}
 }

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

Braces +6 added lines, -4 removed lines

@@ -121,10 +121,11 @@ 
 		{
 			$msg = $context->getI18n()->dt( 'controller/frontend', 'No unique article found for selected attributes and product ID "%1$s"' );
 			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $productItem->getId() ) );
-		}
-		else if( ( $result = reset( $productItems ) ) !== false ) // count == 1
+		} else if( ( $result = reset( $productItems ) ) !== false ) {
+			// count == 1
 		{
 			$productItem = $result;
+		}
 			$orderBaseProductItem->setProductCode( $productItem->getCode() );
 
 			$subprices = $productItem->getRefItems( 'price', 'default', 'default' );
@@ -150,10 +151,11 @@ 
 
 				$attr[] = $orderAttributeItem;
 			}
-		}
-		else if( $requireVariant != false ) // count == 0
+		} else if( $requireVariant != false ) {
+			// count == 0
 		{
 			$msg = $context->getI18n()->dt( 'controller/frontend', 'No article found for selected attributes and product ID "%1$s"' );
+		}
 			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $productItem->getId() ) );
 		}
 

Spacing +43 added lines, -43 removed lines

@@ -36,14 +36,14 @@ 
 	 * @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 = [])
 	{
 		$context = $this->getContext();
-		$productManager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
-		$productItem = $productManager->getItem( $prodid, [], true );
+		$productManager = \Aimeos\MShop\Factory::createManager($context, 'product');
+		$productItem = $productManager->getItem($prodid, [], true);
 
-		if( $productManager->getItem( $prodid, [], true )->getType() !== 'select' )
+		if ($productManager->getItem($prodid, [], true)->getType() !== 'select')
 		{
 			return $this->getController()->addProduct(
 				$prodid, $quantity, $stocktype, $variantAttributeIds,
@@ -51,30 +51,30 @@ 
 			);
 		}
 
-		$productItem = $productManager->getItem( $prodid, ['attribute', 'media', 'supplier', 'price', 'product', 'text'], true );
-		$prices = $productItem->getRefItems( 'price', 'default', 'default' );
-		$hidden = $productItem->getRefItems( 'attribute', null, 'hidden' );
+		$productItem = $productManager->getItem($prodid, ['attribute', 'media', 'supplier', 'price', 'product', 'text'], true);
+		$prices = $productItem->getRefItems('price', 'default', 'default');
+		$hidden = $productItem->getRefItems('attribute', null, 'hidden');
 
-		$orderBaseProductItem = \Aimeos\MShop\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->getVariantDetails( $orderBaseProductItem, $productItem, $prices, $variantAttributeIds );
-		$hidden += $productItem->getRefItems( 'attribute', null, 'hidden' );
+		$attr = $this->getVariantDetails($orderBaseProductItem, $productItem, $prices, $variantAttributeIds);
+		$hidden += $productItem->getRefItems('attribute', null, 'hidden');
 
 		$attributeMap = [
-			'custom' => array_keys( $customAttributeValues ),
-			'config' => array_keys( $configAttributeIds ),
+			'custom' => array_keys($customAttributeValues),
+			'config' => array_keys($configAttributeIds),
 		];
-		$this->checkListRef( array( $prodid, $productItem->getId() ), 'attribute', $attributeMap );
+		$this->checkListRef(array($prodid, $productItem->getId()), 'attribute', $attributeMap);
 
-		$custAttr = $this->getOrderProductAttributes( 'custom', array_keys( $customAttributeValues ), $customAttributeValues );
-		$confAttr = $this->getOrderProductAttributes( 'config', array_keys( $configAttributeIds ), [], $configAttributeIds );
-		$attr = array_merge( $attr, $custAttr, $confAttr, $this->getOrderProductAttributes( 'hidden', array_keys( $hidden ) ) );
+		$custAttr = $this->getOrderProductAttributes('custom', array_keys($customAttributeValues), $customAttributeValues);
+		$confAttr = $this->getOrderProductAttributes('config', array_keys($configAttributeIds), [], $configAttributeIds);
+		$attr = array_merge($attr, $custAttr, $confAttr, $this->getOrderProductAttributes('hidden', array_keys($hidden)));
 
-		$orderBaseProductItem->setAttributeItems( $attr );
-		$orderBaseProductItem->setPrice( $this->calcPrice( $orderBaseProductItem, $prices, $quantity ) );
+		$orderBaseProductItem->setAttributeItems($attr);
+		$orderBaseProductItem->setPrice($this->calcPrice($orderBaseProductItem, $prices, $quantity));
 
-		$this->getController()->get()->addProduct( $orderBaseProductItem );
+		$this->getController()->get()->addProduct($orderBaseProductItem);
 		$this->getController()->save();
 	}
 
@@ -89,12 +89,12 @@ 
 	 * @return \Aimeos\MShop\Order\Item\Base\Product\Attribute\Iface[] List of order product attributes
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If no product variant is found
 	 */
-	protected function getVariantDetails( \Aimeos\MShop\Order\Item\Base\Product\Iface $orderBaseProductItem,
-		\Aimeos\MShop\Product\Item\Iface &$productItem, array &$prices, array $variantAttributeIds )
+	protected function getVariantDetails(\Aimeos\MShop\Order\Item\Base\Product\Iface $orderBaseProductItem,
+		\Aimeos\MShop\Product\Item\Iface &$productItem, array &$prices, array $variantAttributeIds)
 	{
 		$attr = [];
 		$context = $this->getContext();
-		$productItems = $this->getProductVariants( $productItem, $variantAttributeIds );
+		$productItems = $this->getProductVariants($productItem, $variantAttributeIds);
 
 		/** controller/frontend/basket/require-variant
 		 * A variant of a selection product must be chosen
@@ -115,47 +115,47 @@ 
 		 * @category Developer
 		 * @category User
 		 */
-		$requireVariant = $context->getConfig()->get( 'controller/frontend/basket/require-variant', true );
+		$requireVariant = $context->getConfig()->get('controller/frontend/basket/require-variant', true);
 
 
-		if( count( $productItems ) > 1 )
+		if (count($productItems) > 1)
 		{
-			$msg = $context->getI18n()->dt( 'controller/frontend', 'No unique article found for selected attributes and product ID "%1$s"' );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $productItem->getId() ) );
+			$msg = $context->getI18n()->dt('controller/frontend', 'No unique article found for selected attributes and product ID "%1$s"');
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $productItem->getId()));
 		}
-		else if( ( $result = reset( $productItems ) ) !== false ) // count == 1
+		else if (($result = reset($productItems)) !== false) // count == 1
 		{
 			$productItem = $result;
-			$orderBaseProductItem->setProductCode( $productItem->getCode() );
+			$orderBaseProductItem->setProductCode($productItem->getCode());
 
-			$subprices = $productItem->getRefItems( 'price', 'default', 'default' );
+			$subprices = $productItem->getRefItems('price', 'default', 'default');
 
-			if( !empty( $subprices ) ) {
+			if (!empty($subprices)) {
 				$prices = $subprices;
 			}
 
-			$submedia = $productItem->getRefItems( 'media', 'default', 'default' );
+			$submedia = $productItem->getRefItems('media', 'default', 'default');
 
-			if( ( $mediaItem = reset( $submedia ) ) !== false ) {
-				$orderBaseProductItem->setMediaUrl( $mediaItem->getPreview() );
+			if (($mediaItem = reset($submedia)) !== false) {
+				$orderBaseProductItem->setMediaUrl($mediaItem->getPreview());
 			}
 
-			$orderProductAttrManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order/base/product/attribute' );
-			$variantAttributes = $productItem->getRefItems( 'attribute', null, 'variant' );
+			$orderProductAttrManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'order/base/product/attribute');
+			$variantAttributes = $productItem->getRefItems('attribute', null, 'variant');
 
-			foreach( $this->getAttributes( array_keys( $variantAttributes ), array( 'text' ) ) as $attrItem )
+			foreach ($this->getAttributes(array_keys($variantAttributes), array('text')) as $attrItem)
 			{
 				$orderAttributeItem = $orderProductAttrManager->createItem();
-				$orderAttributeItem->copyFrom( $attrItem );
-				$orderAttributeItem->setType( 'variant' );
+				$orderAttributeItem->copyFrom($attrItem);
+				$orderAttributeItem->setType('variant');
 
 				$attr[] = $orderAttributeItem;
 			}
 		}
-		else if( $requireVariant != false ) // count == 0
+		else if ($requireVariant != false) // count == 0
 		{
-			$msg = $context->getI18n()->dt( 'controller/frontend', 'No article found for selected attributes and product ID "%1$s"' );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $productItem->getId() ) );
+			$msg = $context->getI18n()->dt('controller/frontend', 'No article found for selected attributes and product ID "%1$s"');
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $productItem->getId()));
 		}
 
 		return $attr;