aimeos / ai-controller-frontend

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

Spacing +10 added lines, -10 removed lines

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

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

Spacing +10 added lines, -10 removed lines

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

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

Spacing +10 added lines, -10 removed lines

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

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

Spacing +10 added lines, -10 removed lines

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

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

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;

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

Spacing +35 added lines, -35 removed lines

@@ -36,13 +36,13 @@ 
 	 * @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' );
+		$productManager = \Aimeos\MShop\Factory::createManager($context, 'product');
 
-		if( $productManager->getItem( $prodid, [], true )->getType() !== 'bundle' )
+		if ($productManager->getItem($prodid, [], true)->getType() !== 'bundle')
 		{
 			return $this->getController()->addProduct(
 				$prodid, $quantity, $stocktype, $variantAttributeIds,
@@ -51,29 +51,29 @@ 
 		}
 
 		$attributeMap = [
-			'custom' => array_keys( $customAttributeValues ),
-			'config' => array_keys( $configAttributeIds ),
+			'custom' => array_keys($customAttributeValues),
+			'config' => array_keys($configAttributeIds),
 		];
-		$this->checkListRef( $prodid, 'attribute', $attributeMap );
+		$this->checkListRef($prodid, 'attribute', $attributeMap);
 
 
-		$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);
 
-		$this->addBundleProducts( $orderBaseProductItem, $productItem, $variantAttributeIds, $stocktype );
+		$this->addBundleProducts($orderBaseProductItem, $productItem, $variantAttributeIds, $stocktype);
 
-		$custAttr = $this->getOrderProductAttributes( 'custom', array_keys( $customAttributeValues ), $customAttributeValues );
-		$confAttr = $this->getOrderProductAttributes( 'config', array_keys( $configAttributeIds ), [], $configAttributeIds );
-		$attr = array_merge( $custAttr, $confAttr, $this->getOrderProductAttributes( 'hidden', array_keys( $hidden ) ) );
+		$custAttr = $this->getOrderProductAttributes('custom', array_keys($customAttributeValues), $customAttributeValues);
+		$confAttr = $this->getOrderProductAttributes('config', array_keys($configAttributeIds), [], $configAttributeIds);
+		$attr = array_merge($custAttr, $confAttr, $this->getOrderProductAttributes('hidden', array_keys($hidden)));
 
-		$orderBaseProductItem->setAttributeItems( $attr );
-		$orderBaseProductItem->setPrice( $this->calcPrice( $orderBaseProductItem, $prices, $quantity ) );
+		$orderBaseProductItem->setAttributeItems($attr);
+		$orderBaseProductItem->setPrice($this->calcPrice($orderBaseProductItem, $prices, $quantity));
 
-		$this->getController()->get()->addProduct( $orderBaseProductItem );
+		$this->getController()->get()->addProduct($orderBaseProductItem);
 		$this->getController()->save();
 	}
 
@@ -86,43 +86,43 @@ 
 	 * @param array $variantAttributeIds List of product variant attribute IDs
 	 * @param string $stocktype
 	 */
-	protected function addBundleProducts( \Aimeos\MShop\Order\Item\Base\Product\Iface $orderBaseProductItem,
-		\Aimeos\MShop\Product\Item\Iface $productItem, array $variantAttributeIds, $stocktype )
+	protected function addBundleProducts(\Aimeos\MShop\Order\Item\Base\Product\Iface $orderBaseProductItem,
+		\Aimeos\MShop\Product\Item\Iface $productItem, array $variantAttributeIds, $stocktype)
 	{
 		$quantity = $orderBaseProductItem->getQuantity();
 		$products = $subProductIds = $orderProducts = [];
-		$orderProductManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order/base/product' );
+		$orderProductManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'order/base/product');
 
-		foreach( $productItem->getRefItems( 'product', null, 'default' ) as $item ) {
+		foreach ($productItem->getRefItems('product', null, 'default') as $item) {
 			$subProductIds[] = $item->getId();
 		}
 
-		if( count( $subProductIds ) > 0 )
+		if (count($subProductIds) > 0)
 		{
-			$productManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product' );
+			$productManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product');
 
-			$search = $productManager->createSearch( true );
+			$search = $productManager->createSearch(true);
 			$expr = array(
-				$search->compare( '==', 'product.id', $subProductIds ),
+				$search->compare('==', 'product.id', $subProductIds),
 				$search->getConditions(),
 			);
-			$search->setConditions( $search->combine( '&&', $expr ) );
+			$search->setConditions($search->combine('&&', $expr));
 
-			$products = $productManager->searchItems( $search, array( 'attribute', 'media', 'price', 'text' ) );
+			$products = $productManager->searchItems($search, array('attribute', 'media', 'price', 'text'));
 		}
 
-		foreach( $products as $product )
+		foreach ($products as $product)
 		{
-			$prices = $product->getRefItems( 'price', 'default', 'default' );
+			$prices = $product->getRefItems('price', 'default', 'default');
 
 			$orderProduct = $orderProductManager->createItem();
-			$orderProduct->copyFrom( $product );
-			$orderProduct->setStockType( $stocktype );
-			$orderProduct->setPrice( $this->calcPrice( $orderProduct, $prices, $quantity ) );
+			$orderProduct->copyFrom($product);
+			$orderProduct->setStockType($stocktype);
+			$orderProduct->setPrice($this->calcPrice($orderProduct, $prices, $quantity));
 
 			$orderProducts[] = $orderProduct;
 		}
 
-		$orderBaseProductItem->setProducts( $orderProducts );
+		$orderBaseProductItem->setProducts($orderProducts);
 	}
 }

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

Spacing +132 added lines, -132 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->baskets[$this->type]->getLocale(), $this->type );
+			$this->baskets[$this->type] = $this->domainManager->getSession($this->type);
+			$this->checkLocale($this->baskets[$this->type]->getLocale(), $this->type);
 		}
 
 		return $this->baskets[$this->type];
@@ -79,8 +79,8 @@ 
 	 */
 	public function save()
 	{
-		if( isset( $this->baskets[$this->type] ) && $this->baskets[$this->type]->isModified() ) {
-			$this->domainManager->setSession( $this->baskets[$this->type], $this->type );
+		if (isset($this->baskets[$this->type]) && $this->baskets[$this->type]->isModified()) {
+			$this->domainManager->setSession($this->baskets[$this->type], $this->type);
 		}
 
 		return $this;
@@ -93,7 +93,7 @@ 
 	 * @param string $type Basket type
 	 * @return \Aimeos\Controller\Frontend\Basket\Iface Basket frontend object
 	 */
-	public function setType( $type )
+	public function setType($type)
 	{
 		$this->type = $type;
 		return $this;
@@ -127,7 +127,7 @@ 
 		 * @category Developer
 		 * @see controller/frontend/basket/limit-seconds
 		 */
-		$count = $config->get( 'controller/frontend/basket/limit-count', 5 );
+		$count = $config->get('controller/frontend/basket/limit-count', 5);
 
 		/** controller/frontend/basket/limit-seconds
 		 * Order limitation time frame in seconds
@@ -145,34 +145,34 @@ 
 		 * @category Developer
 		 * @see controller/frontend/basket/limit-count
 		 */
-		$seconds = $config->get( 'controller/frontend/basket/limit-seconds', 300 );
+		$seconds = $config->get('controller/frontend/basket/limit-seconds', 300);
 
 		$search = $this->domainManager->createSearch();
 		$expr = [
-			$search->compare( '==', 'order.base.editor', $context->getEditor() ),
-			$search->compare( '>=', 'order.base.ctime', date( 'Y-m-d H:i:s', time() - $seconds ) ),
+			$search->compare('==', 'order.base.editor', $context->getEditor()),
+			$search->compare('>=', 'order.base.ctime', date('Y-m-d H:i:s', time() - $seconds)),
 		];
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, 0 );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, 0);
 
-		$this->domainManager->searchItems( $search, [], $total );
+		$this->domainManager->searchItems($search, [], $total);
 
-		if( $total > $count )
+		if ($total > $count)
 		{
-			$msg = $context->getI18n()->dt( 'controller/frontend', 'Temporary order limit reached' );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+			$msg = $context->getI18n()->dt('controller/frontend', 'Temporary order limit reached');
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
 		}
 
 
 		$basket = $this->get()->finish();
-		$basket->setCustomerId( (string) $context->getUserId() );
+		$basket->setCustomerId((string) $context->getUserId());
 
 		$this->domainManager->begin();
-		$this->domainManager->store( $basket );
+		$this->domainManager->store($basket);
 		$this->domainManager->commit();
 
 		$this->save(); // for reusing unpaid orders, might have side effects (!)
-		$this->createSubscriptions( $basket );
+		$this->createSubscriptions($basket);
 
 		return $basket;
 	}
@@ -186,9 +186,9 @@ 
 	 * @param boolean $default True to add default criteria (user logged in), false if not
 	 * @return \Aimeos\MShop\Order\Item\Base\Iface Order base object including the given parts
 	 */
-	public function load( $id, $parts = \Aimeos\MShop\Order\Item\Base\Base::PARTS_ALL, $default = true )
+	public function load($id, $parts = \Aimeos\MShop\Order\Item\Base\Base::PARTS_ALL, $default = true)
 	{
-		return $this->domainManager->load( $id, $parts, false, $default );
+		return $this->domainManager->load($id, $parts, false, $default);
 	}
 
 
@@ -207,34 +207,34 @@ 
 	 * @param string $stocktype Unique code of the stock type to deliver the products from
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the product isn't available
 	 */
-	public function addProduct( $prodid, $quantity = 1, $stocktype = 'default', array $variantAttributeIds = [],
-		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [] )
+	public function addProduct($prodid, $quantity = 1, $stocktype = 'default', array $variantAttributeIds = [],
+		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [])
 	{
 		$attributeMap = [
-			'custom' => array_keys( $customAttributeValues ),
-			'config' => array_keys( $configAttributeIds ),
+			'custom' => array_keys($customAttributeValues),
+			'config' => array_keys($configAttributeIds),
 		];
-		$this->checkListRef( $prodid, 'attribute', $attributeMap );
+		$this->checkListRef($prodid, 'attribute', $attributeMap);
 
 
 		$context = $this->getContext();
-		$productManager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
+		$productManager = \Aimeos\MShop\Factory::createManager($context, 'product');
 
-		$productItem = $productManager->getItem( $prodid, ['attribute', 'media', 'supplier', 'price', 'product', 'text'], true );
-		$prices = $productItem->getRefItems( 'price', 'default', 'default' );
-		$hidden = $productItem->getRefItems( 'attribute', null, 'hidden' );
+		$productItem = $productManager->getItem($prodid, ['attribute', 'media', 'supplier', 'price', 'product', 'text'], true);
+		$prices = $productItem->getRefItems('price', 'default', 'default');
+		$hidden = $productItem->getRefItems('attribute', null, 'hidden');
 
-		$orderBaseProductItem = \Aimeos\MShop\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);
 
-		$custAttr = $this->getOrderProductAttributes( 'custom', array_keys( $customAttributeValues ), $customAttributeValues );
-		$confAttr = $this->getOrderProductAttributes( 'config', array_keys( $configAttributeIds ), [], $configAttributeIds );
-		$attr = array_merge( $custAttr, $confAttr, $this->getOrderProductAttributes( 'hidden', array_keys( $hidden ) ) );
+		$custAttr = $this->getOrderProductAttributes('custom', array_keys($customAttributeValues), $customAttributeValues);
+		$confAttr = $this->getOrderProductAttributes('config', array_keys($configAttributeIds), [], $configAttributeIds);
+		$attr = array_merge($custAttr, $confAttr, $this->getOrderProductAttributes('hidden', array_keys($hidden)));
 
-		$orderBaseProductItem->setAttributeItems( $attr );
-		$orderBaseProductItem->setPrice( $this->calcPrice( $orderBaseProductItem, $prices, $quantity ) );
+		$orderBaseProductItem->setAttributeItems($attr);
+		$orderBaseProductItem->setPrice($this->calcPrice($orderBaseProductItem, $prices, $quantity));
 
-		$this->get()->addProduct( $orderBaseProductItem );
+		$this->get()->addProduct($orderBaseProductItem);
 		$this->save();
 	}
 
@@ -244,17 +244,17 @@ 
 	 *
 	 * @param integer $position Position number (key) of the order product item
 	 */
-	public function deleteProduct( $position )
+	public function deleteProduct($position)
 	{
-		$product = $this->get()->getProduct( $position );
+		$product = $this->get()->getProduct($position);
 
-		if( $product->getFlags() === \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE )
+		if ($product->getFlags() === \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE)
 		{
-			$msg = $this->getContext()->getI18n()->dt( 'controller/frontend', 'Basket item at position "%1$d" cannot be deleted manually' );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $position ) );
+			$msg = $this->getContext()->getI18n()->dt('controller/frontend', 'Basket item at position "%1$d" cannot be deleted manually');
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $position));
 		}
 
-		$this->get()->deleteProduct( $position );
+		$this->get()->deleteProduct($position);
 		$this->save();
 	}
 
@@ -266,32 +266,32 @@ 
 	 * @param integer $quantity New quantiy of the product item
 	 * @param string[] $configAttributeCodes Codes of the product config attributes that should be REMOVED
 	 */
-	public function editProduct( $position, $quantity, array $configAttributeCodes = [] )
+	public function editProduct($position, $quantity, array $configAttributeCodes = [])
 	{
-		$product = $this->get()->getProduct( $position );
+		$product = $this->get()->getProduct($position);
 
-		if( $product->getFlags() & \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE )
+		if ($product->getFlags() & \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE)
 		{
-			$msg = $this->getContext()->getI18n()->dt( 'controller/frontend', 'Basket item at position "%1$d" cannot be changed' );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $position ) );
+			$msg = $this->getContext()->getI18n()->dt('controller/frontend', 'Basket item at position "%1$d" cannot be changed');
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $position));
 		}
 
-		$product->setQuantity( $quantity );
+		$product->setQuantity($quantity);
 
 		$attributes = $product->getAttributeItems();
-		foreach( $attributes as $key => $attribute )
+		foreach ($attributes as $key => $attribute)
 		{
-			if( in_array( $attribute->getCode(), $configAttributeCodes ) ) {
-				unset( $attributes[$key] );
+			if (in_array($attribute->getCode(), $configAttributeCodes)) {
+				unset($attributes[$key]);
 			}
 		}
-		$product->setAttributeItems( $attributes );
+		$product->setAttributeItems($attributes);
 
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product' );
-		$productItem = $manager->findItem( $product->getProductCode(), array( 'price', 'text' ), true );
-		$product->setPrice( $this->calcPrice( $product, $productItem->getRefItems( 'price', 'default' ), $quantity ) );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product');
+		$productItem = $manager->findItem($product->getProductCode(), array('price', 'text'), true);
+		$product->setPrice($this->calcPrice($product, $productItem->getRefItems('price', 'default'), $quantity));
 
-		$this->get()->editProduct( $product, $position );
+		$this->get()->editProduct($product, $position);
 
 		$this->save();
 	}
@@ -303,7 +303,7 @@ 
 	 * @param string $code Coupon code entered by the user
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid or not allowed
 	 */
-	public function addCoupon( $code )
+	public function addCoupon($code)
 	{
 		$context = $this->getContext();
 
@@ -323,44 +323,44 @@ 
 		 * @category User
 		 * @category Developer
 		 */
-		$allowed = $context->getConfig()->get( 'controller/frontend/basket/standard/coupon/allowed', 1 );
+		$allowed = $context->getConfig()->get('controller/frontend/basket/standard/coupon/allowed', 1);
 
-		if( $allowed <= count( $this->get()->getCoupons() ) )
+		if ($allowed <= count($this->get()->getCoupons()))
 		{
-			$msg = $context->getI18n()->dt( 'controller/frontend', 'Number of coupon codes exceeds the limit' );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+			$msg = $context->getI18n()->dt('controller/frontend', 'Number of coupon codes exceeds the limit');
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
 		}
 
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'coupon' );
-		$codeManager = \Aimeos\MShop\Factory::createManager( $context, 'coupon/code' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'coupon');
+		$codeManager = \Aimeos\MShop\Factory::createManager($context, 'coupon/code');
 
-		$search = $manager->createSearch( true )->setSlice( 0, 1 );
+		$search = $manager->createSearch(true)->setSlice(0, 1);
 		$expr = [
-			$search->compare( '==', 'coupon.code.code', $code ),
-			$codeManager->createSearch( true )->getConditions(),
+			$search->compare('==', 'coupon.code.code', $code),
+			$codeManager->createSearch(true)->getConditions(),
 			$search->getConditions(),
 		];
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		$result = $manager->searchItems( $search );
+		$result = $manager->searchItems($search);
 
-		if( ( $item = reset( $result ) ) === false )
+		if (($item = reset($result)) === false)
 		{
-			$msg = sprintf( $context->getI18n()->dt( 'controller/frontend', 'Coupon code "%1$s" is invalid or not available any more' ), $code );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+			$msg = sprintf($context->getI18n()->dt('controller/frontend', 'Coupon code "%1$s" is invalid or not available any more'), $code);
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
 		}
 
 
-		$provider = $manager->getProvider( $item, $code );
+		$provider = $manager->getProvider($item, $code);
 
-		if( $provider->isAvailable( $this->get() ) !== true )
+		if ($provider->isAvailable($this->get()) !== true)
 		{
-			$msg = sprintf( $context->getI18n()->dt( 'controller/frontend', 'Requirements for coupon code "%1$s" aren\'t met' ), $code );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+			$msg = sprintf($context->getI18n()->dt('controller/frontend', 'Requirements for coupon code "%1$s" aren\'t met'), $code);
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
 		}
 
-		$provider->addCoupon( $this->get() );
+		$provider->addCoupon($this->get());
 		$this->save();
 	}
 
@@ -371,24 +371,24 @@ 
 	 * @param string $code Coupon code entered by the user
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid
 	 */
-	public function deleteCoupon( $code )
+	public function deleteCoupon($code)
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\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();
 	}
 
@@ -401,30 +401,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();
@@ -440,42 +440,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();
 	}
 
@@ -485,9 +485,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();
 	}
 
@@ -500,18 +500,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/tests/Controller/Frontend/Service/StandardTest.php

Spacing +50 added lines, -50 removed lines

@@ -19,124 +19,124 @@ 
 
 	protected function setUp()
 	{
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 
 		$this->context = \TestHelperFrontend::getContext();
-		$this->object = new \Aimeos\Controller\Frontend\Service\Standard( $this->context );
+		$this->object = new \Aimeos\Controller\Frontend\Service\Standard($this->context);
 	}
 
 
 	public static function setUpBeforeClass()
 	{
-		$orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
-		$orderBaseMgr = $orderManager->getSubManager( 'base' );
+		$orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager(\TestHelperFrontend::getContext());
+		$orderBaseMgr = $orderManager->getSubManager('base');
 		self::$basket = $orderBaseMgr->createItem();
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object, $this->context );
+		unset($this->object, $this->context);
 
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 	}
 
 
 	public function testCheckAttributes()
 	{
-		$attributes = $this->object->checkAttributes( $this->getServiceItem()->getId(), [] );
-		$this->assertEquals( [], $attributes );
+		$attributes = $this->object->checkAttributes($this->getServiceItem()->getId(), []);
+		$this->assertEquals([], $attributes);
 	}
 
 
 	public function testGetProviders()
 	{
-		$providers = $this->object->getProviders( 'delivery' );
-		$this->assertGreaterThan( 0, count( $providers ) );
+		$providers = $this->object->getProviders('delivery');
+		$this->assertGreaterThan(0, count($providers));
 
-		foreach( $providers as $provider ) {
-			$this->assertInstanceOf( '\\Aimeos\\MShop\\Service\\Provider\\Iface', $provider );
+		foreach ($providers as $provider) {
+			$this->assertInstanceOf('\\Aimeos\\MShop\\Service\\Provider\\Iface', $provider);
 		}
 	}
 
 
 	public function testGetProvider()
 	{
-		$provider = $this->object->getProvider( $this->getServiceItem()->getId() );
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Service\\Provider\\Iface', $provider );
+		$provider = $this->object->getProvider($this->getServiceItem()->getId());
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Service\\Provider\\Iface', $provider);
 	}
 
 
 	public function testProcess()
 	{
 		$form = new \Aimeos\MShop\Common\Item\Helper\Form\Standard();
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'order' )->createItem();
-		$serviceId = \Aimeos\MShop\Factory::createManager( $this->context, 'service' )->findItem( 'unitcode' )->getId();
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'order')->createItem();
+		$serviceId = \Aimeos\MShop\Factory::createManager($this->context, 'service')->findItem('unitcode')->getId();
 
-		$provider = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Provider\\Delivery\\Standard' )
+		$provider = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Provider\\Delivery\\Standard')
 			->disableOriginalConstructor()
-			->setMethods( ['process'] )
+			->setMethods(['process'])
 			->getMock();
 
-		$manager = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Manager\\Standard' )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( ['getProvider'] )
+		$manager = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Manager\\Standard')
+			->setConstructorArgs([$this->context])
+			->setMethods(['getProvider'])
 			->getMock();
 
-		\Aimeos\MShop\Factory::injectManager( $this->context, 'service', $manager );
+		\Aimeos\MShop\Factory::injectManager($this->context, 'service', $manager);
 
-		$provider->expects( $this->once() )->method( 'process' )->will( $this->returnValue( $form ) );
-		$manager->expects( $this->once() )->method( 'getProvider' )->will( $this->returnValue( $provider ) );
+		$provider->expects($this->once())->method('process')->will($this->returnValue($form));
+		$manager->expects($this->once())->method('getProvider')->will($this->returnValue($provider));
 
 
-		$result = $this->object->process( $item, $serviceId, [], [] );
-		$this->assertInstanceOf( \Aimeos\MShop\Common\Item\Helper\Form\Iface::class, $result );
+		$result = $this->object->process($item, $serviceId, [], []);
+		$this->assertInstanceOf(\Aimeos\MShop\Common\Item\Helper\Form\Iface::class, $result);
 	}
 
 
 	public function testUpdatePush()
 	{
-		$request = $this->getMockBuilder( \Psr\Http\Message\ServerRequestInterface::class )->getMock();
-		$response = $this->getMockBuilder( \Psr\Http\Message\ResponseInterface::class )->getMock();
+		$request = $this->getMockBuilder(\Psr\Http\Message\ServerRequestInterface::class)->getMock();
+		$response = $this->getMockBuilder(\Psr\Http\Message\ResponseInterface::class)->getMock();
 
-		$response->expects( $this->once() )->method( 'withStatus' )->will( $this->returnValue( $response ) );
+		$response->expects($this->once())->method('withStatus')->will($this->returnValue($response));
 
-		$this->assertInstanceOf( \Psr\Http\Message\ResponseInterface::class, $this->object->updatePush( $request, $response, 'unitcode' ) );
+		$this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $this->object->updatePush($request, $response, 'unitcode'));
 	}
 
 
 	public function testUpdateSync()
 	{
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'order' )->createItem();
-		$request = $this->getMockBuilder( \Psr\Http\Message\ServerRequestInterface::class )->getMock();
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'order')->createItem();
+		$request = $this->getMockBuilder(\Psr\Http\Message\ServerRequestInterface::class)->getMock();
 
-		$provider = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Provider\\Delivery\\Standard' )
-			->setMethods( ['updateSync', 'query', 'isImplemented'] )
+		$provider = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Provider\\Delivery\\Standard')
+			->setMethods(['updateSync', 'query', 'isImplemented'])
 			->disableOriginalConstructor()
 			->getMock();
 
-		$orderManager = $this->getMockBuilder( '\\Aimeos\\MShop\\Order\\Manager\\Standard' )
-			->setConstructorArgs( array( $this->context ) )
-			->setMethods( ['getItem'] )
+		$orderManager = $this->getMockBuilder('\\Aimeos\\MShop\\Order\\Manager\\Standard')
+			->setConstructorArgs(array($this->context))
+			->setMethods(['getItem'])
 			->getMock();
 
-		$serviceManager = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Manager\\Standard' )
-			->setConstructorArgs( array( $this->context ) )
-			->setMethods( ['getProvider'] )
+		$serviceManager = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Manager\\Standard')
+			->setConstructorArgs(array($this->context))
+			->setMethods(['getProvider'])
 			->getMock();
 
-		\Aimeos\MShop\Factory::injectManager( $this->context, 'order', $orderManager );
-		\Aimeos\MShop\Factory::injectManager( $this->context, 'service', $serviceManager );
+		\Aimeos\MShop\Factory::injectManager($this->context, 'order', $orderManager);
+		\Aimeos\MShop\Factory::injectManager($this->context, 'service', $serviceManager);
 
 
-		$orderManager->expects( $this->once() )->method( 'getItem' )->will( $this->returnValue( $item ) );
-		$serviceManager->expects( $this->once() )->method( 'getProvider' )->will( $this->returnValue( $provider ) );
-		$provider->expects( $this->once() )->method( 'updateSync' )->will( $this->returnValue( $item ) );
-		$provider->expects( $this->once() )->method( 'isImplemented' )->will( $this->returnValue( true ) );
-		$provider->expects( $this->once() )->method( 'query' );
+		$orderManager->expects($this->once())->method('getItem')->will($this->returnValue($item));
+		$serviceManager->expects($this->once())->method('getProvider')->will($this->returnValue($provider));
+		$provider->expects($this->once())->method('updateSync')->will($this->returnValue($item));
+		$provider->expects($this->once())->method('isImplemented')->will($this->returnValue(true));
+		$provider->expects($this->once())->method('query');
 
-		$this->object->updateSync( $request, 'unitcode', -1 );
+		$this->object->updateSync($request, 'unitcode', -1);
 	}
 
 
@@ -145,7 +145,7 @@ 
 	 */
 	protected function getServiceItem()
 	{
-		$manager = \Aimeos\MShop\Service\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
-		return $manager->findItem( 'unitcode' );
+		$manager = \Aimeos\MShop\Service\Manager\Factory::createManager(\TestHelperFrontend::getContext());
+		return $manager->findItem('unitcode');
 	}
 }

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

Spacing +46 added lines, -46 removed lines

@@ -20,130 +20,130 @@
 	{
 		$this->context = \TestHelperFrontend::getContext();
 
-		$this->stub = $this->getMockBuilder( \Aimeos\Controller\Frontend\Service\Standard::class )
+		$this->stub = $this->getMockBuilder(\Aimeos\Controller\Frontend\Service\Standard::class)
 			->disableOriginalConstructor()
 			->getMock();
 
-		$this->object = $this->getMockBuilder( \Aimeos\Controller\Frontend\Service\Decorator\Base::class )
-			->setConstructorArgs( [$this->stub, $this->context] )
+		$this->object = $this->getMockBuilder(\Aimeos\Controller\Frontend\Service\Decorator\Base::class)
+			->setConstructorArgs([$this->stub, $this->context])
 			->getMockForAbstractClass();
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->context, $this->object, $this->stub );
+		unset($this->context, $this->object, $this->stub);
 	}
 
 
 	public function testConstructException()
 	{
-		$stub = $this->getMockBuilder( \Aimeos\Controller\Frontend\Iface::class )->getMock();
+		$stub = $this->getMockBuilder(\Aimeos\Controller\Frontend\Iface::class)->getMock();
 
-		$this->setExpectedException( \Aimeos\MW\Common\Exception::class );
+		$this->setExpectedException(\Aimeos\MW\Common\Exception::class);
 
-		$this->getMockBuilder( \Aimeos\Controller\Frontend\Service\Decorator\Base::class )
-			->setConstructorArgs( [$stub, $this->context] )
+		$this->getMockBuilder(\Aimeos\Controller\Frontend\Service\Decorator\Base::class)
+			->setConstructorArgs([$stub, $this->context])
 			->getMockForAbstractClass();
 	}
 
 
 	public function testCall()
 	{
-		$stub = $this->getMockBuilder( \Aimeos\Controller\Frontend\Service\Standard::class )
+		$stub = $this->getMockBuilder(\Aimeos\Controller\Frontend\Service\Standard::class)
 			->disableOriginalConstructor()
-			->setMethods( ['invalid'] )
+			->setMethods(['invalid'])
 			->getMock();
 
-		$object = $this->getMockBuilder( \Aimeos\Controller\Frontend\Service\Decorator\Base::class )
-			->setConstructorArgs( [$stub, $this->context] )
+		$object = $this->getMockBuilder(\Aimeos\Controller\Frontend\Service\Decorator\Base::class)
+			->setConstructorArgs([$stub, $this->context])
 			->getMockForAbstractClass();
 
-		$stub->expects( $this->once() )->method( 'invalid' )->will( $this->returnValue( true ) );
+		$stub->expects($this->once())->method('invalid')->will($this->returnValue(true));
 
-		$this->assertTrue( $object->invalid() );
+		$this->assertTrue($object->invalid());
 	}
 
 
 	public function testCheckAttributes()
 	{
-		$this->stub->expects( $this->once() )->method( 'checkAttributes' )
-			->will( $this->returnValue( [] ) );
+		$this->stub->expects($this->once())->method('checkAttributes')
+			->will($this->returnValue([]));
 
-		$this->assertEquals( [], $this->object->checkAttributes( -1, [] ) );
+		$this->assertEquals([], $this->object->checkAttributes( -1, [] ));
 	}
 
 
 	public function testGetProvider()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'service' );
-		$provider = $manager->getProvider( $manager->findItem( 'unitcode', [], 'service', 'delivery' ), 'delivery' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'service');
+		$provider = $manager->getProvider($manager->findItem('unitcode', [], 'service', 'delivery'), 'delivery');
 
-		$this->stub->expects( $this->once() )->method( 'getProvider' )
-			->will( $this->returnValue( $provider ) );
+		$this->stub->expects($this->once())->method('getProvider')
+			->will($this->returnValue($provider));
 
-		$this->assertSame( $provider, $this->object->getProvider( -1 ) );
+		$this->assertSame($provider, $this->object->getProvider( -1 ));
 	}
 
 
 	public function testGetProviders()
 	{
-		$this->stub->expects( $this->once() )->method( 'getProviders' )
-			->will( $this->returnValue( [] ) );
+		$this->stub->expects($this->once())->method('getProviders')
+			->will($this->returnValue([]));
 
-		$this->assertEquals( [], $this->object->getProviders( 'payment' ) );
+		$this->assertEquals([], $this->object->getProviders('payment'));
 	}
 
 
 	public function testProcess()
 	{
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'order' )->createItem();
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'order')->createItem();
 
-		$this->stub->expects( $this->once() )->method( 'process' )
-			->will( $this->returnValue( new \Aimeos\MShop\Common\Item\Helper\Form\Standard() ) );
+		$this->stub->expects($this->once())->method('process')
+			->will($this->returnValue(new \Aimeos\MShop\Common\Item\Helper\Form\Standard()));
 
-		$this->assertInstanceOf( 'Aimeos\MShop\Common\Item\Helper\Form\Iface', $this->object->process( $item, -1, [], [] ) );
+		$this->assertInstanceOf('Aimeos\MShop\Common\Item\Helper\Form\Iface', $this->object->process($item, -1, [], []));
 	}
 
 
 	public function testUpdatePush()
 	{
-		$response = $this->getMockBuilder( \Psr\Http\Message\ResponseInterface::class )->getMock();
-		$request = $this->getMockBuilder( \Psr\Http\Message\ServerRequestInterface::class )->getMock();
+		$response = $this->getMockBuilder(\Psr\Http\Message\ResponseInterface::class)->getMock();
+		$request = $this->getMockBuilder(\Psr\Http\Message\ServerRequestInterface::class)->getMock();
 
-		$this->stub->expects( $this->once() )->method( 'updatePush' )
-			->will( $this->returnValue( $response ) );
+		$this->stub->expects($this->once())->method('updatePush')
+			->will($this->returnValue($response));
 
-		$this->assertInstanceOf( \Psr\Http\Message\ResponseInterface::class, $this->object->updatePush( $request, $response, 'test' ) );
+		$this->assertInstanceOf(\Psr\Http\Message\ResponseInterface::class, $this->object->updatePush($request, $response, 'test'));
 	}
 
 
 	public function testUpdateSync()
 	{
-		$response = $this->getMockBuilder( \Psr\Http\Message\ResponseInterface::class )->getMock();
-		$request = $this->getMockBuilder( \Psr\Http\Message\ServerRequestInterface::class )->getMock();
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'order' )->createItem();
+		$response = $this->getMockBuilder(\Psr\Http\Message\ResponseInterface::class)->getMock();
+		$request = $this->getMockBuilder(\Psr\Http\Message\ServerRequestInterface::class)->getMock();
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'order')->createItem();
 
-		$this->stub->expects( $this->once() )->method( 'updateSync' )
-			->will( $this->returnValue( $item ) );
+		$this->stub->expects($this->once())->method('updateSync')
+			->will($this->returnValue($item));
 
-		$this->assertInstanceOf( 'Aimeos\MShop\Order\Item\Iface', $this->object->updateSync( $request, $response, [], 'test', -1 ) );
+		$this->assertInstanceOf('Aimeos\MShop\Order\Item\Iface', $this->object->updateSync($request, $response, [], 'test', -1));
 	}
 
 
 	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\Service\Decorator\Base::class );
-		$method = $class->getMethod( $name );
-		$method->setAccessible( true );
+		$class = new \ReflectionClass(\Aimeos\Controller\Frontend\Service\Decorator\Base::class);
+		$method = $class->getMethod($name);
+		$method->setAccessible(true);
 
 		return $method;
 	}