aimeos / ai-controller-frontend

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

Doc Comments +3 added lines, -2 removed lines

@@ -73,7 +73,7 @@ 
 	 *
 	 * @param string $operator Comparison operator, e.g. "==", "!=", "<", "<=", ">=", ">", "=~", "~="
 	 * @param string $key Search key defined by the attribute manager, e.g. "attribute.status"
-	 * @param array|string $value Value or list of values to compare to
+	 * @param string $value Value or list of values to compare to
 	 * @return \Aimeos\Controller\Frontend\Attribute\Iface Attribute controller for fluent interface
 	 * @since 2019.04
 	 */
@@ -146,6 +146,7 @@ 
 	 *
 	 * @param string[] $domains Domain names of items that are associated with the attributes and that should be fetched too
 	 * @param integer &$total Parameter where the total number of found attributes will be stored in
+	 * @param integer $total
 	 * @return \Aimeos\MShop\Attribute\Item\Iface[] Ordered list of attribute items
 	 * @since 2019.04
 	 */
@@ -212,7 +213,7 @@ 
 	/**
 	 * Adds attribute types for filtering
 	 *
-	 * @param array|string $codes Attribute ID or list of IDs
+	 * @param string $codes Attribute ID or list of IDs
 	 * @return \Aimeos\Controller\Frontend\Attribute\Iface Attribute controller for fluent interface
 	 * @since 2019.04
 	 */

Spacing +35 added lines, -35 removed lines

@@ -32,12 +32,12 @@ 
 	 *
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Common MShop context object
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		parent::__construct( $context );
+		parent::__construct($context);
 
-		$this->manager = \Aimeos\MShop::create( $context, 'attribute' );
-		$this->filter = $this->manager->createSearch( true );
+		$this->manager = \Aimeos\MShop::create($context, 'attribute');
+		$this->filter = $this->manager->createSearch(true);
 		$this->conditions[] = $this->filter->getConditions();
 	}
 
@@ -58,10 +58,10 @@ 
 	 * @return \Aimeos\Controller\Frontend\Attribute\Iface Attribute controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function attribute( $attrIds )
+	public function attribute($attrIds)
 	{
-		if( !empty( $attrIds ) ) {
-			$this->conditions[] = $this->filter->compare( '==', 'attribute.id', $attrIds );
+		if (!empty($attrIds)) {
+			$this->conditions[] = $this->filter->compare('==', 'attribute.id', $attrIds);
 		}
 
 		return $this;
@@ -77,9 +77,9 @@ 
 	 * @return \Aimeos\Controller\Frontend\Attribute\Iface Attribute controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function compare( $operator, $key, $value )
+	public function compare($operator, $key, $value)
 	{
-		$this->conditions[] = $this->filter->compare( $operator, $key, $value );
+		$this->conditions[] = $this->filter->compare($operator, $key, $value);
 		return $this;
 	}
 
@@ -91,7 +91,7 @@ 
 	 * @return \Aimeos\Controller\Frontend\Attribute\Iface Attribute controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function domain( $domain )
+	public function domain($domain)
 	{
 		$this->domain = $domain;
 		return $this;
@@ -106,9 +106,9 @@ 
 	 * @return \Aimeos\MShop\Attribute\Item\Iface Attribute item including the referenced domains items
 	 * @since 2019.04
 	 */
-	public function get( $id, $domains = ['media', 'price', 'text'] )
+	public function get($id, $domains = ['media', 'price', 'text'])
 	{
-		return $this->manager->getItem( $id, $domains, true );
+		return $this->manager->getItem($id, $domains, true);
 	}
 
 
@@ -121,9 +121,9 @@ 
 	 * @return \Aimeos\MShop\Attribute\Item\Iface Attribute item including the referenced domains items
 	 * @since 2019.04
 	 */
-	public function find( $code, $domains = ['media', 'price', 'text'], $type )
+	public function find($code, $domains = ['media', 'price', 'text'], $type)
 	{
-		return $this->manager->findItem( $code, $domains, $this->domain, $type, true );
+		return $this->manager->findItem($code, $domains, $this->domain, $type, true);
 	}
 
 
@@ -134,9 +134,9 @@ 
 	 * @return \Aimeos\Controller\Frontend\Attribute\Iface Attribute controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function parse( array $conditions )
+	public function parse(array $conditions)
 	{
-		$this->conditions[] = $this->filter->toConditions( $conditions );
+		$this->conditions[] = $this->filter->toConditions($conditions);
 		return $this;
 	}
 
@@ -149,12 +149,12 @@ 
 	 * @return \Aimeos\MShop\Attribute\Item\Iface[] Ordered list of attribute items
 	 * @since 2019.04
 	 */
-	public function search( $domains = ['media', 'price', 'text'], &$total = null )
+	public function search($domains = ['media', 'price', 'text'], &$total = null)
 	{
-		$expr = array_merge( $this->conditions, [$this->filter->compare( '==', 'attribute.domain', $this->domain )] );
-		$this->filter->setConditions( $this->filter->combine( '&&', $expr ) );
+		$expr = array_merge($this->conditions, [$this->filter->compare('==', 'attribute.domain', $this->domain)]);
+		$this->filter->setConditions($this->filter->combine('&&', $expr));
 
-		return $this->manager->searchItems( $this->filter, $domains, $total );
+		return $this->manager->searchItems($this->filter, $domains, $total);
 	}
 
 
@@ -166,9 +166,9 @@ 
 	 * @return \Aimeos\Controller\Frontend\Attribute\Iface Attribute controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function slice( $start, $limit )
+	public function slice($start, $limit)
 	{
-		$this->filter->setSlice( $start, $limit );
+		$this->filter->setSlice($start, $limit);
 		return $this;
 	}
 
@@ -180,29 +180,29 @@ 
 	 * @return \Aimeos\Controller\Frontend\Attribute\Iface Attribute controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function sort( $key = null )
+	public function sort($key = null)
 	{
 		$direction = '+';
 
-		if( $key != null && $key[0] === '-' )
+		if ($key != null && $key[0] === '-')
 		{
-			$key = substr( $key, 1 );
+			$key = substr($key, 1);
 			$direction = '-';
 		}
 
-		switch( $key )
+		switch ($key)
 		{
 			case null:
-				$this->filter->setSortations( [] );
+				$this->filter->setSortations([]);
 				break;
 			case 'position':
-				$this->filter->setSortations( [
-					$this->filter->sort( $direction, 'attribute.type' ),
-					$this->filter->sort( $direction, 'attribute.position' )
-				] );
+				$this->filter->setSortations([
+					$this->filter->sort($direction, 'attribute.type'),
+					$this->filter->sort($direction, 'attribute.position')
+				]);
 				break;
 			default:
-				$this->filter->setSortations( [$this->filter->sort( $direction, $key )] );
+				$this->filter->setSortations([$this->filter->sort($direction, $key)]);
 		}
 
 		return $this;
@@ -216,10 +216,10 @@ 
 	 * @return \Aimeos\Controller\Frontend\Attribute\Iface Attribute controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function type( $codes )
+	public function type($codes)
 	{
-		if( !empty( $codes ) ) {
-			$this->conditions[] = $this->filter->compare( '==', 'attribute.type', $codes );
+		if (!empty($codes)) {
+			$this->conditions[] = $this->filter->compare('==', 'attribute.type', $codes);
 		}
 
 		return $this;

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

Doc Comments +2 added lines, -1 removed lines

@@ -145,7 +145,7 @@ 
 	 *
 	 * @param string $operator Comparison operator, e.g. "==", "!=", "<", "<=", ">=", ">", "=~", "~="
 	 * @param string $key Search key defined by the product manager, e.g. "product.status"
-	 * @param array|string $value Value or list of values to compare to
+	 * @param string $value Value or list of values to compare to
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
 	 * @since 2019.04
 	 */
@@ -249,6 +249,7 @@ 
 	 *
 	 * @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 \Aimeos\MShop\Product\Item\Iface[] Ordered list of product items
 	 * @since 2019.04
 	 */

Spacing +85 added lines, -85 removed lines

@@ -32,13 +32,13 @@ 
 	 *
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Common MShop context object
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		parent::__construct( $context );
+		parent::__construct($context);
 
-		$this->manager = \Aimeos\MShop::create( $context, 'index' );
-		$this->filter = $this->manager->createSearch( true );
-		$this->conditions[] = $this->filter->compare( '!=', 'index.catalog.id', null );
+		$this->manager = \Aimeos\MShop::create($context, 'index');
+		$this->filter = $this->manager->createSearch(true);
+		$this->conditions[] = $this->filter->compare('!=', 'index.catalog.id', null);
 
 		/** controller/frontend/product/ignore-dates
 		 * Ignore start and end dates of products
@@ -52,8 +52,8 @@ 
 		 * @since 2017.08
 		 * @category Developer
 		 */
-		if( $context->getConfig()->get( 'controller/frontend/product/ignore-dates', false ) ) {
-			$this->conditions[] = $this->filter->compare( '>', 'product.status', 0 );
+		if ($context->getConfig()->get('controller/frontend/product/ignore-dates', false)) {
+			$this->conditions[] = $this->filter->compare('>', 'product.status', 0);
 		} else {
 			$this->conditions[] = $this->filter->getConditions();
 		}
@@ -76,10 +76,10 @@ 
 	 * @return array Associative list of key values as key and the product count for this key as value
 	 * @since 2019.04
 	 */
-	public function aggregate( $key )
+	public function aggregate($key)
 	{
-		$this->filter->setConditions( $this->filter->combine( '&&', $this->conditions ) );
-		return $this->manager->aggregate( $this->filter, $key );
+		$this->filter->setConditions($this->filter->combine('&&', $this->conditions));
+		return $this->manager->aggregate($this->filter, $key);
 	}
 
 
@@ -90,12 +90,12 @@ 
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function allOf( $attrIds )
+	public function allOf($attrIds)
 	{
-		if( !empty( $attrIds ) && ( $ids = array_unique( $this->validateIds( (array) $attrIds ) ) ) !== [] )
+		if (!empty($attrIds) && ($ids = array_unique($this->validateIds((array) $attrIds))) !== [])
 		{
-			$func = $this->filter->createFunction( 'index.attribute:all', [$ids] );
-			$this->conditions[] = $this->filter->compare( '!=', $func, null );
+			$func = $this->filter->createFunction('index.attribute:all', [$ids]);
+			$this->conditions[] = $this->filter->compare('!=', $func, null);
 		}
 
 		return $this;
@@ -111,29 +111,29 @@ 
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function category( $catIds, $listtype = 'default', $level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE )
+	public function category($catIds, $listtype = 'default', $level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE)
 	{
-		if( !empty( $catIds ) && ( $ids = $this->validateIds( (array) $catIds ) ) !== [] )
+		if (!empty($catIds) && ($ids = $this->validateIds((array) $catIds)) !== [])
 		{
-			if( $level != \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE )
+			if ($level != \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE)
 			{
 				$list = [];
-				$cntl = \Aimeos\Controller\Frontend::create( $this->getContext(), 'catalog' );
+				$cntl = \Aimeos\Controller\Frontend::create($this->getContext(), 'catalog');
 
-				foreach( $ids as $catId ) {
-					$list += $cntl->root( $catId )->getTree( [], $level )->toList();
+				foreach ($ids as $catId) {
+					$list += $cntl->root($catId)->getTree([], $level)->toList();
 				}
 
-				$ids = array_keys( $list );
+				$ids = array_keys($list);
 			}
 
-			$func = $this->filter->createFunction( 'index.catalog:position', [$listtype, $ids] );
+			$func = $this->filter->createFunction('index.catalog:position', [$listtype, $ids]);
 
-			$this->conditions[] = $this->filter->compare( '==', 'index.catalog.id', $ids );
-			$this->conditions[] = $this->filter->compare( '>=', $func, 0 );
+			$this->conditions[] = $this->filter->compare('==', 'index.catalog.id', $ids);
+			$this->conditions[] = $this->filter->compare('>=', $func, 0);
 
-			$func = $this->filter->createFunction( 'sort:index.catalog:position', [$listtype, $ids] );
-			$this->sort = $this->filter->sort( '+', $func );
+			$func = $this->filter->createFunction('sort:index.catalog:position', [$listtype, $ids]);
+			$this->sort = $this->filter->sort('+', $func);
 		}
 
 		return $this;
@@ -149,9 +149,9 @@ 
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function compare( $operator, $key, $value )
+	public function compare($operator, $key, $value)
 	{
-		$this->conditions[] = $this->filter->compare( $operator, $key, $value );
+		$this->conditions[] = $this->filter->compare($operator, $key, $value);
 		return $this;
 	}
 
@@ -164,9 +164,9 @@ 
 	 * @return \Aimeos\MShop\Product\Item\Iface Product item including the referenced domains items
 	 * @since 2019.04
 	 */
-	public function get( $id, $domains = ['media', 'price', 'text'] )
+	public function get($id, $domains = ['media', 'price', 'text'])
 	{
-		return $this->manager->getItem( $id, $domains, true );
+		return $this->manager->getItem($id, $domains, true);
 	}
 
 
@@ -178,9 +178,9 @@ 
 	 * @return \Aimeos\MShop\Product\Item\Iface Product item including the referenced domains items
 	 * @since 2019.04
 	 */
-	public function find( $code, $domains = ['media', 'price', 'text'] )
+	public function find($code, $domains = ['media', 'price', 'text'])
 	{
-		return $this->manager->findItem( $code, $domains, 'product', null, true );
+		return $this->manager->findItem($code, $domains, 'product', null, true);
 	}
 
 
@@ -193,20 +193,20 @@ 
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function oneOf( $attrIds )
+	public function oneOf($attrIds)
 	{
 		$attrIds = (array) $attrIds;
 
-		foreach( $attrIds as $key => $entry )
+		foreach ($attrIds as $key => $entry)
 		{
-			if( is_array( $entry ) && ( $ids = array_unique( $this->validateIds( $entry ) ) ) !== [] ) {
-				$this->conditions[] = $this->filter->compare( '==', 'index.attribute.id', $ids );
-				unset( $attrIds[$key] );
+			if (is_array($entry) && ($ids = array_unique($this->validateIds($entry))) !== []) {
+				$this->conditions[] = $this->filter->compare('==', 'index.attribute.id', $ids);
+				unset($attrIds[$key]);
 			}
 		}
 
-		if( ( $ids = array_unique( $this->validateIds( $attrIds ) ) ) !== [] ) {
-			$this->conditions[] = $this->filter->compare( '==', 'index.attribute.id', $ids );
+		if (($ids = array_unique($this->validateIds($attrIds))) !== []) {
+			$this->conditions[] = $this->filter->compare('==', 'index.attribute.id', $ids);
 		}
 
 		return $this;
@@ -220,9 +220,9 @@ 
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function parse( array $conditions )
+	public function parse(array $conditions)
 	{
-		$this->conditions[] = $this->filter->toConditions( $conditions );
+		$this->conditions[] = $this->filter->toConditions($conditions);
 		return $this;
 	}
 
@@ -234,10 +234,10 @@ 
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function product( $prodIds )
+	public function product($prodIds)
 	{
-		if( !empty( $prodIds ) && ( $ids = array_unique( $this->validateIds( (array) $prodIds ) ) ) !== [] ) {
-			$this->conditions[] = $this->filter->compare( '==', 'product.id', $ids );
+		if (!empty($prodIds) && ($ids = array_unique($this->validateIds((array) $prodIds))) !== []) {
+			$this->conditions[] = $this->filter->compare('==', 'product.id', $ids);
 		}
 
 		return $this;
@@ -252,10 +252,10 @@ 
 	 * @return \Aimeos\MShop\Product\Item\Iface[] Ordered list of product items
 	 * @since 2019.04
 	 */
-	public function search( $domains = ['media', 'price', 'text'], &$total = null )
+	public function search($domains = ['media', 'price', 'text'], &$total = null)
 	{
-		$this->filter->setConditions( $this->filter->combine( '&&', $this->conditions ) );
-		return $this->manager->searchItems( $this->filter, $domains, $total );
+		$this->filter->setConditions($this->filter->combine('&&', $this->conditions));
+		return $this->manager->searchItems($this->filter, $domains, $total);
 	}
 
 
@@ -267,9 +267,9 @@ 
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function slice( $start, $limit )
+	public function slice($start, $limit)
 	{
-		$this->filter->setSlice( $start, $limit );
+		$this->filter->setSlice($start, $limit);
 		return $this;
 	}
 
@@ -281,17 +281,17 @@ 
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function sort( $key = null )
+	public function sort($key = null)
 	{
 		$direction = '+';
 
-		if( $key != null && $key[0] === '-' )
+		if ($key != null && $key[0] === '-')
 		{
-			$key = substr( $key, 1 );
+			$key = substr($key, 1);
 			$direction = '-';
 		}
 
-		switch( $key )
+		switch ($key)
 		{
 			case null:
 				$this->sort = null;
@@ -301,39 +301,39 @@ 
 				break;
 
 			case 'code':
-				$this->sort = $this->filter->sort( $direction, 'product.code' );
+				$this->sort = $this->filter->sort($direction, 'product.code');
 				break;
 
 			case 'ctime':
-				$this->sort = $this->filter->sort( $direction, 'product.ctime' );
+				$this->sort = $this->filter->sort($direction, 'product.ctime');
 				break;
 
 			case 'name':
 				$langid = $this->getContext()->getLocale()->getLanguageId();
 
-				$cmpfunc = $this->filter->createFunction( 'index.text:name', [$langid] );
-				$this->conditions[] = $this->filter->compare( '!=', $cmpfunc, null );
+				$cmpfunc = $this->filter->createFunction('index.text:name', [$langid]);
+				$this->conditions[] = $this->filter->compare('!=', $cmpfunc, null);
 
-				$sortfunc = $this->filter->createFunction( 'sort:index.text:name', [$langid] );
-				$this->sort = $this->filter->sort( $direction, $sortfunc );
+				$sortfunc = $this->filter->createFunction('sort:index.text:name', [$langid]);
+				$this->sort = $this->filter->sort($direction, $sortfunc);
 				break;
 
 			case 'price':
 				$currencyid = $this->getContext()->getLocale()->getCurrencyId();
 
-				$cmpfunc = $this->filter->createFunction( 'index.price:value', [$currencyid] );
-				$this->conditions[] = $this->filter->compare( '!=', $cmpfunc, null );
+				$cmpfunc = $this->filter->createFunction('index.price:value', [$currencyid]);
+				$this->conditions[] = $this->filter->compare('!=', $cmpfunc, null);
 
-				$sortfunc = $this->filter->createFunction( 'sort:index.price:value', [$currencyid] );
-				$this->sort = $this->filter->sort( $direction, $sortfunc );
+				$sortfunc = $this->filter->createFunction('sort:index.price:value', [$currencyid]);
+				$this->sort = $this->filter->sort($direction, $sortfunc);
 				break;
 
 			default:
-				$this->sort = $this->filter->sort( $direction, $key );
+				$this->sort = $this->filter->sort($direction, $key);
 		}
 
-		if( $this->sort ) {
-			$this->filter->setSortations( [$this->sort] );
+		if ($this->sort) {
+			$this->filter->setSortations([$this->sort]);
 		}
 
 		return $this;
@@ -348,17 +348,17 @@ 
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function supplier( $supIds, $listtype = 'default' )
+	public function supplier($supIds, $listtype = 'default')
 	{
-		if( !empty( $supIds ) && ( $ids = array_unique( $this->validateIds( (array) $supIds ) ) ) !== [] )
+		if (!empty($supIds) && ($ids = array_unique($this->validateIds((array) $supIds))) !== [])
 		{
-			$func = $this->filter->createFunction( 'index.supplier:position', [$listtype, $ids] );
+			$func = $this->filter->createFunction('index.supplier:position', [$listtype, $ids]);
 
-			$this->conditions[] = $this->filter->compare( '==', 'index.supplier.id', $ids );
-			$this->conditions[] = $this->filter->compare( '>=', $func, 0 );
+			$this->conditions[] = $this->filter->compare('==', 'index.supplier.id', $ids);
+			$this->conditions[] = $this->filter->compare('>=', $func, 0);
 
-			$func = $this->filter->createFunction( 'sort:index.supplier:position', [$listtype, $ids] );
-			$this->sort = $this->filter->sort( '+', $func );
+			$func = $this->filter->createFunction('sort:index.supplier:position', [$listtype, $ids]);
+			$this->sort = $this->filter->sort('+', $func);
 		}
 
 		return $this;
@@ -372,14 +372,14 @@ 
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function text( $text )
+	public function text($text)
 	{
-		if( !empty( $text ) )
+		if (!empty($text))
 		{
 			$langid = $this->getContext()->getLocale()->getLanguageId();
-			$func = $this->filter->createFunction( 'index.text:relevance', [$langid, $text] );
+			$func = $this->filter->createFunction('index.text:relevance', [$langid, $text]);
 
-			$this->conditions[] = $this->filter->compare( '>', $func, 0 );
+			$this->conditions[] = $this->filter->compare('>', $func, 0);
 		}
 
 		return $this;
@@ -392,16 +392,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;
@@ -414,13 +414,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/tests/Controller/Frontend/Attribute/Decorator/BaseTest.php

Doc Comments +3 added lines

@@ -176,6 +176,9 @@
 	}
 
 
+	/**
+	 * @param string $name
+	 */
 	protected function access( $name )
 	{
 		$class = new \ReflectionClass( \Aimeos\Controller\Frontend\Attribute\Decorator\Base::class );

Spacing +50 added lines, -50 removed lines

@@ -20,48 +20,48 @@ 
 	{
 		$this->context = \TestHelperFrontend::getContext();
 
-		$this->stub = $this->getMockBuilder( \Aimeos\Controller\Frontend\Attribute\Standard::class )
+		$this->stub = $this->getMockBuilder(\Aimeos\Controller\Frontend\Attribute\Standard::class)
 			->disableOriginalConstructor()
 			->getMock();
 
-		$this->object = $this->getMockBuilder( \Aimeos\Controller\Frontend\Attribute\Decorator\Base::class )
-			->setConstructorArgs( [$this->stub, $this->context] )
+		$this->object = $this->getMockBuilder(\Aimeos\Controller\Frontend\Attribute\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\Attribute\Decorator\Base::class )
-			->setConstructorArgs( [$stub, $this->context] )
+		$this->getMockBuilder(\Aimeos\Controller\Frontend\Attribute\Decorator\Base::class)
+			->setConstructorArgs([$stub, $this->context])
 			->getMockForAbstractClass();
 	}
 
 
 	public function testCall()
 	{
-		$stub = $this->getMockBuilder( \Aimeos\Controller\Frontend\Attribute\Standard::class )
+		$stub = $this->getMockBuilder(\Aimeos\Controller\Frontend\Attribute\Standard::class)
 			->disableOriginalConstructor()
-			->setMethods( ['invalid'] )
+			->setMethods(['invalid'])
 			->getMock();
 
-		$object = $this->getMockBuilder( \Aimeos\Controller\Frontend\Attribute\Decorator\Base::class )
-			->setConstructorArgs( [$stub, $this->context] )
+		$object = $this->getMockBuilder(\Aimeos\Controller\Frontend\Attribute\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());
 	}
 
 
@@ -69,10 +69,10 @@ 
 	{
 		$expected = \Aimeos\Controller\Frontend\Attribute\Iface::class;
 
-		$this->stub->expects( $this->once() )->method( 'attribute' )
-			->will( $this->returnValue( $this->stub ) );
+		$this->stub->expects($this->once())->method('attribute')
+			->will($this->returnValue($this->stub));
 
-		$this->assertInstanceOf( $expected, $this->object->attribute( [1, 3] ) );
+		$this->assertInstanceOf($expected, $this->object->attribute([1, 3]));
 	}
 
 
@@ -80,10 +80,10 @@ 
 	{
 		$expected = \Aimeos\Controller\Frontend\Attribute\Iface::class;
 
-		$this->stub->expects( $this->once() )->method( 'domain' )
-			->will( $this->returnValue( $this->stub ) );
+		$this->stub->expects($this->once())->method('domain')
+			->will($this->returnValue($this->stub));
 
-		$this->assertInstanceOf( $expected, $this->object->domain( 'catalog' ) );
+		$this->assertInstanceOf($expected, $this->object->domain('catalog'));
 	}
 
 
@@ -91,34 +91,34 @@ 
 	{
 		$expected = \Aimeos\Controller\Frontend\Attribute\Iface::class;
 
-		$this->stub->expects( $this->once() )->method( 'compare' )
-			->will( $this->returnValue( $this->stub ) );
+		$this->stub->expects($this->once())->method('compare')
+			->will($this->returnValue($this->stub));
 
-		$this->assertInstanceOf( $expected, $this->object->compare( '==', 'attribute.code', 'test' ) );
+		$this->assertInstanceOf($expected, $this->object->compare('==', 'attribute.code', 'test'));
 	}
 
 
 	public function testGet()
 	{
-		$item = \Aimeos\MShop::create( $this->context, 'attribute' )->createItem();
+		$item = \Aimeos\MShop::create($this->context, 'attribute')->createItem();
 		$expected = \Aimeos\MShop\Attribute\Item\Iface::class;
 
-		$this->stub->expects( $this->once() )->method( 'get' )
-			->will( $this->returnValue( $item ) );
+		$this->stub->expects($this->once())->method('get')
+			->will($this->returnValue($item));
 
-		$this->assertInstanceOf( $expected, $this->object->get( 1, ['text'] ) );
+		$this->assertInstanceOf($expected, $this->object->get(1, ['text']));
 	}
 
 
 	public function testFind()
 	{
-		$item = \Aimeos\MShop::create( $this->context, 'attribute' )->createItem();
+		$item = \Aimeos\MShop::create($this->context, 'attribute')->createItem();
 		$expected = \Aimeos\MShop\Attribute\Item\Iface::class;
 
-		$this->stub->expects( $this->once() )->method( 'find' )
-			->will( $this->returnValue( $item ) );
+		$this->stub->expects($this->once())->method('find')
+			->will($this->returnValue($item));
 
-		$this->assertInstanceOf( $expected, $this->object->find( 'test', ['text'], 'color' ) );
+		$this->assertInstanceOf($expected, $this->object->find('test', ['text'], 'color'));
 	}
 
 
@@ -126,23 +126,23 @@ 
 	{
 		$expected = \Aimeos\Controller\Frontend\Attribute\Iface::class;
 
-		$this->stub->expects( $this->once() )->method( 'parse' )
-			->will( $this->returnValue( $this->stub ) );
+		$this->stub->expects($this->once())->method('parse')
+			->will($this->returnValue($this->stub));
 
-		$this->assertInstanceOf( $expected, $this->object->parse( [] ) );
+		$this->assertInstanceOf($expected, $this->object->parse([]));
 	}
 
 
 	public function testSearch()
 	{
-		$item = \Aimeos\MShop::create( $this->context, 'attribute' )->createItem();
+		$item = \Aimeos\MShop::create($this->context, 'attribute')->createItem();
 		$expected = \Aimeos\MShop\Attribute\Item\Iface::class;
 		$total = 0;
 
-		$this->stub->expects( $this->once() )->method( 'search' )
-			->will( $this->returnValue( [$item] ) );
+		$this->stub->expects($this->once())->method('search')
+			->will($this->returnValue([$item]));
 
-		$this->assertEquals( [$item], $this->object->search( ['text'], $total ) );
+		$this->assertEquals([$item], $this->object->search(['text'], $total));
 	}
 
 
@@ -150,10 +150,10 @@ 
 	{
 		$expected = \Aimeos\Controller\Frontend\Attribute\Iface::class;
 
-		$this->stub->expects( $this->once() )->method( 'slice' )
-			->will( $this->returnValue( $this->stub ) );
+		$this->stub->expects($this->once())->method('slice')
+			->will($this->returnValue($this->stub));
 
-		$this->assertInstanceOf( $expected, $this->object->slice( 0, 100 ) );
+		$this->assertInstanceOf($expected, $this->object->slice(0, 100));
 	}
 
 
@@ -161,26 +161,26 @@ 
 	{
 		$expected = \Aimeos\Controller\Frontend\Attribute\Iface::class;
 
-		$this->stub->expects( $this->once() )->method( 'sort' )
-			->will( $this->returnValue( $this->stub ) );
+		$this->stub->expects($this->once())->method('sort')
+			->will($this->returnValue($this->stub));
 
-		$this->assertInstanceOf( $expected, $this->object->sort( 'position' ) );
+		$this->assertInstanceOf($expected, $this->object->sort('position'));
 	}
 
 
 	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\Attribute\Decorator\Base::class );
-		$method = $class->getMethod( $name );
-		$method->setAccessible( true );
+		$class = new \ReflectionClass(\Aimeos\Controller\Frontend\Attribute\Decorator\Base::class);
+		$method = $class->getMethod($name);
+		$method->setAccessible(true);
 
 		return $method;
 	}

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

Spacing +22 added lines, -22 removed lines

@@ -18,104 +18,104 @@
 	protected function setUp()
 	{
 		$this->context = \TestHelperFrontend::getContext();
-		$this->object = new \Aimeos\Controller\Frontend\Attribute\Standard( $this->context );
+		$this->object = new \Aimeos\Controller\Frontend\Attribute\Standard($this->context);
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object, $this->context );
+		unset($this->object, $this->context);
 	}
 
 
 	public function testAttribute()
 	{
-		$manager = \Aimeos\MShop::create( $this->context, 'attribute' );
+		$manager = \Aimeos\MShop::create($this->context, 'attribute');
 
-		$blueId = $manager->findItem( 'blue', [], 'product', 'color' )->getId();
-		$whiteId = $manager->findItem( 'white', [], 'product', 'color' )->getId();
+		$blueId = $manager->findItem('blue', [], 'product', 'color')->getId();
+		$whiteId = $manager->findItem('white', [], 'product', 'color')->getId();
 
-		$this->assertEquals( 2, count( $this->object->attribute( [$blueId, $whiteId] )->search() ) );
+		$this->assertEquals(2, count($this->object->attribute([$blueId, $whiteId])->search()));
 	}
 
 
 	public function testDomain()
 	{
-		$this->assertEquals( 5, count( $this->object->domain( 'media' )->search() ) );
+		$this->assertEquals(5, count($this->object->domain('media')->search()));
 	}
 
 
 	public function testCompare()
 	{
-		$this->assertEquals( 5, count( $this->object->compare( '==', 'attribute.type', 'color' )->search() ) );
+		$this->assertEquals(5, count($this->object->compare('==', 'attribute.type', 'color')->search()));
 	}
 
 
 	public function testGet()
 	{
 		$iface = \Aimeos\MShop\Attribute\Item\Iface::class;
-		$item = \Aimeos\MShop::create( $this->context, 'attribute' )->findItem( 'white', [], 'product', 'color' );
+		$item = \Aimeos\MShop::create($this->context, 'attribute')->findItem('white', [], 'product', 'color');
 
-		$this->assertInstanceOf( $iface, $this->object->get( $item->getId() ) );
+		$this->assertInstanceOf($iface, $this->object->get($item->getId()));
 	}
 
 
 	public function testFind()
 	{
 		$iface = \Aimeos\MShop\Attribute\Item\Iface::class;
-		$this->assertInstanceOf( $iface, $this->object->find( 'white', [], 'color' ) );
+		$this->assertInstanceOf($iface, $this->object->find('white', [], 'color'));
 	}
 
 
 	public function testParse()
 	{
 		$cond = ['&&' => [['>' => ['attribute.status' => 0]], ['==' => ['attribute.type' => 'color']]]];
-		$this->assertEquals( 5, count( $this->object->parse( $cond )->search() ) );
+		$this->assertEquals(5, count($this->object->parse($cond)->search()));
 	}
 
 
 	public function testSearch()
 	{
 		$total = 0;
-		$this->assertGreaterThanOrEqual( 26, count( $this->object->search( [], $total ) ) );
-		$this->assertGreaterThanOrEqual( 26, $total );
+		$this->assertGreaterThanOrEqual(26, count($this->object->search([], $total)));
+		$this->assertGreaterThanOrEqual(26, $total);
 	}
 
 
 	public function testSlice()
 	{
-		$this->assertEquals( 2, count( $this->object->slice( 0, 2 )->search() ) );
+		$this->assertEquals(2, count($this->object->slice(0, 2)->search()));
 	}
 
 
 	public function testSort()
 	{
-		$this->assertGreaterThanOrEqual( 26, count( $this->object->sort()->search() ) );
+		$this->assertGreaterThanOrEqual(26, count($this->object->sort()->search()));
 	}
 
 
 	public function testSortGeneric()
 	{
-		$this->assertGreaterThanOrEqual( 26, count( $this->object->sort( 'attribute.status' )->search() ) );
+		$this->assertGreaterThanOrEqual(26, count($this->object->sort('attribute.status')->search()));
 	}
 
 
 	public function testSortPosition()
 	{
-		$result = $this->object->sort( 'position' )->search( [] );
-		$this->assertEquals( 'white', reset( $result )->getCode() );
+		$result = $this->object->sort('position')->search([]);
+		$this->assertEquals('white', reset($result)->getCode());
 	}
 
 
 	public function testSortCodeDesc()
 	{
-		$result = $this->object->sort( '-position' )->search( [] );
-		$this->assertStringStartsWith( 'white', end( $result )->getCode() );
+		$result = $this->object->sort('-position')->search([]);
+		$this->assertStringStartsWith('white', end($result)->getCode());
 	}
 
 
 	public function testType()
 	{
-		$this->assertEquals( 6, count( $this->object->type( 'size' )->search() ) );
+		$this->assertEquals(6, count($this->object->type('size')->search()));
 	}
 }

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

Spacing +26 added lines, -26 removed lines

@@ -19,41 +19,41 @@ 
 	protected function setUp()
 	{
 		$this->context = \TestHelperFrontend::getContext();
-		$this->object = new \Aimeos\Controller\Frontend\Catalog\Standard( $this->context );
+		$this->object = new \Aimeos\Controller\Frontend\Catalog\Standard($this->context);
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object, $this->context );
+		unset($this->object, $this->context);
 	}
 
 
 	public function testCompare()
 	{
-		$list = $this->object->compare( '==', 'catalog.code', 'categories' )->getTree( [] )->toList();
-		$this->assertEquals( 1, count( $list ) );
+		$list = $this->object->compare('==', 'catalog.code', 'categories')->getTree([])->toList();
+		$this->assertEquals(1, count($list));
 	}
 
 
 	public function testGet()
 	{
 		$iface = \Aimeos\MShop\Catalog\Item\Iface::class;
-		$item = \Aimeos\MShop::create( $this->context, 'catalog' )->findItem( 'cafe', [] );
+		$item = \Aimeos\MShop::create($this->context, 'catalog')->findItem('cafe', []);
 
-		$this->assertInstanceOf( $iface, $this->object->get( $item->getId() ) );
+		$this->assertInstanceOf($iface, $this->object->get($item->getId()));
 	}
 
 
 	public function testGetPath()
 	{
-		$manager = \Aimeos\MShop::create( $this->context, 'catalog' );
-		$items = $this->object->getPath( $manager->findItem( 'cafe', [] )->getId() );
+		$manager = \Aimeos\MShop::create($this->context, 'catalog');
+		$items = $this->object->getPath($manager->findItem('cafe', [])->getId());
 
-		$this->assertEquals( 3, count( $items ) );
+		$this->assertEquals(3, count($items));
 
-		foreach( $items as $item ) {
-			$this->assertInstanceOf( \Aimeos\MShop\Catalog\Item\Iface::class, $item );
+		foreach ($items as $item) {
+			$this->assertInstanceOf(\Aimeos\MShop\Catalog\Item\Iface::class, $item);
 		}
 	}
 
@@ -62,49 +62,49 @@ 
 	{
 		$tree = $this->object->getTree();
 
-		foreach( $tree->toList() as $item ) {
-			$this->assertInstanceOf( \Aimeos\MShop\Catalog\Item\Iface::class, $item );
+		foreach ($tree->toList() as $item) {
+			$this->assertInstanceOf(\Aimeos\MShop\Catalog\Item\Iface::class, $item);
 		}
 
-		$this->assertEquals( 2, count( $tree->getChildren() ) );
+		$this->assertEquals(2, count($tree->getChildren()));
 	}
 
 
 	public function testFind()
 	{
 		$iface = \Aimeos\MShop\Catalog\Item\Iface::class;
-		$this->assertInstanceOf( $iface, $this->object->find( 'cafe', [] ) );
+		$this->assertInstanceOf($iface, $this->object->find('cafe', []));
 	}
 
 
 	public function testParse()
 	{
 		$cond = ['>' => ['catalog.status' => 0]];
-		$this->assertEquals( 8, count( $this->object->parse( $cond )->getTree( [] )->toList() ) );
+		$this->assertEquals(8, count($this->object->parse($cond)->getTree([])->toList()));
 	}
 
 
 	public function testRoot()
 	{
-		$manager = \Aimeos\MShop::create( $this->context, 'catalog' );
+		$manager = \Aimeos\MShop::create($this->context, 'catalog');
 
-		$root = $manager->findItem( 'categories' );
-		$item = $manager->findItem( 'cafe' );
+		$root = $manager->findItem('categories');
+		$item = $manager->findItem('cafe');
 
-		$this->assertEquals( 2, count( $this->object->root( $root->getId() )->getPath( $item->getId(), [] ) ) );
+		$this->assertEquals(2, count($this->object->root($root->getId())->getPath($item->getId(), [])));
 	}
 
 
 	public function testVisible()
 	{
-		$manager = \Aimeos\MShop::create( $this->context, 'catalog' );
+		$manager = \Aimeos\MShop::create($this->context, 'catalog');
 
-		$root = $manager->findItem( 'root' );
-		$item = $manager->findItem( 'cafe' );
-		$catIds = array_keys( $manager->getPath( $item->getId() ) );
+		$root = $manager->findItem('root');
+		$item = $manager->findItem('cafe');
+		$catIds = array_keys($manager->getPath($item->getId()));
 
-		$result = $this->object->root( $root->getId() )->visible( $catIds )->getTree( [] );
+		$result = $this->object->root($root->getId())->visible($catIds)->getTree([]);
 
-		$this->assertEquals( 6, count( $result->toList() ) );
+		$this->assertEquals(6, count($result->toList()));
 	}
 }

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

Spacing +47 added lines, -47 removed lines

@@ -20,48 +20,48 @@ 
 	{
 		$this->context = \TestHelperFrontend::getContext();
 
-		$this->stub = $this->getMockBuilder( \Aimeos\Controller\Frontend\Catalog\Standard::class )
+		$this->stub = $this->getMockBuilder(\Aimeos\Controller\Frontend\Catalog\Standard::class)
 			->disableOriginalConstructor()
 			->getMock();
 
-		$this->object = $this->getMockBuilder( \Aimeos\Controller\Frontend\Catalog\Decorator\Base::class )
-			->setConstructorArgs( [$this->stub, $this->context] )
+		$this->object = $this->getMockBuilder(\Aimeos\Controller\Frontend\Catalog\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\Catalog\Decorator\Base::class )
-			->setConstructorArgs( [$stub, $this->context] )
+		$this->getMockBuilder(\Aimeos\Controller\Frontend\Catalog\Decorator\Base::class)
+			->setConstructorArgs([$stub, $this->context])
 			->getMockForAbstractClass();
 	}
 
 
 	public function testCall()
 	{
-		$stub = $this->getMockBuilder( \Aimeos\Controller\Frontend\Catalog\Standard::class )
+		$stub = $this->getMockBuilder(\Aimeos\Controller\Frontend\Catalog\Standard::class)
 			->disableOriginalConstructor()
-			->setMethods( ['invalid'] )
+			->setMethods(['invalid'])
 			->getMock();
 
-		$object = $this->getMockBuilder( \Aimeos\Controller\Frontend\Catalog\Decorator\Base::class )
-			->setConstructorArgs( [$stub, $this->context] )
+		$object = $this->getMockBuilder(\Aimeos\Controller\Frontend\Catalog\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());
 	}
 
 
@@ -69,34 +69,34 @@ 
 	{
 		$expected = \Aimeos\Controller\Frontend\Catalog\Iface::class;
 
-		$this->stub->expects( $this->once() )->method( 'compare' )
-			->will( $this->returnValue( $this->stub ) );
+		$this->stub->expects($this->once())->method('compare')
+			->will($this->returnValue($this->stub));
 
-		$this->assertInstanceOf( $expected, $this->object->compare( '==', 'catalog.code', 'test' ) );
+		$this->assertInstanceOf($expected, $this->object->compare('==', 'catalog.code', 'test'));
 	}
 
 
 	public function testGet()
 	{
-		$item = \Aimeos\MShop::create( $this->context, 'catalog' )->createItem();
+		$item = \Aimeos\MShop::create($this->context, 'catalog')->createItem();
 		$expected = \Aimeos\MShop\Catalog\Item\Iface::class;
 
-		$this->stub->expects( $this->once() )->method( 'get' )
-			->will( $this->returnValue( $item ) );
+		$this->stub->expects($this->once())->method('get')
+			->will($this->returnValue($item));
 
-		$this->assertInstanceOf( $expected, $this->object->get( 1, ['text'] ) );
+		$this->assertInstanceOf($expected, $this->object->get(1, ['text']));
 	}
 
 
 	public function testFind()
 	{
-		$item = \Aimeos\MShop::create( $this->context, 'catalog' )->createItem();
+		$item = \Aimeos\MShop::create($this->context, 'catalog')->createItem();
 		$expected = \Aimeos\MShop\Catalog\Item\Iface::class;
 
-		$this->stub->expects( $this->once() )->method( 'find' )
-			->will( $this->returnValue( $item ) );
+		$this->stub->expects($this->once())->method('find')
+			->will($this->returnValue($item));
 
-		$this->assertInstanceOf( $expected, $this->object->find( 'test', ['text'] ) );
+		$this->assertInstanceOf($expected, $this->object->find('test', ['text']));
 	}
 
 
@@ -104,30 +104,30 @@ 
 	{
 		$expected = \Aimeos\Controller\Frontend\Catalog\Iface::class;
 
-		$this->stub->expects( $this->once() )->method( 'parse' )
-			->will( $this->returnValue( $this->stub ) );
+		$this->stub->expects($this->once())->method('parse')
+			->will($this->returnValue($this->stub));
 
-		$this->assertInstanceOf( $expected, $this->object->parse( [] ) );
+		$this->assertInstanceOf($expected, $this->object->parse([]));
 	}
 
 
 	public function testGetPath()
 	{
-		$this->stub->expects( $this->once() )->method( 'getPath' )
-			->will( $this->returnValue( [] ) );
+		$this->stub->expects($this->once())->method('getPath')
+			->will($this->returnValue([]));
 
-		$this->assertEquals( [], $this->object->getPath( -1 ) );
+		$this->assertEquals([], $this->object->getPath( -1 ));
 	}
 
 
 	public function testGetTree()
 	{
-		$catItem = \Aimeos\MShop::create( $this->context, 'catalog' )->createItem();
+		$catItem = \Aimeos\MShop::create($this->context, 'catalog')->createItem();
 
-		$this->stub->expects( $this->once() )->method( 'getTree' )
-			->will( $this->returnValue( $catItem ) );
+		$this->stub->expects($this->once())->method('getTree')
+			->will($this->returnValue($catItem));
 
-		$this->assertInstanceOf( \Aimeos\MShop\Catalog\Item\Iface::class, $this->object->getTree() );
+		$this->assertInstanceOf(\Aimeos\MShop\Catalog\Item\Iface::class, $this->object->getTree());
 	}
 
 
@@ -135,10 +135,10 @@ 
 	{
 		$expected = \Aimeos\Controller\Frontend\Catalog\Iface::class;
 
-		$this->stub->expects( $this->once() )->method( 'root' )
-			->will( $this->returnValue( $this->stub ) );
+		$this->stub->expects($this->once())->method('root')
+			->will($this->returnValue($this->stub));
 
-		$this->assertInstanceOf( $expected, $this->object->root( -1 ) );
+		$this->assertInstanceOf($expected, $this->object->root( -1 ));
 	}
 
 
@@ -146,26 +146,26 @@ 
 	{
 		$expected = \Aimeos\Controller\Frontend\Catalog\Iface::class;
 
-		$this->stub->expects( $this->once() )->method( 'visible' )
-			->will( $this->returnValue( $this->stub ) );
+		$this->stub->expects($this->once())->method('visible')
+			->will($this->returnValue($this->stub));
 
-		$this->assertInstanceOf( $expected, $this->object->visible( [1, 2] ) );
+		$this->assertInstanceOf($expected, $this->object->visible([1, 2]));
 	}
 
 
 	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\Catalog\Decorator\Base::class );
-		$method = $class->getMethod( $name );
-		$method->setAccessible( true );
+		$class = new \ReflectionClass(\Aimeos\Controller\Frontend\Catalog\Decorator\Base::class);
+		$method = $class->getMethod($name);
+		$method->setAccessible(true);
 
 		return $method;
 	}

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

Spacing +68 added lines, -68 removed lines

@@ -17,233 +17,233 @@
 	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()
 	{
-		$list = $this->object->aggregate( 'index.attribute.id' );
+		$list = $this->object->aggregate('index.attribute.id');
 
-		$this->assertGreaterThan( 0, count( $list ) );
+		$this->assertGreaterThan(0, count($list));
 	}
 
 
 	public function testAllOf()
 	{
-		$manager = \Aimeos\MShop::create( $this->context, 'attribute' );
+		$manager = \Aimeos\MShop::create($this->context, 'attribute');
 
-		$length = $manager->findItem( '30', [], 'product', 'length' )->getId();
-		$width = $manager->findItem( '29', [], 'product', 'width' )->getId();
+		$length = $manager->findItem('30', [], 'product', 'length')->getId();
+		$width = $manager->findItem('29', [], 'product', 'width')->getId();
 
-		$this->assertEquals( 2, count( $this->object->allOf( [$length, $width] )->search() ) );
+		$this->assertEquals(2, count($this->object->allOf([$length, $width])->search()));
 	}
 
 
 	public function testCategory()
 	{
-		$manager = \Aimeos\MShop::create( $this->context, 'catalog' );
-		$catId = $manager->findItem( 'cafe' )->getId();
+		$manager = \Aimeos\MShop::create($this->context, 'catalog');
+		$catId = $manager->findItem('cafe')->getId();
 
-		$this->assertEquals( 2, count( $this->object->category( $catId, 'promotion' )->search() ) );
+		$this->assertEquals(2, count($this->object->category($catId, 'promotion')->search()));
 	}
 
 
 	public function testCategoryTree()
 	{
-		$manager = \Aimeos\MShop::create( $this->context, 'catalog' );
+		$manager = \Aimeos\MShop::create($this->context, 'catalog');
 
-		$catId = $manager->findItem( 'categories' )->getId();
-		$grpId = $manager->findItem( 'group' )->getId();
+		$catId = $manager->findItem('categories')->getId();
+		$grpId = $manager->findItem('group')->getId();
 
-		$this->object->category( [$catId, $grpId], 'promotion', \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE );
-		$this->assertEquals( 3, count( $this->object->search() ) );
+		$this->object->category([$catId, $grpId], 'promotion', \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE);
+		$this->assertEquals(3, count($this->object->search()));
 	}
 
 
 	public function testCompare()
 	{
-		$this->assertEquals( 1, count( $this->object->compare( '==', 'product.type', 'bundle' )->search() ) );
+		$this->assertEquals(1, count($this->object->compare('==', 'product.type', 'bundle')->search()));
 	}
 
 
 	public function testGet()
 	{
-		$item = \Aimeos\MShop::create( $this->context, 'product' )->findItem( 'CNC' );
+		$item = \Aimeos\MShop::create($this->context, 'product')->findItem('CNC');
 
-		$this->assertInstanceOf( \Aimeos\MShop\Product\Item\Iface::class, $this->object->get( $item->getId() ) );
+		$this->assertInstanceOf(\Aimeos\MShop\Product\Item\Iface::class, $this->object->get($item->getId()));
 	}
 
 
 	public function testFind()
 	{
-		$this->assertInstanceOf( \Aimeos\MShop\Product\Item\Iface::class, $this->object->find( 'CNC' ) );
+		$this->assertInstanceOf(\Aimeos\MShop\Product\Item\Iface::class, $this->object->find('CNC'));
 	}
 
 
 	public function testOneOf()
 	{
-		$manager = \Aimeos\MShop::create( $this->context, 'attribute' );
+		$manager = \Aimeos\MShop::create($this->context, 'attribute');
 
-		$length = $manager->findItem( '30', [], 'product', 'length' )->getId();
-		$width = $manager->findItem( '29', [], 'product', 'width' )->getId();
+		$length = $manager->findItem('30', [], 'product', 'length')->getId();
+		$width = $manager->findItem('29', [], 'product', 'width')->getId();
 
-		$this->assertEquals( 4, count( $this->object->oneOf( [$length, $width] )->search() ) );
+		$this->assertEquals(4, count($this->object->oneOf([$length, $width])->search()));
 	}
 
 
 	public function testOneOfList()
 	{
-		$manager = \Aimeos\MShop::create( $this->context, 'attribute' );
+		$manager = \Aimeos\MShop::create($this->context, 'attribute');
 
-		$length = $manager->findItem( '30', [], 'product', 'length' )->getId();
-		$width = $manager->findItem( '29', [], 'product', 'width' )->getId();
+		$length = $manager->findItem('30', [], 'product', 'length')->getId();
+		$width = $manager->findItem('29', [], 'product', 'width')->getId();
 
-		$this->assertEquals( 4, count( $this->object->oneOf( [[$length, $width]] )->search() ) );
+		$this->assertEquals(4, count($this->object->oneOf([[$length, $width]])->search()));
 	}
 
 
 	public function testParse()
 	{
 		$cond = ['&&' => [['>' => ['product.status' => 0]], ['==' => ['product.type' => 'default']]]];
-		$this->assertEquals( 4, count( $this->object->parse( $cond )->search() ) );
+		$this->assertEquals(4, count($this->object->parse($cond)->search()));
 	}
 
 
 	public function testProduct()
 	{
-		$manager = \Aimeos\MShop::create( $this->context, 'product' );
+		$manager = \Aimeos\MShop::create($this->context, 'product');
 
-		$cncId = $manager->findItem( 'CNC' )->getId();
-		$cneId = $manager->findItem( 'CNE' )->getId();
+		$cncId = $manager->findItem('CNC')->getId();
+		$cneId = $manager->findItem('CNE')->getId();
 
-		$this->assertEquals( 2, count( $this->object->product( [$cncId, $cneId] )->search() ) );
+		$this->assertEquals(2, count($this->object->product([$cncId, $cneId])->search()));
 	}
 
 
 	public function testSearch()
 	{
 		$total = 0;
-		$this->assertEquals( 8, count( $this->object->search( [], $total ) ) );
-		$this->assertEquals( 8, $total );
+		$this->assertEquals(8, count($this->object->search([], $total)));
+		$this->assertEquals(8, $total);
 	}
 
 
 	public function testSlice()
 	{
-		$this->assertEquals( 2, count( $this->object->slice( 0, 2 )->search() ) );
+		$this->assertEquals(2, count($this->object->slice(0, 2)->search()));
 	}
 
 
 	public function testSort()
 	{
-		$this->assertEquals( 8, count( $this->object->sort( 'relevance' )->search() ) );
+		$this->assertEquals(8, count($this->object->sort('relevance')->search()));
 	}
 
 
 	public function testSortGeneric()
 	{
-		$this->assertEquals( 8, count( $this->object->sort( 'product.status' )->search() ) );
+		$this->assertEquals(8, count($this->object->sort('product.status')->search()));
 	}
 
 
 	public function testSortCode()
 	{
-		$result = $this->object->sort( 'code' )->search( [] );
-		$this->assertEquals( 'CNC', reset( $result )->getCode() );
+		$result = $this->object->sort('code')->search([]);
+		$this->assertEquals('CNC', reset($result)->getCode());
 	}
 
 
 	public function testSortCodeDesc()
 	{
-		$result = $this->object->sort( '-code' )->search( [] );
-		$this->assertStringStartsWith( 'U:', reset( $result )->getCode() );
+		$result = $this->object->sort('-code')->search([]);
+		$this->assertStringStartsWith('U:', reset($result)->getCode());
 	}
 
 
 	public function testSortCtime()
 	{
-		$this->assertEquals( 8, count( $this->object->sort( 'ctime' )->search( [] ) ) );
+		$this->assertEquals(8, count($this->object->sort('ctime')->search([])));
 	}
 
 
 	public function testSortCtimeDesc()
 	{
-		$this->assertEquals( 8, count( $this->object->sort( '-ctime' )->search( [] ) ) );
+		$this->assertEquals(8, count($this->object->sort('-ctime')->search([])));
 	}
 
 
 	public function testSortName()
 	{
-		$result = $this->object->sort( 'name' )->search( ['text'] );
-		$this->assertEquals( 'Cafe Noire Cappuccino', reset( $result )->getName() );
+		$result = $this->object->sort('name')->search(['text']);
+		$this->assertEquals('Cafe Noire Cappuccino', reset($result)->getName());
 	}
 
 
 	public function testSortNameDesc()
 	{
-		$result = $this->object->sort( '-name' )->search( ['text'] );
-		$this->assertEquals( 'Unterproduct 3', reset( $result )->getName() );
+		$result = $this->object->sort('-name')->search(['text']);
+		$this->assertEquals('Unterproduct 3', reset($result)->getName());
 	}
 
 
 	public function testSortPrice()
 	{
-		$result = $this->object->sort( 'price' )->search( [] );
-		$this->assertEquals( 'IJKL', reset( $result )->getCode() );
+		$result = $this->object->sort('price')->search([]);
+		$this->assertEquals('IJKL', reset($result)->getCode());
 	}
 
 
 	public function testSortPriceDesc()
 	{
-		$result = $this->object->sort( '-price' )->search( [] );
-		$this->assertTrue( in_array( reset( $result )->getCode(), ['CNC', 'U:BUNDLE'] ) );
+		$result = $this->object->sort('-price')->search([]);
+		$this->assertTrue(in_array(reset($result)->getCode(), ['CNC', 'U:BUNDLE']));
 	}
 
 
 	public function testSortRelevanceCategory()
 	{
-		$manager = \Aimeos\MShop::create( $this->context, 'catalog' );
-		$catId = $manager->findItem( 'new' )->getId();
+		$manager = \Aimeos\MShop::create($this->context, 'catalog');
+		$catId = $manager->findItem('new')->getId();
 
-		$result = $this->object->category( $catId )->sort( 'relevance' )->search( [] );
+		$result = $this->object->category($catId)->sort('relevance')->search([]);
 
-		$this->assertEquals( 3, count( $result ) );
-		$this->assertEquals( 'CNE', reset( $result )->getCode() );
-		$this->assertEquals( 'U:BUNDLE', end( $result )->getCode() );
+		$this->assertEquals(3, count($result));
+		$this->assertEquals('CNE', reset($result)->getCode());
+		$this->assertEquals('U:BUNDLE', end($result)->getCode());
 	}
 
 
 	public function testSortRelevanceSupplier()
 	{
-		$manager = \Aimeos\MShop::create( $this->context, 'supplier' );
-		$supId = $manager->findItem( 'unitCode001' )->getId();
+		$manager = \Aimeos\MShop::create($this->context, 'supplier');
+		$supId = $manager->findItem('unitCode001')->getId();
 
-		$result = $this->object->supplier( $supId )->sort( 'relevance' )->search( [] );
+		$result = $this->object->supplier($supId)->sort('relevance')->search([]);
 
-		$this->assertEquals( 2, count( $result ) );
-		$this->assertEquals( 'CNC', reset( $result )->getCode() );
-		$this->assertEquals( 'CNE', end( $result )->getCode() );
+		$this->assertEquals(2, count($result));
+		$this->assertEquals('CNC', reset($result)->getCode());
+		$this->assertEquals('CNE', end($result)->getCode());
 	}
 
 
 	public function testSupplier()
 	{
-		$manager = \Aimeos\MShop::create( $this->context, 'supplier' );
-		$supId = $manager->findItem( 'unitCode001' )->getId();
+		$manager = \Aimeos\MShop::create($this->context, 'supplier');
+		$supId = $manager->findItem('unitCode001')->getId();
 
-		$this->assertEquals( 2, count( $this->object->supplier( $supId )->search( [] ) ) );
+		$this->assertEquals(2, count($this->object->supplier($supId)->search([])));
 	}
 
 
 	public function testText()
 	{
-		$this->assertEquals( 3, count( $this->object->text( 'Cafe' )->search( [] ) ) );
+		$this->assertEquals(3, count($this->object->text('Cafe')->search([])));
 	}
 }

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

Spacing +10 added lines, -10 removed lines

@@ -26,7 +26,7 @@ 
 	 * @return \Aimeos\Controller\Frontend\Attribute\Iface Attribute controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function attribute( $attrIds );
+	public function attribute($attrIds);
 
 	/**
 	 * Adds generic condition for filtering attributes
@@ -37,7 +37,7 @@ 
 	 * @return \Aimeos\Controller\Frontend\Attribute\Iface Attribute controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function compare( $operator, $key, $value );
+	public function compare($operator, $key, $value);
 
 	/**
 	 * Adds the domain of the attributes for filtering
@@ -46,7 +46,7 @@ 
 	 * @return \Aimeos\Controller\Frontend\Attribute\Iface Attribute controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function domain( $domain );
+	public function domain($domain);
 
 	/**
 	 * Returns the attribute for the given attribute ID
@@ -56,7 +56,7 @@ 
 	 * @return \Aimeos\MShop\Attribute\Item\Iface Attribute item including the referenced domains items
 	 * @since 2019.04
 	 */
-	public function get( $id, $domains = ['media', 'price', 'text'] );
+	public function get($id, $domains = ['media', 'price', 'text']);
 
 	/**
 	 * Returns the attribute for the given attribute code
@@ -67,7 +67,7 @@ 
 	 * @return \Aimeos\MShop\Attribute\Item\Iface Attribute item including the referenced domains items
 	 * @since 2019.04
 	 */
-	public function find( $code, $domains = ['media', 'price', 'text'], $type );
+	public function find($code, $domains = ['media', 'price', 'text'], $type);
 
 	/**
 	 * Parses the given array and adds the conditions to the list of conditions
@@ -76,7 +76,7 @@ 
 	 * @return \Aimeos\Controller\Frontend\Attribute\Iface Attribute controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function parse( array $conditions );
+	public function parse(array $conditions);
 
 	/**
 	 * Returns the attributes filtered by the previously assigned conditions
@@ -86,7 +86,7 @@ 
 	 * @return \Aimeos\MShop\Attribute\Item\Iface[] Ordered list of attribute items
 	 * @since 2019.04
 	 */
-	public function search( $domains = ['media', 'price', 'text'], &$total = null );
+	public function search($domains = ['media', 'price', 'text'], &$total = null);
 
 	/**
 	 * Sets the start value and the number of returned attributes for slicing the list of found attributes
@@ -96,7 +96,7 @@ 
 	 * @return \Aimeos\Controller\Frontend\Attribute\Iface Attribute controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function slice( $start, $limit );
+	public function slice($start, $limit);
 
 	/**
 	 * Sets the sorting of the attribute list
@@ -105,7 +105,7 @@ 
 	 * @return \Aimeos\Controller\Frontend\Attribute\Iface Attribute controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function sort( $key = null );
+	public function sort($key = null);
 
 	/**
 	 * Adds attribute types for filtering
@@ -114,5 +114,5 @@ 
 	 * @return \Aimeos\Controller\Frontend\Attribute\Iface Attribute controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function type( $codes );
+	public function type($codes);
 }

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

Spacing +25 added lines, -25 removed lines

@@ -30,12 +30,12 @@ 
 	 * @param \Aimeos\Controller\Frontend\Iface $controller Controller object
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object with required objects
 	 */
-	public function __construct( \Aimeos\Controller\Frontend\Iface $controller, \Aimeos\MShop\Context\Item\Iface $context )
+	public function __construct(\Aimeos\Controller\Frontend\Iface $controller, \Aimeos\MShop\Context\Item\Iface $context)
 	{
 		$iface = \Aimeos\Controller\Frontend\Attribute\Iface::class;
-		$this->controller = \Aimeos\MW\Common\Base::checkClass( $iface, $controller );
+		$this->controller = \Aimeos\MW\Common\Base::checkClass($iface, $controller);
 
-		parent::__construct( $context );
+		parent::__construct($context);
 	}
 
 
@@ -47,9 +47,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);
 	}
 
 
@@ -69,9 +69,9 @@ 
 	 * @return \Aimeos\Controller\Frontend\Attribute\Iface Attribute controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function attribute( $attrIds )
+	public function attribute($attrIds)
 	{
-		$this->controller->attribute( $attrIds );
+		$this->controller->attribute($attrIds);
 		return $this;
 	}
 
@@ -85,9 +85,9 @@ 
 	 * @return \Aimeos\Controller\Frontend\Attribute\Iface Attribute controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function compare( $operator, $key, $value )
+	public function compare($operator, $key, $value)
 	{
-		$this->controller->compare( $operator, $key, $value );
+		$this->controller->compare($operator, $key, $value);
 		return $this;
 	}
 
@@ -99,9 +99,9 @@ 
 	 * @return \Aimeos\Controller\Frontend\Attribute\Iface Attribute controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function domain( $domain )
+	public function domain($domain)
 	{
-		$this->controller->domain( $domain );
+		$this->controller->domain($domain);
 		return $this;
 	}
 
@@ -114,9 +114,9 @@ 
 	 * @return \Aimeos\MShop\Attribute\Item\Iface Attribute item including the referenced domains items
 	 * @since 2019.04
 	 */
-	public function get( $id, $domains = ['media', 'price', 'text'] )
+	public function get($id, $domains = ['media', 'price', 'text'])
 	{
-		return $this->controller->get( $id, $domains );
+		return $this->controller->get($id, $domains);
 	}
 
 
@@ -129,9 +129,9 @@ 
 	 * @return \Aimeos\MShop\Attribute\Item\Iface Attribute item including the referenced domains items
 	 * @since 2019.04
 	 */
-	public function find( $code, $domains = ['media', 'price', 'text'], $type )
+	public function find($code, $domains = ['media', 'price', 'text'], $type)
 	{
-		return $this->controller->find( $code, $domains, $type );
+		return $this->controller->find($code, $domains, $type);
 	}
 
 
@@ -142,9 +142,9 @@ 
 	 * @return \Aimeos\Controller\Frontend\Attribute\Iface Attribute controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function parse( array $conditions )
+	public function parse(array $conditions)
 	{
-		$this->controller->parse( $conditions );
+		$this->controller->parse($conditions);
 		return $this;
 	}
 
@@ -157,9 +157,9 @@ 
 	 * @return \Aimeos\MShop\Attribute\Item\Iface[] Ordered list of attribute items
 	 * @since 2019.04
 	 */
-	public function search( $domains = ['media', 'price', 'text'], &$total = null )
+	public function search($domains = ['media', 'price', 'text'], &$total = null)
 	{
-		return $this->controller->search( $domains, $total );
+		return $this->controller->search($domains, $total);
 	}
 
 
@@ -171,9 +171,9 @@ 
 	 * @return \Aimeos\Controller\Frontend\Attribute\Iface Attribute controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function slice( $start, $limit )
+	public function slice($start, $limit)
 	{
-		$this->controller->slice( $start, $limit );
+		$this->controller->slice($start, $limit);
 		return $this;
 	}
 
@@ -185,9 +185,9 @@ 
 	 * @return \Aimeos\Controller\Frontend\Attribute\Iface Attribute controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function sort( $key = null )
+	public function sort($key = null)
 	{
-		$this->controller->sort( $key );
+		$this->controller->sort($key);
 		return $this;
 	}
 
@@ -199,9 +199,9 @@ 
 	 * @return \Aimeos\Controller\Frontend\Attribute\Iface Attribute controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function type( $codes )
+	public function type($codes)
 	{
-		$this->controller->type( $codes );
+		$this->controller->type($codes);
 		return $this;
 	}