aimeos / ai-controller-frontend

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

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( ( $ids = array_unique( $this->validateIds( (array) $attrIds ) ) ) !== [] )
+		if (($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,31 +111,31 @@ 
 	 * @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( ( $ids = $this->validateIds( (array) $catIds ) ) !== [] )
+		if (($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 )
+				foreach ($ids 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));
 				}
 
-				$ids = array_unique( $list );
+				$ids = array_unique($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;
@@ -151,9 +151,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;
 	}
 
@@ -166,9 +166,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 );
+		return $this->manager->getItem($id, $domains);
 	}
 
 
@@ -180,9 +180,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 );
+		return $this->manager->findItem($code, $domains);
 	}
 
 
@@ -195,18 +195,18 @@ 
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function oneOf( $attrIds )
+	public function oneOf($attrIds)
 	{
-		foreach( (array) $attrIds as $key => $entry )
+		foreach ((array) $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( (array) $attrIds ) ) ) !== [] ) {
-			$this->conditions[] = $this->filter->compare( '==', 'index.attribute.id', $ids );
+		if (($ids = array_unique($this->validateIds((array) $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( ( $ids = array_unique( $this->validateIds( (array) $prodIds ) ) ) !== [] ) {
-			$this->conditions[] = $this->filter->compare( '==', 'product.id', $ids );
+		if (($ids = array_unique($this->validateIds((array) $prodIds))) !== []) {
+			$this->conditions[] = $this->filter->compare('==', 'product.id', $ids);
 		}
 
 		return $this;
@@ -252,10 +252,10 @@ 
 	 * @return array Ordered list of product items implementing \Aimeos\MShop\Product\Item\Iface
 	 * @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,44 +281,44 @@ 
 	 * @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 '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;
 
 			case null:
@@ -326,8 +326,8 @@ 
 				break;
 		}
 
-		if( $this->sort ) {
-			$this->filter->setSortations( [$this->sort] );
+		if ($this->sort) {
+			$this->filter->setSortations([$this->sort]);
 		}
 
 		return $this;
@@ -342,17 +342,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( ( $ids = array_unique( $this->validateIds( (array) $supIds ) ) ) !== [] )
+		if (($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;
@@ -366,14 +366,14 @@ 
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function text( $text )
+	public function text($text)
 	{
-		if( $text )
+		if ($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;
@@ -386,16 +386,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;
@@ -408,13 +408,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/Decorator/Base.php

Spacing +33 added lines, -33 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\Product\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);
 	}
 
 
@@ -56,9 +56,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 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)
 	{
-		return $this->controller->aggregate( $key );
+		return $this->controller->aggregate($key);
 	}
 
 
@@ -82,9 +82,9 @@ 
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function allOf( $attrIds )
+	public function allOf($attrIds)
 	{
-		$this->controller->allOf( $attrIds );
+		$this->controller->allOf($attrIds);
 		return $this;
 	}
 
@@ -98,9 +98,9 @@ 
 	 * @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)
 	{
-		$this->controller->category( $catIds, $listtype, $level );
+		$this->controller->category($catIds, $listtype, $level);
 		return $this;
 	}
 
@@ -114,9 +114,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->controller->compare( $operator, $key, $value );
+		$this->controller->compare($operator, $key, $value);
 		return $this;
 	}
 
@@ -129,9 +129,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->controller->get( $id, $domains );
+		return $this->controller->get($id, $domains);
 	}
 
 
@@ -143,9 +143,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->controller->find( $code, $domains );
+		return $this->controller->find($code, $domains);
 	}
 
 
@@ -156,9 +156,9 @@ 
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function oneOf( $attrIds )
+	public function oneOf($attrIds)
 	{
-		$this->controller->oneOf( $attrIds );
+		$this->controller->oneOf($attrIds);
 		return $this;
 	}
 
@@ -170,9 +170,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->controller->parse( $conditions );
+		$this->controller->parse($conditions);
 		return $this;
 	}
 
@@ -184,9 +184,9 @@ 
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function product( $prodIds )
+	public function product($prodIds)
 	{
-		$this->controller->product( $prodIds );
+		$this->controller->product($prodIds);
 		return $this;
 	}
 
@@ -199,9 +199,9 @@ 
 	 * @return array Ordered list of product items implementing \Aimeos\MShop\Product\Item\Iface
 	 * @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);
 	}
 
 
@@ -213,9 +213,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->controller->slice( $start, $limit );
+		$this->controller->slice($start, $limit);
 		return $this;
 	}
 
@@ -227,9 +227,9 @@ 
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product 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;
 	}
 
@@ -242,9 +242,9 @@ 
 	 * @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')
 	{
-		$this->controller->supplier( $supIds, $listtype );
+		$this->controller->supplier($supIds, $listtype);
 		return $this;
 	}
 
@@ -256,9 +256,9 @@ 
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function text( $text )
+	public function text($text)
 	{
-		$this->controller->text( $text );
+		$this->controller->text($text);
 		return $this;
 	}