aimeos / ai-controller-frontend

controller/frontend/config/controller.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 	'frontend' => array(
 		'basket' => array(
 			'decorators' => array(
-				'local' => array( 'Category', 'Bundle', 'Select' ),
+				'local' => array('Category', 'Bundle', 'Select'),
 			),
 		),
 	),

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

Spacing +37 added lines, -37 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(), array $variantAttributeIds = array(),
+	public function addProduct($prodid, $quantity = 1, array $options = array(), array $variantAttributeIds = array(),
 		array $configAttributeIds = array(), array $hiddenAttributeIds = array(), array $customAttributeValues = array(),
-		$stocktype = 'default' )
+		$stocktype = 'default')
 	{
 		$context = $this->getContext();
-		$productManager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
-		$productItem = $productManager->getItem( $prodid );
+		$productManager = \Aimeos\MShop\Factory::createManager($context, 'product');
+		$productItem = $productManager->getItem($prodid);
 
-		if( $productItem->getType() !== 'bundle' )
+		if ($productItem->getType() !== 'bundle')
 		{
 			return $this->getController()->addProduct(
 				$prodid, $quantity, $options, $variantAttributeIds, $configAttributeIds,
@@ -57,30 +57,30 @@ 
 			);
 		}
 
-		$productItem = $productManager->getItem( $prodid, array( 'media', 'supplier', 'price', 'product', 'text' ) );
+		$productItem = $productManager->getItem($prodid, array('media', 'supplier', 'price', 'product', 'text'));
 
-		$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' );
-		$this->addBundleProducts( $orderBaseProductItem, $productItem, $variantAttributeIds, $stocktype );
+		$prices = $productItem->getRefItems('price', 'default', 'default');
+		$this->addBundleProducts($orderBaseProductItem, $productItem, $variantAttributeIds, $stocktype);
 
-		$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 = $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 = $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->getController()->get()->addProduct( $orderBaseProductItem );
+		$this->getController()->get()->addProduct($orderBaseProductItem);
 		$this->getController()->save();
 	}
 
@@ -93,43 +93,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 = array();
-		$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/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(), array $variantAttributeIds = array(),
+	public function addProduct($prodid, $quantity = 1, array $options = array(), array $variantAttributeIds = array(),
 		array $configAttributeIds = array(), array $hiddenAttributeIds = array(), array $customAttributeValues = array(),
-		$stocktype = 'default' )
+		$stocktype = 'default')
 	{
 		$context = $this->getContext();
-		$productManager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
-		$productItem = $productManager->getItem( $prodid );
+		$productManager = \Aimeos\MShop\Factory::createManager($context, 'product');
+		$productItem = $productManager->getItem($prodid);
 
-		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' ) );
+		$productItem = $productManager->getItem($prodid, array('media', 'supplier', 'price', 'product', 'text'));
 
-		$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 = array();
-		$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/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 ) ) !== array() )
+			if (($list = $this->validateIds((array) $list)) !== array())
 			{
-				$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 = array();
-			$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, array(), $level );
-				$list = array_merge( $list, $this->getCatalogIdsFromTree( $tree ) );
+				$tree = $cntl->getCatalogTree($catId, array(), $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 = array();
 		$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 );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'product')->getItem($productId, $domains);
 	}
 
 
@@ -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 = array();
 
-		foreach( $ids as $id )
+		foreach ($ids as $id)
 		{
-			if( $id != '' ) {
+			if ($id != '') {
 				$list[] = (int) $id;
 			}
 		}

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

Spacing +9 added lines, -9 removed lines

@@ -30,7 +30,7 @@ 
 	 * @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);
 
 
 	/**
@@ -45,8 +45,8 @@ 
 	 * @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');
 
 
 	/**
@@ -60,7 +60,7 @@ 
 	 * @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');
 
 
 	/**
@@ -71,7 +71,7 @@ 
 	 * @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);
 
 
 	/**
@@ -85,7 +85,7 @@ 
 	 * @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');
 
 
 	/**
@@ -96,7 +96,7 @@ 
 	 * @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'));
 
 
 	/**
@@ -107,7 +107,7 @@ 
 	 * @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'));
 
 
 	/**
@@ -119,5 +119,5 @@ 
 	 * @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);
 }

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

Spacing +10 added lines, -10 removed lines

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

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

Spacing +8 added lines, -8 removed lines

@@ -29,7 +29,7 @@ 
 	 * @param string|null $name Name of the controller implementaton (default: "Standard")
 	 * @return \Aimeos\Controller\Frontend\Basket\Iface Controller object
 	 */
-	public static function createController( \Aimeos\MShop\Context\Item\Iface $context, $name = null )
+	public static function createController(\Aimeos\MShop\Context\Item\Iface $context, $name = null)
 	{
 		/** controller/frontend/basket/name
 		 * Class name of the used basket frontend controller implementation
@@ -64,20 +64,20 @@ 
 		 * @since 2014.03
 		 * @category Developer
 		 */
-		if( $name === null ) {
-			$name = $context->getConfig()->get( 'controller/frontend/basket/name', 'Standard' );
+		if ($name === null) {
+			$name = $context->getConfig()->get('controller/frontend/basket/name', 'Standard');
 		}
 
-		if( ctype_alnum( $name ) === false )
+		if (ctype_alnum($name) === false)
 		{
-			$classname = is_string( $name ) ? '\\Aimeos\\Controller\\Frontend\\Basket\\' . $name : '<not a string>';
-			throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+			$classname = is_string($name) ? '\\Aimeos\\Controller\\Frontend\\Basket\\' . $name : '<not a string>';
+			throw new \Aimeos\Controller\Frontend\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 		}
 
 		$iface = '\\Aimeos\\Controller\\Frontend\\Basket\\Iface';
 		$classname = '\\Aimeos\\Controller\\Frontend\\Basket\\' . $name;
 
-		$manager = self::createControllerBase( $context, $classname, $iface );
+		$manager = self::createControllerBase($context, $classname, $iface);
 
 		/** controller/frontend/basket/decorators/excludes
 		 * Excludes decorators added by the "common" option from the basket frontend controllers
@@ -153,7 +153,7 @@ 
 		 * @see controller/frontend/basket/decorators/excludes
 		 * @see controller/frontend/basket/decorators/global
 		 */
-		return self::addControllerDecorators( $context, $manager, 'basket' );
+		return self::addControllerDecorators($context, $manager, 'basket');
 	}
 
 }

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

Spacing +8 added lines, -8 removed lines

@@ -29,7 +29,7 @@ 
 	 * @param string|null $name Name of the controller implementaton (default: "Standard")
 	 * @return \Aimeos\Controller\Frontend\Order\Iface Controller object
 	 */
-	public static function createController( \Aimeos\MShop\Context\Item\Iface $context, $name = null )
+	public static function createController(\Aimeos\MShop\Context\Item\Iface $context, $name = null)
 	{
 		/** controller/frontend/order/name
 		 * Class name of the used order frontend controller implementation
@@ -64,19 +64,19 @@ 
 		 * @since 2014.03
 		 * @category Developer
 		 */
-		if( $name === null ) {
-			$name = $context->getConfig()->get( 'controller/frontend/order/name', 'Standard' );
+		if ($name === null) {
+			$name = $context->getConfig()->get('controller/frontend/order/name', 'Standard');
 		}
 
-		if( ctype_alnum( $name ) === false ) {
-			$classname = is_string( $name ) ? '\\Aimeos\\Controller\\Frontend\\Order\\' . $name : '<not a string>';
-			throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+		if (ctype_alnum($name) === false) {
+			$classname = is_string($name) ? '\\Aimeos\\Controller\\Frontend\\Order\\' . $name : '<not a string>';
+			throw new \Aimeos\Controller\Frontend\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 		}
 
 		$iface = '\\Aimeos\\Controller\\Frontend\\Order\\Iface';
 		$classname = '\\Aimeos\\Controller\\Frontend\\Order\\' . $name;
 
-		$manager = self::createControllerBase( $context, $classname, $iface );
+		$manager = self::createControllerBase($context, $classname, $iface);
 
 		/** controller/frontend/order/decorators/excludes
 		 * Excludes decorators added by the "common" option from the order frontend controllers
@@ -152,6 +152,6 @@ 
 		 * @see controller/frontend/order/decorators/excludes
 		 * @see controller/frontend/order/decorators/global
 		 */
-		return self::addControllerDecorators( $context, $manager, 'order' );
+		return self::addControllerDecorators($context, $manager, 'order');
 	}
 }

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

Spacing +8 added lines, -8 removed lines

@@ -29,7 +29,7 @@ 
 	 * @param string|null $name Name of the controller implementaton (default: "Standard")
 	 * @return \Aimeos\Controller\Frontend\Catalog\Iface Controller object
 	 */
-	public static function createController( \Aimeos\MShop\Context\Item\Iface $context, $name = null )
+	public static function createController(\Aimeos\MShop\Context\Item\Iface $context, $name = null)
 	{
 		/** controller/frontend/catalog/name
 		 * Class name of the used catalog frontend controller implementation
@@ -64,20 +64,20 @@ 
 		 * @since 2014.03
 		 * @category Developer
 		 */
-		if( $name === null ) {
-			$name = $context->getConfig()->get( 'controller/frontend/catalog/name', 'Standard' );
+		if ($name === null) {
+			$name = $context->getConfig()->get('controller/frontend/catalog/name', 'Standard');
 		}
 
-		if( ctype_alnum( $name ) === false )
+		if (ctype_alnum($name) === false)
 		{
-			$classname = is_string( $name ) ? '\\Aimeos\\Controller\\Frontend\\Catalog\\' . $name : '<not a string>';
-			throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+			$classname = is_string($name) ? '\\Aimeos\\Controller\\Frontend\\Catalog\\' . $name : '<not a string>';
+			throw new \Aimeos\Controller\Frontend\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 		}
 
 		$iface = '\\Aimeos\\Controller\\Frontend\\Catalog\\Iface';
 		$classname = '\\Aimeos\\Controller\\Frontend\\Catalog\\' . $name;
 
-		$manager = self::createControllerBase( $context, $classname, $iface );
+		$manager = self::createControllerBase($context, $classname, $iface);
 
 		/** controller/frontend/catalog/decorators/excludes
 		 * Excludes decorators added by the "common" option from the catalog frontend controllers
@@ -153,7 +153,7 @@ 
 		 * @see controller/frontend/catalog/decorators/excludes
 		 * @see controller/frontend/catalog/decorators/global
 		 */
-		return self::addControllerDecorators( $context, $manager, 'catalog' );
+		return self::addControllerDecorators($context, $manager, 'catalog');
 	}
 
 }