aimeos / ai-controller-frontend

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

Doc Comments +2 added lines, -1 removed lines

@@ -130,7 +130,7 @@ 
 	/**
 	 * Returns the product item for the given ID if it's available
 	 *
-	 * @param array $ids List of product IDs
+	 * @param integer[] $ids List of product IDs
 	 * @param array $domains Domain names of items that are associated with the products and that should be fetched too
 	 * @return string[] List of product items implementing \Aimeos\MShop\Product\Item\Iface
 	 * @throws \Aimeos\Controller\Frontend\Catalog\Exception If product isn't available
@@ -266,6 +266,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 2015.08
 	 * @deprecated Use method in index controller instead

Spacing +54 added lines, -54 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);
 	}
 
 
@@ -43,7 +43,7 @@ 
 	 */
 	public function createFilter()
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog' )->createSearch( true );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog')->createSearch(true);
 	}
 
 
@@ -55,9 +55,9 @@ 
 	 * @return array Associative list of items implementing \Aimeos\MShop\Catalog\Item\Iface with their IDs as keys
 	 * @since 2017.03
 	 */
-	public function getPath( $id, array $domains = array( 'text', 'media' ) )
+	public function getPath($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);
 	}
 
 
@@ -72,10 +72,10 @@ 
 	 * @return \Aimeos\MShop\Catalog\Item\Iface Catalog node, maybe with children depending on the level constant
 	 * @since 2017.03
 	 */
-	public function getTree( $id = null, array $domains = array( 'text', 'media' ),
-		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE, \Aimeos\MW\Criteria\Iface $search = null )
+	public function getTree($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);
 	}
 
 
@@ -87,7 +87,7 @@ 
 	 * @since 2015.08
 	 * @deprecated Use createFilter() instead
 	 */
-	public function createCatalogFilter( $default = true )
+	public function createCatalogFilter($default = true)
 	{
 		return $this->createFilter();
 	}
@@ -102,9 +102,9 @@ 
 	 * @since 2015.08
 	 * @deprecated Use getPath() instead
 	 */
-	public function getCatalogPath( $id, array $domains = array( 'text', 'media' ) )
+	public function getCatalogPath($id, array $domains = array('text', 'media'))
 	{
-		return $this->getPath( $id, $domains );
+		return $this->getPath($id, $domains);
 	}
 
 
@@ -120,10 +120,10 @@ 
 	 * @since 2015.08
 	 * @deprecated Use getTree() instead
 	 */
-	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->getTree( $id, $domains, $level, $search );
+		return $this->getTree($id, $domains, $level, $search);
 	}
 
 
@@ -137,10 +137,10 @@ 
 	 * @since 2015.08
 	 * @deprecated Use getItems() method in index controller instead
 	 */
-	public function getProductItems( array $ids, array $domains = array( 'media', 'price', 'text' ) )
+	public function getProductItems(array $ids, array $domains = array('media', 'price', 'text'))
 	{
-		$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'product' );
-		return $cntl->getItems( $ids, $domains );
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'product');
+		return $cntl->getItems($ids, $domains);
 	}
 
 
@@ -153,10 +153,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(), 'product' );
-		return $cntl->aggregate( $filter, $key );
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'product');
+		return $cntl->aggregate($filter, $key);
 	}
 
 
@@ -172,10 +172,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(), 'product' );
-		return $cntl->createFilter( $sort, $direction, $start, $size, $listtype );
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'product');
+		return $cntl->createFilter($sort, $direction, $start, $size, $listtype);
 	}
 
 
@@ -192,12 +192,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(), 'product' );
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'product');
 
-		$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;
 	}
@@ -216,12 +216,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(), 'product' );
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'product');
 
-		$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;
 	}
@@ -236,10 +236,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(), 'product' );
-		return $cntl->addFilterCategory( $search, $catid );
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'product');
+		return $cntl->addFilterCategory($search, $catid);
 	}
 
 
@@ -253,10 +253,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(), 'product' );
-		return $cntl->addFilterText( $search, $input, $listtype );
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'product');
+		return $cntl->addFilterText($search, $input, $listtype);
 	}
 
 
@@ -270,10 +270,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(), 'product' );
-		return $cntl->searchItems( $filter, $domains, $total );
+		$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'product');
+		return $cntl->searchItems($filter, $domains, $total);
 	}
 
 
@@ -290,37 +290,37 @@ 
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
 	 * @deprecated Use createFilter() 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')
 	{
 		$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 = [];
 
-		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;
 	}
@@ -333,8 +333,8 @@ 
 	 * @return array Associative list of the product ID as key and the product text as value
 	 * @deprecated Use searchItems() method in index controller to retrieve product items instead
 	 */
-	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);
 	}
 }

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

Spacing +33 added lines, -33 removed lines

@@ -14,92 +14,92 @@
 {
 	public function testCreateController()
 	{
-		$controller = \Aimeos\Controller\Frontend\Factory::createController( \TestHelperFrontend::getContext(), 'basket' );
-		$this->assertInstanceOf( '\\Aimeos\\Controller\\Frontend\\Iface', $controller );
+		$controller = \Aimeos\Controller\Frontend\Factory::createController(\TestHelperFrontend::getContext(), 'basket');
+		$this->assertInstanceOf('\\Aimeos\\Controller\\Frontend\\Iface', $controller);
 	}
 
 
 	public function testCreateControllerEmpty()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
-		\Aimeos\Controller\Frontend\Factory::createController( \TestHelperFrontend::getContext(), '' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
+		\Aimeos\Controller\Frontend\Factory::createController(\TestHelperFrontend::getContext(), '');
 	}
 
 
 	public function testCreateControllerInvalidName()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
-		\Aimeos\Controller\Frontend\Factory::createController( \TestHelperFrontend::getContext(), '%^' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
+		\Aimeos\Controller\Frontend\Factory::createController(\TestHelperFrontend::getContext(), '%^');
 	}
 
 
 	public function testCreateControllerNotExisting()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
-		\Aimeos\Controller\Frontend\Factory::createController( \TestHelperFrontend::getContext(), 'notexist' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
+		\Aimeos\Controller\Frontend\Factory::createController(\TestHelperFrontend::getContext(), 'notexist');
 	}
 
 
 	public function testCreateSubControllerNotExisting()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
-		\Aimeos\Controller\Frontend\Factory::createController( \TestHelperFrontend::getContext(), 'basket/notexist' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
+		\Aimeos\Controller\Frontend\Factory::createController(\TestHelperFrontend::getContext(), 'basket/notexist');
 	}
 
 
 	public function testClear()
 	{
-		$cache = \Aimeos\Controller\Frontend\Factory::setCache( true );
+		$cache = \Aimeos\Controller\Frontend\Factory::setCache(true);
 
 		$context = \TestHelperFrontend::getContext();
 
-		$controller1 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
+		$controller1 = \Aimeos\Controller\Frontend\Factory::createController($context, 'basket');
 		\Aimeos\Controller\Frontend\Factory::clear();
-		$controller2 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
+		$controller2 = \Aimeos\Controller\Frontend\Factory::createController($context, 'basket');
 
-		\Aimeos\Controller\Frontend\Factory::setCache( $cache );
+		\Aimeos\Controller\Frontend\Factory::setCache($cache);
 
-		$this->assertNotSame( $controller1, $controller2 );
+		$this->assertNotSame($controller1, $controller2);
 	}
 
 
 	public function testClearSite()
 	{
-		$cache = \Aimeos\Controller\Frontend\Factory::setCache( true );
+		$cache = \Aimeos\Controller\Frontend\Factory::setCache(true);
 
 		$context = \TestHelperFrontend::getContext();
 
-		$basket1 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
-		$catalog1 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'catalog' );
-		\Aimeos\Controller\Frontend\Factory::clear( (string) $context );
+		$basket1 = \Aimeos\Controller\Frontend\Factory::createController($context, 'basket');
+		$catalog1 = \Aimeos\Controller\Frontend\Factory::createController($context, 'catalog');
+		\Aimeos\Controller\Frontend\Factory::clear((string) $context);
 
-		$basket2 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
-		$catalog2 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'catalog' );
+		$basket2 = \Aimeos\Controller\Frontend\Factory::createController($context, 'basket');
+		$catalog2 = \Aimeos\Controller\Frontend\Factory::createController($context, 'catalog');
 
-		\Aimeos\Controller\Frontend\Factory::setCache( $cache );
+		\Aimeos\Controller\Frontend\Factory::setCache($cache);
 
-		$this->assertNotSame( $basket1, $basket2 );
-		$this->assertNotSame( $catalog1, $catalog2 );
+		$this->assertNotSame($basket1, $basket2);
+		$this->assertNotSame($catalog1, $catalog2);
 	}
 
 
 	public function testClearSpecific()
 	{
-		$cache = \Aimeos\Controller\Frontend\Factory::setCache( true );
+		$cache = \Aimeos\Controller\Frontend\Factory::setCache(true);
 
 		$context = \TestHelperFrontend::getContext();
 
-		$basket1 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
-		$catalog1 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'catalog' );
-		\Aimeos\Controller\Frontend\Factory::clear( (string) $context, 'basket' );
+		$basket1 = \Aimeos\Controller\Frontend\Factory::createController($context, 'basket');
+		$catalog1 = \Aimeos\Controller\Frontend\Factory::createController($context, 'catalog');
+		\Aimeos\Controller\Frontend\Factory::clear((string) $context, 'basket');
 
-		$basket2 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
-		$catalog2 = \Aimeos\Controller\Frontend\Factory::createController( $context, 'catalog' );
+		$basket2 = \Aimeos\Controller\Frontend\Factory::createController($context, 'basket');
+		$catalog2 = \Aimeos\Controller\Frontend\Factory::createController($context, 'catalog');
 
-		\Aimeos\Controller\Frontend\Factory::setCache( $cache );
+		\Aimeos\Controller\Frontend\Factory::setCache($cache);
 
-		$this->assertNotSame( $basket1, $basket2 );
-		$this->assertSame( $catalog1, $catalog2 );
+		$this->assertNotSame($basket1, $basket2);
+		$this->assertSame($catalog1, $catalog2);
 	}
 
 }
\ No newline at end of file

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

Doc Comments +1 added lines, -1 removed lines

@@ -104,7 +104,7 @@
 	/**
 	 * Returns the frontend controller
 	 *
-	 * @return \Aimeos\Controller\Frontend\Locale\Iface Frontend controller object
+	 * @return \Aimeos\Controller\Frontend\Iface Frontend controller object
 	 */
 	protected function getController()
 	{

Spacing +11 added lines, -11 removed lines

@@ -30,18 +30,18 @@ 
 	 * @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\Locale\Iface';
-		if( !( $controller instanceof $iface ) )
+		if (!($controller instanceof $iface))
 		{
-			$msg = sprintf( 'Class "%1$s" does not implement interface "%2$s"', get_class( $controller ), $iface );
-			throw new \Aimeos\Controller\Frontend\Exception( $msg );
+			$msg = sprintf('Class "%1$s" does not implement interface "%2$s"', get_class($controller), $iface);
+			throw new \Aimeos\Controller\Frontend\Exception($msg);
 		}
 
 		$this->controller = $controller;
 
-		parent::__construct( $context );
+		parent::__construct($context);
 	}
 
 
@@ -53,9 +53,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);
 	}
 
 
@@ -80,9 +80,9 @@ 
 	 * @return \Aimeos\MShop\Locale\Item\Iface Locale item including the referenced domains items
 	 * @since 2017.03
 	 */
-	public function getItem( $id, array $domains = [] )
+	public function getItem($id, array $domains = [])
 	{
-		return $this->controller->getItem( $id, $domains );
+		return $this->controller->getItem($id, $domains);
 	}
 
 
@@ -95,9 +95,9 @@ 
 	 * @return array Ordered list of locale items implementing \Aimeos\MShop\Locale\Item\Iface
 	 * @since 2017.03
 	 */
-	public function searchItems( \Aimeos\MW\Criteria\Iface $filter, array $domains = [], &$total = null )
+	public function searchItems(\Aimeos\MW\Criteria\Iface $filter, array $domains = [], &$total = null)
 	{
-		return $this->controller->searchItems( $filter, $domains, $total );
+		return $this->controller->searchItems($filter, $domains, $total);
 	}
 
 

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

Spacing +10 added lines, -10 removed lines

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

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

Spacing +32 added lines, -32 removed lines

@@ -20,97 +20,97 @@
 	{
 		$this->context = \TestHelperFrontend::getContext();
 
-		$this->stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Locale\Standard' )
+		$this->stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Locale\Standard')
 			->disableOriginalConstructor()
 			->getMock();
 
-		$this->object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Locale\Decorator\Base' )
-			->setConstructorArgs( [$this->stub, $this->context] )
+		$this->object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Locale\Decorator\Base')
+			->setConstructorArgs([$this->stub, $this->context])
 			->getMockForAbstractClass();
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->context, $this->object, $this->stub );
+		unset($this->context, $this->object, $this->stub);
 	}
 
 
 	public function testConstructException()
 	{
-		$stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Iface' )->getMock();
+		$stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Iface')->getMock();
 
-		$this->setExpectedException( '\Aimeos\Controller\Frontend\Exception' );
+		$this->setExpectedException('\Aimeos\Controller\Frontend\Exception');
 
-		$this->getMockBuilder( '\Aimeos\Controller\Frontend\Locale\Decorator\Base' )
-			->setConstructorArgs( [$stub, $this->context] )
+		$this->getMockBuilder('\Aimeos\Controller\Frontend\Locale\Decorator\Base')
+			->setConstructorArgs([$stub, $this->context])
 			->getMockForAbstractClass();
 	}
 
 
 	public function testCall()
 	{
-		$stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Locale\Standard' )
+		$stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Locale\Standard')
 			->disableOriginalConstructor()
-			->setMethods( ['invalid'] )
+			->setMethods(['invalid'])
 			->getMock();
 
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Locale\Decorator\Base' )
-			->setConstructorArgs( [$stub, $this->context] )
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Locale\Decorator\Base')
+			->setConstructorArgs([$stub, $this->context])
 			->getMockForAbstractClass();
 
-		$stub->expects( $this->once() )->method( 'invalid' )->will( $this->returnValue( true ) );
+		$stub->expects($this->once())->method('invalid')->will($this->returnValue(true));
 
-		$this->assertTrue( $object->invalid() );
+		$this->assertTrue($object->invalid());
 	}
 
 
 	public function testCreateFilter()
 	{
-		$search = \Aimeos\MShop\Factory::createManager( $this->context, 'locale' )->createSearch();
+		$search = \Aimeos\MShop\Factory::createManager($this->context, 'locale')->createSearch();
 
-		$this->stub->expects( $this->once() )->method( 'createFilter' )
-			->will( $this->returnValue( $search ) );
+		$this->stub->expects($this->once())->method('createFilter')
+			->will($this->returnValue($search));
 
-		$this->assertInstanceOf( '\Aimeos\MW\Criteria\Iface', $this->object->createFilter() );
+		$this->assertInstanceOf('\Aimeos\MW\Criteria\Iface', $this->object->createFilter());
 	}
 
 
 	public function testGetItem()
 	{
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'locale' )->createItem();
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'locale')->createItem();
 
-		$this->stub->expects( $this->once() )->method( 'getItem' )
-			->will( $this->returnValue( $item ) );
+		$this->stub->expects($this->once())->method('getItem')
+			->will($this->returnValue($item));
 
-		$this->assertInstanceOf( '\Aimeos\MShop\Locale\Item\Iface', $this->object->getItem( -1 ) );
+		$this->assertInstanceOf('\Aimeos\MShop\Locale\Item\Iface', $this->object->getItem( -1 ));
 	}
 
 
 	public function testSearchItems()
 	{
-		$filter = \Aimeos\MShop\Factory::createManager( $this->context, 'locale' )->createSearch();
+		$filter = \Aimeos\MShop\Factory::createManager($this->context, 'locale')->createSearch();
 
-		$this->stub->expects( $this->once() )->method( 'searchItems' )
-			->will( $this->returnValue( [] ) );
+		$this->stub->expects($this->once())->method('searchItems')
+			->will($this->returnValue([]));
 
-		$this->assertEquals( [], $this->object->searchItems( $filter, ['media'] ) );
+		$this->assertEquals([], $this->object->searchItems($filter, ['media']));
 	}
 
 
 	public function testGetController()
 	{
-		$result = $this->access( 'getController' )->invokeArgs( $this->object, [] );
+		$result = $this->access('getController')->invokeArgs($this->object, []);
 
-		$this->assertSame( $this->stub, $result );
+		$this->assertSame($this->stub, $result);
 	}
 
 
-	protected function access( $name )
+	protected function access($name)
 	{
-		$class = new \ReflectionClass( '\Aimeos\Controller\Frontend\Locale\Decorator\Base' );
-		$method = $class->getMethod( $name );
-		$method->setAccessible( true );
+		$class = new \ReflectionClass('\Aimeos\Controller\Frontend\Locale\Decorator\Base');
+		$method = $class->getMethod($name);
+		$method->setAccessible(true);
 
 		return $method;
 	}

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

Spacing +8 added lines, -8 removed lines

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

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

Braces +3 added lines, -6 removed lines

@@ -311,17 +311,14 @@
 		{
 			$address->copyFrom( $value );
 			$this->get()->setAddress( $address, $type );
-		}
-		else if( is_array( $value ) )
+		} else if( is_array( $value ) )
 		{
 			$this->setAddressFromArray( $address, $value );
 			$this->get()->setAddress( $address, $type );
-		}
-		else if( $value === null )
+		} else if( $value === null )
 		{
 			$this->get()->deleteAddress( $type );
-		}
-		else
+		} else
 		{
 			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Invalid value for address type "%1$s"', $type ) );
 		}

Doc Comments -1 removed lines

@@ -150,7 +150,6 @@
 	 * Sets the delivery/payment service item based on the service ID.
 	 *
 	 * @param string $type Service type code like 'payment' or 'delivery'
-	 * @param string $id|null Unique ID of the service item or null to remove it
 	 * @param array $attributes Associative list of key/value pairs containing the attributes selected or
 	 * 	entered by the customer when choosing one of the delivery or payment options
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If there is no price to the service item attached

Spacing +127 added lines, -127 removed lines

@@ -33,11 +33,11 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Object storing the required instances for manaing databases
 	 *  connections, logger, session, etc.
 	 */
-	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->domainManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' );
+		$this->domainManager = \Aimeos\MShop\Factory::createManager($context, 'order/base');
 	}
 
 
@@ -49,7 +49,7 @@ 
 	public function clear()
 	{
 		$this->baskets[$this->type] = $this->domainManager->createItem();
-		$this->domainManager->setSession( $this->baskets[$this->type], $this->type );
+		$this->domainManager->setSession($this->baskets[$this->type], $this->type);
 
 		return $this;
 	}
@@ -62,10 +62,10 @@ 
 	 */
 	public function get()
 	{
-		if( !isset( $this->baskets[$this->type] ) )
+		if (!isset($this->baskets[$this->type]))
 		{
-			$this->baskets[$this->type] = $this->domainManager->getSession( $this->type );
-			$this->checkLocale( $this->type );
+			$this->baskets[$this->type] = $this->domainManager->getSession($this->type);
+			$this->checkLocale($this->type);
 		}
 
 		return $this->baskets[$this->type];
@@ -79,8 +79,8 @@ 
 	 */
 	public function save()
 	{
-		if( isset( $this->baskets[$this->type] ) && $this->baskets[$this->type]->isModified() ) {
-			$this->domainManager->setSession( $this->baskets[$this->type], $this->type );
+		if (isset($this->baskets[$this->type]) && $this->baskets[$this->type]->isModified()) {
+			$this->domainManager->setSession($this->baskets[$this->type], $this->type);
 		}
 
 		return $this;
@@ -93,7 +93,7 @@ 
 	 * @param string $type Basket type
 	 * @return \Aimeos\Controller\Frontend\Basket\Iface Basket frontend object
 	 */
-	public function setType( $type )
+	public function setType($type)
 	{
 		$this->type = $type;
 		return $this;
@@ -127,7 +127,7 @@ 
 		 * @category Developer
 		 * @see controller/frontend/basket/limit-seconds
 		 */
-		$count = $config->get( 'controller/frontend/basket/limit-count', 5 );
+		$count = $config->get('controller/frontend/basket/limit-count', 5);
 
 		/** controller/frontend/basket/limit-seconds
 		 * Order limitation time frame in seconds
@@ -145,28 +145,28 @@ 
 		 * @category Developer
 		 * @see controller/frontend/basket/limit-count
 		 */
-		$seconds = $config->get( 'controller/frontend/basket/limit-seconds', 300 );
+		$seconds = $config->get('controller/frontend/basket/limit-seconds', 300);
 
 		$search = $this->domainManager->createSearch();
 		$expr = [
-			$search->compare( '==', 'order.base.editor', $context->getEditor() ),
-			$search->compare( '>=', 'order.base.ctime', date( 'Y-m-d H:i:s', time() - $seconds ) ),
+			$search->compare('==', 'order.base.editor', $context->getEditor()),
+			$search->compare('>=', 'order.base.ctime', date('Y-m-d H:i:s', time() - $seconds)),
 		];
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, 0 );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, 0);
 
-		$this->domainManager->searchItems( $search, [], $total );
+		$this->domainManager->searchItems($search, [], $total);
 
-		if( $total > $count ) {
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Temporary order limit reached' ) );
+		if ($total > $count) {
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Temporary order limit reached'));
 		}
 
 
 		$basket = $this->get()->finish();
-		$basket->setCustomerId( (string) $context->getUserId() );
+		$basket->setCustomerId((string) $context->getUserId());
 
 		$this->domainManager->begin();
-		$this->domainManager->store( $basket );
+		$this->domainManager->store($basket);
 		$this->domainManager->commit();
 
 		return $basket;
@@ -181,9 +181,9 @@ 
 	 * @param boolean $default True to add default criteria (user logged in), false if not
 	 * @return \Aimeos\MShop\Order\Item\Base\Iface Order base object including the given parts
 	 */
-	public function load( $id, $parts = \Aimeos\MShop\Order\Manager\Base\Base::PARTS_ALL, $default = true )
+	public function load($id, $parts = \Aimeos\MShop\Order\Manager\Base\Base::PARTS_ALL, $default = true)
 	{
-		return $this->domainManager->load( $id, $parts, false, $default );
+		return $this->domainManager->load($id, $parts, false, $default);
 	}
 
 
@@ -203,34 +203,34 @@ 
 	 * @param string $stocktype Unique code of the stock type to deliver the products from
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the product isn't available
 	 */
-	public function addProduct( $prodid, $quantity = 1, array $options = [], array $variantAttributeIds = [],
+	public function addProduct($prodid, $quantity = 1, array $options = [], array $variantAttributeIds = [],
 		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [],
-		$stocktype = 'default' )
+		$stocktype = 'default')
 	{
 		$attributeMap = [
-			'custom' => array_keys( $customAttributeValues ),
+			'custom' => array_keys($customAttributeValues),
 			'config' => $configAttributeIds,
 			'hidden' => $hiddenAttributeIds,
 		];
-		$this->checkListRef( $prodid, 'attribute', $attributeMap );
+		$this->checkListRef($prodid, 'attribute', $attributeMap);
 
 
 		$context = $this->getContext();
-		$productManager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
-		$productItem = $productManager->getItem( $prodid, array( 'media', 'supplier', 'price', 'product', 'text' ), true );
-		$prices = $productItem->getRefItems( 'price', 'default', 'default' );
+		$productManager = \Aimeos\MShop\Factory::createManager($context, 'product');
+		$productItem = $productManager->getItem($prodid, array('media', 'supplier', 'price', 'product', 'text'), true);
+		$prices = $productItem->getRefItems('price', 'default', 'default');
 
-		$orderBaseProductItem = \Aimeos\MShop\Factory::createManager( $context, 'order/base/product' )->createItem();
-		$orderBaseProductItem->copyFrom( $productItem )->setQuantity( $quantity )->setStockType( $stocktype );
+		$orderBaseProductItem = \Aimeos\MShop\Factory::createManager($context, 'order/base/product')->createItem();
+		$orderBaseProductItem->copyFrom($productItem)->setQuantity($quantity)->setStockType($stocktype);
 
-		$attr = $this->getOrderProductAttributes( 'custom', array_keys( $customAttributeValues ), $customAttributeValues );
-		$attr = array_merge( $attr, $this->getOrderProductAttributes( 'config', $configAttributeIds ) );
-		$attr = array_merge( $attr, $this->getOrderProductAttributes( 'hidden', $hiddenAttributeIds ) );
+		$attr = $this->getOrderProductAttributes('custom', array_keys($customAttributeValues), $customAttributeValues);
+		$attr = array_merge($attr, $this->getOrderProductAttributes('config', $configAttributeIds));
+		$attr = array_merge($attr, $this->getOrderProductAttributes('hidden', $hiddenAttributeIds));
 
-		$orderBaseProductItem->setAttributes( $attr );
-		$orderBaseProductItem->setPrice( $this->calcPrice( $orderBaseProductItem, $prices, $quantity ) );
+		$orderBaseProductItem->setAttributes($attr);
+		$orderBaseProductItem->setPrice($this->calcPrice($orderBaseProductItem, $prices, $quantity));
 
-		$this->get()->addProduct( $orderBaseProductItem );
+		$this->get()->addProduct($orderBaseProductItem);
 		$this->save();
 	}
 
@@ -240,17 +240,17 @@ 
 	 *
 	 * @param integer $position Position number (key) of the order product item
 	 */
-	public function deleteProduct( $position )
+	public function deleteProduct($position)
 	{
-		$product = $this->get()->getProduct( $position );
+		$product = $this->get()->getProduct($position);
 
-		if( $product->getFlags() === \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE )
+		if ($product->getFlags() === \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE)
 		{
-			$msg = sprintf( 'Basket item at position "%1$d" cannot be deleted manually', $position );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+			$msg = sprintf('Basket item at position "%1$d" cannot be deleted manually', $position);
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
 		}
 
-		$this->get()->deleteProduct( $position );
+		$this->get()->deleteProduct($position);
 		$this->save();
 	}
 
@@ -264,33 +264,33 @@ 
 	 * 	The 'stock'=>false option allows adding products without being in stock.
 	 * @param string[] $configAttributeCodes Codes of the product config attributes that should be REMOVED
 	 */
-	public function editProduct( $position, $quantity, array $options = [],
-		array $configAttributeCodes = [] )
+	public function editProduct($position, $quantity, array $options = [],
+		array $configAttributeCodes = [])
 	{
-		$product = $this->get()->getProduct( $position );
+		$product = $this->get()->getProduct($position);
 
-		if( $product->getFlags() & \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE )
+		if ($product->getFlags() & \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE)
 		{
-			$msg = sprintf( 'Basket item at position "%1$d" cannot be changed', $position );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+			$msg = sprintf('Basket item at position "%1$d" cannot be changed', $position);
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
 		}
 
-		$product->setQuantity( $quantity );
+		$product->setQuantity($quantity);
 
 		$attributes = $product->getAttributes();
-		foreach( $attributes as $key => $attribute )
+		foreach ($attributes as $key => $attribute)
 		{
-			if( in_array( $attribute->getCode(), $configAttributeCodes ) ) {
-				unset( $attributes[$key] );
+			if (in_array($attribute->getCode(), $configAttributeCodes)) {
+				unset($attributes[$key]);
 			}
 		}
-		$product->setAttributes( $attributes );
+		$product->setAttributes($attributes);
 
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product' );
-		$productItem = $manager->findItem( $product->getProductCode(), array( 'price', 'text' ) );
-		$product->setPrice( $this->calcPrice( $product, $productItem->getRefItems( 'price', 'default' ), $quantity ) );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product');
+		$productItem = $manager->findItem($product->getProductCode(), array('price', 'text'));
+		$product->setPrice($this->calcPrice($product, $productItem->getRefItems('price', 'default'), $quantity));
 
-		$this->get()->editProduct( $product, $position );
+		$this->get()->editProduct($product, $position);
 
 		$this->save();
 	}
@@ -302,49 +302,49 @@ 
 	 * @param string $code Coupon code entered by the user
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid or not allowed
 	 */
-	public function addCoupon( $code )
+	public function addCoupon($code)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'coupon' );
-		$codeManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'coupon/code' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'coupon');
+		$codeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'coupon/code');
 
 
-		$search = $codeManager->createSearch( true );
+		$search = $codeManager->createSearch(true);
 		$expr = array(
-			$search->compare( '==', 'coupon.code.code', $code ),
+			$search->compare('==', 'coupon.code.code', $code),
 			$search->getConditions(),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, 1 );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, 1);
 
-		$result = $codeManager->searchItems( $search );
+		$result = $codeManager->searchItems($search);
 
-		if( ( $codeItem = reset( $result ) ) === false ) {
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Coupon code "%1$s" is invalid or not available any more', $code ) );
+		if (($codeItem = reset($result)) === false) {
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Coupon code "%1$s" is invalid or not available any more', $code));
 		}
 
 
-		$search = $manager->createSearch( true );
+		$search = $manager->createSearch(true);
 		$expr = array(
-			$search->compare( '==', 'coupon.id', $codeItem->getParentId() ),
+			$search->compare('==', 'coupon.id', $codeItem->getParentId()),
 			$search->getConditions(),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, 1 );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, 1);
 
-		$result = $manager->searchItems( $search );
+		$result = $manager->searchItems($search);
 
-		if( ( $item = reset( $result ) ) === false ) {
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Coupon for code "%1$s" is not available any more', $code ) );
+		if (($item = reset($result)) === false) {
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Coupon for code "%1$s" is not available any more', $code));
 		}
 
 
-		$provider = $manager->getProvider( $item, $codeItem->getCode() );
+		$provider = $manager->getProvider($item, $codeItem->getCode());
 
-		if( $provider->isAvailable( $this->get() ) !== true ) {
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Requirements for coupon code "%1$s" aren\'t met', $code ) );
+		if ($provider->isAvailable($this->get()) !== true) {
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Requirements for coupon code "%1$s" aren\'t met', $code));
 		}
 
-		$provider->addCoupon( $this->get() );
+		$provider->addCoupon($this->get());
 		$this->save();
 	}
 
@@ -355,21 +355,21 @@ 
 	 * @param string $code Coupon code entered by the user
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid
 	 */
-	public function deleteCoupon( $code )
+	public function deleteCoupon($code)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'coupon' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'coupon');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'coupon.code.code', $code ) );
-		$search->setSlice( 0, 1 );
+		$search->setConditions($search->compare('==', 'coupon.code.code', $code));
+		$search->setSlice(0, 1);
 
-		$result = $manager->searchItems( $search );
+		$result = $manager->searchItems($search);
 
-		if( ( $item = reset( $result ) ) === false ) {
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Coupon code "%1$s" is invalid', $code ) );
+		if (($item = reset($result)) === false) {
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Coupon code "%1$s" is invalid', $code));
 		}
 
-		$manager->getProvider( $item, $code )->deleteCoupon( $this->get() );
+		$manager->getProvider($item, $code)->deleteCoupon($this->get());
 		$this->save();
 	}
 
@@ -382,28 +382,28 @@ 
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the billing or delivery address is not of any required type of
 	 * 	if one of the keys is invalid when using an array with key/value pairs
 	 */
-	public function setAddress( $type, $value )
+	public function setAddress($type, $value)
 	{
-		$address = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order/base/address' )->createItem();
-		$address->setType( $type );
+		$address = \Aimeos\MShop\Factory::createManager($this->getContext(), 'order/base/address')->createItem();
+		$address->setType($type);
 
-		if( $value instanceof \Aimeos\MShop\Common\Item\Address\Iface )
+		if ($value instanceof \Aimeos\MShop\Common\Item\Address\Iface)
 		{
-			$address->copyFrom( $value );
-			$this->get()->setAddress( $address, $type );
+			$address->copyFrom($value);
+			$this->get()->setAddress($address, $type);
 		}
-		else if( is_array( $value ) )
+		else if (is_array($value))
 		{
-			$this->setAddressFromArray( $address, $value );
-			$this->get()->setAddress( $address, $type );
+			$this->setAddressFromArray($address, $value);
+			$this->get()->setAddress($address, $type);
 		}
-		else if( $value === null )
+		else if ($value === null)
 		{
-			$this->get()->deleteAddress( $type );
+			$this->get()->deleteAddress($type);
 		}
 		else
 		{
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Invalid value for address type "%1$s"', $type ) );
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Invalid value for address type "%1$s"', $type));
 		}
 
 		$this->save();
@@ -419,48 +419,48 @@ 
 	 * 	entered by the customer when choosing one of the delivery or payment options
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If there is no price to the service item attached
 	 */
-	public function setService( $type, $id, array $attributes = [] )
+	public function setService($type, $id, array $attributes = [])
 	{
-		if( $id === null )
+		if ($id === null)
 		{
-			$this->get()->deleteService( $type );
+			$this->get()->deleteService($type);
 			$this->save();
 			return;
 		}
 
 		$context = $this->getContext();
 
-		$serviceManager = \Aimeos\MShop\Factory::createManager( $context, 'service' );
-		$serviceItem = $serviceManager->getItem( $id, array( 'media', 'price', 'text' ) );
+		$serviceManager = \Aimeos\MShop\Factory::createManager($context, 'service');
+		$serviceItem = $serviceManager->getItem($id, array('media', 'price', 'text'));
 
-		$provider = $serviceManager->getProvider( $serviceItem );
-		$result = $provider->checkConfigFE( $attributes );
-		$unknown = array_diff_key( $attributes, $result );
+		$provider = $serviceManager->getProvider($serviceItem);
+		$result = $provider->checkConfigFE($attributes);
+		$unknown = array_diff_key($attributes, $result);
 
-		if( count( $unknown ) > 0 )
+		if (count($unknown) > 0)
 		{
-			$msg = sprintf( 'Unknown attributes "%1$s"', implode( '","', array_keys( $unknown ) ) );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+			$msg = sprintf('Unknown attributes "%1$s"', implode('","', array_keys($unknown)));
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
 		}
 
-		foreach( $result as $key => $value )
+		foreach ($result as $key => $value)
 		{
-			if( $value !== null ) {
-				throw new \Aimeos\Controller\Frontend\Basket\Exception( $value );
+			if ($value !== null) {
+				throw new \Aimeos\Controller\Frontend\Basket\Exception($value);
 			}
 		}
 
-		$orderBaseServiceManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base/service' );
+		$orderBaseServiceManager = \Aimeos\MShop\Factory::createManager($context, 'order/base/service');
 		$orderServiceItem = $orderBaseServiceManager->createItem();
-		$orderServiceItem->copyFrom( $serviceItem );
+		$orderServiceItem->copyFrom($serviceItem);
 
 		// remove service rebate of original price
-		$price = $provider->calcPrice( $this->get() )->setRebate( '0.00' );
-		$orderServiceItem->setPrice( $price );
+		$price = $provider->calcPrice($this->get())->setRebate('0.00');
+		$orderServiceItem->setPrice($price);
 
-		$provider->setConfigFE( $orderServiceItem, $attributes );
+		$provider->setConfigFE($orderServiceItem, $attributes);
 
-		$this->get()->setService( $orderServiceItem, $type );
+		$this->get()->setService($orderServiceItem, $type);
 		$this->save();
 	}
 
@@ -473,18 +473,18 @@ 
 	 * 	an address item.
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception
 	 */
-	protected function setAddressFromArray( \Aimeos\MShop\Order\Item\Base\Address\Iface $address, array $map )
+	protected function setAddressFromArray(\Aimeos\MShop\Order\Item\Base\Address\Iface $address, array $map)
 	{
-		foreach( $map as $key => $value ) {
-			$map[$key] = strip_tags( $value ); // prevent XSS
+		foreach ($map as $key => $value) {
+			$map[$key] = strip_tags($value); // prevent XSS
 		}
 
-		$errors = $address->fromArray( $map );
+		$errors = $address->fromArray($map);
 
-		if( count( $errors ) > 0 )
+		if (count($errors) > 0)
 		{
-			$msg = sprintf( 'Invalid address properties, please check your input' );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg, 0, null, $errors );
+			$msg = sprintf('Invalid address properties, please check your input');
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg, 0, null, $errors);
 		}
 	}
 }

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

Doc Comments +2 added lines, -2 removed lines

@@ -61,7 +61,7 @@ 
 
 	/**
 	 * Empties the basket and removing all products, addresses, services, etc.
-	 * @return void
+	 * @return Base
 	 */
 	public function clear()
 	{
@@ -247,7 +247,7 @@ 
 	/**
 	 * Returns the frontend controller
 	 *
-	 * @return \Aimeos\Controller\Frontend\Basket\Iface Frontend controller object
+	 * @return \Aimeos\Controller\Frontend\Iface Frontend controller object
 	 */
 	protected function getController()
 	{

Spacing +25 added lines, -25 removed lines

@@ -30,18 +30,18 @@ 
 	 * @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\Basket\Iface';
-		if( !( $controller instanceof $iface ) )
+		if (!($controller instanceof $iface))
 		{
-			$msg = sprintf( 'Class "%1$s" does not implement interface "%2$s"', get_class( $controller ), $iface );
-			throw new \Aimeos\Controller\Frontend\Exception( $msg );
+			$msg = sprintf('Class "%1$s" does not implement interface "%2$s"', get_class($controller), $iface);
+			throw new \Aimeos\Controller\Frontend\Exception($msg);
 		}
 
 		$this->controller = $controller;
 
-		parent::__construct( $context );
+		parent::__construct($context);
 	}
 
 
@@ -53,9 +53,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);
 	}
 
 
@@ -97,9 +97,9 @@ 
 	 * @param string $type Basket type
 	 * @return \Aimeos\Controller\Frontend\Basket\Iface Basket frontend object
 	 */
-	public function setType( $type )
+	public function setType($type)
 	{
-		$this->controller->setType( $type );
+		$this->controller->setType($type);
 		return $this;
 	}
 
@@ -123,9 +123,9 @@ 
 	 * @param boolean $default True to add default criteria (user logged in), false if not
 	 * @return \Aimeos\MShop\Order\Item\Base\Iface Order base object including the given parts
 	 */
-	public function load( $id, $parts = \Aimeos\MShop\Order\Manager\Base\Base::PARTS_ALL, $default = true )
+	public function load($id, $parts = \Aimeos\MShop\Order\Manager\Base\Base::PARTS_ALL, $default = true)
 	{
-		return $this->controller->load( $id, $parts, $default );
+		return $this->controller->load($id, $parts, $default);
 	}
 
 
@@ -150,9 +150,9 @@ 
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the product isn't available
 	 * @return void
 	 */
-	public function addProduct( $prodid, $quantity = 1, array $options = [], array $variantAttributeIds = [],
+	public function addProduct($prodid, $quantity = 1, array $options = [], array $variantAttributeIds = [],
 		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [],
-		$stocktype = 'default' )
+		$stocktype = 'default')
 	{
 		$this->controller->addProduct(
 			$prodid, $quantity, $options, $variantAttributeIds, $configAttributeIds,
@@ -167,9 +167,9 @@ 
 	 * @param integer $position Position number (key) of the order product item
 	 * @return void
 	 */
-	public function deleteProduct( $position )
+	public function deleteProduct($position)
 	{
-		$this->controller->deleteProduct( $position );
+		$this->controller->deleteProduct($position);
 	}
 
 
@@ -182,9 +182,9 @@ 
 	 * @param array $configAttributeCodes Codes of the product config attributes that should be REMOVED
 	 * @return void
 	 */
-	public function editProduct( $position, $quantity, array $options = [], array $configAttributeCodes = [] )
+	public function editProduct($position, $quantity, array $options = [], array $configAttributeCodes = [])
 	{
-		$this->controller->editProduct( $position, $quantity, $options, $configAttributeCodes );
+		$this->controller->editProduct($position, $quantity, $options, $configAttributeCodes);
 	}
 
 
@@ -195,9 +195,9 @@ 
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid or not allowed
 	 * @return void
 	 */
-	public function addCoupon( $code )
+	public function addCoupon($code)
 	{
-		$this->controller->addCoupon( $code );
+		$this->controller->addCoupon($code);
 	}
 
 
@@ -208,9 +208,9 @@ 
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid
 	 * @return void
 	 */
-	public function deleteCoupon( $code )
+	public function deleteCoupon($code)
 	{
-		$this->controller->deleteCoupon( $code );
+		$this->controller->deleteCoupon($code);
 	}
 
 
@@ -223,9 +223,9 @@ 
 	 * 	if one of the keys is invalid when using an array with key/value pairs
 	 * @return void
 	 */
-	public function setAddress( $type, $value )
+	public function setAddress($type, $value)
 	{
-		$this->controller->setAddress( $type, $value );
+		$this->controller->setAddress($type, $value);
 	}
 
 
@@ -239,9 +239,9 @@ 
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If there is no price to the service item attached
 	 * @return void
 	 */
-	public function setService( $type, $id, array $attributes = [] )
+	public function setService($type, $id, array $attributes = [])
 	{
-		$this->controller->setService( $type, $id, $attributes );
+		$this->controller->setService($type, $id, $attributes);
 	}
 
 

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

Spacing +43 added lines, -43 removed lines

@@ -20,54 +20,54 @@ 
 	{
 		$this->context = \TestHelperFrontend::getContext();
 
-		$this->stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' )
+		$this->stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard')
 			->disableOriginalConstructor()
 			->getMock();
 
-		$this->object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Decorator\Base' )
-			->setConstructorArgs( [$this->stub, $this->context] )
+		$this->object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Decorator\Base')
+			->setConstructorArgs([$this->stub, $this->context])
 			->getMockForAbstractClass();
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->context, $this->object, $this->stub );
+		unset($this->context, $this->object, $this->stub);
 	}
 
 
 	public function testConstructException()
 	{
-		$stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Iface' )->getMock();
+		$stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Iface')->getMock();
 
-		$this->setExpectedException( '\Aimeos\Controller\Frontend\Exception' );
+		$this->setExpectedException('\Aimeos\Controller\Frontend\Exception');
 
-		$this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Decorator\Base' )
-			->setConstructorArgs( [$stub, $this->context] )
+		$this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Decorator\Base')
+			->setConstructorArgs([$stub, $this->context])
 			->getMockForAbstractClass();
 	}
 
 
 	public function testCall()
 	{
-		$stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' )
+		$stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard')
 			->disableOriginalConstructor()
-			->setMethods( ['invalid'] )
+			->setMethods(['invalid'])
 			->getMock();
 
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Decorator\Base' )
-			->setConstructorArgs( [$stub, $this->context] )
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Decorator\Base')
+			->setConstructorArgs([$stub, $this->context])
 			->getMockForAbstractClass();
 
-		$stub->expects( $this->once() )->method( 'invalid' )->will( $this->returnValue( true ) );
+		$stub->expects($this->once())->method('invalid')->will($this->returnValue(true));
 
-		$this->assertTrue( $object->invalid() );
+		$this->assertTrue($object->invalid());
 	}
 
 
 	public function testClear()
 	{
-		$this->stub->expects( $this->once() )->method( 'clear' );
+		$this->stub->expects($this->once())->method('clear');
 
 		$this->object->clear();
 	}
@@ -76,18 +76,18 @@ 
 	public function testGet()
 	{
 		$context = \TestHelperFrontend::getContext();
-		$order = \Aimeos\MShop\Factory::createManager( $context, 'order/base' )->createItem();
+		$order = \Aimeos\MShop\Factory::createManager($context, 'order/base')->createItem();
 
-		$this->stub->expects( $this->once() )->method( 'get' )
-			->will( $this->returnValue( $order ) );
+		$this->stub->expects($this->once())->method('get')
+			->will($this->returnValue($order));
 
-		$this->assertInstanceOf( '\Aimeos\MShop\Order\Item\Base\Iface', $this->object->get() );
+		$this->assertInstanceOf('\Aimeos\MShop\Order\Item\Base\Iface', $this->object->get());
 	}
 
 
 	public function testSave()
 	{
-		$this->stub->expects( $this->once() )->method( 'save' );
+		$this->stub->expects($this->once())->method('save');
 
 		$this->object->save();
 	}
@@ -95,15 +95,15 @@ 
 
 	public function testSetType()
 	{
-		$this->stub->expects( $this->once() )->method( 'setType' );
+		$this->stub->expects($this->once())->method('setType');
 
-		$this->object->setType( 'test' );
+		$this->object->setType('test');
 	}
 
 
 	public function testStore()
 	{
-		$this->stub->expects( $this->once() )->method( 'store' );
+		$this->stub->expects($this->once())->method('store');
 
 		$this->object->store();
 	}
@@ -111,7 +111,7 @@ 
 
 	public function testLoad()
 	{
-		$this->stub->expects( $this->once() )->method( 'load' );
+		$this->stub->expects($this->once())->method('load');
 
 		$this->object->load( -1 );
 	}
@@ -119,7 +119,7 @@ 
 
 	public function testAddProduct()
 	{
-		$this->stub->expects( $this->once() )->method( 'addProduct' );
+		$this->stub->expects($this->once())->method('addProduct');
 
 		$this->object->addProduct( -1 );
 	}
@@ -127,65 +127,65 @@ 
 
 	public function testDeleteProduct()
 	{
-		$this->stub->expects( $this->once() )->method( 'deleteProduct' );
+		$this->stub->expects($this->once())->method('deleteProduct');
 
-		$this->object->deleteProduct( 0 );
+		$this->object->deleteProduct(0);
 	}
 
 
 	public function testEditProduct()
 	{
-		$this->stub->expects( $this->once() )->method( 'editProduct' );
+		$this->stub->expects($this->once())->method('editProduct');
 
-		$this->object->editProduct( 0, 1 );
+		$this->object->editProduct(0, 1);
 	}
 
 
 	public function testAddCoupon()
 	{
-		$this->stub->expects( $this->once() )->method( 'addCoupon' );
+		$this->stub->expects($this->once())->method('addCoupon');
 
-		$this->object->addCoupon( 'test' );
+		$this->object->addCoupon('test');
 	}
 
 
 	public function testDeleteCoupon()
 	{
-		$this->stub->expects( $this->once() )->method( 'deleteCoupon' );
+		$this->stub->expects($this->once())->method('deleteCoupon');
 
-		$this->object->deleteCoupon( 'test' );
+		$this->object->deleteCoupon('test');
 	}
 
 
 	public function testSetAddress()
 	{
-		$this->stub->expects( $this->once() )->method( 'setAddress' );
+		$this->stub->expects($this->once())->method('setAddress');
 
-		$this->object->setAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT, null );
+		$this->object->setAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT, null);
 	}
 
 
 	public function testSetService()
 	{
-		$this->stub->expects( $this->once() )->method( 'setService' );
+		$this->stub->expects($this->once())->method('setService');
 
-		$this->object->setService( \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT, -1 );
+		$this->object->setService(\Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT, -1);
 	}
 
 
 	public function testGetController()
 	{
-		$result = $this->access( 'getController' )->invokeArgs( $this->object, [] );
+		$result = $this->access('getController')->invokeArgs($this->object, []);
 
-		$this->assertSame( $this->stub, $result );
+		$this->assertSame($this->stub, $result);
 	}
 
 
-	protected function access( $name )
+	protected function access($name)
 	{
-		$class = new \ReflectionClass( '\Aimeos\Controller\Frontend\Basket\Decorator\Base' );
-		$method = $class->getMethod( $name );
-		$method->setAccessible( true );
+		$class = new \ReflectionClass('\Aimeos\Controller\Frontend\Basket\Decorator\Base');
+		$method = $class->getMethod($name);
+		$method->setAccessible(true);
 
 		return $method;
 	}