aimeos / ai-controller-frontend

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

Spacing +43 added lines, -43 removed lines

@@ -41,15 +41,15 @@ 
 	 * @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, array $options = [], array $variantAttributeIds = [],
+	public function addProduct($prodid, $quantity = 1, array $options = [], array $variantAttributeIds = [],
 		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [],
-		$stocktype = 'default' )
+		$stocktype = 'default')
 	{
 		$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( $productItem->getType() !== 'select' )
+		if ($productItem->getType() !== 'select')
 		{
 			return $this->getController()->addProduct(
 				$prodid, $quantity, $options, $variantAttributeIds, $configAttributeIds,
@@ -57,31 +57,31 @@ 
 			);
 		}
 
-		$productItem = $productManager->getItem( $prodid, array( 'media', 'supplier', 'price', 'product', 'text' ), true );
+		$productItem = $productManager->getItem($prodid, array('media', 'supplier', 'price', 'product', 'text'), true);
 
-		$orderBaseProductItem = \Aimeos\MShop\Factory::createManager( $context, 'order/base/product' )->createItem();
-		$orderBaseProductItem->copyFrom( $productItem );
-		$orderBaseProductItem->setQuantity( $quantity );
-		$orderBaseProductItem->setStockType( $stocktype );
+		$orderBaseProductItem = \Aimeos\MShop\Factory::createManager($context, 'order/base/product')->createItem();
+		$orderBaseProductItem->copyFrom($productItem);
+		$orderBaseProductItem->setQuantity($quantity);
+		$orderBaseProductItem->setStockType($stocktype);
 
-		$prices = $productItem->getRefItems( 'price', 'default', 'default' );
-		$attr = $this->getVariantDetails( $orderBaseProductItem, $productItem, $prices, $variantAttributeIds, $options );
-		$prodIds = array( $prodid, $productItem->getId() );
+		$prices = $productItem->getRefItems('price', 'default', 'default');
+		$attr = $this->getVariantDetails($orderBaseProductItem, $productItem, $prices, $variantAttributeIds, $options);
+		$prodIds = array($prodid, $productItem->getId());
 
-		$priceManager = \Aimeos\MShop\Factory::createManager( $context, 'price' );
-		$price = $priceManager->getLowestPrice( $prices, $quantity );
+		$priceManager = \Aimeos\MShop\Factory::createManager($context, 'price');
+		$price = $priceManager->getLowestPrice($prices, $quantity);
 
-		$attr = array_merge( $attr, $this->createOrderProductAttributes( $price, $prodIds, $quantity, $configAttributeIds, 'config' ) );
-		$attr = array_merge( $attr, $this->createOrderProductAttributes( $price, $prodIds, $quantity, $hiddenAttributeIds, 'hidden' ) );
-		$attr = array_merge( $attr, $this->createOrderProductAttributes( $price, $prodIds, $quantity, array_keys( $customAttributeValues ), 'custom', $customAttributeValues ) );
+		$attr = array_merge($attr, $this->createOrderProductAttributes($price, $prodIds, $quantity, $configAttributeIds, 'config'));
+		$attr = array_merge($attr, $this->createOrderProductAttributes($price, $prodIds, $quantity, $hiddenAttributeIds, 'hidden'));
+		$attr = array_merge($attr, $this->createOrderProductAttributes($price, $prodIds, $quantity, array_keys($customAttributeValues), 'custom', $customAttributeValues));
 
 		// remove product rebate of original price in favor to rebates granted for the order
-		$price->setRebate( '0.00' );
+		$price->setRebate('0.00');
 
-		$orderBaseProductItem->setPrice( $price );
-		$orderBaseProductItem->setAttributes( $attr );
+		$orderBaseProductItem->setPrice($price);
+		$orderBaseProductItem->setAttributes($attr);
 
-		$this->getController()->get()->addProduct( $orderBaseProductItem );
+		$this->getController()->get()->addProduct($orderBaseProductItem);
 		$this->getController()->save();
 	}
 
@@ -97,50 +97,50 @@ 
 	 * @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, array $options )
+	protected function getVariantDetails(\Aimeos\MShop\Order\Item\Base\Product\Iface $orderBaseProductItem,
+		\Aimeos\MShop\Product\Item\Iface & $productItem, array &$prices, array $variantAttributeIds, array $options)
 	{
 		$attr = [];
-		$productItems = $this->getProductVariants( $productItem, $variantAttributeIds );
+		$productItems = $this->getProductVariants($productItem, $variantAttributeIds);
 
-		if( count( $productItems ) > 1 )
+		if (count($productItems) > 1)
 		{
-			$msg = sprintf( 'No unique article found for selected attributes and product ID "%1$s"', $productItem->getId() );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+			$msg = sprintf('No unique article found for selected attributes and product ID "%1$s"', $productItem->getId());
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
 		}
-		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( !isset( $options['variant'] ) || $options['variant'] != false ) // count == 0
+		else if (!isset($options['variant']) || $options['variant'] != false) // count == 0
 		{
-			$msg = sprintf( 'No article found for selected attributes and product ID "%1$s"', $productItem->getId() );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+			$msg = sprintf('No article found for selected attributes and product ID "%1$s"', $productItem->getId());
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
 		}
 
 		return $attr;

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

Spacing +12 added lines, -12 removed lines

@@ -41,27 +41,27 @@
 	 * @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, array $options = [], array $variantAttributeIds = [],
+	public function addProduct($prodid, $quantity = 1, array $options = [], array $variantAttributeIds = [],
 		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [],
-		$stocktype = 'default' )
+		$stocktype = 'default')
 	{
-		$catalogListManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog/lists' );
+		$catalogListManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog/lists');
 
-		$search = $catalogListManager->createSearch( true );
+		$search = $catalogListManager->createSearch(true);
 		$expr = array(
-			$search->compare( '==', 'catalog.lists.domain', 'product' ),
-			$search->compare( '==', 'catalog.lists.refid', $prodid ),
+			$search->compare('==', 'catalog.lists.domain', 'product'),
+			$search->compare('==', 'catalog.lists.refid', $prodid),
 			$search->getConditions()
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, 1 );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, 1);
 
-		$result = $catalogListManager->searchItems( $search );
+		$result = $catalogListManager->searchItems($search);
 
-		if( reset( $result ) === false )
+		if (reset($result) === false)
 		{
-			$msg = sprintf( 'Adding product with ID "%1$s" is not allowed', $prodid );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+			$msg = sprintf('Adding product with ID "%1$s" is not allowed', $prodid);
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
 		}
 
 		$this->getController()->addProduct(

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

Spacing +25 added lines, -25 removed lines

@@ -30,18 +30,18 @@ 
 	 * @param \Aimeos\Controller\Frontend\Iface $controller Controller object
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object with required objects
 	 */
-	public function __construct( \Aimeos\Controller\Frontend\Iface $controller, \Aimeos\MShop\Context\Item\Iface $context )
+	public function __construct(\Aimeos\Controller\Frontend\Iface $controller, \Aimeos\MShop\Context\Item\Iface $context)
 	{
 		$iface = '\Aimeos\Controller\Frontend\Basket\Iface';
-		if( !( $controller instanceof $iface ) )
+		if (!($controller instanceof $iface))
 		{
-			$msg = sprintf( 'Class "%1$s" does not implement interface "%2$s"', get_class( $controller ), $iface );
-			throw new \Aimeos\Controller\Frontend\Exception( $msg );
+			$msg = sprintf('Class "%1$s" does not implement interface "%2$s"', get_class($controller), $iface);
+			throw new \Aimeos\Controller\Frontend\Exception($msg);
 		}
 
 		$this->controller = $controller;
 
-		parent::__construct( $context );
+		parent::__construct($context);
 	}
 
 
@@ -53,9 +53,9 @@ 
 	 * @return mixed Returns the value of the called method
 	 * @throws \Aimeos\Controller\Frontend\Exception If method call failed
 	 */
-	public function __call( $name, array $param )
+	public function __call($name, array $param)
 	{
-		return @call_user_func_array( array( $this->controller, $name ), $param );
+		return @call_user_func_array(array($this->controller, $name), $param);
 	}
 
 
@@ -97,9 +97,9 @@ 
 	 * @param string $type Basket type
 	 * @return \Aimeos\Controller\Frontend\Basket\Iface Basket frontend object
 	 */
-	public function setType( $type )
+	public function setType($type)
 	{
-		$this->controller->setType( $type );
+		$this->controller->setType($type);
 		return $this;
 	}
 
@@ -123,9 +123,9 @@ 
 	 * @param boolean $default True to add default criteria (user logged in), false if not
 	 * @return \Aimeos\MShop\Order\Item\Base\Iface Order base object including the given parts
 	 */
-	public function load( $id, $parts = \Aimeos\MShop\Order\Manager\Base\Base::PARTS_ALL, $default = true )
+	public function load($id, $parts = \Aimeos\MShop\Order\Manager\Base\Base::PARTS_ALL, $default = true)
 	{
-		return $this->controller->load( $id, $parts, $default );
+		return $this->controller->load($id, $parts, $default);
 	}
 
 
@@ -150,9 +150,9 @@ 
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the product isn't available
 	 * @return void
 	 */
-	public function addProduct( $prodid, $quantity = 1, array $options = [], array $variantAttributeIds = [],
+	public function addProduct($prodid, $quantity = 1, array $options = [], array $variantAttributeIds = [],
 		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [],
-		$stocktype = 'default' )
+		$stocktype = 'default')
 	{
 		$this->controller->addProduct(
 			$prodid, $quantity, $options, $variantAttributeIds, $configAttributeIds,
@@ -167,9 +167,9 @@ 
 	 * @param integer $position Position number (key) of the order product item
 	 * @return void
 	 */
-	public function deleteProduct( $position )
+	public function deleteProduct($position)
 	{
-		$this->controller->deleteProduct( $position );
+		$this->controller->deleteProduct($position);
 	}
 
 
@@ -182,9 +182,9 @@ 
 	 * @param array $configAttributeCodes Codes of the product config attributes that should be REMOVED
 	 * @return void
 	 */
-	public function editProduct( $position, $quantity, array $options = [], array $configAttributeCodes = [] )
+	public function editProduct($position, $quantity, array $options = [], array $configAttributeCodes = [])
 	{
-		$this->controller->editProduct( $position, $quantity, $options, $configAttributeCodes );
+		$this->controller->editProduct($position, $quantity, $options, $configAttributeCodes);
 	}
 
 
@@ -195,9 +195,9 @@ 
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid or not allowed
 	 * @return void
 	 */
-	public function addCoupon( $code )
+	public function addCoupon($code)
 	{
-		$this->controller->addCoupon( $code );
+		$this->controller->addCoupon($code);
 	}
 
 
@@ -208,9 +208,9 @@ 
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid
 	 * @return void
 	 */
-	public function deleteCoupon( $code )
+	public function deleteCoupon($code)
 	{
-		$this->controller->deleteCoupon( $code );
+		$this->controller->deleteCoupon($code);
 	}
 
 
@@ -223,9 +223,9 @@ 
 	 * 	if one of the keys is invalid when using an array with key/value pairs
 	 * @return void
 	 */
-	public function setAddress( $type, $value )
+	public function setAddress($type, $value)
 	{
-		$this->controller->setAddress( $type, $value );
+		$this->controller->setAddress($type, $value);
 	}
 
 
@@ -239,9 +239,9 @@ 
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If there is no price to the service item attached
 	 * @return void
 	 */
-	public function setService( $type, $id, array $attributes = [] )
+	public function setService($type, $id, array $attributes = [])
 	{
-		$this->controller->setService( $type, $id, $attributes );
+		$this->controller->setService($type, $id, $attributes);
 	}
 
 

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

Spacing +122 added lines, -122 removed lines

@@ -33,11 +33,11 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Object storing the required instances for manaing databases
 	 *  connections, logger, session, etc.
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		parent::__construct( $context );
+		parent::__construct($context);
 
-		$this->domainManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' );
+		$this->domainManager = \Aimeos\MShop\Factory::createManager($context, 'order/base');
 	}
 
 
@@ -49,7 +49,7 @@ 
 	public function clear()
 	{
 		$this->baskets[$this->type] = $this->domainManager->createItem();
-		$this->domainManager->setSession( $this->baskets[$this->type], $this->type );
+		$this->domainManager->setSession($this->baskets[$this->type], $this->type);
 
 		return $this;
 	}
@@ -62,10 +62,10 @@ 
 	 */
 	public function get()
 	{
-		if( !isset( $this->baskets[$this->type] ) )
+		if (!isset($this->baskets[$this->type]))
 		{
-			$this->baskets[$this->type] = $this->domainManager->getSession( $this->type );
-			$this->checkLocale( $this->type );
+			$this->baskets[$this->type] = $this->domainManager->getSession($this->type);
+			$this->checkLocale($this->type);
 		}
 
 		return $this->baskets[$this->type];
@@ -79,8 +79,8 @@ 
 	 */
 	public function save()
 	{
-		if( isset( $this->baskets[$this->type] ) && $this->baskets[$this->type]->isModified() ) {
-			$this->domainManager->setSession( $this->baskets[$this->type], $this->type );
+		if (isset($this->baskets[$this->type]) && $this->baskets[$this->type]->isModified()) {
+			$this->domainManager->setSession($this->baskets[$this->type], $this->type);
 		}
 
 		return $this;
@@ -93,7 +93,7 @@ 
 	 * @param string $type Basket type
 	 * @return \Aimeos\Controller\Frontend\Basket\Iface Basket frontend object
 	 */
-	public function setType( $type )
+	public function setType($type)
 	{
 		$this->type = $type;
 		return $this;
@@ -107,10 +107,10 @@ 
 	 */
 	public function store()
 	{
-		$basket = $this->get()->finish()->setStatus( 1 );
+		$basket = $this->get()->finish()->setStatus(1);
 
 		$this->domainManager->begin();
-		$this->domainManager->store( $basket );
+		$this->domainManager->store($basket);
 		$this->domainManager->commit();
 
 		return $basket;
@@ -125,9 +125,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\Manager\Base\Base::PARTS_ALL, $default = true )
+	public function load($id, $parts = \Aimeos\MShop\Order\Manager\Base\Base::PARTS_ALL, $default = true)
 	{
-		return $this->domainManager->load( $id, $parts, false, $default );
+		return $this->domainManager->load($id, $parts, false, $default);
 	}
 
 
@@ -147,36 +147,36 @@ 
 	 * @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, array $options = [], array $variantAttributeIds = [],
+	public function addProduct($prodid, $quantity = 1, array $options = [], array $variantAttributeIds = [],
 		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [],
-		$stocktype = 'default' )
+		$stocktype = 'default')
 	{
 		$context = $this->getContext();
-		$productManager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
-		$productItem = $productManager->getItem( $prodid, array( 'media', 'supplier', 'price', 'product', 'text' ), true );
+		$productManager = \Aimeos\MShop\Factory::createManager($context, 'product');
+		$productItem = $productManager->getItem($prodid, array('media', 'supplier', 'price', 'product', 'text'), true);
 
-		$orderBaseProductItem = \Aimeos\MShop\Factory::createManager( $context, 'order/base/product' )->createItem();
-		$orderBaseProductItem->copyFrom( $productItem );
-		$orderBaseProductItem->setQuantity( $quantity );
-		$orderBaseProductItem->setStockType( $stocktype );
+		$orderBaseProductItem = \Aimeos\MShop\Factory::createManager($context, 'order/base/product')->createItem();
+		$orderBaseProductItem->copyFrom($productItem);
+		$orderBaseProductItem->setQuantity($quantity);
+		$orderBaseProductItem->setStockType($stocktype);
 
 		$attr = [];
-		$prices = $productItem->getRefItems( 'price', 'default', 'default' );
+		$prices = $productItem->getRefItems('price', 'default', '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);
 
-		$attr = array_merge( $attr, $this->createOrderProductAttributes( $price, $prodid, $quantity, $configAttributeIds, 'config' ) );
-		$attr = array_merge( $attr, $this->createOrderProductAttributes( $price, $prodid, $quantity, $hiddenAttributeIds, 'hidden' ) );
-		$attr = array_merge( $attr, $this->createOrderProductAttributes( $price, $prodid, $quantity, array_keys( $customAttributeValues ), 'custom', $customAttributeValues ) );
+		$attr = array_merge($attr, $this->createOrderProductAttributes($price, $prodid, $quantity, $configAttributeIds, 'config'));
+		$attr = array_merge($attr, $this->createOrderProductAttributes($price, $prodid, $quantity, $hiddenAttributeIds, 'hidden'));
+		$attr = array_merge($attr, $this->createOrderProductAttributes($price, $prodid, $quantity, array_keys($customAttributeValues), 'custom', $customAttributeValues));
 
 		// remove product rebate of original price in favor to rebates granted for the order
-		$price->setRebate( '0.00' );
+		$price->setRebate('0.00');
 
-		$orderBaseProductItem->setPrice( $price );
-		$orderBaseProductItem->setAttributes( $attr );
+		$orderBaseProductItem->setPrice($price);
+		$orderBaseProductItem->setAttributes($attr);
 
-		$this->get()->addProduct( $orderBaseProductItem );
+		$this->get()->addProduct($orderBaseProductItem);
 		$this->save();
 	}
 
@@ -186,17 +186,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 = sprintf( 'Basket item at position "%1$d" cannot be deleted manually', $position );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+			$msg = sprintf('Basket item at position "%1$d" cannot be deleted manually', $position);
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
 		}
 
-		$this->get()->deleteProduct( $position );
+		$this->get()->deleteProduct($position);
 		$this->save();
 	}
 
@@ -210,34 +210,34 @@ 
 	 * 	The 'stock'=>false option allows adding products without being in stock.
 	 * @param string[] $configAttributeCodes Codes of the product config attributes that should be REMOVED
 	 */
-	public function editProduct( $position, $quantity, array $options = [],
-		array $configAttributeCodes = [] )
+	public function editProduct($position, $quantity, array $options = [],
+		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 = sprintf( 'Basket item at position "%1$d" cannot be changed', $position );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+			$msg = sprintf('Basket item at position "%1$d" cannot be changed', $position);
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
 		}
 
-		$product->setQuantity( $quantity );
+		$product->setQuantity($quantity);
 
 		$attributes = $product->getAttributes();
-		foreach( $attributes as $key => $attribute )
+		foreach ($attributes as $key => $attribute)
 		{
-			if( in_array( $attribute->getCode(), $configAttributeCodes ) ) {
-				unset( $attributes[$key] );
+			if (in_array($attribute->getCode(), $configAttributeCodes)) {
+				unset($attributes[$key]);
 			}
 		}
-		$product->setAttributes( $attributes );
+		$product->setAttributes($attributes);
 
-		$productItem = $this->getDomainItem( 'product', 'product.code', $product->getProductCode(), array( 'price', 'text' ) );
-		$prices = $productItem->getRefItems( 'price', 'default' );
-		$product->setPrice( $this->calcPrice( $product, $prices, $quantity ) );
+		$productItem = $this->getDomainItem('product', 'product.code', $product->getProductCode(), array('price', 'text'));
+		$prices = $productItem->getRefItems('price', 'default');
+		$product->setPrice($this->calcPrice($product, $prices, $quantity));
 
-		$this->get()->deleteProduct( $position );
-		$this->get()->addProduct( $product, $position );
+		$this->get()->deleteProduct($position);
+		$this->get()->addProduct($product, $position);
 
 		$this->save();
 	}
@@ -249,49 +249,49 @@ 
 	 * @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)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'coupon' );
-		$codeManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'coupon/code' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'coupon');
+		$codeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'coupon/code');
 
 
-		$search = $codeManager->createSearch( true );
+		$search = $codeManager->createSearch(true);
 		$expr = array(
-			$search->compare( '==', 'coupon.code.code', $code ),
+			$search->compare('==', 'coupon.code.code', $code),
 			$search->getConditions(),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, 1 );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, 1);
 
-		$result = $codeManager->searchItems( $search );
+		$result = $codeManager->searchItems($search);
 
-		if( ( $codeItem = reset( $result ) ) === false ) {
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Coupon code "%1$s" is invalid or not available any more', $code ) );
+		if (($codeItem = reset($result)) === false) {
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Coupon code "%1$s" is invalid or not available any more', $code));
 		}
 
 
-		$search = $manager->createSearch( true );
+		$search = $manager->createSearch(true);
 		$expr = array(
-			$search->compare( '==', 'coupon.id', $codeItem->getParentId() ),
+			$search->compare('==', 'coupon.id', $codeItem->getParentId()),
 			$search->getConditions(),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, 1 );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, 1);
 
-		$result = $manager->searchItems( $search );
+		$result = $manager->searchItems($search);
 
-		if( ( $item = reset( $result ) ) === false ) {
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Coupon for code "%1$s" is not available any more', $code ) );
+		if (($item = reset($result)) === false) {
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Coupon for code "%1$s" is not available any more', $code));
 		}
 
 
-		$provider = $manager->getProvider( $item, $code );
+		$provider = $manager->getProvider($item, $code);
 
-		if( $provider->isAvailable( $this->get() ) !== true ) {
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Requirements for coupon code "%1$s" aren\'t met', $code ) );
+		if ($provider->isAvailable($this->get()) !== true) {
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Requirements for coupon code "%1$s" aren\'t met', $code));
 		}
 
-		$provider->addCoupon( $this->get() );
+		$provider->addCoupon($this->get());
 		$this->save();
 	}
 
@@ -302,21 +302,21 @@ 
 	 * @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)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'coupon' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), '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 ) {
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Coupon code "%1$s" is invalid', $code ) );
+		if (($item = reset($result)) === false) {
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Coupon code "%1$s" is invalid', $code));
 		}
 
-		$manager->getProvider( $item, $code )->deleteCoupon( $this->get() );
+		$manager->getProvider($item, $code)->deleteCoupon($this->get());
 		$this->save();
 	}
 
@@ -329,28 +329,28 @@ 
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the billing or delivery address is not of any required type of
 	 * 	if one of the keys is invalid when using an array with key/value pairs
 	 */
-	public function setAddress( $type, $value )
+	public function setAddress($type, $value)
 	{
-		$address = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order/base/address' )->createItem();
-		$address->setType( $type );
+		$address = \Aimeos\MShop\Factory::createManager($this->getContext(), '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
 		{
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Invalid value for address type "%1$s"', $type ) );
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Invalid value for address type "%1$s"', $type));
 		}
 
 		$this->save();
@@ -366,48 +366,48 @@ 
 	 * 	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 setService( $type, $id, array $attributes = [] )
+	public function setService($type, $id, array $attributes = [])
 	{
-		if( $id === null )
+		if ($id === null)
 		{
-			$this->get()->deleteService( $type );
+			$this->get()->deleteService($type);
 			$this->save();
 			return;
 		}
 
 		$context = $this->getContext();
 
-		$serviceManager = \Aimeos\MShop\Factory::createManager( $context, 'service' );
-		$serviceItem = $this->getDomainItem( 'service', 'service.id', $id, array( 'media', 'price', 'text' ) );
+		$serviceManager = \Aimeos\MShop\Factory::createManager($context, 'service');
+		$serviceItem = $this->getDomainItem('service', 'service.id', $id, array('media', 'price', 'text'));
 
-		$provider = $serviceManager->getProvider( $serviceItem );
-		$result = $provider->checkConfigFE( $attributes );
-		$unknown = array_diff_key( $attributes, $result );
+		$provider = $serviceManager->getProvider($serviceItem);
+		$result = $provider->checkConfigFE($attributes);
+		$unknown = array_diff_key($attributes, $result);
 
-		if( count( $unknown ) > 0 )
+		if (count($unknown) > 0)
 		{
-			$msg = sprintf( 'Unknown attributes "%1$s"', implode( '","', array_keys( $unknown ) ) );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+			$msg = sprintf('Unknown attributes "%1$s"', 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()->setService( $orderServiceItem, $type );
+		$this->get()->setService($orderServiceItem, $type);
 		$this->save();
 	}
 
@@ -420,18 +420,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 = sprintf( 'Invalid address properties, please check your input' );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg, 0, null, $errors );
+			$msg = sprintf('Invalid address properties, please check your input');
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg, 0, null, $errors);
 		}
 	}
 }

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

Spacing +54 added lines, -54 removed lines

@@ -29,9 +29,9 @@ 
 	 * @return \Aimeos\MShop\Common\Manager\Iface Manager object
 	 * @since 2015.08
 	 */
-	public function createManager( $name )
+	public function createManager($name)
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), $name );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), $name);
 	}
 
 
@@ -43,7 +43,7 @@ 
 	 */
 	public function createFilter()
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog' )->createSearch( true );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog')->createSearch(true);
 	}
 
 
@@ -55,9 +55,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);
 	}
 
 
@@ -72,10 +72,10 @@ 
 	 * @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);
 	}
 
 
@@ -87,7 +87,7 @@ 
 	 * @since 2015.08
 	 * @deprecated Use createFilter() instead
 	 */
-	public function createCatalogFilter( $default = true )
+	public function createCatalogFilter($default = true)
 	{
 		return $this->createFilter();
 	}
@@ -102,9 +102,9 @@ 
 	 * @since 2015.08
 	 * @deprecated Use getPath() instead
 	 */
-	public function getCatalogPath( $id, array $domains = array( 'text', 'media' ) )
+	public function getCatalogPath($id, array $domains = array('text', 'media'))
 	{
-		return $this->getPath( $id, $domains );
+		return $this->getPath($id, $domains);
 	}
 
 
@@ -120,10 +120,10 @@ 
 	 * @since 2015.08
 	 * @deprecated Use getTree() instead
 	 */
-	public function getCatalogTree( $id = null, array $domains = array( 'text', 'media' ),
-		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE, \Aimeos\MW\Criteria\Iface $search = null )
+	public function getCatalogTree($id = null, array $domains = array('text', 'media'),
+		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE, \Aimeos\MW\Criteria\Iface $search = null)
 	{
-		return $this->getTree( $id, $domains, $level, $search );
+		return $this->getTree($id, $domains, $level, $search);
 	}
 
 
@@ -137,10 +137,10 @@ 
 	 * @since 2015.08
 	 * @deprecated Use getItems() method in index controller instead
 	 */
-	public function getProductItems( array $ids, array $domains = array( 'media', 'price', 'text' ) )
+	public function getProductItems(array $ids, array $domains = array('media', 'price', 'text'))
 	{
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'product' );
-		return $cntl->getItems( $ids, $domains );
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'product');
+		return $cntl->getItems($ids, $domains);
 	}
 
 
@@ -153,10 +153,10 @@ 
 	 * @since 2015.08
 	 * @deprecated Use method in index controller instead
 	 */
-	public function aggregateIndex( \Aimeos\MW\Criteria\Iface $filter, $key )
+	public function aggregateIndex(\Aimeos\MW\Criteria\Iface $filter, $key)
 	{
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'product' );
-		return $cntl->aggregate( $filter, $key );
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'product');
+		return $cntl->aggregate($filter, $key);
 	}
 
 
@@ -172,10 +172,10 @@ 
 	 * @since 2015.08
 	 * @deprecated Use method in index controller instead
 	 */
-	public function createIndexFilter( $sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default' )
+	public function createIndexFilter($sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default')
 	{
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'product' );
-		return $cntl->createFilter( $sort, $direction, $start, $size, $listtype );
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'product');
+		return $cntl->createFilter($sort, $direction, $start, $size, $listtype);
 	}
 
 
@@ -192,12 +192,12 @@ 
 	 * @since 2015.08
 	 * @deprecated Use createIndexFilter() and addIndexFilterCategory() instead
 	 */
-	public function createIndexFilterCategory( $catid, $sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default' )
+	public function createIndexFilterCategory($catid, $sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default')
 	{
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'product' );
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'product');
 
-		$filter = $cntl->createFilter( $sort, $direction, $start, $size, $listtype );
-		$filter = $cntl->addFilterCategory( $filter, $catid, \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE, $sort, $direction, $listtype );
+		$filter = $cntl->createFilter($sort, $direction, $start, $size, $listtype);
+		$filter = $cntl->addFilterCategory($filter, $catid, \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE, $sort, $direction, $listtype);
 
 		return $filter;
 	}
@@ -216,12 +216,12 @@ 
 	 * @since 2015.08
 	 * @deprecated Use createIndexFilter() and addIndexFilterText() instead
 	 */
-	public function createIndexFilterText( $input, $sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default' )
+	public function createIndexFilterText($input, $sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default')
 	{
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'product' );
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'product');
 
-		$filter = $cntl->createFilter( $sort, $direction, $start, $size, $listtype );
-		$filter = $cntl->addFilterText( $filter, $input, $sort, $direction, $listtype );
+		$filter = $cntl->createFilter($sort, $direction, $start, $size, $listtype);
+		$filter = $cntl->addFilterText($filter, $input, $sort, $direction, $listtype);
 
 		return $filter;
 	}
@@ -236,10 +236,10 @@ 
 	 * @since 2015.08
 	 * @deprecated Use method in index controller instead
 	 */
-	public function addIndexFilterCategory( \Aimeos\MW\Criteria\Iface $search, $catid )
+	public function addIndexFilterCategory(\Aimeos\MW\Criteria\Iface $search, $catid)
 	{
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'product' );
-		return $cntl->addFilterCategory( $search, $catid );
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'product');
+		return $cntl->addFilterCategory($search, $catid);
 	}
 
 
@@ -253,10 +253,10 @@ 
 	 * @since 2015.08
 	 * @deprecated Use method in index controller instead
 	 */
-	public function addIndexFilterText( \Aimeos\MW\Criteria\Iface $search, $input, $listtype = 'default' )
+	public function addIndexFilterText(\Aimeos\MW\Criteria\Iface $search, $input, $listtype = 'default')
 	{
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'product' );
-		return $cntl->addFilterText( $search, $input, $listtype );
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'product');
+		return $cntl->addFilterText($search, $input, $listtype);
 	}
 
 
@@ -270,10 +270,10 @@ 
 	 * @since 2015.08
 	 * @deprecated Use method in index controller instead
 	 */
-	public function getIndexItems( \Aimeos\MW\Criteria\Iface $filter, array $domains = array( 'media', 'price', 'text' ), &$total = null )
+	public function getIndexItems(\Aimeos\MW\Criteria\Iface $filter, array $domains = array('media', 'price', 'text'), &$total = null)
 	{
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'product' );
-		return $cntl->searchItems( $filter, $domains, $total );
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'product');
+		return $cntl->searchItems($filter, $domains, $total);
 	}
 
 
@@ -290,37 +290,37 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @deprecated Use createFilter() method in index controller instead
 	 */
-	public function createTextFilter( $input, $sort = null, $direction = '+', $start = 0, $size = 25, $listtype = 'default', $type = 'name' )
+	public function createTextFilter($input, $sort = null, $direction = '+', $start = 0, $size = 25, $listtype = 'default', $type = 'name')
 	{
 		$locale = $this->getContext()->getLocale();
 		$langid = $locale->getLanguageId();
 
-		$search = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'index/text' )->createSearch( true );
+		$search = \Aimeos\MShop\Factory::createManager($this->getContext(), 'index/text')->createSearch(true);
 
 		$expr = array(
-			$search->compare( '>', $search->createFunction( 'index.text.relevance', array( $listtype, $langid, $input ) ), 0 ),
-			$search->compare( '>', $search->createFunction( 'index.text.value', array( $listtype, $langid, $type, 'product' ) ), '' ),
+			$search->compare('>', $search->createFunction('index.text.relevance', array($listtype, $langid, $input)), 0),
+			$search->compare('>', $search->createFunction('index.text.value', array($listtype, $langid, $type, 'product')), ''),
 		);
 
 		$sortations = [];
 
-		switch( $sort )
+		switch ($sort)
 		{
 			case 'name':
-				$cmpfunc = $search->createFunction( 'index.text.value', array( $listtype, $langid, 'name', 'product' ) );
-				$expr[] = $search->compare( '>=', $cmpfunc, '' );
+				$cmpfunc = $search->createFunction('index.text.value', array($listtype, $langid, 'name', 'product'));
+				$expr[] = $search->compare('>=', $cmpfunc, '');
 
-				$sortfunc = $search->createFunction( 'sort:index.text.value', array( $listtype, $langid, 'name' ) );
-				$sortations[] = $search->sort( $direction, $sortfunc );
+				$sortfunc = $search->createFunction('sort:index.text.value', array($listtype, $langid, 'name'));
+				$sortations[] = $search->sort($direction, $sortfunc);
 				break;
 
 			case 'relevance':
 				// we don't need to sort by 'sort:index.text.relevance' because it's a boolean match (relevance is either 0 or 1)
 		}
 
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSortations( $sortations );
-		$search->setSlice( $start, $size );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSortations($sortations);
+		$search->setSlice($start, $size);
 
 		return $search;
 	}
@@ -333,8 +333,8 @@ 
 	 * @return array Associative list of the product ID as key and the product text as value
 	 * @deprecated Use searchItems() method in index controller to retrieve product items instead
 	 */
-	public function getTextList( \Aimeos\MW\Criteria\Iface $filter )
+	public function getTextList(\Aimeos\MW\Criteria\Iface $filter)
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'index/text' )->searchTexts( $filter );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'index/text')->searchTexts($filter);
 	}
 }

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

Spacing +71 added lines, -71 removed lines

@@ -31,42 +31,42 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @since 2017.03
 	 */
-	public function addFilterAttribute( \Aimeos\MW\Criteria\Iface $filter, array $attrIds, array $optIds, array $oneIds )
+	public function addFilterAttribute(\Aimeos\MW\Criteria\Iface $filter, array $attrIds, array $optIds, array $oneIds)
 	{
-		if( !empty( $attrIds ) )
+		if (!empty($attrIds))
 		{
-			$attrIds = $this->validateIds( $attrIds );
+			$attrIds = $this->validateIds($attrIds);
 
-			$func = $filter->createFunction( 'index.attributeaggregate', array( $attrIds ) );
+			$func = $filter->createFunction('index.attributeaggregate', array($attrIds));
 			$expr = array(
-				$filter->compare( '==', $func, count( $attrIds ) ),
+				$filter->compare('==', $func, count($attrIds)),
 				$filter->getConditions(),
 			);
-			$filter->setConditions( $filter->combine( '&&', $expr ) );
+			$filter->setConditions($filter->combine('&&', $expr));
 		}
 
-		if( !empty( $optIds ) )
+		if (!empty($optIds))
 		{
-			$optIds = $this->validateIds( $optIds );
+			$optIds = $this->validateIds($optIds);
 
-			$func = $filter->createFunction( 'index.attributeaggregate', array( $optIds ) );
+			$func = $filter->createFunction('index.attributeaggregate', array($optIds));
 			$expr = array(
-				$filter->compare( '>', $func, 0 ),
+				$filter->compare('>', $func, 0),
 				$filter->getConditions(),
 			);
-			$filter->setConditions( $filter->combine( '&&', $expr ) );
+			$filter->setConditions($filter->combine('&&', $expr));
 		}
 
-		foreach( $oneIds as $type => $list )
+		foreach ($oneIds as $type => $list)
 		{
-			if( ( $list = $this->validateIds( (array) $list ) ) !== [] )
+			if (($list = $this->validateIds((array) $list)) !== [])
 			{
-				$func = $filter->createFunction( 'index.attributeaggregate', array( $list ) );
+				$func = $filter->createFunction('index.attributeaggregate', array($list));
 				$expr = array(
-					$filter->compare( '>', $func, 0 ),
+					$filter->compare('>', $func, 0),
 					$filter->getConditions(),
 				);
-				$filter->setConditions( $filter->combine( '&&', $expr ) );
+				$filter->setConditions($filter->combine('&&', $expr));
 			}
 		}
 
@@ -86,38 +86,38 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @since 2017.03
 	 */
-	public function addFilterCategory( \Aimeos\MW\Criteria\Iface $filter, $catId,
-		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE, $sort = null, $direction = '+', $listtype = 'default' )
+	public function addFilterCategory(\Aimeos\MW\Criteria\Iface $filter, $catId,
+		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE, $sort = null, $direction = '+', $listtype = 'default')
 	{
-		$catIds = ( !is_array( $catId ) ? explode( ',', $catId ) : $catId );
+		$catIds = (!is_array($catId) ? explode(',', $catId) : $catId);
 
-		if( $level != \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE )
+		if ($level != \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE)
 		{
 			$list = [];
-			$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'catalog' );
+			$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'catalog');
 
-			foreach( $catIds as $catId )
+			foreach ($catIds as $catId)
 			{
-				$tree = $cntl->getCatalogTree( $catId, [], $level );
-				$list = array_merge( $list, $this->getCatalogIdsFromTree( $tree ) );
+				$tree = $cntl->getCatalogTree($catId, [], $level);
+				$list = array_merge($list, $this->getCatalogIdsFromTree($tree));
 			}
 
 			$catIds = $list;
 		}
 
-		$expr = array( $filter->compare( '==', 'index.catalog.id', array_unique( $catIds ) ) );
+		$expr = array($filter->compare('==', 'index.catalog.id', array_unique($catIds)));
 		$expr[] = $filter->getConditions();
 
-		if( $sort === 'relevance' )
+		if ($sort === 'relevance')
 		{
-			$cmpfunc = $filter->createFunction( 'index.catalog.position', array( $listtype, $catIds ) );
-			$expr[] = $filter->compare( '>=', $cmpfunc, 0 );
+			$cmpfunc = $filter->createFunction('index.catalog.position', array($listtype, $catIds));
+			$expr[] = $filter->compare('>=', $cmpfunc, 0);
 
-			$sortfunc = $filter->createFunction( 'sort:index.catalog.position', array( $listtype, $catIds ) );
-			$filter->setSortations( array( $filter->sort( $direction, $sortfunc ) ) );
+			$sortfunc = $filter->createFunction('sort:index.catalog.position', array($listtype, $catIds));
+			$filter->setSortations(array($filter->sort($direction, $sortfunc)));
 		}
 
-		$filter->setConditions( $filter->combine( '&&', $expr ) );
+		$filter->setConditions($filter->combine('&&', $expr));
 
 		return $filter;
 	}
@@ -134,13 +134,13 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @since 2017.03
 	 */
-	public function addFilterText( \Aimeos\MW\Criteria\Iface $filter, $input, $sort = null, $direction = '+', $listtype = 'default' )
+	public function addFilterText(\Aimeos\MW\Criteria\Iface $filter, $input, $sort = null, $direction = '+', $listtype = 'default')
 	{
 		$langid = $this->getContext()->getLocale()->getLanguageId();
-		$cmpfunc = $filter->createFunction( 'index.text.relevance', array( $listtype, $langid, $input ) );
-		$expr = array( $filter->compare( '>', $cmpfunc, 0 ), $filter->getConditions() );
+		$cmpfunc = $filter->createFunction('index.text.relevance', array($listtype, $langid, $input));
+		$expr = array($filter->compare('>', $cmpfunc, 0), $filter->getConditions());
 
-		return $filter->setConditions( $filter->combine( '&&', $expr ) );
+		return $filter->setConditions($filter->combine('&&', $expr));
 	}
 
 
@@ -152,9 +152,9 @@ 
 	 * @return array Associative list of key values as key and the product count for this key as value
 	 * @since 2017.03
 	 */
-	public function aggregate( \Aimeos\MW\Criteria\Iface $filter, $key )
+	public function aggregate(\Aimeos\MW\Criteria\Iface $filter, $key)
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'index' )->aggregate( $filter, $key );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'index')->aggregate($filter, $key);
 	}
 
 
@@ -169,46 +169,46 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @since 2017.03
 	 */
-	public function createFilter( $sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default' )
+	public function createFilter($sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default')
 	{
 		$sortations = [];
 		$context = $this->getContext();
 
-		$search = \Aimeos\MShop\Factory::createManager( $context, 'index' )->createSearch( true );
-		$expr = array( $search->compare( '!=', 'index.catalog.id', null ) );
+		$search = \Aimeos\MShop\Factory::createManager($context, 'index')->createSearch(true);
+		$expr = array($search->compare('!=', 'index.catalog.id', null));
 
-		switch( $sort )
+		switch ($sort)
 		{
 			case 'code':
-				$sortations[] = $search->sort( $direction, 'product.code' );
+				$sortations[] = $search->sort($direction, 'product.code');
 				break;
 
 			case 'name':
 				$langid = $context->getLocale()->getLanguageId();
 
-				$cmpfunc = $search->createFunction( 'index.text.value', array( $listtype, $langid, 'name', 'product' ) );
-				$expr[] = $search->compare( '>=', $cmpfunc, '' );
+				$cmpfunc = $search->createFunction('index.text.value', array($listtype, $langid, 'name', 'product'));
+				$expr[] = $search->compare('>=', $cmpfunc, '');
 
-				$sortfunc = $search->createFunction( 'sort:index.text.value', array( $listtype, $langid, 'name' ) );
-				$sortations[] = $search->sort( $direction, $sortfunc );
+				$sortfunc = $search->createFunction('sort:index.text.value', array($listtype, $langid, 'name'));
+				$sortations[] = $search->sort($direction, $sortfunc);
 				break;
 
 			case 'price':
 				$currencyid = $context->getLocale()->getCurrencyId();
 
-				$cmpfunc = $search->createFunction( 'index.price.value', array( $listtype, $currencyid, 'default' ) );
-				$expr[] = $search->compare( '>=', $cmpfunc, '0.00' );
+				$cmpfunc = $search->createFunction('index.price.value', array($listtype, $currencyid, 'default'));
+				$expr[] = $search->compare('>=', $cmpfunc, '0.00');
 
-				$sortfunc = $search->createFunction( 'sort:index.price.value', array( $listtype, $currencyid, 'default' ) );
-				$sortations[] = $search->sort( $direction, $sortfunc );
+				$sortfunc = $search->createFunction('sort:index.price.value', array($listtype, $currencyid, 'default'));
+				$sortations[] = $search->sort($direction, $sortfunc);
 				break;
 		}
 
 		$expr[] = $search->getConditions();
 
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSortations( $sortations );
-		$search->setSlice( $start, $size );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSortations($sortations);
+		$search->setSlice($start, $size);
 
 		return $search;
 	}
@@ -222,9 +222,9 @@ 
 	 * @return \Aimeos\MShop\Product\Item\Iface Product item including the referenced domains items
 	 * @since 2017.03
 	 */
-	public function getItem( $productId, array $domains = array( 'attribute', 'media', 'price', 'product', 'product/property', 'text' ) )
+	public function getItem($productId, array $domains = array('attribute', 'media', 'price', 'product', 'product/property', 'text'))
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product' )->getItem( $productId, $domains, true );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'product')->getItem($productId, $domains, true);
 	}
 
 
@@ -236,19 +236,19 @@ 
 	 * @return \Aimeos\MShop\Product\Item\Iface[] Associative list of product IDs as keys and product items as values
 	 * @since 2017.03
 	 */
-	public function getItems( array $productIds, array $domains = array( 'media', 'price', 'text' ) )
+	public function getItems(array $productIds, array $domains = array('media', 'price', 'text'))
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product');
 
-		$search = $manager->createSearch( true );
+		$search = $manager->createSearch(true);
 		$expr = array(
-			$search->compare( '==', 'product.id', $productIds ),
+			$search->compare('==', 'product.id', $productIds),
 			$search->getConditions(),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, count( $productIds ) );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, count($productIds));
 
-		return $manager->searchItems( $search, $domains );
+		return $manager->searchItems($search, $domains);
 	}
 
 
@@ -261,9 +261,9 @@ 
 	 * @return array Ordered list of product items implementing \Aimeos\MShop\Product\Item\Iface
 	 * @since 2017.03
 	 */
-	public function searchItems( \Aimeos\MW\Criteria\Iface $filter, array $domains = array( 'media', 'price', 'text' ), &$total = null )
+	public function searchItems(\Aimeos\MW\Criteria\Iface $filter, array $domains = array('media', 'price', 'text'), &$total = null)
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'index' )->searchItems( $filter, $domains, $total );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'index')->searchItems($filter, $domains, $total);
 	}
 
 
@@ -273,12 +273,12 @@ 
 	 * @param \Aimeos\MShop\Catalog\Item\Iface $item Catalog item with children
 	 * @return array List of catalog IDs
 	 */
-	protected function getCatalogIdsFromTree( \Aimeos\MShop\Catalog\Item\Iface $item )
+	protected function getCatalogIdsFromTree(\Aimeos\MShop\Catalog\Item\Iface $item)
 	{
-		$list = array( $item->getId() );
+		$list = array($item->getId());
 
-		foreach( $item->getChildren() as $child ) {
-			$list = array_merge( $list, $this->getCatalogIdsFromTree( $child ) );
+		foreach ($item->getChildren() as $child) {
+			$list = array_merge($list, $this->getCatalogIdsFromTree($child));
 		}
 
 		return $list;
@@ -291,13 +291,13 @@ 
 	 * @param array $ids List of IDs to validate
 	 * @return array List of validated IDs
 	 */
-	protected function validateIds( array $ids )
+	protected function validateIds(array $ids)
 	{
 		$list = [];
 
-		foreach( $ids as $id )
+		foreach ($ids as $id)
 		{
-			if( $id != '' ) {
+			if ($id != '') {
 				$list[] = (int) $id;
 			}
 		}

controller/frontend/src/Controller/Frontend/Exception.php

Spacing +2 added lines, -2 removed lines

@@ -32,9 +32,9 @@
 	 * @param \Exception $previous The previous exception used for the exception chaining.
 	 * @param array $list The associative list of errors and their messages when several errors occured
 	 */
-	public function __construct( $msg = '', $code = 0, \Exception $previous = null, array $list = [] )
+	public function __construct($msg = '', $code = 0, \Exception $previous = null, array $list = [])
 	{
-		parent::__construct( $msg, $code, $previous );
+		parent::__construct($msg, $code, $previous);
 
 		$this->list = $list;
 	}

controller/frontend/src/Controller/Frontend/Common/Factory/Base.php

Spacing +35 added lines, -35 removed lines

@@ -31,7 +31,7 @@ 
 	 * @param string $classname Full name of the class for which the object should be returned
 	 * @param \Aimeos\Controller\Frontend\Iface|null $controller Frontend controller object
 	 */
-	public static function injectController( $classname, \Aimeos\Controller\Frontend\Iface $controller = null )
+	public static function injectController($classname, \Aimeos\Controller\Frontend\Iface $controller = null)
 	{
 		self::$objects[$classname] = $controller;
 	}
@@ -46,29 +46,29 @@ 
 	 * @param string $classprefix Decorator class prefix, e.g. "\Aimeos\Controller\Frontend\Basket\Decorator\"
 	 * @return \Aimeos\Controller\Frontend\Common\Iface Controller object
 	 */
-	protected static function addDecorators( \Aimeos\MShop\Context\Item\Iface $context,
-		\Aimeos\Controller\Frontend\Iface $controller, array $decorators, $classprefix )
+	protected static function addDecorators(\Aimeos\MShop\Context\Item\Iface $context,
+		\Aimeos\Controller\Frontend\Iface $controller, array $decorators, $classprefix)
 	{
 		$iface = '\\Aimeos\\Controller\\Frontend\\Common\\Decorator\\Iface';
 
-		foreach( $decorators as $name )
+		foreach ($decorators as $name)
 		{
-			if( ctype_alnum( $name ) === false )
+			if (ctype_alnum($name) === false)
 			{
-				$classname = is_string( $name ) ? $classprefix . $name : '<not a string>';
-				throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+				$classname = is_string($name) ? $classprefix . $name : '<not a string>';
+				throw new \Aimeos\Controller\Frontend\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 			}
 
 			$classname = $classprefix . $name;
 
-			if( class_exists( $classname ) === false ) {
-				throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Class "%1$s" not available', $classname ) );
+			if (class_exists($classname) === false) {
+				throw new \Aimeos\Controller\Frontend\Exception(sprintf('Class "%1$s" not available', $classname));
 			}
 
-			$controller = new $classname( $controller, $context );
+			$controller = new $classname($controller, $context);
 
-			if( !( $controller instanceof $iface ) ) {
-				throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Class "%1$s" does not implement interface "%2$s"', $classname, $iface ) );
+			if (!($controller instanceof $iface)) {
+				throw new \Aimeos\Controller\Frontend\Exception(sprintf('Class "%1$s" does not implement interface "%2$s"', $classname, $iface));
 			}
 		}
 
@@ -84,14 +84,14 @@ 
 	 * @param string $domain Domain name in lower case, e.g. "product"
 	 * @return \Aimeos\Controller\Frontend\Common\Iface Controller object
 	 */
-	protected static function addControllerDecorators( \Aimeos\MShop\Context\Item\Iface $context,
-		\Aimeos\Controller\Frontend\Iface $controller, $domain )
+	protected static function addControllerDecorators(\Aimeos\MShop\Context\Item\Iface $context,
+		\Aimeos\Controller\Frontend\Iface $controller, $domain)
 	{
-		if( !is_string( $domain ) || $domain === '' ) {
-			throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid domain "%1$s"', $domain ) );
+		if (!is_string($domain) || $domain === '') {
+			throw new \Aimeos\Controller\Frontend\Exception(sprintf('Invalid domain "%1$s"', $domain));
 		}
 
-		$localClass = str_replace( ' ', '\\', ucwords( str_replace( '/', ' ', $domain ) ) );
+		$localClass = str_replace(' ', '\\', ucwords(str_replace('/', ' ', $domain)));
 		$config = $context->getConfig();
 
 		/** controller/frontend/common/decorators/default
@@ -116,26 +116,26 @@ 
 		 * @since 2014.03
 		 * @category Developer
 		 */
-		$decorators = $config->get( 'controller/frontend/common/decorators/default', [] );
-		$excludes = $config->get( 'controller/frontend/' . $domain . '/decorators/excludes', [] );
+		$decorators = $config->get('controller/frontend/common/decorators/default', []);
+		$excludes = $config->get('controller/frontend/' . $domain . '/decorators/excludes', []);
 
-		foreach( $decorators as $key => $name )
+		foreach ($decorators as $key => $name)
 		{
-			if( in_array( $name, $excludes ) ) {
-				unset( $decorators[$key] );
+			if (in_array($name, $excludes)) {
+				unset($decorators[$key]);
 			}
 		}
 
 		$classprefix = '\\Aimeos\\Controller\\Frontend\\Common\\Decorator\\';
-		$controller = self::addDecorators( $context, $controller, $decorators, $classprefix );
+		$controller = self::addDecorators($context, $controller, $decorators, $classprefix);
 
 		$classprefix = '\\Aimeos\\Controller\\Frontend\\Common\\Decorator\\';
-		$decorators = $config->get( 'controller/frontend/' . $domain . '/decorators/global', [] );
-		$controller = self::addDecorators( $context, $controller, $decorators, $classprefix );
+		$decorators = $config->get('controller/frontend/' . $domain . '/decorators/global', []);
+		$controller = self::addDecorators($context, $controller, $decorators, $classprefix);
 
-		$classprefix = '\\Aimeos\\Controller\\Frontend\\' . ucfirst( $localClass ) . '\\Decorator\\';
-		$decorators = $config->get( 'controller/frontend/' . $domain . '/decorators/local', [] );
-		$controller = self::addDecorators( $context, $controller, $decorators, $classprefix );
+		$classprefix = '\\Aimeos\\Controller\\Frontend\\' . ucfirst($localClass) . '\\Decorator\\';
+		$decorators = $config->get('controller/frontend/' . $domain . '/decorators/local', []);
+		$controller = self::addDecorators($context, $controller, $decorators, $classprefix);
 
 		return $controller;
 	}
@@ -149,20 +149,20 @@ 
 	 * @param string $interface Name of the controller interface
 	 * @return \Aimeos\Controller\Frontend\Common\Iface Controller object
 	 */
-	protected static function createControllerBase( \Aimeos\MShop\Context\Item\Iface $context, $classname, $interface )
+	protected static function createControllerBase(\Aimeos\MShop\Context\Item\Iface $context, $classname, $interface)
 	{
-		if( isset( self::$objects[$classname] ) ) {
+		if (isset(self::$objects[$classname])) {
 			return self::$objects[$classname];
 		}
 
-		if( class_exists( $classname ) === false ) {
-			throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Class "%1$s" not available', $classname ) );
+		if (class_exists($classname) === false) {
+			throw new \Aimeos\Controller\Frontend\Exception(sprintf('Class "%1$s" not available', $classname));
 		}
 
-		$controller = new $classname( $context );
+		$controller = new $classname($context);
 
-		if( !( $controller instanceof $interface ) ) {
-			throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Class "%1$s" does not implement interface "%2$s"', $classname, $interface ) );
+		if (!($controller instanceof $interface)) {
+			throw new \Aimeos\Controller\Frontend\Exception(sprintf('Class "%1$s" does not implement interface "%2$s"', $classname, $interface));
 		}
 
 		return $controller;

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

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
 	 * @return \Aimeos\MShop\Locale\Item\Iface Locale item including the referenced domains items
 	 * @since 2017.03
 	 */
-	public function getItem( $id, array $domains = [] );
+	public function getItem($id, array $domains = []);
 
 
 	/**
@@ -48,5 +48,5 @@ 
 	 * @return array Ordered list of locale items implementing \Aimeos\MShop\Locale\Item\Iface
 	 * @since 2017.03
 	 */
-	public function searchItems( \Aimeos\MW\Criteria\Iface $filter, array $domains = [], &$total = null );
+	public function searchItems(\Aimeos\MW\Criteria\Iface $filter, array $domains = [], &$total = null);
 }