aimeos / ai-controller-frontend

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

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

Doc Comments +3 added lines

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

Spacing +121 added lines, -121 removed lines

@@ -21,46 +21,46 @@ 
 
 	protected function tearDown()
 	{
-		$this->context->getSession()->set( 'aimeos', [] );
+		$this->context->getSession()->set('aimeos', []);
 
-		unset( $this->context );
+		unset($this->context);
 	}
 
 
 	public function testCheckLocale()
 	{
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( null )
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard')
+			->setConstructorArgs([$this->context])
+			->setMethods(null)
 			->getMock();
 
-		$this->context->getSession()->set( 'aimeos/basket/locale', 'unittest|en|EUR' );
-		$this->access( 'checkLocale' )->invokeArgs( $object, ['unittest'] );
+		$this->context->getSession()->set('aimeos/basket/locale', 'unittest|en|EUR');
+		$this->access('checkLocale')->invokeArgs($object, ['unittest']);
 	}
 
 
 	public function testCopyAddresses()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'order/base' );
+		$manager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'order/base');
 		$ordBaseItem = $manager->createItem();
 
-		$address = $this->getAddress( 'Example company' );
-		$ordBaseItem->setAddress( $address, \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT );
+		$address = $this->getAddress('Example company');
+		$ordBaseItem->setAddress($address, \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT);
 
 
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( null )
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard')
+			->setConstructorArgs([$this->context])
+			->setMethods(null)
 			->getMock();
 
-		$result = $this->access( 'copyAddresses' )->invokeArgs( $object, [$ordBaseItem, ['test'], 'unittest|en|EUR'] );
+		$result = $this->access('copyAddresses')->invokeArgs($object, [$ordBaseItem, ['test'], 'unittest|en|EUR']);
 
 
-		$this->assertEquals( ['test'], $result );
-		$this->assertEquals( 1, count( $object->get()->getAddresses() ) );
+		$this->assertEquals(['test'], $result);
+		$this->assertEquals(1, count($object->get()->getAddresses()));
 
-		$addr = $object->get()->getAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT );
-		$this->assertInstanceOf( '\Aimeos\MShop\Order\Item\Base\Address\Iface', $addr );
+		$addr = $object->get()->getAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT);
+		$this->assertInstanceOf('\Aimeos\MShop\Order\Item\Base\Address\Iface', $addr);
 
 		$object->clear();
 	}
@@ -68,54 +68,54 @@ 
 
 	public function testCopyAddressesException()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'order/base' );
+		$manager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'order/base');
 		$ordBaseItem = $manager->createItem();
 
-		$address = $this->getAddress( 'Example company' );
-		$ordBaseItem->setAddress( $address, \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT );
+		$address = $this->getAddress('Example company');
+		$ordBaseItem->setAddress($address, \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT);
 
 
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( ['setAddress'] )
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard')
+			->setConstructorArgs([$this->context])
+			->setMethods(['setAddress'])
 			->getMock();
 
-		$object->expects( $this->once() )->method( 'setAddress' )->will( $this->throwException( new \Exception() ) );
+		$object->expects($this->once())->method('setAddress')->will($this->throwException(new \Exception()));
 
-		$result = $this->access( 'copyAddresses' )->invokeArgs( $object, [$ordBaseItem, [], 'unittest|en|EUR'] );
+		$result = $this->access('copyAddresses')->invokeArgs($object, [$ordBaseItem, [], 'unittest|en|EUR']);
 
-		$this->assertEquals( 1, count( $result ) );
-		$this->assertArrayHasKey( 'address', $result );
+		$this->assertEquals(1, count($result));
+		$this->assertArrayHasKey('address', $result);
 	}
 
 
 	public function testCopyCoupon()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'order/base' );
+		$manager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'order/base');
 		$ordBaseItem = $manager->createItem();
 
-		$product = \Aimeos\MShop\Factory::createManager( $this->context, 'product' )->findItem( 'CNC', ['price'] );
-		$ordProdManager = \Aimeos\MShop\Factory::createManager( $this->context, 'order/base/product' );
-		$ordProdItem = $ordProdManager->createItem()->copyFrom( $product );
+		$product = \Aimeos\MShop\Factory::createManager($this->context, 'product')->findItem('CNC', ['price']);
+		$ordProdManager = \Aimeos\MShop\Factory::createManager($this->context, 'order/base/product');
+		$ordProdItem = $ordProdManager->createItem()->copyFrom($product);
 
-		$priceItems = $product->getRefItems( 'price' );
-		$ordProdItem->setPrice( reset( $priceItems ) );
+		$priceItems = $product->getRefItems('price');
+		$ordProdItem->setPrice(reset($priceItems));
 
-		$ordBaseItem->addProduct( $ordProdItem );
-		$ordBaseItem->addCoupon( 'OPQR', [] );
+		$ordBaseItem->addProduct($ordProdItem);
+		$ordBaseItem->addCoupon('OPQR', []);
 
 
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( null )
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard')
+			->setConstructorArgs([$this->context])
+			->setMethods(null)
 			->getMock();
 
-		$object->addProduct( $product->getId() );
+		$object->addProduct($product->getId());
 
-		$result = $this->access( 'copyCoupons' )->invokeArgs( $object, [$ordBaseItem, ['test'], 'unittest|en|EUR'] );
+		$result = $this->access('copyCoupons')->invokeArgs($object, [$ordBaseItem, ['test'], 'unittest|en|EUR']);
 
 
-		$this->assertEquals( ['test'], $result );
+		$this->assertEquals(['test'], $result);
 
 		$object->clear();
 	}
@@ -123,48 +123,48 @@ 
 
 	public function testCopyCouponException()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'order/base' );
+		$manager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'order/base');
 		$ordBaseItem = $manager->createItem();
 
-		$ordBaseItem->addCoupon( '90AB', [] );
+		$ordBaseItem->addCoupon('90AB', []);
 
 
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( ['addCoupon'] )
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard')
+			->setConstructorArgs([$this->context])
+			->setMethods(['addCoupon'])
 			->getMock();
 
-		$object->expects( $this->once() )->method( 'addCoupon' )->will( $this->throwException( new \Exception() ) );
+		$object->expects($this->once())->method('addCoupon')->will($this->throwException(new \Exception()));
 
-		$result = $this->access( 'copyCoupons' )->invokeArgs( $object, [$ordBaseItem, [], 'unittest|en|EUR'] );
+		$result = $this->access('copyCoupons')->invokeArgs($object, [$ordBaseItem, [], 'unittest|en|EUR']);
 
-		$this->assertEquals( 1, count( $result ) );
-		$this->assertArrayHasKey( 'coupon', $result );
+		$this->assertEquals(1, count($result));
+		$this->assertArrayHasKey('coupon', $result);
 	}
 
 
 	public function testCopyProduct()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'order/base' );
+		$manager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'order/base');
 		$ordBaseItem = $manager->createItem();
 
-		$product = \Aimeos\MShop\Factory::createManager( $this->context, 'product' )->findItem( 'CNC' );
-		$ordProdManager = \Aimeos\MShop\Factory::createManager( $this->context, 'order/base/product' );
-		$ordProdItem = $ordProdManager->createItem()->copyFrom( $product );
-		$ordBaseItem->addProduct( $ordProdItem );
+		$product = \Aimeos\MShop\Factory::createManager($this->context, 'product')->findItem('CNC');
+		$ordProdManager = \Aimeos\MShop\Factory::createManager($this->context, 'order/base/product');
+		$ordProdItem = $ordProdManager->createItem()->copyFrom($product);
+		$ordBaseItem->addProduct($ordProdItem);
 
 
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( null )
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard')
+			->setConstructorArgs([$this->context])
+			->setMethods(null)
 			->getMock();
 
-		$result = $this->access( 'copyProducts' )->invokeArgs( $object, [$ordBaseItem, ['test'], 'unittest|en|EUR'] );
+		$result = $this->access('copyProducts')->invokeArgs($object, [$ordBaseItem, ['test'], 'unittest|en|EUR']);
 
 
-		$this->assertEquals( ['test'], $result );
-		$this->assertEquals( 1, count( $object->get()->getProducts() ) );
-		$this->assertInstanceOf( '\Aimeos\MShop\Order\Item\Base\Product\Iface', $object->get()->getProduct( 0 ) );
+		$this->assertEquals(['test'], $result);
+		$this->assertEquals(1, count($object->get()->getProducts()));
+		$this->assertInstanceOf('\Aimeos\MShop\Order\Item\Base\Product\Iface', $object->get()->getProduct(0));
 
 		$object->clear();
 	}
@@ -172,56 +172,56 @@ 
 
 	public function testCopyProductException()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'order/base' );
+		$manager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'order/base');
 		$ordBaseItem = $manager->createItem();
 
-		$product = \Aimeos\MShop\Factory::createManager( $this->context, 'product' )->findItem( 'CNC' );
-		$ordProdManager = \Aimeos\MShop\Factory::createManager( $this->context, 'order/base/product' );
-		$ordProdItem = $ordProdManager->createItem()->copyFrom( $product );
-		$ordBaseItem->addProduct( $ordProdItem );
+		$product = \Aimeos\MShop\Factory::createManager($this->context, 'product')->findItem('CNC');
+		$ordProdManager = \Aimeos\MShop\Factory::createManager($this->context, 'order/base/product');
+		$ordProdItem = $ordProdManager->createItem()->copyFrom($product);
+		$ordBaseItem->addProduct($ordProdItem);
 
 
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( ['addProduct'] )
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard')
+			->setConstructorArgs([$this->context])
+			->setMethods(['addProduct'])
 			->getMock();
 
-		$object->expects( $this->once() )->method( 'addProduct' )->will( $this->throwException( new \Exception() ) );
+		$object->expects($this->once())->method('addProduct')->will($this->throwException(new \Exception()));
 
-		$result = $this->access( 'copyProducts' )->invokeArgs( $object, [$ordBaseItem, [], 'unittest|en|EUR'] );
+		$result = $this->access('copyProducts')->invokeArgs($object, [$ordBaseItem, [], 'unittest|en|EUR']);
 
-		$this->assertEquals( 1, count( $result ) );
-		$this->assertArrayHasKey( 'product', $result );
+		$this->assertEquals(1, count($result));
+		$this->assertArrayHasKey('product', $result);
 	}
 
 
 	public function testCopyServices()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'order/base' );
+		$manager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'order/base');
 		$ordBaseItem = $manager->createItem();
 
-		$serviceManager = \Aimeos\MShop\Factory::createManager( $this->context, 'service' );
-		$ordServManager = \Aimeos\MShop\Factory::createManager( $this->context, 'order/base/service' );
+		$serviceManager = \Aimeos\MShop\Factory::createManager($this->context, 'service');
+		$ordServManager = \Aimeos\MShop\Factory::createManager($this->context, 'order/base/service');
 
-		$serviceItem = $serviceManager->findItem( 'unitcode', [], 'service', 'delivery' );
-		$ordServItem = $ordServManager->createItem()->copyFrom( $serviceItem );
+		$serviceItem = $serviceManager->findItem('unitcode', [], 'service', 'delivery');
+		$ordServItem = $ordServManager->createItem()->copyFrom($serviceItem);
 
-		$ordBaseItem->setService( $ordServItem, \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_DELIVERY );
+		$ordBaseItem->setService($ordServItem, \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_DELIVERY);
 
 
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( null )
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard')
+			->setConstructorArgs([$this->context])
+			->setMethods(null)
 			->getMock();
 
-		$result = $this->access( 'copyServices' )->invokeArgs( $object, [$ordBaseItem, ['test'], 'unittest|en|EUR'] );
+		$result = $this->access('copyServices')->invokeArgs($object, [$ordBaseItem, ['test'], 'unittest|en|EUR']);
 
 
-		$this->assertEquals( ['test'], $result );
-		$this->assertEquals( 1, count( $object->get()->getServices() ) );
+		$this->assertEquals(['test'], $result);
+		$this->assertEquals(1, count($object->get()->getServices()));
 
-		$service = $object->get()->getService( \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_DELIVERY );
-		$this->assertInstanceOf( '\Aimeos\MShop\Order\Item\Base\Service\Iface', $service );
+		$service = $object->get()->getService(\Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_DELIVERY);
+		$this->assertInstanceOf('\Aimeos\MShop\Order\Item\Base\Service\Iface', $service);
 
 		$object->clear();
 	}
@@ -229,77 +229,77 @@ 
 
 	public function testCopyServicesException()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'order/base' );
+		$manager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'order/base');
 		$ordBaseItem = $manager->createItem();
 
-		$serviceManager = \Aimeos\MShop\Factory::createManager( $this->context, 'service' );
-		$ordServManager = \Aimeos\MShop\Factory::createManager( $this->context, 'order/base/service' );
+		$serviceManager = \Aimeos\MShop\Factory::createManager($this->context, 'service');
+		$ordServManager = \Aimeos\MShop\Factory::createManager($this->context, 'order/base/service');
 
-		$serviceItem = $serviceManager->findItem( 'unitcode', [], 'service', 'delivery' );
-		$ordServItem = $ordServManager->createItem()->copyFrom( $serviceItem );
+		$serviceItem = $serviceManager->findItem('unitcode', [], 'service', 'delivery');
+		$ordServItem = $ordServManager->createItem()->copyFrom($serviceItem);
 
-		$ordBaseItem->setService( $ordServItem, \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_DELIVERY );
+		$ordBaseItem->setService($ordServItem, \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_DELIVERY);
 
 
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( ['setService'] )
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard')
+			->setConstructorArgs([$this->context])
+			->setMethods(['setService'])
 			->getMock();
 
-		$object->expects( $this->once() )->method( 'setService' )->will( $this->throwException( new \Exception() ) );
+		$object->expects($this->once())->method('setService')->will($this->throwException(new \Exception()));
 
-		$result = $this->access( 'copyServices' )->invokeArgs( $object, [$ordBaseItem, [], 'unittest|en|EUR'] );
+		$result = $this->access('copyServices')->invokeArgs($object, [$ordBaseItem, [], 'unittest|en|EUR']);
 
-		$this->assertEquals( 0, count( $result ) );
+		$this->assertEquals(0, count($result));
 	}
 
 
 	public function testGetOrderProductAttributes()
 	{
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Basket\Standard' )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( ['getAttributes'] )
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Basket\Standard')
+			->setConstructorArgs([$this->context])
+			->setMethods(['getAttributes'])
 			->getMock();
 
-		$list = [1 => new \Aimeos\MShop\Attribute\Item\Standard( ['attribute.code' => 'special_instructions'] )];
-		$object->expects( $this->once() )->method( 'getAttributes' )->will( $this->returnValue( $list ) );
+		$list = [1 => new \Aimeos\MShop\Attribute\Item\Standard(['attribute.code' => 'special_instructions'])];
+		$object->expects($this->once())->method('getAttributes')->will($this->returnValue($list));
 
 		$values = new \stdClass(); // test for PHP bug
 		$values->{'1'} = 'test';
-		$result = $this->access( 'getOrderProductAttributes' )->invokeArgs( $object, ['test', ['1'], (array) $values] );
+		$result = $this->access('getOrderProductAttributes')->invokeArgs($object, ['test', ['1'], (array) $values]);
 
-		$this->assertEquals( 1, count( $result ) );
-		$this->assertEquals( 'test', $result[0]->getValue() );
+		$this->assertEquals(1, count($result));
+		$this->assertEquals('test', $result[0]->getValue());
 	}
 
 
 	/**
 	 * @param string $company
 	 */
-	protected function getAddress( $company )
+	protected function getAddress($company)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'customer/address' );
+		$manager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'customer/address');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'customer.address.company', $company ) );
-		$items = $manager->searchItems( $search );
+		$search->setConditions($search->compare('==', 'customer.address.company', $company));
+		$items = $manager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \RuntimeException( sprintf( 'No address item with company "%1$s" found', $company ) );
+		if (($item = reset($items)) === false) {
+			throw new \RuntimeException(sprintf('No address item with company "%1$s" found', $company));
 		}
 
-		$ordAddrManager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'order/base/address' );
-		$ordAddrItem = $ordAddrManager->createItem()->copyFrom( $item );
+		$ordAddrManager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'order/base/address');
+		$ordAddrItem = $ordAddrManager->createItem()->copyFrom($item);
 
 		return $ordAddrItem;
 	}
 
 
-	protected function access( $name )
+	protected function access($name)
 	{
-		$class = new \ReflectionClass( '\Aimeos\Controller\Frontend\Basket\Base' );
-		$method = $class->getMethod( $name );
-		$method->setAccessible( true );
+		$class = new \ReflectionClass('\Aimeos\Controller\Frontend\Basket\Base');
+		$method = $class->getMethod($name);
+		$method->setAccessible(true);
 
 		return $method;
 	}

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

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 +10 added lines, -10 removed lines

@@ -50,7 +50,7 @@ 
 	 * @param string $type Basket type
 	 * @return \Aimeos\Controller\Frontend\Basket\Iface Basket frontend object
 	 */
-	public function setType( $type );
+	public function setType($type);
 
 
 	/**
@@ -69,7 +69,7 @@ 
 	 * @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);
 
 
 	/**
@@ -89,9 +89,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');
 
 
 	/**
@@ -100,7 +100,7 @@ 
 	 * @param integer $position Position number (key) of the order product item
 	 * @return void
 	 */
-	public function deleteProduct( $position );
+	public function deleteProduct($position);
 
 
 	/**
@@ -111,7 +111,7 @@ 
 	 * @param array $configAttributeCodes Codes of the product config attributes that should be REMOVED
 	 * @return void
 	 */
-	public function editProduct( $position, $quantity, array $configAttributeCodes = [] );
+	public function editProduct($position, $quantity, array $configAttributeCodes = []);
 
 
 	/**
@@ -121,7 +121,7 @@ 
 	 * @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);
 
 
 	/**
@@ -131,7 +131,7 @@ 
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid
 	 * @return void
 	 */
-	public function deleteCoupon( $code );
+	public function deleteCoupon($code);
 
 
 	/**
@@ -143,7 +143,7 @@ 
 	 * 	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);
 
 
 	/**
@@ -156,5 +156,5 @@ 
 	 * @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 = []);
 }