aimeos / ai-controller-frontend

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 +122 added lines, -122 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;
@@ -108,11 +108,11 @@ 
 	public function store()
 	{
 		$basket = $this->get();
-		$basket->setCustomerId( $this->getContext()->getUserId() );
+		$basket->setCustomerId($this->getContext()->getUserId());
 		$basket->finish();
 
 		$this->domainManager->begin();
-		$this->domainManager->store( $basket );
+		$this->domainManager->store($basket);
 		$this->domainManager->commit();
 
 		return $basket;
@@ -127,9 +127,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);
 	}
 
 
@@ -149,36 +149,36 @@ 
 	 * @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(), array $variantAttributeIds = array(),
+	public function addProduct($prodid, $quantity = 1, array $options = array(), array $variantAttributeIds = array(),
 		array $configAttributeIds = array(), array $hiddenAttributeIds = array(), array $customAttributeValues = array(),
-		$stocktype = 'default' )
+		$stocktype = 'default')
 	{
 		$context = $this->getContext();
-		$productManager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
-		$productItem = $productManager->getItem( $prodid, array( 'media', 'supplier', 'price', 'product', 'text' ), true );
+		$productManager = \Aimeos\MShop\Factory::createManager($context, 'product');
+		$productItem = $productManager->getItem($prodid, array('media', 'supplier', 'price', 'product', 'text'), true);
 
-		$orderBaseProductItem = \Aimeos\MShop\Factory::createManager( $context, 'order/base/product' )->createItem();
-		$orderBaseProductItem->copyFrom( $productItem );
-		$orderBaseProductItem->setQuantity( $quantity );
-		$orderBaseProductItem->setStockType( $stocktype );
+		$orderBaseProductItem = \Aimeos\MShop\Factory::createManager($context, 'order/base/product')->createItem();
+		$orderBaseProductItem->copyFrom($productItem);
+		$orderBaseProductItem->setQuantity($quantity);
+		$orderBaseProductItem->setStockType($stocktype);
 
 		$attr = array();
-		$prices = $productItem->getRefItems( 'price', 'default', 'default' );
+		$prices = $productItem->getRefItems('price', 'default', 'default');
 
-		$priceManager = \Aimeos\MShop\Factory::createManager( $context, 'price' );
-		$price = $priceManager->getLowestPrice( $prices, $quantity );
+		$priceManager = \Aimeos\MShop\Factory::createManager($context, 'price');
+		$price = $priceManager->getLowestPrice($prices, $quantity);
 
-		$attr = array_merge( $attr, $this->createOrderProductAttributes( $price, $prodid, $quantity, $configAttributeIds, 'config' ) );
-		$attr = array_merge( $attr, $this->createOrderProductAttributes( $price, $prodid, $quantity, $hiddenAttributeIds, 'hidden' ) );
-		$attr = array_merge( $attr, $this->createOrderProductAttributes( $price, $prodid, $quantity, array_keys( $customAttributeValues ), 'custom', $customAttributeValues ) );
+		$attr = array_merge($attr, $this->createOrderProductAttributes($price, $prodid, $quantity, $configAttributeIds, 'config'));
+		$attr = array_merge($attr, $this->createOrderProductAttributes($price, $prodid, $quantity, $hiddenAttributeIds, 'hidden'));
+		$attr = array_merge($attr, $this->createOrderProductAttributes($price, $prodid, $quantity, array_keys($customAttributeValues), 'custom', $customAttributeValues));
 
 		// remove product rebate of original price in favor to rebates granted for the order
-		$price->setRebate( '0.00' );
+		$price->setRebate('0.00');
 
-		$orderBaseProductItem->setPrice( $price );
-		$orderBaseProductItem->setAttributes( $attr );
+		$orderBaseProductItem->setPrice($price);
+		$orderBaseProductItem->setAttributes($attr);
 
-		$this->get()->addProduct( $orderBaseProductItem );
+		$this->get()->addProduct($orderBaseProductItem);
 		$this->save();
 	}
 
@@ -188,17 +188,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();
 	}
 
@@ -212,34 +212,34 @@ 
 	 * 	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(),
-		array $configAttributeCodes = array() )
+	public function editProduct($position, $quantity, array $options = array(),
+		array $configAttributeCodes = array())
 	{
-		$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);
 
-		$productItem = $this->getDomainItem( 'product', 'product.code', $product->getProductCode(), array( 'price', 'text' ) );
-		$prices = $productItem->getRefItems( 'price', 'default' );
-		$product->setPrice( $this->calcPrice( $product, $prices, $quantity ) );
+		$productItem = $this->getDomainItem('product', 'product.code', $product->getProductCode(), array('price', 'text'));
+		$prices = $productItem->getRefItems('price', 'default');
+		$product->setPrice($this->calcPrice($product, $prices, $quantity));
 
-		$this->get()->deleteProduct( $position );
-		$this->get()->addProduct( $product, $position );
+		$this->get()->deleteProduct($position);
+		$this->get()->addProduct($product, $position);
 
 		$this->save();
 	}
@@ -251,49 +251,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, $code );
+		$provider = $manager->getProvider($item, $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 ) );
+		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();
 	}
 
@@ -304,21 +304,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();
 	}
 
@@ -331,28 +331,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();
@@ -368,48 +368,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 = array() )
+	public function setService($type, $id, array $attributes = array())
 	{
-		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 = $this->getDomainItem( 'service', 'service.id', $id, array( 'media', 'price', 'text' ) );
+		$serviceManager = \Aimeos\MShop\Factory::createManager($context, 'service');
+		$serviceItem = $this->getDomainItem('service', 'service.id', $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();
 	}
 
@@ -422,18 +422,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(), array $variantAttributeIds = array(),
+	public function addProduct($prodid, $quantity = 1, array $options = array(), array $variantAttributeIds = array(),
 		array $configAttributeIds = array(), array $hiddenAttributeIds = array(), array $customAttributeValues = array(),
-		$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(), array $configAttributeCodes = array() )
+	public function editProduct($position, $quantity, array $options = array(), array $configAttributeCodes = array())
 	{
-		$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 = array() )
+	public function setService($type, $id, array $attributes = array())
 	{
-		$this->controller->setService( $type, $id, $attributes );
+		$this->controller->setService($type, $id, $attributes);
 	}
 
 

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

Spacing +4 added lines, -4 removed lines

@@ -31,7 +31,7 @@ 
 	 * @return \Aimeos\MShop\Order\Item\Iface Order item that belongs to the stored basket
 	 * @deprecated 2017.04 Use store() from basket controller instead
 	 */
-	public function store( \Aimeos\MShop\Order\Item\Base\Iface $basket );
+	public function store(\Aimeos\MShop\Order\Item\Base\Iface $basket);
 
 
 	/**
@@ -53,7 +53,7 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object
 	 * @return void
 	 */
-	public function block( \Aimeos\MShop\Order\Item\Iface $orderItem );
+	public function block(\Aimeos\MShop\Order\Item\Iface $orderItem);
 
 
 	/**
@@ -75,7 +75,7 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object
 	 * @return void
 	 */
-	public function unblock( \Aimeos\MShop\Order\Item\Iface $orderItem );
+	public function unblock(\Aimeos\MShop\Order\Item\Iface $orderItem);
 
 
 	/**
@@ -93,5 +93,5 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object
 	 * @return void
 	 */
-	public function update( \Aimeos\MShop\Order\Item\Iface $orderItem );
+	public function update(\Aimeos\MShop\Order\Item\Iface $orderItem);
 }

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

Spacing +13 added lines, -13 removed lines

@@ -33,22 +33,22 @@ 
 	 * @return \Aimeos\MShop\Order\Item\Iface Order item that belongs to the stored basket
 	 * @deprecated 2017.04 Use store() from basket controller instead
 	 */
-	public function store( \Aimeos\MShop\Order\Item\Base\Iface $basket )
+	public function store(\Aimeos\MShop\Order\Item\Base\Iface $basket)
 	{
 		$context = $this->getContext();
 
-		$orderManager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
-		$orderBaseManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' );
+		$orderManager = \Aimeos\MShop\Factory::createManager($context, 'order');
+		$orderBaseManager = \Aimeos\MShop\Factory::createManager($context, 'order/base');
 
 
 		$orderBaseManager->begin();
-		$orderBaseManager->store( $basket );
+		$orderBaseManager->store($basket);
 		$orderBaseManager->commit();
 
 		$orderItem = $orderManager->createItem();
-		$orderItem->setBaseId( $basket->getId() );
-		$orderItem->setType( \Aimeos\MShop\Order\Item\Base::TYPE_WEB );
-		$orderManager->saveItem( $orderItem );
+		$orderItem->setBaseId($basket->getId());
+		$orderItem->setType(\Aimeos\MShop\Order\Item\Base::TYPE_WEB);
+		$orderManager->saveItem($orderItem);
 
 
 		return $orderItem;
@@ -73,9 +73,9 @@ 
 	 *
 	 * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object
 	 */
-	public function block( \Aimeos\MShop\Order\Item\Iface $orderItem )
+	public function block(\Aimeos\MShop\Order\Item\Iface $orderItem)
 	{
-		\Aimeos\Controller\Common\Order\Factory::createController( $this->getContext() )->block( $orderItem );
+		\Aimeos\Controller\Common\Order\Factory::createController($this->getContext())->block($orderItem);
 	}
 
 
@@ -97,9 +97,9 @@ 
 	 *
 	 * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object
 	 */
-	public function unblock( \Aimeos\MShop\Order\Item\Iface $orderItem )
+	public function unblock(\Aimeos\MShop\Order\Item\Iface $orderItem)
 	{
-		\Aimeos\Controller\Common\Order\Factory::createController( $this->getContext() )->unblock( $orderItem );
+		\Aimeos\Controller\Common\Order\Factory::createController($this->getContext())->unblock($orderItem);
 	}
 
 
@@ -117,8 +117,8 @@ 
 	 *
 	 * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object
 	 */
-	public function update( \Aimeos\MShop\Order\Item\Iface $orderItem )
+	public function update(\Aimeos\MShop\Order\Item\Iface $orderItem)
 	{
-		\Aimeos\Controller\Common\Order\Factory::createController( $this->getContext() )->update( $orderItem );
+		\Aimeos\Controller\Common\Order\Factory::createController($this->getContext())->update($orderItem);
 	}
 }

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

Spacing +202 added lines, -202 removed lines

@@ -19,98 +19,98 @@ 
 	public static function setUpBeforeClass()
 	{
 		$context = \TestHelperFrontend::getContext();
-		self::$testItem = \Aimeos\MShop\Factory::createManager( $context, 'product' )->findItem( 'U:TESTP' );
+		self::$testItem = \Aimeos\MShop\Factory::createManager($context, 'product')->findItem('U:TESTP');
 	}
 
 
 	protected function setUp()
 	{
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 
 		$this->context = \TestHelperFrontend::getContext();
-		$this->object = new \Aimeos\Controller\Frontend\Basket\Standard( $this->context );
+		$this->object = new \Aimeos\Controller\Frontend\Basket\Standard($this->context);
 	}
 
 
 	protected function tearDown()
 	{
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 
 		$this->object->clear();
-		$this->context->getSession()->set( 'aimeos', array() );
+		$this->context->getSession()->set('aimeos', array());
 
-		unset( $this->context, $this->object );
+		unset($this->context, $this->object);
 	}
 
 
 	public function testClear()
 	{
-		$this->object->addProduct( self::$testItem->getId(), 2 );
+		$this->object->addProduct(self::$testItem->getId(), 2);
 		$this->object->clear();
 
-		$this->assertEquals( 0, count( $this->object->get()->getProducts() ) );
+		$this->assertEquals(0, count($this->object->get()->getProducts()));
 	}
 
 
 	public function testGet()
 	{
-		$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()
 	{
-		$stub = $this->getMockBuilder( '\Aimeos\MShop\Order\Manager\Base\Standard' )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( ['setSession'] )
+		$stub = $this->getMockBuilder('\Aimeos\MShop\Order\Manager\Base\Standard')
+			->setConstructorArgs([$this->context])
+			->setMethods(['setSession'])
 			->getMock();
 
-		\Aimeos\MShop\Factory::injectManager( $this->context, 'order/base', $stub );
+		\Aimeos\MShop\Factory::injectManager($this->context, 'order/base', $stub);
 
-		$stub->expects( $this->exactly( 2 ) )->method( 'setSession' );
+		$stub->expects($this->exactly(2))->method('setSession');
 
-		$object = new \Aimeos\Controller\Frontend\Basket\Standard( $this->context );
-		$object->addProduct( self::$testItem->getId(), 2 );
+		$object = new \Aimeos\Controller\Frontend\Basket\Standard($this->context);
+		$object->addProduct(self::$testItem->getId(), 2);
 		$object->save();
 	}
 
 
 	public function testSetType()
 	{
-		$this->assertInstanceOf( '\Aimeos\Controller\Frontend\Basket\Iface', $this->object->setType( 'test' ) );
+		$this->assertInstanceOf('\Aimeos\Controller\Frontend\Basket\Iface', $this->object->setType('test'));
 	}
 
 
 	public function testStore()
 	{
-		$stub = $this->getMockBuilder( '\Aimeos\MShop\Order\Manager\Base\Standard' )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( ['store'] )
+		$stub = $this->getMockBuilder('\Aimeos\MShop\Order\Manager\Base\Standard')
+			->setConstructorArgs([$this->context])
+			->setMethods(['store'])
 			->getMock();
 
-		\Aimeos\MShop\Factory::injectManager( $this->context, 'order/base', $stub );
+		\Aimeos\MShop\Factory::injectManager($this->context, 'order/base', $stub);
 
-		$stub->expects( $this->once() )->method( 'store' );
+		$stub->expects($this->once())->method('store');
 
-		$object = new \Aimeos\Controller\Frontend\Basket\Standard( $this->context );
+		$object = new \Aimeos\Controller\Frontend\Basket\Standard($this->context);
 		$object->store();
 	}
 
 
 	public function testLoad()
 	{
-		$stub = $this->getMockBuilder( '\Aimeos\MShop\Order\Manager\Base\Standard' )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( ['load'] )
+		$stub = $this->getMockBuilder('\Aimeos\MShop\Order\Manager\Base\Standard')
+			->setConstructorArgs([$this->context])
+			->setMethods(['load'])
 			->getMock();
 
-		\Aimeos\MShop\Factory::injectManager( $this->context, 'order/base', $stub );
+		\Aimeos\MShop\Factory::injectManager($this->context, 'order/base', $stub);
 
-		$stub->expects( $this->once() )->method( 'load' )
-			->will( $this->returnValue( $stub->createItem() ) );
+		$stub->expects($this->once())->method('load')
+			->will($this->returnValue($stub->createItem()));
 
-		$object = new \Aimeos\Controller\Frontend\Basket\Standard( $this->context );
+		$object = new \Aimeos\Controller\Frontend\Basket\Standard($this->context);
 		$object->load( -1 );
 	}
 
@@ -118,250 +118,250 @@ 
 	public function testAddDeleteProduct()
 	{
 		$basket = $this->object->get();
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'product' )->findItem( 'CNC' );
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'product')->findItem('CNC');
 
-		$this->object->addProduct( $item->getId(), 2, array(), array(), array(), array(), array(), 'default' );
-		$item2 = $this->object->get()->getProduct( 0 );
-		$this->object->deleteProduct( 0 );
+		$this->object->addProduct($item->getId(), 2, array(), array(), array(), array(), array(), 'default');
+		$item2 = $this->object->get()->getProduct(0);
+		$this->object->deleteProduct(0);
 
-		$this->assertEquals( 0, count( $basket->getProducts() ) );
-		$this->assertEquals( 'CNC', $item2->getProductCode() );
+		$this->assertEquals(0, count($basket->getProducts()));
+		$this->assertEquals('CNC', $item2->getProductCode());
 	}
 
 
 	public function testAddProductCustomAttribute()
 	{
-		$attributeManager = \Aimeos\MShop\Factory::createManager( $this->context, 'attribute' );
+		$attributeManager = \Aimeos\MShop\Factory::createManager($this->context, 'attribute');
 
 		$search = $attributeManager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'attribute.code', 'custom' ),
-			$search->compare( '==', 'attribute.type.code', 'date' ),
+			$search->compare('==', 'attribute.code', 'custom'),
+			$search->compare('==', 'attribute.type.code', 'date'),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		$attributes = $attributeManager->searchItems( $search );
+		$attributes = $attributeManager->searchItems($search);
 
-		if( ( $attrItem = reset( $attributes ) ) === false ) {
-			throw new \RuntimeException( 'Attribute not found' );
+		if (($attrItem = reset($attributes)) === false) {
+			throw new \RuntimeException('Attribute not found');
 		}
 
-		$attrValues = array( $attrItem->getId() => '2000-01-01' );
+		$attrValues = array($attrItem->getId() => '2000-01-01');
 
-		$this->object->addProduct( self::$testItem->getId(), 1, array(), array(), array(), array(), $attrValues );
+		$this->object->addProduct(self::$testItem->getId(), 1, array(), array(), array(), array(), $attrValues);
 		$basket = $this->object->get();
 
-		$this->assertEquals( 1, count( $basket->getProducts() ) );
-		$this->assertEquals( '2000-01-01', $basket->getProduct( 0 )->getAttribute( 'date', 'custom' ) );
+		$this->assertEquals(1, count($basket->getProducts()));
+		$this->assertEquals('2000-01-01', $basket->getProduct(0)->getAttribute('date', 'custom'));
 	}
 
 
 	public function testAddProductAttributeNotAssigned()
 	{
-		$attributeManager = \Aimeos\MShop\Factory::createManager( $this->context, 'attribute' );
+		$attributeManager = \Aimeos\MShop\Factory::createManager($this->context, 'attribute');
 
 		$search = $attributeManager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'attribute.code', '30' ),
-			$search->compare( '==', 'attribute.type.code', 'width' ),
+			$search->compare('==', 'attribute.code', '30'),
+			$search->compare('==', 'attribute.type.code', 'width'),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		$attribute = $attributeManager->searchItems( $search );
+		$attribute = $attributeManager->searchItems($search);
 
-		if( empty( $attribute ) ) {
-			throw new \RuntimeException( 'Attribute not found' );
+		if (empty($attribute)) {
+			throw new \RuntimeException('Attribute not found');
 		}
 
-		$hiddenAttrIds = array_keys( $attribute );
-		$configAttrIds = array_keys( $attribute );
+		$hiddenAttrIds = array_keys($attribute);
+		$configAttrIds = array_keys($attribute);
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Basket\\Exception' );
-		$this->object->addProduct( self::$testItem->getId(), 1, array(), array(), $configAttrIds, $hiddenAttrIds );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
+		$this->object->addProduct(self::$testItem->getId(), 1, array(), array(), $configAttrIds, $hiddenAttrIds);
 	}
 
 
 	public function testAddProductNegativeQuantityException()
 	{
-		$this->setExpectedException( '\\Aimeos\\MShop\\Order\\Exception' );
-		$this->object->addProduct( self::$testItem->getId(), -1 );
+		$this->setExpectedException('\\Aimeos\\MShop\\Order\\Exception');
+		$this->object->addProduct(self::$testItem->getId(), -1);
 	}
 
 
 	public function testAddProductNoPriceException()
 	{
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'product' )->findItem( 'MNOP' );
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'product')->findItem('MNOP');
 
-		$this->setExpectedException( '\\Aimeos\\MShop\\Price\\Exception' );
-		$this->object->addProduct( $item->getId(), 1 );
+		$this->setExpectedException('\\Aimeos\\MShop\\Price\\Exception');
+		$this->object->addProduct($item->getId(), 1);
 	}
 
 
 	public function testAddProductConfigAttributeException()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Basket\\Exception' );
-		$this->object->addProduct( self::$testItem->getId(), 1, array(), array(), array( -1 ) );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
+		$this->object->addProduct(self::$testItem->getId(), 1, array(), array(), array( -1 ));
 	}
 
 
 	public function testAddProductLowQuantityPriceException()
 	{
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'product' )->findItem( 'IJKL' );
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'product')->findItem('IJKL');
 
-		$this->setExpectedException( '\\Aimeos\\MShop\\Price\\Exception' );
-		$this->object->addProduct( $item->getId(), 1 );
+		$this->setExpectedException('\\Aimeos\\MShop\\Price\\Exception');
+		$this->object->addProduct($item->getId(), 1);
 	}
 
 
 	public function testAddProductHigherQuantities()
 	{
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'product' )->findItem( 'IJKL' );
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'product')->findItem('IJKL');
 
-		$this->object->addProduct( $item->getId(), 2, array(), array(), array(), array(), array(), 'unit_type3' );
+		$this->object->addProduct($item->getId(), 2, array(), array(), array(), array(), array(), 'unit_type3');
 
-		$this->assertEquals( 2, $this->object->get()->getProduct( 0 )->getQuantity() );
-		$this->assertEquals( 'IJKL', $this->object->get()->getProduct( 0 )->getProductCode() );
+		$this->assertEquals(2, $this->object->get()->getProduct(0)->getQuantity());
+		$this->assertEquals('IJKL', $this->object->get()->getProduct(0)->getProductCode());
 	}
 
 
 	public function testDeleteProductFlagError()
 	{
-		$this->object->addProduct( self::$testItem->getId(), 2 );
+		$this->object->addProduct(self::$testItem->getId(), 2);
 
-		$item = $this->object->get()->getProduct( 0 );
-		$item->setFlags( \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE );
+		$item = $this->object->get()->getProduct(0);
+		$item->setFlags(\Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE);
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Basket\\Exception' );
-		$this->object->deleteProduct( 0 );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
+		$this->object->deleteProduct(0);
 	}
 
 
 	public function testEditProduct()
 	{
-		$this->object->addProduct( self::$testItem->getId(), 1 );
+		$this->object->addProduct(self::$testItem->getId(), 1);
 
-		$item = $this->object->get()->getProduct( 0 );
-		$this->assertEquals( 1, $item->getQuantity() );
+		$item = $this->object->get()->getProduct(0);
+		$this->assertEquals(1, $item->getQuantity());
 
-		$this->object->editProduct( 0, 4 );
+		$this->object->editProduct(0, 4);
 
-		$item = $this->object->get()->getProduct( 0 );
-		$this->assertEquals( 4, $item->getQuantity() );
-		$this->assertEquals( 'U:TESTP', $item->getProductCode() );
+		$item = $this->object->get()->getProduct(0);
+		$this->assertEquals(4, $item->getQuantity());
+		$this->assertEquals('U:TESTP', $item->getProductCode());
 	}
 
 
 	public function testEditProductAttributes()
 	{
-		$attributeManager = \Aimeos\MShop\Factory::createManager( $this->context, 'attribute' );
+		$attributeManager = \Aimeos\MShop\Factory::createManager($this->context, 'attribute');
 
 		$search = $attributeManager->createSearch();
 		$conditions = array(
-			$search->compare( '==', 'attribute.domain', 'product' ),
-			$search->combine( '||', array(
-				$search->combine( '&&', array(
-					$search->compare( '==', 'attribute.code', 'xs' ),
-					$search->compare( '==', 'attribute.type.code', 'size' ),
-				) ),
-				$search->combine( '&&', array(
-					$search->compare( '==', 'attribute.code', 'white' ),
-					$search->compare( '==', 'attribute.type.code', 'color' ),
-				) ),
-			) )
+			$search->compare('==', 'attribute.domain', 'product'),
+			$search->combine('||', array(
+				$search->combine('&&', array(
+					$search->compare('==', 'attribute.code', 'xs'),
+					$search->compare('==', 'attribute.type.code', 'size'),
+				)),
+				$search->combine('&&', array(
+					$search->compare('==', 'attribute.code', 'white'),
+					$search->compare('==', 'attribute.type.code', 'color'),
+				)),
+			))
 		);
-		$search->setConditions( $search->combine( '&&', $conditions ) );
-		$attributes = $attributeManager->searchItems( $search );
+		$search->setConditions($search->combine('&&', $conditions));
+		$attributes = $attributeManager->searchItems($search);
 
-		if( ( $attribute = reset( $attributes ) ) === false ) {
-			throw new \RuntimeException( 'No attributes available' );
+		if (($attribute = reset($attributes)) === false) {
+			throw new \RuntimeException('No attributes available');
 		}
 
 
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'product' )->findItem( 'U:TESTP' );
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'product')->findItem('U:TESTP');
 
-		$this->object->addProduct( $item->getId(), 1, array(), array(), array_keys( $attributes ) );
-		$this->object->editProduct( 0, 4 );
+		$this->object->addProduct($item->getId(), 1, array(), array(), array_keys($attributes));
+		$this->object->editProduct(0, 4);
 
-		$item = $this->object->get()->getProduct( 0 );
-		$this->assertEquals( 2, count( $item->getAttributes() ) );
-		$this->assertEquals( 4, $item->getQuantity() );
+		$item = $this->object->get()->getProduct(0);
+		$this->assertEquals(2, count($item->getAttributes()));
+		$this->assertEquals(4, $item->getQuantity());
 
 
-		$this->object->editProduct( 0, 3, array(), array( $attribute->getType() ) );
+		$this->object->editProduct(0, 3, array(), array($attribute->getType()));
 
-		$item = $this->object->get()->getProduct( 0 );
-		$this->assertEquals( 3, $item->getQuantity() );
-		$this->assertEquals( 1, count( $item->getAttributes() ) );
-		$this->assertEquals( 'U:TESTP', $item->getProductCode() );
+		$item = $this->object->get()->getProduct(0);
+		$this->assertEquals(3, $item->getQuantity());
+		$this->assertEquals(1, count($item->getAttributes()));
+		$this->assertEquals('U:TESTP', $item->getProductCode());
 	}
 
 
 	public function testEditProductFlagError()
 	{
-		$this->object->addProduct( self::$testItem->getId(), 2 );
+		$this->object->addProduct(self::$testItem->getId(), 2);
 
-		$item = $this->object->get()->getProduct( 0 );
-		$item->setFlags( \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE );
+		$item = $this->object->get()->getProduct(0);
+		$item->setFlags(\Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE);
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Basket\\Exception' );
-		$this->object->editProduct( 0, 4 );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
+		$this->object->editProduct(0, 4);
 	}
 
 
 	public function testAddCoupon()
 	{
-		$this->object->addProduct( self::$testItem->getId(), 2 );
-		$this->object->addCoupon( 'GHIJ' );
+		$this->object->addProduct(self::$testItem->getId(), 2);
+		$this->object->addCoupon('GHIJ');
 
 		$basket = $this->object->get();
 
-		$this->assertEquals( 1, count( $basket->getCoupons() ) );
+		$this->assertEquals(1, count($basket->getCoupons()));
 	}
 
 
 	public function testAddCouponInvalidCode()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Basket\\Exception' );
-		$this->object->addCoupon( 'invalid' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
+		$this->object->addCoupon('invalid');
 	}
 
 
 	public function testAddCouponMissingRequirements()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Basket\\Exception' );
-		$this->object->addCoupon( 'OPQR' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
+		$this->object->addCoupon('OPQR');
 	}
 
 
 	public function testDeleteCoupon()
 	{
-		$this->object->addProduct( self::$testItem->getId(), 2 );
-		$this->object->addCoupon( '90AB' );
-		$this->object->deleteCoupon( '90AB' );
+		$this->object->addProduct(self::$testItem->getId(), 2);
+		$this->object->addCoupon('90AB');
+		$this->object->deleteCoupon('90AB');
 
 		$basket = $this->object->get();
 
-		$this->assertEquals( 0, count( $basket->getCoupons() ) );
+		$this->assertEquals(0, count($basket->getCoupons()));
 	}
 
 
 	public function testSetAddressDelete()
 	{
-		$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);
 
-		$this->setExpectedException( '\Aimeos\MShop\Order\Exception' );
-		$this->object->get()->getAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT );
+		$this->setExpectedException('\Aimeos\MShop\Order\Exception');
+		$this->object->get()->getAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT);
 	}
 
 
 	public function testSetBillingAddressByItem()
 	{
-		$item = $this->getAddress( 'Example company' );
+		$item = $this->getAddress('Example company');
 
-		$this->object->setAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT, $item );
+		$this->object->setAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT, $item);
 
-		$address = $this->object->get()->getAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT );
-		$this->assertEquals( 'Example company', $address->getCompany() );
+		$address = $this->object->get()->getAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT);
+		$this->assertEquals('Example company', $address->getCompany());
 	}
 
 
@@ -389,37 +389,37 @@ 
 			'order.base.address.flag' => 0,
 		);
 
-		$this->object->setAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT, $fixture );
+		$this->object->setAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT, $fixture);
 
-		$address = $this->object->get()->getAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT );
-		$this->assertEquals( 'Example company', $address->getCompany() );
-		$this->assertEquals( 'Dr.', $address->getTitle() );
-		$this->assertEquals( 'firstunit', $address->getFirstname() );
+		$address = $this->object->get()->getAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT);
+		$this->assertEquals('Example company', $address->getCompany());
+		$this->assertEquals('Dr.', $address->getTitle());
+		$this->assertEquals('firstunit', $address->getFirstname());
 	}
 
 
 	public function testSetBillingAddressByArrayError()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Basket\\Exception' );
-		$this->object->setAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT, array( 'error' => false ) );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
+		$this->object->setAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT, array('error' => false));
 	}
 
 
 	public function testSetBillingAddressParameterError()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Basket\\Exception' );
-		$this->object->setAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT, 'error' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
+		$this->object->setAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT, 'error');
 	}
 
 
 	public function testSetDeliveryAddressByItem()
 	{
-		$item = $this->getAddress( 'Example company' );
+		$item = $this->getAddress('Example company');
 
-		$this->object->setAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY, $item );
+		$this->object->setAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY, $item);
 
-		$address = $this->object->get()->getAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY );
-		$this->assertEquals( 'Example company', $address->getCompany() );
+		$address = $this->object->get()->getAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY);
+		$this->assertEquals('Example company', $address->getCompany());
 	}
 
 
@@ -446,119 +446,119 @@ 
 			'order.base.address.website' => 'www.example.com',
 			'order.base.address.flag' => 0,
 		);
-		$this->object->setAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY, $fixture );
+		$this->object->setAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY, $fixture);
 
-		$address = $this->object->get()->getAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY );
-		$this->assertEquals( 'Example company', $address->getCompany() );
-		$this->assertEquals( 'Dr.', $address->getTitle() );
-		$this->assertEquals( 'firstunit', $address->getFirstname() );
+		$address = $this->object->get()->getAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY);
+		$this->assertEquals('Example company', $address->getCompany());
+		$this->assertEquals('Dr.', $address->getTitle());
+		$this->assertEquals('firstunit', $address->getFirstname());
 	}
 
 
 	public function testSetDeliveryAddressByArrayError()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Basket\\Exception' );
-		$this->object->setAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY, array( 'error' => false ) );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
+		$this->object->setAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY, array('error' => false));
 	}
 
 
 	public function testSetDeliveryAddressTypeError()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Basket\\Exception' );
-		$this->object->setAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY, 'error' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
+		$this->object->setAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY, 'error');
 	}
 
 
 	public function testSetServicePayment()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'service' );
-		$service = $manager->findItem( 'unitpaymentcode', array(), 'service', 'payment' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'service');
+		$service = $manager->findItem('unitpaymentcode', array(), 'service', 'payment');
 
-		$this->object->setService( 'payment', $service->getId(), array() );
-		$this->assertEquals( 'unitpaymentcode', $this->object->get()->getService( 'payment' )->getCode() );
+		$this->object->setService('payment', $service->getId(), array());
+		$this->assertEquals('unitpaymentcode', $this->object->get()->getService('payment')->getCode());
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Basket\\Exception' );
-		$this->object->setService( 'payment', $service->getId(), array( 'prepay' => true ) );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
+		$this->object->setService('payment', $service->getId(), array('prepay' => true));
 	}
 
 
 	public function testSetDeliveryOption()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'service' );
-		$service = $manager->findItem( 'unitcode', array(), 'service', 'delivery' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'service');
+		$service = $manager->findItem('unitcode', array(), 'service', 'delivery');
 
-		$this->object->setService( 'delivery', $service->getId(), array() );
-		$this->assertEquals( 'unitcode', $this->object->get()->getService( 'delivery' )->getCode() );
+		$this->object->setService('delivery', $service->getId(), array());
+		$this->assertEquals('unitcode', $this->object->get()->getService('delivery')->getCode());
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Basket\\Exception' );
-		$this->object->setService( 'delivery', $service->getId(), array( 'fast shipping' => true, 'air shipping' => false ) );
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Basket\\Exception');
+		$this->object->setService('delivery', $service->getId(), array('fast shipping' => true, 'air shipping' => false));
 	}
 
 
 	public function testCheckLocale()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'service' );
-		$payment = $manager->findItem( 'unitpaymentcode', array(), 'service', 'payment' );
-		$delivery = $manager->findItem( 'unitcode', array(), 'service', 'delivery' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'service');
+		$payment = $manager->findItem('unitpaymentcode', array(), 'service', 'payment');
+		$delivery = $manager->findItem('unitcode', array(), 'service', 'delivery');
 
-		$this->object->addProduct( self::$testItem->getId(), 2 );
-		$this->object->addCoupon( 'OPQR' );
+		$this->object->addProduct(self::$testItem->getId(), 2);
+		$this->object->addCoupon('OPQR');
 
-		$this->object->setService( 'payment', $payment->getId() );
-		$this->object->setService( 'delivery', $delivery->getId() );
+		$this->object->setService('payment', $payment->getId());
+		$this->object->setService('delivery', $delivery->getId());
 
 		$basket = $this->object->get();
 		$price = $basket->getPrice();
 
-		foreach( $basket->getProducts() as $product )
+		foreach ($basket->getProducts() as $product)
 		{
-			$this->assertEquals( 2, $product->getQuantity() );
-			$product->getPrice()->setCurrencyId( 'CHF' );
+			$this->assertEquals(2, $product->getQuantity());
+			$product->getPrice()->setCurrencyId('CHF');
 		}
 
-		$basket->getService( 'delivery' )->getPrice()->setCurrencyId( 'CHF' );
-		$basket->getService( 'payment' )->getPrice()->setCurrencyId( 'CHF' );
-		$basket->getLocale()->setCurrencyId( 'CHF' );
-		$price->setCurrencyId( 'CHF' );
+		$basket->getService('delivery')->getPrice()->setCurrencyId('CHF');
+		$basket->getService('payment')->getPrice()->setCurrencyId('CHF');
+		$basket->getLocale()->setCurrencyId('CHF');
+		$price->setCurrencyId('CHF');
 
-		$this->context->getLocale()->setCurrencyId( 'CHF' );
-		$this->object->setAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT, $this->getAddress( 'Example company' ) );
+		$this->context->getLocale()->setCurrencyId('CHF');
+		$this->object->setAddress(\Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT, $this->getAddress('Example company'));
 
-		$this->context->getSession()->set( 'aimeos/basket/currency', 'CHF' );
-		$this->context->getLocale()->setCurrencyId( 'EUR' );
+		$this->context->getSession()->set('aimeos/basket/currency', 'CHF');
+		$this->context->getLocale()->setCurrencyId('EUR');
 
-		$this->context->getSession()->set( 'aimeos/basket/content-unittest-en-EUR-', null );
+		$this->context->getSession()->set('aimeos/basket/content-unittest-en-EUR-', null);
 
-		$object = new \Aimeos\Controller\Frontend\Basket\Standard( $this->context );
+		$object = new \Aimeos\Controller\Frontend\Basket\Standard($this->context);
 		$basket = $object->get();
 
-		foreach( $basket->getProducts() as $product )
+		foreach ($basket->getProducts() as $product)
 		{
-			$this->assertEquals( 'EUR', $product->getPrice()->getCurrencyId() );
-			$this->assertEquals( 2, $product->getQuantity() );
+			$this->assertEquals('EUR', $product->getPrice()->getCurrencyId());
+			$this->assertEquals(2, $product->getQuantity());
 		}
 
-		$this->assertEquals( 'EUR', $basket->getService( 'payment' )->getPrice()->getCurrencyId() );
-		$this->assertEquals( 'EUR', $basket->getService( 'delivery' )->getPrice()->getCurrencyId() );
-		$this->assertEquals( 'EUR', $basket->getLocale()->getCurrencyId() );
-		$this->assertEquals( 'EUR', $basket->getPrice()->getCurrencyId() );
+		$this->assertEquals('EUR', $basket->getService('payment')->getPrice()->getCurrencyId());
+		$this->assertEquals('EUR', $basket->getService('delivery')->getPrice()->getCurrencyId());
+		$this->assertEquals('EUR', $basket->getLocale()->getCurrencyId());
+		$this->assertEquals('EUR', $basket->getPrice()->getCurrencyId());
 	}
 
 
 	/**
 	 * @param string $company
 	 */
-	protected function getAddress( $company )
+	protected function getAddress($company)
 	{
-		$customer = \Aimeos\MShop\Customer\Manager\Factory::createManager( \TestHelperFrontend::getContext(), 'Standard' );
-		$addressManager = $customer->getSubManager( 'address', 'Standard' );
+		$customer = \Aimeos\MShop\Customer\Manager\Factory::createManager(\TestHelperFrontend::getContext(), 'Standard');
+		$addressManager = $customer->getSubManager('address', 'Standard');
 
 		$search = $addressManager->createSearch();
-		$search->setConditions( $search->compare( '==', 'customer.address.company', $company ) );
-		$items = $addressManager->searchItems( $search );
+		$search->setConditions($search->compare('==', 'customer.address.company', $company));
+		$items = $addressManager->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));
 		}
 
 		return $item;

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

@@ -21,46 +21,46 @@ 
 
 	protected function tearDown()
 	{
-		$this->context->getSession()->set( 'aimeos', array() );
+		$this->context->getSession()->set('aimeos', array());
 
-		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,58 +229,58 @@ 
 
 	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));
 	}
 
 
 	/**
 	 * @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

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(), array $variantAttributeIds = array(),
+	public function addProduct($prodid, $quantity = 1, array $options = array(), array $variantAttributeIds = array(),
 		array $configAttributeIds = array(), array $hiddenAttributeIds = array(), array $customAttributeValues = array(),
-		$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 = array() );
+	public function editProduct($position, $quantity, array $configAttributeCodes = array());
 
 
 	/**
@@ -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 = array() );
+	public function setService($type, $id, array $attributes = array());
 }

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