aimeos / ai-controller-frontend

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

Spacing +10 added lines, -10 removed lines

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

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

Doc Comments +3 added lines

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

Spacing +65 added lines, -65 removed lines

@@ -20,57 +20,57 @@ 
 	{
 		$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 testAggregate()
 	{
-		$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( 'test' ) );
+		$this->assertEquals([], $this->object->aggregate('test'));
 	}
 
 
@@ -78,10 +78,10 @@ 
 	{
 		$expected = \Aimeos\Controller\Frontend\Product\Iface::class;
 
-		$this->stub->expects( $this->once() )->method( 'allOf' )
-			->will( $this->returnValue( $this->stub ) );
+		$this->stub->expects($this->once())->method('allOf')
+			->will($this->returnValue($this->stub));
 
-		$this->assertInstanceOf( $expected, $this->object->allOf( [1, 2] ) );
+		$this->assertInstanceOf($expected, $this->object->allOf([1, 2]));
 	}
 
 
@@ -89,10 +89,10 @@ 
 	{
 		$expected = \Aimeos\Controller\Frontend\Product\Iface::class;
 
-		$this->stub->expects( $this->once() )->method( 'category' )
-			->will( $this->returnValue( $this->stub ) );
+		$this->stub->expects($this->once())->method('category')
+			->will($this->returnValue($this->stub));
 
-		$this->assertInstanceOf( $expected, $this->object->category( 1, 'default', \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE ) );
+		$this->assertInstanceOf($expected, $this->object->category(1, 'default', \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE));
 	}
 
 
@@ -100,34 +100,34 @@ 
 	{
 		$expected = \Aimeos\Controller\Frontend\Product\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( '==', 'product.code', 'test' ) );
+		$this->assertInstanceOf($expected, $this->object->compare('==', 'product.code', 'test'));
 	}
 
 
 	public function testGet()
 	{
-		$item = \Aimeos\MShop::create( $this->context, 'product' )->createItem();
+		$item = \Aimeos\MShop::create($this->context, 'product')->createItem();
 		$expected = \Aimeos\MShop\Product\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, 'product' )->createItem();
+		$item = \Aimeos\MShop::create($this->context, 'product')->createItem();
 		$expected = \Aimeos\MShop\Product\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']));
 	}
 
 
@@ -135,10 +135,10 @@ 
 	{
 		$expected = \Aimeos\Controller\Frontend\Product\Iface::class;
 
-		$this->stub->expects( $this->once() )->method( 'oneOf' )
-			->will( $this->returnValue( $this->stub ) );
+		$this->stub->expects($this->once())->method('oneOf')
+			->will($this->returnValue($this->stub));
 
-		$this->assertInstanceOf( $expected, $this->object->oneOf( [1, 2] ) );
+		$this->assertInstanceOf($expected, $this->object->oneOf([1, 2]));
 	}
 
 
@@ -146,10 +146,10 @@ 
 	{
 		$expected = \Aimeos\Controller\Frontend\Product\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([]));
 	}
 
 
@@ -157,23 +157,23 @@ 
 	{
 		$expected = \Aimeos\Controller\Frontend\Product\Iface::class;
 
-		$this->stub->expects( $this->once() )->method( 'product' )
-			->will( $this->returnValue( $this->stub ) );
+		$this->stub->expects($this->once())->method('product')
+			->will($this->returnValue($this->stub));
 
-		$this->assertInstanceOf( $expected, $this->object->product( [1, 3] ) );
+		$this->assertInstanceOf($expected, $this->object->product([1, 3]));
 	}
 
 
 	public function testSearch()
 	{
-		$item = \Aimeos\MShop::create( $this->context, 'product' )->createItem();
+		$item = \Aimeos\MShop::create($this->context, 'product')->createItem();
 		$expected = \Aimeos\MShop\Product\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));
 	}
 
 
@@ -181,10 +181,10 @@ 
 	{
 		$expected = \Aimeos\Controller\Frontend\Product\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));
 	}
 
 
@@ -192,10 +192,10 @@ 
 	{
 		$expected = \Aimeos\Controller\Frontend\Product\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( 'code' ) );
+		$this->assertInstanceOf($expected, $this->object->sort('code'));
 	}
 
 
@@ -203,10 +203,10 @@ 
 	{
 		$expected = \Aimeos\Controller\Frontend\Product\Iface::class;
 
-		$this->stub->expects( $this->once() )->method( 'supplier' )
-			->will( $this->returnValue( $this->stub ) );
+		$this->stub->expects($this->once())->method('supplier')
+			->will($this->returnValue($this->stub));
 
-		$this->assertInstanceOf( $expected, $this->object->supplier( [1], 'default' ) );
+		$this->assertInstanceOf($expected, $this->object->supplier([1], 'default'));
 	}
 
 
@@ -214,26 +214,26 @@ 
 	{
 		$expected = \Aimeos\Controller\Frontend\Product\Iface::class;
 
-		$this->stub->expects( $this->once() )->method( 'text' )
-			->will( $this->returnValue( $this->stub ) );
+		$this->stub->expects($this->once())->method('text')
+			->will($this->returnValue($this->stub));
 
-		$this->assertInstanceOf( $expected, $this->object->text( 'test' ) );
+		$this->assertInstanceOf($expected, $this->object->text('test'));
 	}
 
 
 	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;
 	}

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

Spacing +14 added lines, -14 removed lines

@@ -26,7 +26,7 @@ 
 	 * @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);
 
 	/**
 	 * Adds attribute IDs for filtering where products must reference all IDs
@@ -35,7 +35,7 @@ 
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function allOf( $attrIds );
+	public function allOf($attrIds);
 
 	/**
 	 * Adds catalog IDs for filtering
@@ -46,7 +46,7 @@ 
 	 * @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);
 
 	/**
 	 * Adds generic condition for filtering products
@@ -57,7 +57,7 @@ 
 	 * @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);
 
 	/**
 	 * Returns the product for the given product ID
@@ -67,7 +67,7 @@ 
 	 * @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']);
 
 	/**
 	 * Returns the product for the given product code
@@ -77,7 +77,7 @@ 
 	 * @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']);
 
 	/**
 	 * Adds attribute IDs for filtering where products must reference at least one ID
@@ -86,7 +86,7 @@ 
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function oneOf( $attrIds );
+	public function oneOf($attrIds);
 
 	/**
 	 * Parses the given array and adds the conditions to the list of conditions
@@ -95,7 +95,7 @@ 
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function parse( array $conditions );
+	public function parse(array $conditions);
 
 	/**
 	 * Adds product IDs for filtering
@@ -104,7 +104,7 @@ 
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function product( $prodIds );
+	public function product($prodIds);
 
 	/**
 	 * Returns the products filtered by the previously assigned conditions
@@ -114,7 +114,7 @@ 
 	 * @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);
 
 	/**
 	 * Sets the start value and the number of returned products for slicing the list of found products
@@ -124,7 +124,7 @@ 
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function slice( $start, $limit );
+	public function slice($start, $limit);
 
 	/**
 	 * Sets the sorting of the product list
@@ -133,7 +133,7 @@ 
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function sort( $key = null );
+	public function sort($key = null);
 
 	/**
 	 * Adds supplier IDs for filtering
@@ -143,7 +143,7 @@ 
 	 * @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');
 
 	/**
 	 * Adds input string for full text search
@@ -152,5 +152,5 @@ 
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function text( $text );
+	public function text($text);
 }

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

Doc Comments +1 added lines, -1 removed lines

@@ -138,7 +138,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
 	 */

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/tests/Controller/Frontend/Product/StandardTest.php

Spacing +66 added lines, -66 removed lines

@@ -17,225 +17,225 @@
 	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()
 	{
-		$this->assertEquals( 8, count( $this->object->search() ) );
+		$this->assertEquals(8, count($this->object->search()));
 	}
 
 
 	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 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/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;
 	}
 

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

Spacing +8 added lines, -8 removed lines

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

controller/frontend/src/Controller/Frontend.php

Spacing +12 added lines, -12 removed lines

@@ -27,7 +27,7 @@ 
 	 * @param boolean $value True to enable caching, false to disable it.
 	 * @return boolean Previous cache setting
 	 */
-	static public function cache( $value )
+	static public function cache($value)
 	{
 		self::$cache = (boolean) $value;
 		self::$objects = [];
@@ -49,26 +49,26 @@ 
 	 * @return \Aimeos\Controller\Frontend\Iface New frontend controller
 	 * @throws \Aimeos\Controller\Frontend\Exception If the given path is invalid or the manager wasn't found
 	 */
-	static public function create( \Aimeos\MShop\Context\Item\Iface $context, $path )
+	static public function create(\Aimeos\MShop\Context\Item\Iface $context, $path)
 	{
-		if( empty( $path ) ) {
-			throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Controller path is empty' ) );
+		if (empty($path)) {
+			throw new \Aimeos\Controller\Frontend\Exception(sprintf('Controller path is empty'));
 		}
 
-		if( self::$cache === false || !isset( self::$objects[$path] ) )
+		if (self::$cache === false || !isset(self::$objects[$path]))
 		{
-			if( ctype_alnum( $path ) === false ) {
-				throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid characters in controller name "%1$s"', $path ) );
+			if (ctype_alnum($path) === false) {
+				throw new \Aimeos\Controller\Frontend\Exception(sprintf('Invalid characters in controller name "%1$s"', $path));
 			}
 
-			$factory = '\\Aimeos\\Controller\\Frontend\\' . ucfirst( $path ) . '\\Factory';
+			$factory = '\\Aimeos\\Controller\\Frontend\\' . ucfirst($path) . '\\Factory';
 
-			if( class_exists( $factory ) === false ) {
-				throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Class "%1$s" not available', $factory ) );
+			if (class_exists($factory) === false) {
+				throw new \Aimeos\Controller\Frontend\Exception(sprintf('Class "%1$s" not available', $factory));
 			}
 
-			if( ( $controller = call_user_func_array( [$factory, 'create'], [$context] ) ) === false ) {
-				throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid factory "%1$s"', $factory ) );
+			if (($controller = call_user_func_array([$factory, 'create'], [$context])) === false) {
+				throw new \Aimeos\Controller\Frontend\Exception(sprintf('Invalid factory "%1$s"', $factory));
 			}
 
 			self::$objects[$path] = $controller;

controller/frontend/tests/Controller/FrontendTest.php

Spacing +15 added lines, -15 removed lines

@@ -13,48 +13,48 @@
 {
 	public function testCreateController()
 	{
-		$controller = \Aimeos\Controller\Frontend::create( \TestHelperFrontend::getContext(), 'basket' );
-		$this->assertInstanceOf( '\\Aimeos\\Controller\\Frontend\\Iface', $controller );
+		$controller = \Aimeos\Controller\Frontend::create(\TestHelperFrontend::getContext(), 'basket');
+		$this->assertInstanceOf('\\Aimeos\\Controller\\Frontend\\Iface', $controller);
 	}
 
 
 	public function testCreateControllerEmpty()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
-		\Aimeos\Controller\Frontend::create( \TestHelperFrontend::getContext(), '' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
+		\Aimeos\Controller\Frontend::create(\TestHelperFrontend::getContext(), '');
 	}
 
 
 	public function testCreateControllerInvalidName()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
-		\Aimeos\Controller\Frontend::create( \TestHelperFrontend::getContext(), '%^' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
+		\Aimeos\Controller\Frontend::create(\TestHelperFrontend::getContext(), '%^');
 	}
 
 
 	public function testCreateControllerNotExisting()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
-		\Aimeos\Controller\Frontend::create( \TestHelperFrontend::getContext(), 'notexist' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
+		\Aimeos\Controller\Frontend::create(\TestHelperFrontend::getContext(), 'notexist');
 	}
 
 
 	public function testCreateSubControllerNotExisting()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
-		\Aimeos\Controller\Frontend::create( \TestHelperFrontend::getContext(), 'basket/notexist' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
+		\Aimeos\Controller\Frontend::create(\TestHelperFrontend::getContext(), 'basket/notexist');
 	}
 
 
 	public function testCache()
 	{
 		$context = \TestHelperFrontend::getContext();
-		\Aimeos\Controller\Frontend::cache( true );
+		\Aimeos\Controller\Frontend::cache(true);
 
-		$controller1 = \Aimeos\Controller\Frontend::create( $context, 'basket' );
-		$controller2 = \Aimeos\Controller\Frontend::create( $context, 'basket' );
+		$controller1 = \Aimeos\Controller\Frontend::create($context, 'basket');
+		$controller2 = \Aimeos\Controller\Frontend::create($context, 'basket');
 
-		\Aimeos\Controller\Frontend::cache( false );
-		$this->assertNotSame( $controller1, $controller2 );
+		\Aimeos\Controller\Frontend::cache(false);
+		$this->assertNotSame($controller1, $controller2);
 	}
 }
\ No newline at end of file