aimeos / ai-controller-frontend

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/Standard.php

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/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;
 	}
 

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

Spacing +32 added lines, -32 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, 'catalog' );
-		$this->filter = $this->manager->createSearch( true );
+		$this->manager = \Aimeos\MShop::create($context, 'catalog');
+		$this->filter = $this->manager->createSearch(true);
 		$this->conditions[] = $this->filter->getConditions();
 	}
 
@@ -60,9 +60,9 @@ 
 	 * @return \Aimeos\Controller\Frontend\Catalog\Iface Catalog 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;
 	}
 
@@ -75,9 +75,9 @@ 
 	 * @return \Aimeos\MShop\Catalog\Item\Iface Catalog item including the referenced domains items
 	 * @since 2019.04
 	 */
-	public function get( $id, array $domains = ['media', 'text'] )
+	public function get($id, array $domains = ['media', 'text'])
 	{
-		return $this->manager->getItem( $id, $domains, true );
+		return $this->manager->getItem($id, $domains, true);
 	}
 
 
@@ -89,18 +89,18 @@ 
 	 * @return \Aimeos\MShop\Catalog\Item\Iface[] Associative list of categories
 	 * @since 2017.03
 	 */
-	public function getPath( $id, array $domains = ['text', 'media'] )
+	public function getPath($id, array $domains = ['text', 'media'])
 	{
-		$list = $this->manager->getPath( $id, $domains );
+		$list = $this->manager->getPath($id, $domains);
 
-		if( $this->root )
+		if ($this->root)
 		{
-			foreach( $list as $key => $item )
+			foreach ($list as $key => $item)
 			{
-				if( $key == $this->root ) {
+				if ($key == $this->root) {
 					break;
 				}
-				unset( $list[$key] );
+				unset($list[$key]);
 			}
 		}
 
@@ -116,10 +116,10 @@ 
 	 * @return \Aimeos\MShop\Catalog\Item\Iface Category tree
 	 * @since 2019.04
 	 */
-	public function getTree( array $domains = ['media', 'text'], $level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE )
+	public function getTree(array $domains = ['media', 'text'], $level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE)
 	{
-		$this->filter->setConditions( $this->filter->combine( '&&', $this->conditions ) );
-		return $this->manager->getTree( $this->root, $domains, $level, $this->filter );
+		$this->filter->setConditions($this->filter->combine('&&', $this->conditions));
+		return $this->manager->getTree($this->root, $domains, $level, $this->filter);
 	}
 
 
@@ -131,9 +131,9 @@ 
 	 * @return \Aimeos\MShop\Catalog\Item\Iface Catalog item including the referenced domains items
 	 * @since 2019.04
 	 */
-	public function find( $code, array $domains = ['media', 'text'] )
+	public function find($code, array $domains = ['media', 'text'])
 	{
-		return $this->manager->findItem( $code, $domains, null, null, true );
+		return $this->manager->findItem($code, $domains, null, null, true);
 	}
 
 
@@ -144,9 +144,9 @@ 
 	 * @return \Aimeos\Controller\Frontend\Catalog\Iface Catalog 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;
 	}
 
@@ -158,9 +158,9 @@ 
 	 * @return \Aimeos\Controller\Frontend\Catalog\Iface Catalog controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function root( $id )
+	public function root($id)
 	{
-		$this->root = ( $id ? $id : null );
+		$this->root = ($id ? $id : null);
 		return $this;
 	}
 
@@ -171,17 +171,17 @@ 
 	 * @param array $catIds List of category IDs
 	 * @return \Aimeos\Controller\Frontend\Catalog\Iface Catalog controller for fluent interface
 	 */
-	public function visible( array $catIds )
+	public function visible(array $catIds)
 	{
-		if( empty( $catIds ) ) {
+		if (empty($catIds)) {
 			return $this;
 		}
 
 		$config = $this->getContext()->getConfig();
 
 		$expr = [
-			$this->filter->compare( '==', 'catalog.parentid', $catIds ),
-			$this->filter->compare( '==', 'catalog.id', $catIds )
+			$this->filter->compare('==', 'catalog.parentid', $catIds),
+			$this->filter->compare('==', 'catalog.id', $catIds)
 		];
 
 		/** controller/frontend/catalog/levels-always
@@ -209,8 +209,8 @@ 
 		 * @category Developer
 		 * @see controller/frontend/catalog/levels-only
 		*/
-		if( ( $levels = $config->get( 'controller/frontend/catalog/levels-always' ) ) != null ) {
-			$expr[] = $this->filter->compare( '<=', 'catalog.level', $levels );
+		if (($levels = $config->get('controller/frontend/catalog/levels-always')) != null) {
+			$expr[] = $this->filter->compare('<=', 'catalog.level', $levels);
 		}
 
 		/** controller/frontend/catalog/levels-only
@@ -235,11 +235,11 @@ 
 		 * @category Developer
 		 * @see controller/frontend/catalog/levels-always
 		 */
-		if( ( $levels = $config->get( 'controller/frontend/catalog/levels-only' ) ) != null ) {
-			$this->conditions[] = $this->filter->compare( '<=', 'catalog.level', $levels );
+		if (($levels = $config->get('controller/frontend/catalog/levels-only')) != null) {
+			$this->conditions[] = $this->filter->compare('<=', 'catalog.level', $levels);
 		}
 
-		$this->conditions[] = $this->filter->combine( '||', $expr );
+		$this->conditions[] = $this->filter->combine('||', $expr);
 		return $this;
 	}
 }

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

Spacing +8 added lines, -8 removed lines

@@ -28,7 +28,7 @@ 
 	 * @return \Aimeos\Controller\Frontend\Catalog\Iface Catalog controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function compare( $operator, $key, $value );
+	public function compare($operator, $key, $value);
 
 	/**
 	 * Returns the category for the given catalog ID
@@ -38,7 +38,7 @@ 
 	 * @return \Aimeos\MShop\Catalog\Item\Iface Catalog item including the referenced domains items
 	 * @since 2019.04
 	 */
-	public function get( $id, array $domains = ['media', 'text'] );
+	public function get($id, array $domains = ['media', 'text']);
 
 	/**
 	 * Returns the list of categories up to the root node including the node given by its ID
@@ -48,7 +48,7 @@ 
 	 * @return \Aimeos\MShop\Catalog\Item\Iface[] Associative list of categories
 	 * @since 2017.03
 	 */
-	public function getPath( $id, array $domains = ['text', 'media'] );
+	public function getPath($id, array $domains = ['text', 'media']);
 
 	/**
 	 * Returns the categories filtered by the previously assigned conditions
@@ -58,7 +58,7 @@ 
 	 * @return \Aimeos\MShop\Catalog\Item\Iface Category tree
 	 * @since 2019.04
 	 */
-	public function getTree( array $domains = ['media', 'text'], $level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE );
+	public function getTree(array $domains = ['media', 'text'], $level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE);
 
 	/**
 	 * Returns the category for the given catalog code
@@ -68,7 +68,7 @@ 
 	 * @return \Aimeos\MShop\Catalog\Item\Iface Catalog item including the referenced domains items
 	 * @since 2019.04
 	 */
-	public function find( $code, array $domains = ['media', 'text'] );
+	public function find($code, array $domains = ['media', 'text']);
 
 	/**
 	 * Parses the given array and adds the conditions to the list of conditions
@@ -77,7 +77,7 @@ 
 	 * @return \Aimeos\Controller\Frontend\Catalog\Iface Catalog controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function parse( array $conditions );
+	public function parse(array $conditions);
 
 	/**
 	 * Sets the catalog ID of node that is used as root node
@@ -86,7 +86,7 @@ 
 	 * @return \Aimeos\Controller\Frontend\Catalog\Iface Catalog controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function root( $id );
+	public function root($id);
 
 	/**
 	 * Limits categories returned to only visible ones depending on the given category IDs
@@ -94,5 +94,5 @@ 
 	 * @param array $catIds List of category IDs
 	 * @return \Aimeos\Controller\Frontend\Catalog\Iface Catalog controller for fluent interface
 	 */
-	public function visible( array $catIds );
+	public function visible(array $catIds);
 }

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

Spacing +21 added lines, -21 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\Catalog\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);
 	}
 
 
@@ -71,9 +71,9 @@ 
 	 * @return \Aimeos\Controller\Frontend\Catalog\Iface Catalog 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;
 	}
 
@@ -86,9 +86,9 @@ 
 	 * @return \Aimeos\MShop\Catalog\Item\Iface Catalog item including the referenced domains items
 	 * @since 2019.04
 	 */
-	public function get( $id, array $domains = ['media', 'text'] )
+	public function get($id, array $domains = ['media', 'text'])
 	{
-		return $this->controller->get( $id, $domains );
+		return $this->controller->get($id, $domains);
 	}
 
 
@@ -100,9 +100,9 @@ 
 	 * @return \Aimeos\MShop\Catalog\Item\Iface[] Associative list of categories
 	 * @since 2017.03
 	 */
-	public function getPath( $id, array $domains = ['text', 'media'] )
+	public function getPath($id, array $domains = ['text', 'media'])
 	{
-		return $this->controller->getPath( $id, $domains );
+		return $this->controller->getPath($id, $domains);
 	}
 
 
@@ -114,9 +114,9 @@ 
 	 * @return \Aimeos\MShop\Catalog\Item\Iface Category tree
 	 * @since 2019.04
 	 */
-	public function getTree( array $domains = ['media', 'text'], $level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE )
+	public function getTree(array $domains = ['media', 'text'], $level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE)
 	{
-		return $this->controller->getTree( $domains, $level );
+		return $this->controller->getTree($domains, $level);
 	}
 
 
@@ -128,9 +128,9 @@ 
 	 * @return \Aimeos\MShop\Catalog\Item\Iface Catalog item including the referenced domains items
 	 * @since 2019.04
 	 */
-	public function find( $code, array $domains = ['media', 'text'] )
+	public function find($code, array $domains = ['media', 'text'])
 	{
-		return $this->controller->find( $code, $domains );
+		return $this->controller->find($code, $domains);
 	}
 
 
@@ -141,9 +141,9 @@ 
 	 * @return \Aimeos\Controller\Frontend\Catalog\Iface Catalog 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;
 	}
 
@@ -155,9 +155,9 @@ 
 	 * @return \Aimeos\Controller\Frontend\Catalog\Iface Catalog controller for fluent interface
 	 * @since 2019.04
 	 */
-	public function root( $id )
+	public function root($id)
 	{
-		$this->controller->root( $id );
+		$this->controller->root($id);
 		return $this;
 	}
 
@@ -168,9 +168,9 @@ 
 	 * @param array $catIds List of category IDs
 	 * @return \Aimeos\Controller\Frontend\Catalog\Iface Catalog controller for fluent interface
 	 */
-	public function visible( array $catIds )
+	public function visible(array $catIds)
 	{
-		$this->controller->visible( $catIds );
+		$this->controller->visible($catIds);
 		return $this;
 	}
 

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( !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/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 \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)
 	{
-		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/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 \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);
 
 	/**
 	 * 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 result 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);
 }