aimeos / ai-controller-frontend

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

Doc Comments +2 added lines, -1 removed lines

@@ -123,7 +123,7 @@ 
 	 * Returns the given search filter with the conditions attached for filtering by suppliers.
 	 *
 	 * @param \Aimeos\MW\Criteria\Iface $filter Criteria object used for product search
-	 * @param array $supIds List of supplier IDs for faceted search
+	 * @param integer[] $supIds List of supplier IDs for faceted search
 	 * @param string $listtype List type of the product associated to the supplier, usually "default"
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @since 2018.07
@@ -341,6 +341,7 @@ 
 	 * @param \Aimeos\MW\Criteria\Iface $filter Critera object which contains the filter conditions
 	 * @param string[] $domains Domain names of items that are associated with the products and that should be fetched too
 	 * @param integer &$total Parameter where the total number of found products will be stored in
+	 * @param integer $total
 	 * @return array Ordered list of product items implementing \Aimeos\MShop\Product\Item\Iface
 	 * @since 2017.03
 	 */

Spacing +87 added lines, -87 removed lines

@@ -31,36 +31,36 @@ 
 	 * @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( ( $attrIds = $this->validateIds( $attrIds ) ) !== [] )
+		if (($attrIds = $this->validateIds($attrIds)) !== [])
 		{
-			$func = $filter->createFunction( 'index.attribute:all', [$attrIds] );
+			$func = $filter->createFunction('index.attribute:all', [$attrIds]);
 			$expr = array(
-				$filter->compare( '!=', $func, null ),
+				$filter->compare('!=', $func, null),
 				$filter->getConditions(),
 			);
-			$filter->setConditions( $filter->combine( '&&', $expr ) );
+			$filter->setConditions($filter->combine('&&', $expr));
 		}
 
-		if( ( $optIds = $this->validateIds( $optIds ) ) !== [] )
+		if (($optIds = $this->validateIds($optIds)) !== [])
 		{
 			$expr = array(
-				$filter->compare( '==', 'index.attribute.id', $optIds ),
+				$filter->compare('==', 'index.attribute.id', $optIds),
 				$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)) !== [])
 			{
 				$expr = array(
-					$filter->compare( '==', 'index.attribute.id', $list ),
+					$filter->compare('==', 'index.attribute.id', $list),
 					$filter->getConditions(),
 				);
-				$filter->setConditions( $filter->combine( '&&', $expr ) );
+				$filter->setConditions($filter->combine('&&', $expr));
 			}
 		}
 
@@ -78,42 +78,42 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @since 2017.03
 	 */
-	public function addFilterCategory( \Aimeos\MW\Criteria\Iface $filter, array $catIds, $listtype = 'default',
-		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE )
+	public function addFilterCategory(\Aimeos\MW\Criteria\Iface $filter, array $catIds, $listtype = 'default',
+		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE)
 	{
-		if( ( $catIds = $this->validateIds( $catIds ) ) === [] ) {
+		if (($catIds = $this->validateIds($catIds)) === []) {
 			return $filter;
 		}
 
-		if( $level != \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE )
+		if ($level != \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE)
 		{
 			$list = [];
-			$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'catalog' );
+			$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'catalog');
 
-			foreach( $catIds as $catId )
+			foreach ($catIds as $catId)
 			{
-				$tree = $cntl->getTree( $catId, [], $level );
-				$list = array_merge( $list, $this->getCatalogIdsFromTree( $tree ) );
+				$tree = $cntl->getTree($catId, [], $level);
+				$list = array_merge($list, $this->getCatalogIdsFromTree($tree));
 			}
 
 			$catIds = $list;
 		}
 
 		$expr = [$filter->getConditions()];
-		$expr[] = $filter->compare( '==', 'index.catalog.id', array_unique( $catIds ) );
+		$expr[] = $filter->compare('==', 'index.catalog.id', array_unique($catIds));
 
-		if( isset( $filter->sortname ) && $filter->sortname === 'relevance' )
+		if (isset($filter->sortname) && $filter->sortname === 'relevance')
 		{
-			$dir = ( isset( $filter->sortdir ) ? $filter->sortdir : '+' );
+			$dir = (isset($filter->sortdir) ? $filter->sortdir : '+');
 
-			$cmpfunc = $filter->createFunction( 'index.catalog:position', [$listtype, $catIds] );
-			$expr[] = $filter->compare( '>=', $cmpfunc, 0 );
+			$cmpfunc = $filter->createFunction('index.catalog:position', [$listtype, $catIds]);
+			$expr[] = $filter->compare('>=', $cmpfunc, 0);
 
-			$sortfunc = $filter->createFunction( 'sort:index.catalog:position', [$listtype, $catIds] );
-			$filter->setSortations( [$filter->sort( $dir, $sortfunc ), $filter->sort( '+', 'product.id' )] );
+			$sortfunc = $filter->createFunction('sort:index.catalog:position', [$listtype, $catIds]);
+			$filter->setSortations([$filter->sort($dir, $sortfunc), $filter->sort('+', 'product.id')]);
 		}
 
-		$filter->setConditions( $filter->combine( '&&', $expr ) );
+		$filter->setConditions($filter->combine('&&', $expr));
 
 		return $filter;
 	}
@@ -128,27 +128,27 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @since 2018.07
 	 */
-	public function addFilterSupplier( \Aimeos\MW\Criteria\Iface $filter, array $supIds, $listtype = 'default' )
+	public function addFilterSupplier(\Aimeos\MW\Criteria\Iface $filter, array $supIds, $listtype = 'default')
 	{
-		if( ( $supIds = $this->validateIds( $supIds ) ) === [] ) {
+		if (($supIds = $this->validateIds($supIds)) === []) {
 			return $filter;
 		}
 
 		$expr = [$filter->getConditions()];
-		$expr[] = $filter->compare( '==', 'index.supplier.id', array_unique( $supIds ) );
+		$expr[] = $filter->compare('==', 'index.supplier.id', array_unique($supIds));
 
-		if( isset( $filter->sortname ) && $filter->sortname === 'relevance' )
+		if (isset($filter->sortname) && $filter->sortname === 'relevance')
 		{
-			$dir = ( isset( $filter->sortdir ) ? $filter->sortdir : '+' );
+			$dir = (isset($filter->sortdir) ? $filter->sortdir : '+');
 
-			$cmpfunc = $filter->createFunction( 'index.supplier:position', [$listtype, $supIds] );
-			$expr[] = $filter->compare( '>=', $cmpfunc, 0 );
+			$cmpfunc = $filter->createFunction('index.supplier:position', [$listtype, $supIds]);
+			$expr[] = $filter->compare('>=', $cmpfunc, 0);
 
-			$sortfunc = $filter->createFunction( 'sort:index.supplier:position', [$listtype, $supIds] );
-			$filter->setSortations( [$filter->sort( $dir, $sortfunc ), $filter->sort( '+', 'product.id' )] );
+			$sortfunc = $filter->createFunction('sort:index.supplier:position', [$listtype, $supIds]);
+			$filter->setSortations([$filter->sort($dir, $sortfunc), $filter->sort('+', 'product.id')]);
 		}
 
-		return $filter->setConditions( $filter->combine( '&&', $expr ) );
+		return $filter->setConditions($filter->combine('&&', $expr));
 	}
 
 
@@ -160,13 +160,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 )
+	public function addFilterText(\Aimeos\MW\Criteria\Iface $filter, $input)
 	{
 		$langid = $this->getContext()->getLocale()->getLanguageId();
-		$cmpfunc = $filter->createFunction( 'index.text:relevance', [$langid, $input] );
-		$expr = array( $filter->compare( '>', $cmpfunc, 0 ), $filter->getConditions() );
+		$cmpfunc = $filter->createFunction('index.text:relevance', [$langid, $input]);
+		$expr = array($filter->compare('>', $cmpfunc, 0), $filter->getConditions());
 
-		return $filter->setConditions( $filter->combine( '&&', $expr ) );
+		return $filter->setConditions($filter->combine('&&', $expr));
 	}
 
 
@@ -178,9 +178,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);
 	}
 
 
@@ -194,11 +194,11 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @since 2017.03
 	 */
-	public function createFilter( $sort = null, $direction = '+', $start = 0, $size = 100 )
+	public function createFilter($sort = null, $direction = '+', $start = 0, $size = 100)
 	{
 		$sortations = [];
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'index' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'index');
 
 
 		/** controller/frontend/product/ignore-dates
@@ -213,55 +213,55 @@ 
 		 * @since 2017.10
 		 * @category Developer
 		 */
-		if( $context->getConfig()->get( 'controller/frontend/product/ignore-dates', false ) )
+		if ($context->getConfig()->get('controller/frontend/product/ignore-dates', false))
 		{
 			$search = $manager->createSearch();
-			$search->setConditions( $search->compare( '>', 'product.status', 0 ) );
+			$search->setConditions($search->compare('>', 'product.status', 0));
 		}
 		else
 		{
-			$search = $manager->createSearch( true );
+			$search = $manager->createSearch(true);
 		}
 
 
-		$expr = array( $search->compare( '!=', 'index.catalog.id', null ) );
+		$expr = array($search->compare('!=', 'index.catalog.id', null));
 
-		switch( $sort )
+		switch ($sort)
 		{
 			case 'code':
-				$sortations[] = $search->sort( $direction, 'product.code' );
+				$sortations[] = $search->sort($direction, 'product.code');
 				break;
 
 			case 'ctime':
-				$sortations[] = $search->sort( $direction, 'product.ctime' );
+				$sortations[] = $search->sort($direction, 'product.ctime');
 				break;
 
 			case 'name':
 				$langid = $context->getLocale()->getLanguageId();
 
-				$cmpfunc = $search->createFunction( 'index.text:name', [$langid] );
-				$expr[] = $search->compare( '!=', $cmpfunc, null );
+				$cmpfunc = $search->createFunction('index.text:name', [$langid]);
+				$expr[] = $search->compare('!=', $cmpfunc, null);
 
-				$sortfunc = $search->createFunction( 'sort:index.text:name', [$langid] );
-				$sortations[] = $search->sort( $direction, $sortfunc );
+				$sortfunc = $search->createFunction('sort:index.text:name', [$langid]);
+				$sortations[] = $search->sort($direction, $sortfunc);
 				break;
 
 			case 'price':
 				$currencyid = $context->getLocale()->getCurrencyId();
 
-				$cmpfunc = $search->createFunction( 'index.price:value', ['default', $currencyid, 'default'] );
-				$expr[] = $search->compare( '!=', $cmpfunc, null );
+				$cmpfunc = $search->createFunction('index.price:value', ['default', $currencyid, 'default']);
+				$expr[] = $search->compare('!=', $cmpfunc, null);
 
-				$sortfunc = $search->createFunction( 'sort:index.price:value', ['default', $currencyid, 'default'] );
-				$sortations[] = $search->sort( $direction, $sortfunc );
+				$sortfunc = $search->createFunction('sort:index.price:value', ['default', $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);
 		$search->sortdir = $direction;
 		$search->sortname = $sort;
 
@@ -277,15 +277,15 @@ 
 	 * @return \Aimeos\MShop\Product\Item\Iface Product item including the referenced domains items
 	 * @since 2017.03
 	 */
-	public function getItem( $productId, array $domains = array( 'attribute', 'media', 'price', 'product', 'product/property', 'text' ) )
+	public function getItem($productId, array $domains = array('attribute', 'media', 'price', 'product', 'product/property', 'text'))
 	{
-		$items = $this->getItems( [$productId], $domains );
+		$items = $this->getItems([$productId], $domains);
 
-		if( ( $item = reset( $items ) ) !== false ) {
+		if (($item = reset($items)) !== false) {
 			return $item;
 		}
 
-		throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Product item with ID "%1$s" not found', $productId ) );
+		throw new \Aimeos\Controller\Frontend\Exception(sprintf('Product item with ID "%1$s" not found', $productId));
 	}
 
 
@@ -297,10 +297,10 @@ 
 	 * @return \Aimeos\MShop\Product\Item\Iface[] Associative list of product IDs as keys and product items as values
 	 * @since 2017.03
 	 */
-	public function getItems( array $productIds, array $domains = array( 'media', 'price', 'text' ) )
+	public function getItems(array $productIds, array $domains = array('media', 'price', 'text'))
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product');
 
 		/** controller/frontend/order/ignore-dates
 		 * Ignore start and end dates of products
@@ -314,24 +314,24 @@ 
 		 * @since 2017.08
 		 * @category Developer
 		 */
-		if( $context->getConfig()->get( 'controller/frontend/product/ignore-dates', false ) )
+		if ($context->getConfig()->get('controller/frontend/product/ignore-dates', false))
 		{
 			$search = $manager->createSearch();
-			$search->setConditions( $search->compare( '>', 'product.status', 0 ) );
+			$search->setConditions($search->compare('>', 'product.status', 0));
 		}
 		else
 		{
-			$search = $manager->createSearch( true );
+			$search = $manager->createSearch(true);
 		}
 
 		$expr = array(
-			$search->compare( '==', 'product.id', $productIds ),
+			$search->compare('==', 'product.id', $productIds),
 			$search->getConditions(),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, count( $productIds ) );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, count($productIds));
 
-		return $manager->searchItems( $search, $domains );
+		return $manager->searchItems($search, $domains);
 	}
 
 
@@ -344,9 +344,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);
 	}
 
 
@@ -356,16 +356,16 @@ 
 	 * @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)
 	{
-		if( $item->getStatus() < 1 ) {
+		if ($item->getStatus() < 1) {
 			return [];
 		}
 
-		$list = [ $item->getId() ];
+		$list = [$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;
@@ -378,13 +378,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 != '' && preg_match( '/^[A-Za-z0-9\-\_]+$/', $id ) === 1 ) {
+			if ($id != '' && preg_match('/^[A-Za-z0-9\-\_]+$/', $id) === 1) {
 				$list[] = (string) $id;
 			}
 		}

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

Spacing +10 added lines, -10 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);
 
 
 	/**
@@ -43,8 +43,8 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @since 2017.03
 	 */
-	public function addFilterCategory( \Aimeos\MW\Criteria\Iface $filter, array $catIds, $listtype = 'default',
-		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE );
+	public function addFilterCategory(\Aimeos\MW\Criteria\Iface $filter, array $catIds, $listtype = 'default',
+		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE);
 
 
 	/**
@@ -56,7 +56,7 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @since 2018.07
 	 */
-	public function addFilterSupplier( \Aimeos\MW\Criteria\Iface $filter, array $supIds, $listtype = 'default' );
+	public function addFilterSupplier(\Aimeos\MW\Criteria\Iface $filter, array $supIds, $listtype = 'default');
 
 
 	/**
@@ -67,7 +67,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 );
+	public function addFilterText(\Aimeos\MW\Criteria\Iface $filter, $input);
 
 
 	/**
@@ -78,7 +78,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);
 
 
 	/**
@@ -91,7 +91,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 );
+	public function createFilter($sort = null, $direction = '+', $start = 0, $size = 100);
 
 
 	/**
@@ -102,7 +102,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'));
 
 
 	/**
@@ -113,7 +113,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'));
 
 
 	/**
@@ -125,5 +125,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/src/Controller/Frontend/Product/Decorator/Base.php

Spacing +24 added lines, -24 removed lines

@@ -30,13 +30,13 @@ 
 	 * @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)
 	{
-		\Aimeos\MW\Common\Base::checkClass( '\\Aimeos\\Controller\\Frontend\\Product\\Iface', $controller );
+		\Aimeos\MW\Common\Base::checkClass('\\Aimeos\\Controller\\Frontend\\Product\\Iface', $controller);
 
 		$this->controller = $controller;
 
-		parent::__construct( $context );
+		parent::__construct($context);
 	}
 
 
@@ -48,9 +48,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);
 	}
 
 
@@ -64,9 +64,9 @@ 
 	 * @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)
 	{
-		return $this->controller->addFilterAttribute( $filter, $attrIds, $optIds, $oneIds );
+		return $this->controller->addFilterAttribute($filter, $attrIds, $optIds, $oneIds);
 	}
 
 
@@ -80,10 +80,10 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @since 2017.03
 	 */
-	public function addFilterCategory( \Aimeos\MW\Criteria\Iface $filter, $catIds, $listtype = 'default',
-		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE )
+	public function addFilterCategory(\Aimeos\MW\Criteria\Iface $filter, $catIds, $listtype = 'default',
+		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE)
 	{
-		return $this->controller->addFilterCategory( $filter, $catIds, $listtype, $level );
+		return $this->controller->addFilterCategory($filter, $catIds, $listtype, $level);
 	}
 
 
@@ -96,9 +96,9 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @since 2018.07
 	 */
-	public function addFilterSupplier( \Aimeos\MW\Criteria\Iface $filter, array $supIds, $listtype = 'default' )
+	public function addFilterSupplier(\Aimeos\MW\Criteria\Iface $filter, array $supIds, $listtype = 'default')
 	{
-		return $this->controller->addFilterSupplier( $filter, $supIds, $listtype );
+		return $this->controller->addFilterSupplier($filter, $supIds, $listtype);
 	}
 
 
@@ -110,9 +110,9 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @since 2017.03
 	 */
-	public function addFilterText( \Aimeos\MW\Criteria\Iface $filter, $input )
+	public function addFilterText(\Aimeos\MW\Criteria\Iface $filter, $input)
 	{
-		return $this->controller->addFilterText( $filter, $input );
+		return $this->controller->addFilterText($filter, $input);
 	}
 
 
@@ -124,9 +124,9 @@ 
 	 * @return array Associative list of key values as key and the product count for this key as value
 	 * @since 2015.08
 	 */
-	public function aggregate( \Aimeos\MW\Criteria\Iface $filter, $key )
+	public function aggregate(\Aimeos\MW\Criteria\Iface $filter, $key)
 	{
-		return $this->controller->aggregate( $filter, $key );
+		return $this->controller->aggregate($filter, $key);
 	}
 
 
@@ -140,9 +140,9 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @since 2015.08
 	 */
-	public function createFilter( $sort = null, $direction = '+', $start = 0, $size = 100 )
+	public function createFilter($sort = null, $direction = '+', $start = 0, $size = 100)
 	{
-		return $this->controller->createFilter( $sort, $direction, $start, $size );
+		return $this->controller->createFilter($sort, $direction, $start, $size);
 	}
 
 
@@ -154,9 +154,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 $this->controller->getItem( $productId, $domains );
+		return $this->controller->getItem($productId, $domains);
 	}
 
 
@@ -168,9 +168,9 @@ 
 	 * @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'))
 	{
-		return $this->controller->getItems( $productIds, $domains );
+		return $this->controller->getItems($productIds, $domains);
 	}
 
 
@@ -183,9 +183,9 @@ 
 	 * @return array Ordered list of product items implementing \Aimeos\MShop\Product\Item\Iface
 	 * @since 2015.08
 	 */
-	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 $this->controller->searchItems( $filter, $domains, $total );
+		return $this->controller->searchItems($filter, $domains, $total);
 	}
 
 

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

Spacing +127 added lines, -127 removed lines

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

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

Spacing +55 added lines, -55 removed lines

@@ -20,161 +20,161 @@
 	{
 		$this->context = \TestHelperFrontend::getContext();
 
-		$this->stub = $this->getMockBuilder( \Aimeos\Controller\Frontend\Product\Standard::class )
+		$this->stub = $this->getMockBuilder(\Aimeos\Controller\Frontend\Product\Standard::class)
 			->disableOriginalConstructor()
 			->getMock();
 
-		$this->object = $this->getMockBuilder( \Aimeos\Controller\Frontend\Product\Decorator\Base::class )
-			->setConstructorArgs( [$this->stub, $this->context] )
+		$this->object = $this->getMockBuilder(\Aimeos\Controller\Frontend\Product\Decorator\Base::class)
+			->setConstructorArgs([$this->stub, $this->context])
 			->getMockForAbstractClass();
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->context, $this->object, $this->stub );
+		unset($this->context, $this->object, $this->stub);
 	}
 
 
 	public function testConstructException()
 	{
-		$stub = $this->getMockBuilder( \Aimeos\Controller\Frontend\Iface::class )->getMock();
+		$stub = $this->getMockBuilder(\Aimeos\Controller\Frontend\Iface::class)->getMock();
 
-		$this->setExpectedException( \Aimeos\MW\Common\Exception::class );
+		$this->setExpectedException(\Aimeos\MW\Common\Exception::class);
 
-		$this->getMockBuilder( \Aimeos\Controller\Frontend\Product\Decorator\Base::class )
-			->setConstructorArgs( [$stub, $this->context] )
+		$this->getMockBuilder(\Aimeos\Controller\Frontend\Product\Decorator\Base::class)
+			->setConstructorArgs([$stub, $this->context])
 			->getMockForAbstractClass();
 	}
 
 
 	public function testCall()
 	{
-		$stub = $this->getMockBuilder( \Aimeos\Controller\Frontend\Product\Standard::class )
+		$stub = $this->getMockBuilder(\Aimeos\Controller\Frontend\Product\Standard::class)
 			->disableOriginalConstructor()
-			->setMethods( ['invalid'] )
+			->setMethods(['invalid'])
 			->getMock();
 
-		$object = $this->getMockBuilder( \Aimeos\Controller\Frontend\Product\Decorator\Base::class )
-			->setConstructorArgs( [$stub, $this->context] )
+		$object = $this->getMockBuilder(\Aimeos\Controller\Frontend\Product\Decorator\Base::class)
+			->setConstructorArgs([$stub, $this->context])
 			->getMockForAbstractClass();
 
-		$stub->expects( $this->once() )->method( 'invalid' )->will( $this->returnValue( true ) );
+		$stub->expects($this->once())->method('invalid')->will($this->returnValue(true));
 
-		$this->assertTrue( $object->invalid() );
+		$this->assertTrue($object->invalid());
 	}
 
 
 	public function testAddFilterAttribute()
 	{
-		$search = \Aimeos\MShop\Factory::createManager( $this->context, 'index' )->createSearch();
+		$search = \Aimeos\MShop\Factory::createManager($this->context, 'index')->createSearch();
 
-		$this->stub->expects( $this->once() )->method( 'addFilterAttribute' )
-			->will( $this->returnArgument( 0 ) );
+		$this->stub->expects($this->once())->method('addFilterAttribute')
+			->will($this->returnArgument(0));
 
-		$this->assertInstanceOf( \Aimeos\MW\Criteria\Iface::class, $this->object->addFilterAttribute( $search, [], [], [] ) );
+		$this->assertInstanceOf(\Aimeos\MW\Criteria\Iface::class, $this->object->addFilterAttribute($search, [], [], []));
 	}
 
 
 	public function testAddFilterCategory()
 	{
-		$search = \Aimeos\MShop\Factory::createManager( $this->context, 'index' )->createSearch();
+		$search = \Aimeos\MShop\Factory::createManager($this->context, 'index')->createSearch();
 
-		$this->stub->expects( $this->once() )->method( 'addFilterCategory' )
-			->will( $this->returnArgument( 0 ) );
+		$this->stub->expects($this->once())->method('addFilterCategory')
+			->will($this->returnArgument(0));
 
-		$this->assertInstanceOf( \Aimeos\MW\Criteria\Iface::class, $this->object->addFilterCategory( $search, [-1] ) );
+		$this->assertInstanceOf(\Aimeos\MW\Criteria\Iface::class, $this->object->addFilterCategory($search, [-1]));
 	}
 
 
 	public function testAddFilterSupplier()
 	{
-		$search = \Aimeos\MShop\Factory::createManager( $this->context, 'index' )->createSearch();
+		$search = \Aimeos\MShop\Factory::createManager($this->context, 'index')->createSearch();
 
-		$this->stub->expects( $this->once() )->method( 'addFilterSupplier' )
-			->will( $this->returnArgument( 0 ) );
+		$this->stub->expects($this->once())->method('addFilterSupplier')
+			->will($this->returnArgument(0));
 
-		$this->assertInstanceOf( \Aimeos\MW\Criteria\Iface::class, $this->object->addFilterSupplier( $search, [] ) );
+		$this->assertInstanceOf(\Aimeos\MW\Criteria\Iface::class, $this->object->addFilterSupplier($search, []));
 	}
 
 
 	public function testAddFilterText()
 	{
-		$search = \Aimeos\MShop\Factory::createManager( $this->context, 'index' )->createSearch();
+		$search = \Aimeos\MShop\Factory::createManager($this->context, 'index')->createSearch();
 
-		$this->stub->expects( $this->once() )->method( 'addFilterText' )
-			->will( $this->returnArgument( 0 ) );
+		$this->stub->expects($this->once())->method('addFilterText')
+			->will($this->returnArgument(0));
 
-		$this->assertInstanceOf( \Aimeos\MW\Criteria\Iface::class, $this->object->addFilterText( $search, 'test' ) );
+		$this->assertInstanceOf(\Aimeos\MW\Criteria\Iface::class, $this->object->addFilterText($search, 'test'));
 	}
 
 
 	public function testAggregate()
 	{
-		$search = \Aimeos\MShop\Factory::createManager( $this->context, 'index' )->createSearch();
+		$search = \Aimeos\MShop\Factory::createManager($this->context, 'index')->createSearch();
 
-		$this->stub->expects( $this->once() )->method( 'aggregate' )
-			->will( $this->returnValue( [] ) );
+		$this->stub->expects($this->once())->method('aggregate')
+			->will($this->returnValue([]));
 
-		$this->assertEquals( [], $this->object->aggregate( $search, 'test' ) );
+		$this->assertEquals([], $this->object->aggregate($search, 'test'));
 	}
 
 
 	public function testCreateFilter()
 	{
-		$search = \Aimeos\MShop\Factory::createManager( $this->context, 'index' )->createSearch();
+		$search = \Aimeos\MShop\Factory::createManager($this->context, 'index')->createSearch();
 
-		$this->stub->expects( $this->once() )->method( 'createFilter' )
-			->will( $this->returnValue( $search ) );
+		$this->stub->expects($this->once())->method('createFilter')
+			->will($this->returnValue($search));
 
-		$this->assertInstanceOf( \Aimeos\MW\Criteria\Iface::class, $this->object->createFilter() );
+		$this->assertInstanceOf(\Aimeos\MW\Criteria\Iface::class, $this->object->createFilter());
 	}
 
 
 	public function testGetItem()
 	{
-		$prodItem = \Aimeos\MShop\Factory::createManager( $this->context, 'index' )->createItem();
+		$prodItem = \Aimeos\MShop\Factory::createManager($this->context, 'index')->createItem();
 
-		$this->stub->expects( $this->once() )->method( 'getItem' )
-			->will( $this->returnValue( $prodItem ) );
+		$this->stub->expects($this->once())->method('getItem')
+			->will($this->returnValue($prodItem));
 
-		$this->assertInstanceOf( \Aimeos\MShop\Product\Item\Iface::class, $this->object->getItem( -1 ) );
+		$this->assertInstanceOf(\Aimeos\MShop\Product\Item\Iface::class, $this->object->getItem( -1 ));
 	}
 
 
 	public function testGetItems()
 	{
-		$this->stub->expects( $this->once() )->method( 'getItems' )
-			->will( $this->returnValue( [] ) );
+		$this->stub->expects($this->once())->method('getItems')
+			->will($this->returnValue([]));
 
-		$this->assertEquals( [], $this->object->getItems( [-1] ) );
+		$this->assertEquals([], $this->object->getItems([-1]));
 	}
 
 
 	public function testSearchItems()
 	{
-		$search = \Aimeos\MShop\Factory::createManager( $this->context, 'index' )->createSearch();
+		$search = \Aimeos\MShop\Factory::createManager($this->context, 'index')->createSearch();
 
-		$this->stub->expects( $this->once() )->method( 'searchItems' )
-			->will( $this->returnValue( [] ) );
+		$this->stub->expects($this->once())->method('searchItems')
+			->will($this->returnValue([]));
 
-		$this->assertEquals( [], $this->object->searchItems( $search ) );
+		$this->assertEquals([], $this->object->searchItems($search));
 	}
 
 
 	public function testGetController()
 	{
-		$result = $this->access( 'getController' )->invokeArgs( $this->object, [] );
+		$result = $this->access('getController')->invokeArgs($this->object, []);
 
-		$this->assertSame( $this->stub, $result );
+		$this->assertSame($this->stub, $result);
 	}
 
 
-	protected function access( $name )
+	protected function access($name)
 	{
-		$class = new \ReflectionClass( \Aimeos\Controller\Frontend\Product\Decorator\Base::class );
-		$method = $class->getMethod( $name );
-		$method->setAccessible( true );
+		$class = new \ReflectionClass(\Aimeos\Controller\Frontend\Product\Decorator\Base::class);
+		$method = $class->getMethod($name);
+		$method->setAccessible(true);
 
 		return $method;
 	}