aimeos / ai-controller-frontend

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

Doc Comments +2 added lines, -1 removed lines

@@ -268,6 +268,7 @@ 
 	 * @param \Aimeos\MW\Criteria\Iface $filter Critera object which contains the filter conditions
 	 * @param string[] $domains Domain names of items that are associated with the products and that should be fetched too
 	 * @param integer &$total Parameter where the total number of found products will be stored in
+	 * @param integer $total
 	 * @return array Ordered list of product items implementing \Aimeos\MShop\Product\Item\Iface
 	 * @since 2017.03
 	 */
@@ -293,7 +294,7 @@ 
 	 * Returns the list of catalog IDs for the given catalog tree
 	 *
 	 * @param \Aimeos\MShop\Catalog\Item\Iface $item Catalog item with children
-	 * @return array List of catalog IDs
+	 * @return integer[] List of catalog IDs
 	 */
 	protected function getCatalogIdsFromTree( \Aimeos\MShop\Catalog\Item\Iface $item )
 	{

Spacing +76 added lines, -76 removed lines

@@ -31,42 +31,42 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @since 2017.03
 	 */
-	public function addFilterAttribute( \Aimeos\MW\Criteria\Iface $filter, array $attrIds, array $optIds, array $oneIds )
+	public function addFilterAttribute(\Aimeos\MW\Criteria\Iface $filter, array $attrIds, array $optIds, array $oneIds)
 	{
-		if( !empty( $attrIds ) )
+		if (!empty($attrIds))
 		{
-			$attrIds = $this->validateIds( $attrIds );
+			$attrIds = $this->validateIds($attrIds);
 
-			$func = $filter->createFunction( 'index.attributeaggregate', array( $attrIds ) );
+			$func = $filter->createFunction('index.attributeaggregate', array($attrIds));
 			$expr = array(
-				$filter->compare( '==', $func, count( $attrIds ) ),
+				$filter->compare('==', $func, count($attrIds)),
 				$filter->getConditions(),
 			);
-			$filter->setConditions( $filter->combine( '&&', $expr ) );
+			$filter->setConditions($filter->combine('&&', $expr));
 		}
 
-		if( !empty( $optIds ) )
+		if (!empty($optIds))
 		{
-			$optIds = $this->validateIds( $optIds );
+			$optIds = $this->validateIds($optIds);
 
-			$func = $filter->createFunction( 'index.attributeaggregate', array( $optIds ) );
+			$func = $filter->createFunction('index.attributeaggregate', array($optIds));
 			$expr = array(
-				$filter->compare( '>', $func, 0 ),
+				$filter->compare('>', $func, 0),
 				$filter->getConditions(),
 			);
-			$filter->setConditions( $filter->combine( '&&', $expr ) );
+			$filter->setConditions($filter->combine('&&', $expr));
 		}
 
-		foreach( $oneIds as $type => $list )
+		foreach ($oneIds as $type => $list)
 		{
-			if( ( $list = $this->validateIds( (array) $list ) ) !== array() )
+			if (($list = $this->validateIds((array) $list)) !== array())
 			{
-				$func = $filter->createFunction( 'index.attributeaggregate', array( $list ) );
+				$func = $filter->createFunction('index.attributeaggregate', array($list));
 				$expr = array(
-					$filter->compare( '>', $func, 0 ),
+					$filter->compare('>', $func, 0),
 					$filter->getConditions(),
 				);
-				$filter->setConditions( $filter->combine( '&&', $expr ) );
+				$filter->setConditions($filter->combine('&&', $expr));
 			}
 		}
 
@@ -86,38 +86,38 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @since 2017.03
 	 */
-	public function addFilterCategory( \Aimeos\MW\Criteria\Iface $filter, $catId,
-		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE, $sort = null, $direction = '+', $listtype = 'default' )
+	public function addFilterCategory(\Aimeos\MW\Criteria\Iface $filter, $catId,
+		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE, $sort = null, $direction = '+', $listtype = 'default')
 	{
-		$catIds = ( !is_array( $catId ) ? explode( ',', $catId ) : $catId );
+		$catIds = (!is_array($catId) ? explode(',', $catId) : $catId);
 
-		if( $level != \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE )
+		if ($level != \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE)
 		{
 			$list = array();
-			$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'catalog' );
+			$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'catalog');
 
-			foreach( $catIds as $catId )
+			foreach ($catIds as $catId)
 			{
-				$tree = $cntl->getCatalogTree( $catId, array(), $level );
-				$list = array_merge( $list, $this->getCatalogIdsFromTree( $tree ) );
+				$tree = $cntl->getCatalogTree($catId, array(), $level);
+				$list = array_merge($list, $this->getCatalogIdsFromTree($tree));
 			}
 
 			$catIds = $list;
 		}
 
-		$expr = array( $filter->compare( '==', 'index.catalog.id', array_unique( $catIds ) ) );
+		$expr = array($filter->compare('==', 'index.catalog.id', array_unique($catIds)));
 		$expr[] = $filter->getConditions();
 
-		if( $sort === 'relevance' )
+		if ($sort === 'relevance')
 		{
-			$cmpfunc = $filter->createFunction( 'index.catalog.position', array( $listtype, $catIds ) );
-			$expr[] = $filter->compare( '>=', $cmpfunc, 0 );
+			$cmpfunc = $filter->createFunction('index.catalog.position', array($listtype, $catIds));
+			$expr[] = $filter->compare('>=', $cmpfunc, 0);
 
-			$sortfunc = $filter->createFunction( 'sort:index.catalog.position', array( $listtype, $catIds ) );
-			$filter->setSortations( array( $filter->sort( $direction, $sortfunc ) ) );
+			$sortfunc = $filter->createFunction('sort:index.catalog.position', array($listtype, $catIds));
+			$filter->setSortations(array($filter->sort($direction, $sortfunc)));
 		}
 
-		$filter->setConditions( $filter->combine( '&&', $expr ) );
+		$filter->setConditions($filter->combine('&&', $expr));
 
 		return $filter;
 	}
@@ -134,13 +134,13 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @since 2017.03
 	 */
-	public function addFilterText( \Aimeos\MW\Criteria\Iface $filter, $input, $sort = null, $direction = '+', $listtype = 'default' )
+	public function addFilterText(\Aimeos\MW\Criteria\Iface $filter, $input, $sort = null, $direction = '+', $listtype = 'default')
 	{
 		$langid = $this->getContext()->getLocale()->getLanguageId();
-		$cmpfunc = $filter->createFunction( 'index.text.relevance', array( $listtype, $langid, $input ) );
-		$expr = array( $filter->compare( '>', $cmpfunc, 0 ), $filter->getConditions() );
+		$cmpfunc = $filter->createFunction('index.text.relevance', array($listtype, $langid, $input));
+		$expr = array($filter->compare('>', $cmpfunc, 0), $filter->getConditions());
 
-		return $filter->setConditions( $filter->combine( '&&', $expr ) );
+		return $filter->setConditions($filter->combine('&&', $expr));
 	}
 
 
@@ -152,9 +152,9 @@ 
 	 * @return array Associative list of key values as key and the product count for this key as value
 	 * @since 2017.03
 	 */
-	public function aggregate( \Aimeos\MW\Criteria\Iface $filter, $key )
+	public function aggregate(\Aimeos\MW\Criteria\Iface $filter, $key)
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'index' )->aggregate( $filter, $key );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'index')->aggregate($filter, $key);
 	}
 
 
@@ -169,46 +169,46 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @since 2017.03
 	 */
-	public function createFilter( $sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default' )
+	public function createFilter($sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default')
 	{
 		$sortations = array();
 		$context = $this->getContext();
 
-		$search = \Aimeos\MShop\Factory::createManager( $context, 'index' )->createSearch( true );
-		$expr = array( $search->compare( '!=', 'index.catalog.id', null ) );
+		$search = \Aimeos\MShop\Factory::createManager($context, 'index')->createSearch(true);
+		$expr = array($search->compare('!=', 'index.catalog.id', null));
 
-		switch( $sort )
+		switch ($sort)
 		{
 			case 'code':
-				$sortations[] = $search->sort( $direction, 'product.code' );
+				$sortations[] = $search->sort($direction, 'product.code');
 				break;
 
 			case 'name':
 				$langid = $context->getLocale()->getLanguageId();
 
-				$cmpfunc = $search->createFunction( 'index.text.value', array( $listtype, $langid, 'name', 'product' ) );
-				$expr[] = $search->compare( '>=', $cmpfunc, '' );
+				$cmpfunc = $search->createFunction('index.text.value', array($listtype, $langid, 'name', 'product'));
+				$expr[] = $search->compare('>=', $cmpfunc, '');
 
-				$sortfunc = $search->createFunction( 'sort:index.text.value', array( $listtype, $langid, 'name' ) );
-				$sortations[] = $search->sort( $direction, $sortfunc );
+				$sortfunc = $search->createFunction('sort:index.text.value', array($listtype, $langid, 'name'));
+				$sortations[] = $search->sort($direction, $sortfunc);
 				break;
 
 			case 'price':
 				$currencyid = $context->getLocale()->getCurrencyId();
 
-				$cmpfunc = $search->createFunction( 'index.price.value', array( $listtype, $currencyid, 'default' ) );
-				$expr[] = $search->compare( '>=', $cmpfunc, '0.00' );
+				$cmpfunc = $search->createFunction('index.price.value', array($listtype, $currencyid, 'default'));
+				$expr[] = $search->compare('>=', $cmpfunc, '0.00');
 
-				$sortfunc = $search->createFunction( 'sort:index.price.value', array( $listtype, $currencyid, 'default' ) );
-				$sortations[] = $search->sort( $direction, $sortfunc );
+				$sortfunc = $search->createFunction('sort:index.price.value', array($listtype, $currencyid, 'default'));
+				$sortations[] = $search->sort($direction, $sortfunc);
 				break;
 		}
 
 		$expr[] = $search->getConditions();
 
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSortations( $sortations );
-		$search->setSlice( $start, $size );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSortations($sortations);
+		$search->setSlice($start, $size);
 
 		return $search;
 	}
@@ -226,37 +226,37 @@ 
 	 * @param string $type Type of the text like "name", "short", "long", etc.
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 */
-	public function createTextFilter( $input, $sort = null, $direction = '+', $start = 0, $size = 25, $listtype = 'default', $type = 'name' )
+	public function createTextFilter($input, $sort = null, $direction = '+', $start = 0, $size = 25, $listtype = 'default', $type = 'name')
 	{
 		$locale = $this->getContext()->getLocale();
 		$langid = $locale->getLanguageId();
 
-		$search = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'index/text' )->createSearch( true );
+		$search = \Aimeos\MShop\Factory::createManager($this->getContext(), 'index/text')->createSearch(true);
 
 		$expr = array(
-			$search->compare( '>', $search->createFunction( 'index.text.relevance', array( $listtype, $langid, $input ) ), 0 ),
-			$search->compare( '>', $search->createFunction( 'index.text.value', array( $listtype, $langid, $type, 'product' ) ), '' ),
+			$search->compare('>', $search->createFunction('index.text.relevance', array($listtype, $langid, $input)), 0),
+			$search->compare('>', $search->createFunction('index.text.value', array($listtype, $langid, $type, 'product')), ''),
 		);
 
 		$sortations = array();
 
-		switch( $sort )
+		switch ($sort)
 		{
 			case 'name':
-				$cmpfunc = $search->createFunction( 'index.text.value', array( $listtype, $langid, 'name', 'product' ) );
-				$expr[] = $search->compare( '>=', $cmpfunc, '' );
+				$cmpfunc = $search->createFunction('index.text.value', array($listtype, $langid, 'name', 'product'));
+				$expr[] = $search->compare('>=', $cmpfunc, '');
 
-				$sortfunc = $search->createFunction( 'sort:index.text.value', array( $listtype, $langid, 'name' ) );
-				$sortations[] = $search->sort( $direction, $sortfunc );
+				$sortfunc = $search->createFunction('sort:index.text.value', array($listtype, $langid, 'name'));
+				$sortations[] = $search->sort($direction, $sortfunc);
 				break;
 
 			case 'relevance':
 				// we don't need to sort by 'sort:index.text.relevance' because it's a boolean match (relevance is either 0 or 1)
 		}
 
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSortations( $sortations );
-		$search->setSlice( $start, $size );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSortations($sortations);
+		$search->setSlice($start, $size);
 
 		return $search;
 	}
@@ -271,9 +271,9 @@ 
 	 * @return array Ordered list of product items implementing \Aimeos\MShop\Product\Item\Iface
 	 * @since 2017.03
 	 */
-	public function getItems( \Aimeos\MW\Criteria\Iface $filter, array $domains = array( 'media', 'price', 'text' ), &$total = null )
+	public function getItems(\Aimeos\MW\Criteria\Iface $filter, array $domains = array('media', 'price', 'text'), &$total = null)
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'index' )->searchItems( $filter, $domains, $total );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'index')->searchItems($filter, $domains, $total);
 	}
 
 
@@ -283,9 +283,9 @@ 
 	 * @param \Aimeos\MW\Criteria\Iface $filter Critera object which contains the filter conditions
 	 * @return array Associative list of the product ID as key and the product text as value
 	 */
-	public function getTextList( \Aimeos\MW\Criteria\Iface $filter )
+	public function getTextList(\Aimeos\MW\Criteria\Iface $filter)
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'index/text' )->searchTexts( $filter );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'index/text')->searchTexts($filter);
 	}
 
 
@@ -295,12 +295,12 @@ 
 	 * @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)
 	{
-		$list = array( $item->getId() );
+		$list = array($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;
@@ -313,13 +313,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 = array();
 
-		foreach( $ids as $id )
+		foreach ($ids as $id)
 		{
-			if( $id != '' ) {
+			if ($id != '') {
 				$list[] = (int) $id;
 			}
 		}

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

Spacing +92 added lines, -92 removed lines

@@ -16,22 +16,22 @@ 
 
 	protected function setUp()
 	{
-		$this->object = new \Aimeos\Controller\Frontend\Index\Standard( \TestHelperFrontend::getContext() );
+		$this->object = new \Aimeos\Controller\Frontend\Index\Standard(\TestHelperFrontend::getContext());
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object );
+		unset($this->object);
 	}
 
 
 	public function testAggregate()
 	{
 		$filter = $this->object->createFilter();
-		$list = $this->object->aggregate( $filter, 'index.attribute.id' );
+		$list = $this->object->aggregate($filter, 'index.attribute.id');
 
-		$this->assertGreaterThan( 0, count( $list ) );
+		$this->assertGreaterThan(0, count($list));
 	}
 
 
@@ -39,97 +39,97 @@ 
 	{
 		$filter = $this->object->createFilter();
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
-		$this->assertEquals( array(), $filter->getSortations() );
-		$this->assertEquals( 0, $filter->getSliceStart() );
-		$this->assertEquals( 100, $filter->getSliceSize() );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
+		$this->assertEquals(array(), $filter->getSortations());
+		$this->assertEquals(0, $filter->getSliceStart());
+		$this->assertEquals(100, $filter->getSliceSize());
 	}
 
 
 	public function testAddFilterAttribute()
 	{
 		$filter = $this->object->createFilter();
-		$filter = $this->object->addFilterAttribute( $filter, array( 0, 1 ), array(), array() );
+		$filter = $this->object->addFilterAttribute($filter, array(0, 1), array(), array());
 
 		$list = $filter->getConditions()->getExpressions();
 
-		if( !isset( $list[0] ) || !( $list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface ) ) {
-			throw new \RuntimeException( 'Wrong expression' );
+		if (!isset($list[0]) || !($list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface)) {
+			throw new \RuntimeException('Wrong expression');
 		}
 
-		$this->assertEquals( 'index.attributeaggregate([0,1])', $list[0]->getName() );
-		$this->assertEquals( 2, $list[0]->getValue() );
+		$this->assertEquals('index.attributeaggregate([0,1])', $list[0]->getName());
+		$this->assertEquals(2, $list[0]->getValue());
 	}
 
 
 	public function testAddFilterAttributeOptions()
 	{
 		$filter = $this->object->createFilter();
-		$filter = $this->object->addFilterAttribute( $filter, array(), array( 1 ), array() );
+		$filter = $this->object->addFilterAttribute($filter, array(), array(1), array());
 
 		$list = $filter->getConditions()->getExpressions();
 
-		if( !isset( $list[0] ) || !( $list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface ) ) {
-			throw new \RuntimeException( 'Wrong expression' );
+		if (!isset($list[0]) || !($list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface)) {
+			throw new \RuntimeException('Wrong expression');
 		}
 
-		$this->assertEquals( 'index.attributeaggregate([1])', $list[0]->getName() );
-		$this->assertEquals( 0, $list[0]->getValue() );
+		$this->assertEquals('index.attributeaggregate([1])', $list[0]->getName());
+		$this->assertEquals(0, $list[0]->getValue());
 	}
 
 
 	public function testAddFilterAttributeOne()
 	{
 		$filter = $this->object->createFilter();
-		$filter = $this->object->addFilterAttribute( $filter, array(), array(), array( 'test' => array( 2 ) ) );
+		$filter = $this->object->addFilterAttribute($filter, array(), array(), array('test' => array(2)));
 
 		$list = $filter->getConditions()->getExpressions();
 
-		if( !isset( $list[0] ) || !( $list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface ) ) {
-			throw new \RuntimeException( 'Wrong expression' );
+		if (!isset($list[0]) || !($list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface)) {
+			throw new \RuntimeException('Wrong expression');
 		}
 
-		$this->assertEquals( 'index.attributeaggregate([2])', $list[0]->getName() );
-		$this->assertEquals( 0, $list[0]->getValue() );
+		$this->assertEquals('index.attributeaggregate([2])', $list[0]->getName());
+		$this->assertEquals(0, $list[0]->getValue());
 	}
 
 
 	public function testAddFilterCategory()
 	{
 		$filter = $this->object->createFilter();
-		$filter = $this->object->addFilterCategory( $filter, 0 );
+		$filter = $this->object->addFilterCategory($filter, 0);
 
 		$list = $filter->getConditions()->getExpressions();
 
-		if( !isset( $list[0] ) || !( $list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface ) ) {
-			throw new \RuntimeException( 'Wrong expression' );
+		if (!isset($list[0]) || !($list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface)) {
+			throw new \RuntimeException('Wrong expression');
 		}
 
-		$this->assertEquals( 'index.catalog.id', $list[0]->getName() );
-		$this->assertEquals( array( 0 ), $list[0]->getValue() );
-		$this->assertEquals( array(), $filter->getSortations() );
+		$this->assertEquals('index.catalog.id', $list[0]->getName());
+		$this->assertEquals(array(0), $list[0]->getValue());
+		$this->assertEquals(array(), $filter->getSortations());
 	}
 
 
 	public function testAddFilterText()
 	{
 		$filter = $this->object->createFilter();
-		$filter = $this->object->addFilterText( $filter, 'Espresso' );
+		$filter = $this->object->addFilterText($filter, 'Espresso');
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
 
 		$list = $filter->getConditions()->getExpressions();
 
 
-		if( !isset( $list[0] ) || !( $list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface ) ) {
-			throw new \RuntimeException( 'Wrong expression' );
+		if (!isset($list[0]) || !($list[0] instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface)) {
+			throw new \RuntimeException('Wrong expression');
 		}
-		$this->assertEquals( 'index.text.relevance("default","de","Espresso")', $list[0]->getName() );
-		$this->assertEquals( 0, $list[0]->getValue() );
+		$this->assertEquals('index.text.relevance("default","de","Espresso")', $list[0]->getName());
+		$this->assertEquals(0, $list[0]->getValue());
 
-		$this->assertEquals( array(), $filter->getSortations() );
-		$this->assertEquals( 0, $filter->getSliceStart() );
-		$this->assertEquals( 100, $filter->getSliceSize() );
+		$this->assertEquals(array(), $filter->getSortations());
+		$this->assertEquals(0, $filter->getSliceStart());
+		$this->assertEquals(100, $filter->getSliceSize());
 	}
 
 
@@ -138,140 +138,140 @@ 
 		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE;
 
 		$filter = $this->object->createFilter();
-		$filter = $this->object->addFilterCategory( $filter, 0, $level, 'relevance', '-', 'test' );
+		$filter = $this->object->addFilterCategory($filter, 0, $level, 'relevance', '-', 'test');
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
 
 		$sort = $filter->getSortations();
-		if( ( $item = reset( $sort ) ) === false ) {
-			throw new \RuntimeException( 'Sortation not set' );
+		if (($item = reset($sort)) === false) {
+			throw new \RuntimeException('Sortation not set');
 		}
 
-		$this->assertEquals( 'sort:index.catalog.position("test",["0"])', $item->getName() );
-		$this->assertEquals( '-', $item->getOperator() );
+		$this->assertEquals('sort:index.catalog.position("test",["0"])', $item->getName());
+		$this->assertEquals('-', $item->getOperator());
 	}
 
 
 	public function testCreateFilterSortRelevanceText()
 	{
-		$filter = $this->object->createFilter( 'relevance', '-', 1, 2, 'test' );
-		$filter = $this->object->addFilterText( $filter, 'Espresso' );
+		$filter = $this->object->createFilter('relevance', '-', 1, 2, 'test');
+		$filter = $this->object->addFilterText($filter, 'Espresso');
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
-		$this->assertEquals( array(), $filter->getSortations() );
-		$this->assertEquals( 1, $filter->getSliceStart() );
-		$this->assertEquals( 2, $filter->getSliceSize() );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
+		$this->assertEquals(array(), $filter->getSortations());
+		$this->assertEquals(1, $filter->getSliceStart());
+		$this->assertEquals(2, $filter->getSliceSize());
 	}
 
 
 	public function testCreateFilterSortCode()
 	{
-		$filter = $this->object->createFilter( 'code' );
+		$filter = $this->object->createFilter('code');
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
 
 		$sort = $filter->getSortations();
-		if( ( $item = reset( $sort ) ) === false ) {
-			throw new \RuntimeException( 'Sortation not set' );
+		if (($item = reset($sort)) === false) {
+			throw new \RuntimeException('Sortation not set');
 		}
 
-		$this->assertEquals( 'product.code', $item->getName() );
+		$this->assertEquals('product.code', $item->getName());
 	}
 
 
 	public function testCreateFilterSortName()
 	{
-		$filter = $this->object->createFilter( 'name' );
+		$filter = $this->object->createFilter('name');
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
 
 		$sort = $filter->getSortations();
-		if( ( $item = reset( $sort ) ) === false ) {
-			throw new \RuntimeException( 'Sortation not set' );
+		if (($item = reset($sort)) === false) {
+			throw new \RuntimeException('Sortation not set');
 		}
 
-		$this->assertEquals( 'sort:index.text.value("default","de","name")', $item->getName() );
+		$this->assertEquals('sort:index.text.value("default","de","name")', $item->getName());
 	}
 
 
 	public function testCreateFilterSortPrice()
 	{
-		$filter = $this->object->createFilter( 'price' );
+		$filter = $this->object->createFilter('price');
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
 
 		$sort = $filter->getSortations();
-		if( ( $item = reset( $sort ) ) === false ) {
-			throw new \RuntimeException( 'Sortation not set' );
+		if (($item = reset($sort)) === false) {
+			throw new \RuntimeException('Sortation not set');
 		}
 
-		$this->assertStringStartsWith( 'sort:index.price.value("default","EUR","default")', $item->getName() );
+		$this->assertStringStartsWith('sort:index.price.value("default","EUR","default")', $item->getName());
 	}
 
 
 	public function testCreateFilterSortInvalid()
 	{
-		$filter = $this->object->createFilter( '', 'failure' );
+		$filter = $this->object->createFilter('', 'failure');
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
-		$this->assertEquals( array(), $filter->getSortations() );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
+		$this->assertEquals(array(), $filter->getSortations());
 	}
 
 
 	public function testGetItemsCategory()
 	{
-		$catalogManager = \Aimeos\MShop\Catalog\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
+		$catalogManager = \Aimeos\MShop\Catalog\Manager\Factory::createManager(\TestHelperFrontend::getContext());
 		$search = $catalogManager->createSearch();
 
-		$search->setConditions( $search->compare( '==', 'catalog.code', 'new' ) );
-		$search->setSlice( 0, 1 );
-		$items = $catalogManager->searchItems( $search );
+		$search->setConditions($search->compare('==', 'catalog.code', 'new'));
+		$search->setSlice(0, 1);
+		$items = $catalogManager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \RuntimeException( 'Index item not found' );
+		if (($item = reset($items)) === false) {
+			throw new \RuntimeException('Index item not found');
 		}
 
-		$filter = $this->object->createFilter( 'position', '+', 1, 1 );
-		$filter = $this->object->addFilterCategory( $filter, $item->getId() );
+		$filter = $this->object->createFilter('position', '+', 1, 1);
+		$filter = $this->object->addFilterCategory($filter, $item->getId());
 
 		$total = 0;
-		$results = $this->object->getItems( $filter, array(), $total );
+		$results = $this->object->getItems($filter, array(), $total);
 
-		$this->assertEquals( 3, $total );
-		$this->assertEquals( 1, count( $results ) );
+		$this->assertEquals(3, $total);
+		$this->assertEquals(1, count($results));
 	}
 
 
 	public function testGetItemsText()
 	{
-		$filter = $this->object->createFilter( 'relevance', '+', 0, 1, 'unittype13' );
-		$filter = $this->object->addFilterText( $filter, 'Expresso', 'relevance', '+', 'unittype13' );
+		$filter = $this->object->createFilter('relevance', '+', 0, 1, 'unittype13');
+		$filter = $this->object->addFilterText($filter, 'Expresso', 'relevance', '+', 'unittype13');
 
 		$total = 0;
-		$results = $this->object->getItems( $filter, array(), $total );
+		$results = $this->object->getItems($filter, array(), $total);
 
-		$this->assertEquals( 2, $total );
-		$this->assertEquals( 1, count( $results ) );
+		$this->assertEquals(2, $total);
+		$this->assertEquals(1, count($results));
 	}
 
 
 	public function testCreateTextFilter()
 	{
-		$filter = $this->object->createTextFilter( 'Expresso', 'name', '+', 0, 1 );
+		$filter = $this->object->createTextFilter('Expresso', 'name', '+', 0, 1);
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Expression\\Combine\\Iface', $filter->getConditions() );
-		$this->assertEquals( 3, count( $filter->getConditions()->getExpressions() ) );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Expression\\Combine\\Iface', $filter->getConditions());
+		$this->assertEquals(3, count($filter->getConditions()->getExpressions()));
 	}
 
 
 	public function testGetTextListName()
 	{
-		$filter = $this->object->createTextFilter( 'Cafe Noire', 'relevance', '-', 0, 25, 'unittype19', 'name' );
-		$results = $this->object->getTextList( $filter );
+		$filter = $this->object->createTextFilter('Cafe Noire', 'relevance', '-', 0, 25, 'unittype19', 'name');
+		$results = $this->object->getTextList($filter);
 
-		$this->assertEquals( 1, count( $results ) );
-		$this->assertContains( 'Cafe Noire Cappuccino', $results );
+		$this->assertEquals(1, count($results));
+		$this->assertContains('Cafe Noire Cappuccino', $results);
 	}
 
 }

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

Spacing +32 added lines, -32 removed lines

@@ -30,7 +30,7 @@ 
 	 * @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)
 	{
 		$this->context = $context;
 		$this->controller = $controller;
@@ -45,9 +45,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);
 	}
 
 
@@ -57,9 +57,9 @@ 
 	 * @param string $name Name of the manager
 	 * @return \Aimeos\MShop\Common\Manager\Iface Manager object
 	 */
-	public function createManager( $name )
+	public function createManager($name)
 	{
-		return $this->getController()->createManager( $name );
+		return $this->getController()->createManager($name);
 	}
 
 
@@ -70,9 +70,9 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object for filtering
 	 * @since 2015.08
 	 */
-	public function createCatalogFilter( $default = true )
+	public function createCatalogFilter($default = true)
 	{
-		return $this->getController()->createCatalogFilter( $default );
+		return $this->getController()->createCatalogFilter($default);
 	}
 
 
@@ -85,9 +85,9 @@ 
 	 * @return array Associative list of items implementing \Aimeos\MShop\Catalog\Item\Iface with their IDs as keys
 	 * @since 2015.08
 	 */
-	public function getCatalogPath( $id, array $domains = array( 'text', 'media' ) )
+	public function getCatalogPath($id, array $domains = array('text', 'media'))
 	{
-		return $this->getController()->getCatalogPath( $id, $domains );
+		return $this->getController()->getCatalogPath($id, $domains);
 	}
 
 
@@ -102,10 +102,10 @@ 
 	 * @return \Aimeos\MShop\Catalog\Item\Iface Catalog node, maybe with children depending on the level constant
 	 * @since 2015.08
 	 */
-	public function getCatalogTree( $id = null, array $domains = array( 'text', 'media' ),
-		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE, \Aimeos\MW\Criteria\Iface $search = null )
+	public function getCatalogTree($id = null, array $domains = array('text', 'media'),
+		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE, \Aimeos\MW\Criteria\Iface $search = null)
 	{
-		return $this->getController()->getCatalogTree( $id, $domains, $level, $search );
+		return $this->getController()->getCatalogTree($id, $domains, $level, $search);
 	}
 
 
@@ -117,9 +117,9 @@ 
 	 * @return array Associative list of key values as key and the product count for this key as value
 	 * @since 2015.08
 	 */
-	public function aggregateIndex( \Aimeos\MW\Criteria\Iface $filter, $key )
+	public function aggregateIndex(\Aimeos\MW\Criteria\Iface $filter, $key)
 	{
-		return $this->getController()->aggregateIndex( $filter, $key );
+		return $this->getController()->aggregateIndex($filter, $key);
 	}
 
 
@@ -131,9 +131,9 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @since 2015.08
 	 */
-	public function addIndexFilterCategory( \Aimeos\MW\Criteria\Iface $search, $catid )
+	public function addIndexFilterCategory(\Aimeos\MW\Criteria\Iface $search, $catid)
 	{
-		return $this->getController()->addIndexFilterCategory( $search, $catid );
+		return $this->getController()->addIndexFilterCategory($search, $catid);
 	}
 
 
@@ -146,9 +146,9 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @since 2015.08
 	 */
-	public function addIndexFilterText( \Aimeos\MW\Criteria\Iface $search, $input, $listtype = 'default' )
+	public function addIndexFilterText(\Aimeos\MW\Criteria\Iface $search, $input, $listtype = 'default')
 	{
-		return $this->getController()->addIndexFilterText( $search, $input, $listtype );
+		return $this->getController()->addIndexFilterText($search, $input, $listtype);
 	}
 
 
@@ -163,9 +163,9 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @since 2015.08
 	 */
-	public function createIndexFilter( $sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default' )
+	public function createIndexFilter($sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default')
 	{
-		return $this->getController()->createIndexFilter( $sort, $direction, $start, $size, $listtype );
+		return $this->getController()->createIndexFilter($sort, $direction, $start, $size, $listtype);
 	}
 
 
@@ -181,9 +181,9 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @since 2015.08
 	 */
-	public function createIndexFilterCategory( $catid, $sort = 'position', $direction = '+', $start = 0, $size = 100, $listtype = 'default' )
+	public function createIndexFilterCategory($catid, $sort = 'position', $direction = '+', $start = 0, $size = 100, $listtype = 'default')
 	{
-		return $this->getController()->createIndexFilter( $catid, $sort, $direction, $start, $size, $listtype );
+		return $this->getController()->createIndexFilter($catid, $sort, $direction, $start, $size, $listtype);
 	}
 
 
@@ -199,9 +199,9 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @since 2015.08
 	 */
-	public function createIndexFilterText( $input, $sort = 'relevance', $direction = '+', $start = 0, $size = 100, $listtype = 'default' )
+	public function createIndexFilterText($input, $sort = 'relevance', $direction = '+', $start = 0, $size = 100, $listtype = 'default')
 	{
-		return $this->getController()->createIndexFilter( $input, $sort, $direction, $start, $size, $listtype );
+		return $this->getController()->createIndexFilter($input, $sort, $direction, $start, $size, $listtype);
 	}
 
 
@@ -214,9 +214,9 @@ 
 	 * @return array Ordered list of product items implementing \Aimeos\MShop\Product\Item\Iface
 	 * @since 2015.08
 	 */
-	public function getIndexItems( \Aimeos\MW\Criteria\Iface $filter, array $domains = array( 'media', 'price', 'text' ), &$total = null )
+	public function getIndexItems(\Aimeos\MW\Criteria\Iface $filter, array $domains = array('media', 'price', 'text'), &$total = null)
 	{
-		return $this->getController()->getIndexItems( $filter, $domains, $total );
+		return $this->getController()->getIndexItems($filter, $domains, $total);
 	}
 
 
@@ -228,9 +228,9 @@ 
 	 * @return array List of product items implementing \Aimeos\MShop\Product\Item\Iface
 	 * @since 2015.08
 	 */
-	public function getProductItems( array $ids, array $domains = array( 'media', 'price', 'text' ) )
+	public function getProductItems(array $ids, array $domains = array('media', 'price', 'text'))
 	{
-		return $this->getController()->getProductItems( $ids, $domains );
+		return $this->getController()->getProductItems($ids, $domains);
 	}
 
 
@@ -246,9 +246,9 @@ 
 	 * @param string $type Type of the text like "name", "short", "long", etc.
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 */
-	public function createTextFilter( $input, $sort = null, $direction = '-', $start = 0, $size = 25, $listtype = 'default', $type = 'name' )
+	public function createTextFilter($input, $sort = null, $direction = '-', $start = 0, $size = 25, $listtype = 'default', $type = 'name')
 	{
-		return $this->getController()->createTextFilter( $input, $sort, $direction, $start, $size, $listtype, $type );
+		return $this->getController()->createTextFilter($input, $sort, $direction, $start, $size, $listtype, $type);
 	}
 
 
@@ -258,9 +258,9 @@ 
 	 * @param \Aimeos\MW\Criteria\Iface $filter Critera object which contains the filter conditions
 	 * @return array Associative list of the product ID as key and the product text as value
 	 */
-	public function getTextList( \Aimeos\MW\Criteria\Iface $filter )
+	public function getTextList(\Aimeos\MW\Criteria\Iface $filter)
 	{
-		return $this->getController()->getTextList( $filter );
+		return $this->getController()->getTextList($filter);
 	}
 
 

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

Spacing +44 added lines, -44 removed lines

@@ -29,9 +29,9 @@ 
 	 * @return \Aimeos\MShop\Common\Manager\Iface Manager object
 	 * @since 2015.08
 	 */
-	public function createManager( $name )
+	public function createManager($name)
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), $name );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), $name);
 	}
 
 
@@ -42,9 +42,9 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object for filtering
 	 * @since 2015.08
 	 */
-	public function createCatalogFilter( $default = true )
+	public function createCatalogFilter($default = true)
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog' )->createSearch( $default );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog')->createSearch($default);
 	}
 
 
@@ -56,9 +56,9 @@ 
 	 * @return array Associative list of items implementing \Aimeos\MShop\Catalog\Item\Iface with their IDs as keys
 	 * @since 2015.08
 	 */
-	public function getCatalogPath( $id, array $domains = array( 'text', 'media' ) )
+	public function getCatalogPath($id, array $domains = array('text', 'media'))
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog' )->getPath( $id, $domains );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog')->getPath($id, $domains);
 	}
 
 
@@ -73,10 +73,10 @@ 
 	 * @return \Aimeos\MShop\Catalog\Item\Iface Catalog node, maybe with children depending on the level constant
 	 * @since 2015.08
 	 */
-	public function getCatalogTree( $id = null, array $domains = array( 'text', 'media' ),
-		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE, \Aimeos\MW\Criteria\Iface $search = null )
+	public function getCatalogTree($id = null, array $domains = array('text', 'media'),
+		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE, \Aimeos\MW\Criteria\Iface $search = null)
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog' )->getTree( $id, $domains, $level, $search );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog')->getTree($id, $domains, $level, $search);
 	}
 
 
@@ -89,19 +89,19 @@ 
 	 * @throws \Aimeos\Controller\Frontend\Catalog\Exception If product isn't available
 	 * @since 2015.08
 	 */
-	public function getProductItems( array $ids, array $domains = array( 'media', 'price', 'text' ) )
+	public function getProductItems(array $ids, array $domains = array('media', 'price', 'text'))
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product');
 
-		$search = $manager->createSearch( true );
+		$search = $manager->createSearch(true);
 		$expr = array(
-			$search->compare( '==', 'product.id', $ids ),
+			$search->compare('==', 'product.id', $ids),
 			$search->getConditions(),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, count( $ids ) );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, count($ids));
 
-		return $manager->searchItems( $search, $domains );
+		return $manager->searchItems($search, $domains);
 	}
 
 
@@ -114,10 +114,10 @@ 
 	 * @since 2015.08
 	 * @deprecated Use method in index controller instead
 	 */
-	public function aggregateIndex( \Aimeos\MW\Criteria\Iface $filter, $key )
+	public function aggregateIndex(\Aimeos\MW\Criteria\Iface $filter, $key)
 	{
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'index' );
-		return $cntl->aggregate( $filter, $key );
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'index');
+		return $cntl->aggregate($filter, $key);
 	}
 
 
@@ -133,10 +133,10 @@ 
 	 * @since 2015.08
 	 * @deprecated Use method in index controller instead
 	 */
-	public function createIndexFilter( $sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default' )
+	public function createIndexFilter($sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default')
 	{
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'index' );
-		return $cntl->createFilter( $sort, $direction, $start, $size, $listtype );
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'index');
+		return $cntl->createFilter($sort, $direction, $start, $size, $listtype);
 	}
 
 
@@ -153,12 +153,12 @@ 
 	 * @since 2015.08
 	 * @deprecated Use createIndexFilter() and addIndexFilterCategory() instead
 	 */
-	public function createIndexFilterCategory( $catid, $sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default' )
+	public function createIndexFilterCategory($catid, $sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default')
 	{
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'index' );
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'index');
 
-		$filter = $cntl->createFilter( $sort, $direction, $start, $size, $listtype );
-		$filter = $cntl->addFilterCategory( $filter, $catid, \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE, $sort, $direction, $listtype );
+		$filter = $cntl->createFilter($sort, $direction, $start, $size, $listtype);
+		$filter = $cntl->addFilterCategory($filter, $catid, \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE, $sort, $direction, $listtype);
 
 		return $filter;
 	}
@@ -177,12 +177,12 @@ 
 	 * @since 2015.08
 	 * @deprecated Use createIndexFilter() and addIndexFilterText() instead
 	 */
-	public function createIndexFilterText( $input, $sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default' )
+	public function createIndexFilterText($input, $sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default')
 	{
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'index' );
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'index');
 
-		$filter = $cntl->createFilter( $sort, $direction, $start, $size, $listtype );
-		$filter = $cntl->addFilterText( $filter, $input, $sort, $direction, $listtype );
+		$filter = $cntl->createFilter($sort, $direction, $start, $size, $listtype);
+		$filter = $cntl->addFilterText($filter, $input, $sort, $direction, $listtype);
 
 		return $filter;
 	}
@@ -197,10 +197,10 @@ 
 	 * @since 2015.08
 	 * @deprecated Use method in index controller instead
 	 */
-	public function addIndexFilterCategory( \Aimeos\MW\Criteria\Iface $search, $catid )
+	public function addIndexFilterCategory(\Aimeos\MW\Criteria\Iface $search, $catid)
 	{
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'index' );
-		return $cntl->addFilterCategory( $search, $catid );
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'index');
+		return $cntl->addFilterCategory($search, $catid);
 	}
 
 
@@ -214,10 +214,10 @@ 
 	 * @since 2015.08
 	 * @deprecated Use method in index controller instead
 	 */
-	public function addIndexFilterText( \Aimeos\MW\Criteria\Iface $search, $input, $listtype = 'default' )
+	public function addIndexFilterText(\Aimeos\MW\Criteria\Iface $search, $input, $listtype = 'default')
 	{
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'index' );
-		return $cntl->addFilterText( $search, $input, $listtype );
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'index');
+		return $cntl->addFilterText($search, $input, $listtype);
 	}
 
 
@@ -231,10 +231,10 @@ 
 	 * @since 2015.08
 	 * @deprecated Use method in index controller instead
 	 */
-	public function getIndexItems( \Aimeos\MW\Criteria\Iface $filter, array $domains = array( 'media', 'price', 'text' ), &$total = null )
+	public function getIndexItems(\Aimeos\MW\Criteria\Iface $filter, array $domains = array('media', 'price', 'text'), &$total = null)
 	{
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'index' );
-		return $cntl->getItems( $filter, $domains, $total );
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'index');
+		return $cntl->getItems($filter, $domains, $total);
 	}
 
 
@@ -251,10 +251,10 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @deprecated Use method in index controller instead
 	 */
-	public function createTextFilter( $input, $sort = null, $direction = '+', $start = 0, $size = 25, $listtype = 'default', $type = 'name' )
+	public function createTextFilter($input, $sort = null, $direction = '+', $start = 0, $size = 25, $listtype = 'default', $type = 'name')
 	{
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'index' );
-		return $cntl->createTextFilter( $input, $sort, $direction, $start, $size, $listtype, $type );
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'index');
+		return $cntl->createTextFilter($input, $sort, $direction, $start, $size, $listtype, $type);
 	}
 
 
@@ -265,8 +265,8 @@ 
 	 * @return array Associative list of the product ID as key and the product text as value
 	 * @deprecated Use method in index controller instead
 	 */
-	public function getTextList( \Aimeos\MW\Criteria\Iface $filter )
+	public function getTextList(\Aimeos\MW\Criteria\Iface $filter)
 	{
-		return \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'index' )->getTextList( $filter );
+		return \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'index')->getTextList($filter);
 	}
 }

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

Spacing +9 added lines, -9 removed lines

@@ -30,7 +30,7 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @since 2017.03
 	 */
-	public function addFilterAttribute( \Aimeos\MW\Criteria\Iface $filter, array $attrIds, array $optIds, array $oneIds );
+	public function addFilterAttribute(\Aimeos\MW\Criteria\Iface $filter, array $attrIds, array $optIds, array $oneIds);
 
 
 	/**
@@ -45,8 +45,8 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @since 2017.03
 	 */
-	public function addFilterCategory( \Aimeos\MW\Criteria\Iface $filter, $catId,
-		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE, $sort = null, $direction = '+', $listtype = 'default' );
+	public function addFilterCategory(\Aimeos\MW\Criteria\Iface $filter, $catId,
+		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE, $sort = null, $direction = '+', $listtype = 'default');
 
 
 	/**
@@ -60,7 +60,7 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @since 2017.03
 	 */
-	public function addFilterText( \Aimeos\MW\Criteria\Iface $filter, $input, $sort = null, $direction = '+', $listtype = 'default' );
+	public function addFilterText(\Aimeos\MW\Criteria\Iface $filter, $input, $sort = null, $direction = '+', $listtype = 'default');
 
 
 	/**
@@ -71,7 +71,7 @@ 
 	 * @return array Associative list of key values as key and the product count for this key as value
 	 * @since 2017.03
 	 */
-	public function aggregate( \Aimeos\MW\Criteria\Iface $filter, $key );
+	public function aggregate(\Aimeos\MW\Criteria\Iface $filter, $key);
 
 
 	/**
@@ -85,7 +85,7 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @since 2017.03
 	 */
-	public function createFilter( $sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default' );
+	public function createFilter($sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default');
 
 
 	/**
@@ -100,7 +100,7 @@ 
 	 * @param string $type Type of the text like "name", "short", "long", etc.
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 */
-	public function createTextFilter( $input, $sort = null, $direction = '-', $start = 0, $size = 25, $listtype = 'default', $type = 'name' );
+	public function createTextFilter($input, $sort = null, $direction = '-', $start = 0, $size = 25, $listtype = 'default', $type = 'name');
 
 
 	/**
@@ -112,7 +112,7 @@ 
 	 * @return array Ordered list of product items implementing \Aimeos\MShop\Product\Item\Iface
 	 * @since 2017.03
 	 */
-	public function getItems( \Aimeos\MW\Criteria\Iface $filter, array $domains = array( 'media', 'price', 'text' ), &$total = null );
+	public function getItems(\Aimeos\MW\Criteria\Iface $filter, array $domains = array('media', 'price', 'text'), &$total = null);
 
 
 	/**
@@ -121,5 +121,5 @@ 
 	 * @param \Aimeos\MW\Criteria\Iface $filter Critera object which contains the filter conditions
 	 * @return array Associative list of the product ID as key and the product text as value
 	 */
-	public function getTextList( \Aimeos\MW\Criteria\Iface $filter );
+	public function getTextList(\Aimeos\MW\Criteria\Iface $filter);
 }

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

Spacing +20 added lines, -20 removed lines

@@ -30,7 +30,7 @@ 
 	 * @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)
 	{
 		$this->context = $context;
 		$this->controller = $controller;
@@ -45,9 +45,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);
 	}
 
 
@@ -61,9 +61,9 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @since 2017.03
 	 */
-	public function addFilterAttribute( \Aimeos\MW\Criteria\Iface $filter, array $attrIds, array $optIds, array $oneIds )
+	public function addFilterAttribute(\Aimeos\MW\Criteria\Iface $filter, array $attrIds, array $optIds, array $oneIds)
 	{
-		return $this->getController()->addFilterAttribute( $filter, $attrIds, $optIds, $oneIds );
+		return $this->getController()->addFilterAttribute($filter, $attrIds, $optIds, $oneIds);
 	}
 
 
@@ -79,10 +79,10 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @since 2017.03
 	 */
-	public function addFilterCategory( \Aimeos\MW\Criteria\Iface $filter, $catId,
-		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE, $sort = null, $direction = '+', $listtype = 'default' )
+	public function addFilterCategory(\Aimeos\MW\Criteria\Iface $filter, $catId,
+		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE, $sort = null, $direction = '+', $listtype = 'default')
 	{
-		return $this->getController()->addFilterCategory( $search, $catid, $level, $sort, $direction, $listtype );
+		return $this->getController()->addFilterCategory($search, $catid, $level, $sort, $direction, $listtype);
 	}
 
 
@@ -97,9 +97,9 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @since 2017.03
 	 */
-	public function addFilterText( \Aimeos\MW\Criteria\Iface $filter, $input, $sort = null, $direction = '+', $listtype = 'default' )
+	public function addFilterText(\Aimeos\MW\Criteria\Iface $filter, $input, $sort = null, $direction = '+', $listtype = 'default')
 	{
-		return $this->getController()->addIndexFilterText( $search, $input, $sort, $direction, $listtype );
+		return $this->getController()->addIndexFilterText($search, $input, $sort, $direction, $listtype);
 	}
 
 
@@ -111,9 +111,9 @@ 
 	 * @return array Associative list of key values as key and the product count for this key as value
 	 * @since 2015.08
 	 */
-	public function aggregate( \Aimeos\MW\Criteria\Iface $filter, $key )
+	public function aggregate(\Aimeos\MW\Criteria\Iface $filter, $key)
 	{
-		return $this->getController()->aggregate( $filter, $key );
+		return $this->getController()->aggregate($filter, $key);
 	}
 
 
@@ -128,9 +128,9 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @since 2015.08
 	 */
-	public function createFilter( $sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default' )
+	public function createFilter($sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default')
 	{
-		return $this->getController()->createFilter( $sort, $direction, $start, $size, $listtype );
+		return $this->getController()->createFilter($sort, $direction, $start, $size, $listtype);
 	}
 
 
@@ -143,9 +143,9 @@ 
 	 * @return array Ordered list of product items implementing \Aimeos\MShop\Product\Item\Iface
 	 * @since 2015.08
 	 */
-	public function getItems( \Aimeos\MW\Criteria\Iface $filter, array $domains = array( 'media', 'price', 'text' ), &$total = null )
+	public function getItems(\Aimeos\MW\Criteria\Iface $filter, array $domains = array('media', 'price', 'text'), &$total = null)
 	{
-		return $this->getController()->getItems( $filter, $domains, $total );
+		return $this->getController()->getItems($filter, $domains, $total);
 	}
 
 
@@ -161,9 +161,9 @@ 
 	 * @param string $type Type of the text like "name", "short", "long", etc.
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 */
-	public function createTextFilter( $input, $sort = null, $direction = '-', $start = 0, $size = 25, $listtype = 'default', $type = 'name' )
+	public function createTextFilter($input, $sort = null, $direction = '-', $start = 0, $size = 25, $listtype = 'default', $type = 'name')
 	{
-		return $this->getController()->createTextFilter( $input, $sort, $direction, $start, $size, $listtype, $type );
+		return $this->getController()->createTextFilter($input, $sort, $direction, $start, $size, $listtype, $type);
 	}
 
 
@@ -173,9 +173,9 @@ 
 	 * @param \Aimeos\MW\Criteria\Iface $filter Critera object which contains the filter conditions
 	 * @return array Associative list of the product ID as key and the product text as value
 	 */
-	public function getTextList( \Aimeos\MW\Criteria\Iface $filter )
+	public function getTextList(\Aimeos\MW\Criteria\Iface $filter)
 	{
-		return $this->getController()->getTextList( $filter );
+		return $this->getController()->getTextList($filter);
 	}