aimeos / ai-controller-frontend

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

Spacing +12 added lines, -12 removed lines

@@ -36,26 +36,26 @@
 	 * @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, $stocktype = 'default', array $variantAttributeIds = [],
-		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [] )
+	public function addProduct($prodid, $quantity = 1, $stocktype = 'default', array $variantAttributeIds = [],
+		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [])
 	{
-		$catalogListManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog/lists' );
+		$catalogListManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog/lists');
 
-		$search = $catalogListManager->createSearch( true );
+		$search = $catalogListManager->createSearch(true);
 		$expr = array(
-			$search->compare( '==', 'catalog.lists.domain', 'product' ),
-			$search->compare( '==', 'catalog.lists.refid', $prodid ),
+			$search->compare('==', 'catalog.lists.domain', 'product'),
+			$search->compare('==', 'catalog.lists.refid', $prodid),
 			$search->getConditions()
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, 1 );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, 1);
 
-		$result = $catalogListManager->searchItems( $search );
+		$result = $catalogListManager->searchItems($search);
 
-		if( reset( $result ) === false )
+		if (reset($result) === false)
 		{
-			$msg = sprintf( 'Adding product with ID "%1$s" is not allowed', $prodid );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+			$msg = sprintf('Adding product with ID "%1$s" is not allowed', $prodid);
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
 		}
 
 		$this->getController()->addProduct(

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

Braces +6 added lines, -4 removed lines

@@ -121,10 +121,11 @@ 
 		{
 			$msg = sprintf( 'No unique article found for selected attributes and product ID "%1$s"', $productItem->getId() );
 			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
-		}
-		else if( ( $result = reset( $productItems ) ) !== false ) // count == 1
+		} else if( ( $result = reset( $productItems ) ) !== false ) {
+			// count == 1
 		{
 			$productItem = $result;
+		}
 			$orderBaseProductItem->setProductCode( $productItem->getCode() );
 
 			$subprices = $productItem->getRefItems( 'price', 'default', 'default' );
@@ -150,10 +151,11 @@ 
 
 				$attr[] = $orderAttributeItem;
 			}
-		}
-		else if( $requireVariant != false ) // count == 0
+		} else if( $requireVariant != false ) {
+			// count == 0
 		{
 			$msg = sprintf( 'No article found for selected attributes and product ID "%1$s"', $productItem->getId() );
+		}
 			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
 		}
 

Spacing +41 added lines, -41 removed lines

@@ -36,14 +36,14 @@ 
 	 * @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, $stocktype = 'default', array $variantAttributeIds = [],
-		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [] )
+	public function addProduct($prodid, $quantity = 1, $stocktype = 'default', array $variantAttributeIds = [],
+		array $configAttributeIds = [], array $hiddenAttributeIds = [], array $customAttributeValues = [])
 	{
 		$context = $this->getContext();
-		$productManager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
-		$productItem = $productManager->getItem( $prodid, [], true );
+		$productManager = \Aimeos\MShop\Factory::createManager($context, 'product');
+		$productItem = $productManager->getItem($prodid, [], true);
 
-		if( $productManager->getItem( $prodid, [], true )->getType() !== 'select' )
+		if ($productManager->getItem($prodid, [], true)->getType() !== 'select')
 		{
 			return $this->getController()->addProduct(
 				$prodid, $quantity, $stocktype, $variantAttributeIds,
@@ -51,29 +51,29 @@ 
 			);
 		}
 
-		$productItem = $productManager->getItem( $prodid, array( 'media', 'supplier', 'price', 'product', 'text' ), true );
-		$prices = $productItem->getRefItems( 'price', 'default', 'default' );
+		$productItem = $productManager->getItem($prodid, array('media', 'supplier', 'price', 'product', 'text'), true);
+		$prices = $productItem->getRefItems('price', 'default', 'default');
 
-		$orderBaseProductItem = \Aimeos\MShop\Factory::createManager( $context, 'order/base/product' )->createItem();
-		$orderBaseProductItem->copyFrom( $productItem )->setQuantity( $quantity )->setStockType( $stocktype );
+		$orderBaseProductItem = \Aimeos\MShop\Factory::createManager($context, 'order/base/product')->createItem();
+		$orderBaseProductItem->copyFrom($productItem)->setQuantity($quantity)->setStockType($stocktype);
 
-		$attr = $this->getVariantDetails( $orderBaseProductItem, $productItem, $prices, $variantAttributeIds );
+		$attr = $this->getVariantDetails($orderBaseProductItem, $productItem, $prices, $variantAttributeIds);
 
 		$attributeMap = [
-			'custom' => array_keys( $customAttributeValues ),
-			'config' => array_keys( $configAttributeIds ),
+			'custom' => array_keys($customAttributeValues),
+			'config' => array_keys($configAttributeIds),
 			'hidden' => $hiddenAttributeIds,
 		];
-		$this->checkListRef( array( $prodid, $productItem->getId() ), 'attribute', $attributeMap );
+		$this->checkListRef(array($prodid, $productItem->getId()), 'attribute', $attributeMap);
 
-		$attr = array_merge( $attr, $this->getOrderProductAttributes( 'custom', array_keys( $customAttributeValues ), $customAttributeValues ) );
-		$attr = array_merge( $attr, $this->getOrderProductAttributes( 'config', array_keys( $configAttributeIds ), [], $configAttributeIds ) );
-		$attr = array_merge( $attr, $this->getOrderProductAttributes( 'hidden', $hiddenAttributeIds ) );
+		$attr = array_merge($attr, $this->getOrderProductAttributes('custom', array_keys($customAttributeValues), $customAttributeValues));
+		$attr = array_merge($attr, $this->getOrderProductAttributes('config', array_keys($configAttributeIds), [], $configAttributeIds));
+		$attr = array_merge($attr, $this->getOrderProductAttributes('hidden', $hiddenAttributeIds));
 
-		$orderBaseProductItem->setAttributes( $attr );
-		$orderBaseProductItem->setPrice( $this->calcPrice( $orderBaseProductItem, $prices, $quantity ) );
+		$orderBaseProductItem->setAttributes($attr);
+		$orderBaseProductItem->setPrice($this->calcPrice($orderBaseProductItem, $prices, $quantity));
 
-		$this->getController()->get()->addProduct( $orderBaseProductItem );
+		$this->getController()->get()->addProduct($orderBaseProductItem);
 		$this->getController()->save();
 	}
 
@@ -88,12 +88,12 @@ 
 	 * @return \Aimeos\MShop\Order\Item\Base\Product\Attribute\Iface[] List of order product attributes
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If no product variant is found
 	 */
-	protected function getVariantDetails( \Aimeos\MShop\Order\Item\Base\Product\Iface $orderBaseProductItem,
-		\Aimeos\MShop\Product\Item\Iface &$productItem, array &$prices, array $variantAttributeIds )
+	protected function getVariantDetails(\Aimeos\MShop\Order\Item\Base\Product\Iface $orderBaseProductItem,
+		\Aimeos\MShop\Product\Item\Iface &$productItem, array &$prices, array $variantAttributeIds)
 	{
 		$attr = [];
 		$context = $this->getContext();
-		$productItems = $this->getProductVariants( $productItem, $variantAttributeIds );
+		$productItems = $this->getProductVariants($productItem, $variantAttributeIds);
 
 		/** controller/frontend/basket/require-variant
 		 * A variant of a selection product must be chosen
@@ -114,47 +114,47 @@ 
 		 * @category Developer
 		 * @category User
 		 */
-		$requireVariant = $context->getConfig()->get( 'controller/frontend/basket/require-variant', true );
+		$requireVariant = $context->getConfig()->get('controller/frontend/basket/require-variant', true);
 
 
-		if( count( $productItems ) > 1 )
+		if (count($productItems) > 1)
 		{
-			$msg = sprintf( 'No unique article found for selected attributes and product ID "%1$s"', $productItem->getId() );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+			$msg = sprintf('No unique article found for selected attributes and product ID "%1$s"', $productItem->getId());
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
 		}
-		else if( ( $result = reset( $productItems ) ) !== false ) // count == 1
+		else if (($result = reset($productItems)) !== false) // count == 1
 		{
 			$productItem = $result;
-			$orderBaseProductItem->setProductCode( $productItem->getCode() );
+			$orderBaseProductItem->setProductCode($productItem->getCode());
 
-			$subprices = $productItem->getRefItems( 'price', 'default', 'default' );
+			$subprices = $productItem->getRefItems('price', 'default', 'default');
 
-			if( !empty( $subprices ) ) {
+			if (!empty($subprices)) {
 				$prices = $subprices;
 			}
 
-			$submedia = $productItem->getRefItems( 'media', 'default', 'default' );
+			$submedia = $productItem->getRefItems('media', 'default', 'default');
 
-			if( ( $mediaItem = reset( $submedia ) ) !== false ) {
-				$orderBaseProductItem->setMediaUrl( $mediaItem->getPreview() );
+			if (($mediaItem = reset($submedia)) !== false) {
+				$orderBaseProductItem->setMediaUrl($mediaItem->getPreview());
 			}
 
-			$orderProductAttrManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order/base/product/attribute' );
-			$variantAttributes = $productItem->getRefItems( 'attribute', null, 'variant' );
+			$orderProductAttrManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'order/base/product/attribute');
+			$variantAttributes = $productItem->getRefItems('attribute', null, 'variant');
 
-			foreach( $this->getAttributes( array_keys( $variantAttributes ), array( 'text' ) ) as $attrItem )
+			foreach ($this->getAttributes(array_keys($variantAttributes), array('text')) as $attrItem)
 			{
 				$orderAttributeItem = $orderProductAttrManager->createItem();
-				$orderAttributeItem->copyFrom( $attrItem );
-				$orderAttributeItem->setType( 'variant' );
+				$orderAttributeItem->copyFrom($attrItem);
+				$orderAttributeItem->setType('variant');
 
 				$attr[] = $orderAttributeItem;
 			}
 		}
-		else if( $requireVariant != false ) // count == 0
+		else if ($requireVariant != false) // count == 0
 		{
-			$msg = sprintf( 'No article found for selected attributes and product ID "%1$s"', $productItem->getId() );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
+			$msg = sprintf('No article found for selected attributes and product ID "%1$s"', $productItem->getId());
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
 		}
 
 		return $attr;

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

Braces +4 added lines, -8 removed lines

@@ -233,8 +233,7 @@ 
 			{
 				$this->setAddress( $type, $item->toArray() );
 				$basket->deleteAddress( $type );
-			}
-			catch( \Exception $e )
+			} catch( \Exception $e )
 			{
 				$logger = $this->getContext()->getLogger();
 				$errors['address'][$type] = $e->getMessage();
@@ -264,8 +263,7 @@ 
 			{
 				$this->addCoupon( $code );
 				$basket->deleteCoupon( $code, true );
-			}
-			catch( \Exception $e )
+			} catch( \Exception $e )
 			{
 				$logger = $this->getContext()->getLogger();
 				$errors['coupon'][$code] = $e->getMessage();
@@ -314,8 +312,7 @@ 
 				);
 
 				$basket->deleteProduct( $pos );
-			}
-			catch( \Exception $e )
+			} catch( \Exception $e )
 			{
 				$code = $product->getProductCode();
 				$logger = $this->getContext()->getLogger();
@@ -353,8 +350,7 @@ 
 
 					$this->addService( $type, $item->getServiceId(), $attributes );
 					$basket->deleteService( $type );
-				}
-				catch( \Exception $e ) { ; } // Don't notify the user as appropriate services can be added automatically
+				} catch( \Exception $e ) { ; } // Don't notify the user as appropriate services can be added automatically
 			}
 		}
 

Spacing +141 added lines, -141 removed lines

@@ -31,52 +31,52 @@ 
 	 * @param integer $quantity New product quantity
 	 * @return \Aimeos\MShop\Price\Item\Iface Price item with calculated price
 	 */
-	protected function calcPrice( \Aimeos\MShop\Order\Item\Base\Product\Iface $product, array $prices, $quantity )
+	protected function calcPrice(\Aimeos\MShop\Order\Item\Base\Product\Iface $product, array $prices, $quantity)
 	{
 		$context = $this->getContext();
 
-		if( empty( $prices ) )
+		if (empty($prices))
 		{
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
-			$prices = $manager->getItem( $product->getProductId(), array( 'price' ) )->getRefItems( 'price', 'default' );
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'product');
+			$prices = $manager->getItem($product->getProductId(), array('price'))->getRefItems('price', '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);
 
 		// customers can pay what they would like to pay
-		if( ( $attr = $product->getAttributeItem( 'price', 'custom' ) ) !== null )
+		if (($attr = $product->getAttributeItem('price', 'custom')) !== null)
 		{
 			$amount = $attr->getValue();
 
-			if( preg_match( '/^[0-9]*(\.[0-9]+)?$/', $amount ) !== 1 || ((double) $amount) < 0.01 )
+			if (preg_match('/^[0-9]*(\.[0-9]+)?$/', $amount) !== 1 || ((double) $amount) < 0.01)
 			{
-				$msg = $context->getI18n()->dt( 'controller/frontend', 'Invalid price value "%1$s"' );
-				throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $amount ) );
+				$msg = $context->getI18n()->dt('controller/frontend', 'Invalid price value "%1$s"');
+				throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $amount));
 			}
 
-			$price->setValue( $amount );
+			$price->setValue($amount);
 		}
 
 		$orderAttributes = $product->getAttributes();
-		$attrItems = $this->getAttributeItems( $orderAttributes );
+		$attrItems = $this->getAttributeItems($orderAttributes);
 
 		// add prices of (optional) attributes
-		foreach( $orderAttributes as $orderAttrItem )
+		foreach ($orderAttributes as $orderAttrItem)
 		{
 			$attrId = $orderAttrItem->getAttributeId();
 
-			if( isset( $attrItems[$attrId] )
-				&& ( $prices = $attrItems[$attrId]->getRefItems( 'price', 'default' ) ) !== []
+			if (isset($attrItems[$attrId])
+				&& ($prices = $attrItems[$attrId]->getRefItems('price', 'default')) !== []
 			) {
-				$attrPrice = $priceManager->getLowestPrice( $prices, $orderAttrItem->getQuantity() );
-				$price->addItem( $attrPrice, $orderAttrItem->getQuantity() );
+				$attrPrice = $priceManager->getLowestPrice($prices, $orderAttrItem->getQuantity());
+				$price->addItem($attrPrice, $orderAttrItem->getQuantity());
 			}
 		}
 
 		// remove product rebate of original price in favor to rebates granted for the order
-		$price->setRebate( '0.00' );
+		$price->setRebate('0.00');
 
 		return $price;
 	}
@@ -90,43 +90,43 @@ 
 	 * @param array $refMap Associative list of list type codes as keys and lists of reference IDs as values
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If one or more of the IDs are not associated
 	 */
-	protected function checkListRef( $prodId, $domain, array $refMap )
+	protected function checkListRef($prodId, $domain, array $refMap)
 	{
-		if( empty( $refMap ) ) {
+		if (empty($refMap)) {
 			return;
 		}
 
 		$context = $this->getContext();
-		$productManager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
-		$search = $productManager->createSearch( true );
+		$productManager = \Aimeos\MShop\Factory::createManager($context, 'product');
+		$search = $productManager->createSearch(true);
 
 		$expr = array(
-			$search->compare( '==', 'product.id', $prodId ),
+			$search->compare('==', 'product.id', $prodId),
 			$search->getConditions(),
 		);
 
-		foreach( $refMap as $listType => $refIds )
+		foreach ($refMap as $listType => $refIds)
 		{
-			if( empty( $refIds ) ) {
+			if (empty($refIds)) {
 				continue;
 			}
 
-			foreach( $refIds as $key => $refId ) {
+			foreach ($refIds as $key => $refId) {
 				$refIds[$key] = (string) $refId;
 			}
 
-			$param = array( $domain, $this->getProductListTypeItem( $domain, $listType )->getId(), $refIds );
-			$cmpfunc = $search->createFunction( 'product.contains', $param );
+			$param = array($domain, $this->getProductListTypeItem($domain, $listType)->getId(), $refIds);
+			$cmpfunc = $search->createFunction('product.contains', $param);
 
-			$expr[] = $search->compare( '==', $cmpfunc, count( $refIds ) );
+			$expr[] = $search->compare('==', $cmpfunc, count($refIds));
 		}
 
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		if( count( $productManager->searchItems( $search, [] ) ) === 0 )
+		if (count($productManager->searchItems($search, [])) === 0)
 		{
-			$msg = $context->getI18n()->dt( 'controller/frontend', 'Invalid "%1$s" references for product with ID %2$s' );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $domain, json_encode( $prodId ) ) );
+			$msg = $context->getI18n()->dt('controller/frontend', 'Invalid "%1$s" references for product with ID %2$s');
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $domain, json_encode($prodId)));
 		}
 	}
 
@@ -137,40 +137,40 @@ 
 	 * @param \Aimeos\MShop\Locale\Item\Iface $locale Locale object from current basket
 	 * @param string $type Basket type
 	 */
-	protected function checkLocale( \Aimeos\MShop\Locale\Item\Iface $locale, $type )
+	protected function checkLocale(\Aimeos\MShop\Locale\Item\Iface $locale, $type)
 	{
 		$errors = [];
 		$context = $this->getContext();
 		$session = $context->getSession();
 
-		$localeStr = $session->get( 'aimeos/basket/locale' );
+		$localeStr = $session->get('aimeos/basket/locale');
 		$localeKey = $locale->getSite()->getCode() . '|' . $locale->getLanguageId() . '|' . $locale->getCurrencyId();
 
-		if( $localeStr !== null && $localeStr !== $localeKey )
+		if ($localeStr !== null && $localeStr !== $localeKey)
 		{
-			$locParts = explode( '|', $localeStr );
-			$locSite = ( isset( $locParts[0] ) ? $locParts[0] : '' );
-			$locLanguage = ( isset( $locParts[1] ) ? $locParts[1] : '' );
-			$locCurrency = ( isset( $locParts[2] ) ? $locParts[2] : '' );
+			$locParts = explode('|', $localeStr);
+			$locSite = (isset($locParts[0]) ? $locParts[0] : '');
+			$locLanguage = (isset($locParts[1]) ? $locParts[1] : '');
+			$locCurrency = (isset($locParts[2]) ? $locParts[2] : '');
 
-			$localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
-			$locale = $localeManager->bootstrap( $locSite, $locLanguage, $locCurrency, false );
+			$localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale');
+			$locale = $localeManager->bootstrap($locSite, $locLanguage, $locCurrency, false);
 
 			$context = clone $context;
-			$context->setLocale( $locale );
+			$context->setLocale($locale);
 
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' );
-			$basket = $manager->getSession( $type );
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'order/base');
+			$basket = $manager->getSession($type);
 
-			$this->copyAddresses( $basket, $errors, $localeKey );
-			$this->copyServices( $basket, $errors );
-			$this->copyProducts( $basket, $errors, $localeKey );
-			$this->copyCoupons( $basket, $errors, $localeKey );
+			$this->copyAddresses($basket, $errors, $localeKey);
+			$this->copyServices($basket, $errors);
+			$this->copyProducts($basket, $errors, $localeKey);
+			$this->copyCoupons($basket, $errors, $localeKey);
 
-			$manager->setSession( $basket, $type );
+			$manager->setSession($basket, $type);
 		}
 
-		$session->set( 'aimeos/basket/locale', $localeKey );
+		$session->set('aimeos/basket/locale', $localeKey);
 	}
 
 
@@ -182,22 +182,22 @@ 
 	 * @param string $localeKey Unique identifier of the site, language and currency
 	 * @return array Associative list of errors occured
 	 */
-	protected function copyAddresses( \Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey )
+	protected function copyAddresses(\Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey)
 	{
-		foreach( $basket->getAddresses() as $type => $item )
+		foreach ($basket->getAddresses() as $type => $item)
 		{
 			try
 			{
-				$this->setAddress( $type, $item->toArray() );
-				$basket->deleteAddress( $type );
+				$this->setAddress($type, $item->toArray());
+				$basket->deleteAddress($type);
 			}
-			catch( \Exception $e )
+			catch (\Exception $e)
 			{
 				$logger = $this->getContext()->getLogger();
 				$errors['address'][$type] = $e->getMessage();
 
 				$str = 'Error migrating address with type "%1$s" in basket to locale "%2$s": %3$s';
-				$logger->log( sprintf( $str, $type, $localeKey, $e->getMessage() ), \Aimeos\MW\Logger\Base::INFO );
+				$logger->log(sprintf($str, $type, $localeKey, $e->getMessage()), \Aimeos\MW\Logger\Base::INFO);
 			}
 		}
 
@@ -213,22 +213,22 @@ 
 	 * @param string $localeKey Unique identifier of the site, language and currency
 	 * @return array Associative list of errors occured
 	 */
-	protected function copyCoupons( \Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey )
+	protected function copyCoupons(\Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey)
 	{
-		foreach( $basket->getCoupons() as $code => $list )
+		foreach ($basket->getCoupons() as $code => $list)
 		{
 			try
 			{
-				$this->addCoupon( $code );
-				$basket->deleteCoupon( $code, true );
+				$this->addCoupon($code);
+				$basket->deleteCoupon($code, true);
 			}
-			catch( \Exception $e )
+			catch (\Exception $e)
 			{
 				$logger = $this->getContext()->getLogger();
 				$errors['coupon'][$code] = $e->getMessage();
 
 				$str = 'Error migrating coupon with code "%1$s" in basket to locale "%2$s": %3$s';
-				$logger->log( sprintf( $str, $code, $localeKey, $e->getMessage() ), \Aimeos\MW\Logger\Base::INFO );
+				$logger->log(sprintf($str, $code, $localeKey, $e->getMessage()), \Aimeos\MW\Logger\Base::INFO);
 			}
 		}
 
@@ -244,11 +244,11 @@ 
 	 * @param string $localeKey Unique identifier of the site, language and currency
 	 * @return array Associative list of errors occured
 	 */
-	protected function copyProducts( \Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey )
+	protected function copyProducts(\Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors, $localeKey)
 	{
-		foreach( $basket->getProducts() as $pos => $product )
+		foreach ($basket->getProducts() as $pos => $product)
 		{
-			if( $product->getFlags() & \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE ) {
+			if ($product->getFlags() & \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE) {
 				continue;
 			}
 
@@ -256,7 +256,7 @@ 
 			{
 				$attrIds = [];
 
-				foreach( $product->getAttributes() as $attrItem ) {
+				foreach ($product->getAttributes() as $attrItem) {
 					$attrIds[$attrItem->getType()][] = $attrItem->getAttributeId();
 				}
 
@@ -264,22 +264,22 @@ 
 					$product->getProductId(),
 					$product->getQuantity(),
 					$product->getStockType(),
-					$this->getValue( $attrIds, 'variant', [] ),
-					$this->getValue( $attrIds, 'config', [] ),
-					$this->getValue( $attrIds, 'hidden', [] ),
-					$this->getValue( $attrIds, 'custom', [] )
+					$this->getValue($attrIds, 'variant', []),
+					$this->getValue($attrIds, 'config', []),
+					$this->getValue($attrIds, 'hidden', []),
+					$this->getValue($attrIds, 'custom', [])
 				);
 
-				$basket->deleteProduct( $pos );
+				$basket->deleteProduct($pos);
 			}
-			catch( \Exception $e )
+			catch (\Exception $e)
 			{
 				$code = $product->getProductCode();
 				$logger = $this->getContext()->getLogger();
 				$errors['product'][$pos] = $e->getMessage();
 
 				$str = 'Error migrating product with code "%1$s" in basket to locale "%2$s": %3$s';
-				$logger->log( sprintf( $str, $code, $localeKey, $e->getMessage() ), \Aimeos\MW\Logger\Base::INFO );
+				$logger->log(sprintf($str, $code, $localeKey, $e->getMessage()), \Aimeos\MW\Logger\Base::INFO);
 			}
 		}
 
@@ -294,24 +294,24 @@ 
 	 * @param array $errors Associative list of previous errors
 	 * @return array Associative list of errors occured
 	 */
-	protected function copyServices( \Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors )
+	protected function copyServices(\Aimeos\MShop\Order\Item\Base\Iface $basket, array $errors)
 	{
-		foreach( $basket->getServices() as $type => $list )
+		foreach ($basket->getServices() as $type => $list)
 		{
-			foreach( $list as $item )
+			foreach ($list as $item)
 			{
 				try
 				{
 					$attributes = [];
 
-					foreach( $item->getAttributes() as $attrItem ) {
+					foreach ($item->getAttributes() as $attrItem) {
 						$attributes[$attrItem->getCode()] = $attrItem->getValue();
 					}
 
-					$this->addService( $type, $item->getServiceId(), $attributes );
-					$basket->deleteService( $type );
+					$this->addService($type, $item->getServiceId(), $attributes);
+					$basket->deleteService($type);
 				}
-				catch( \Exception $e ) { ; } // Don't notify the user as appropriate services can be added automatically
+				catch (\Exception $e) {; } // Don't notify the user as appropriate services can be added automatically
 			}
 		}
 
@@ -327,32 +327,32 @@ 
 	 * @return array List of items implementing \Aimeos\MShop\Attribute\Item\Iface
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the actual attribute number doesn't match the expected one
 	 */
-	protected function getAttributes( array $attributeIds, array $domains = array( 'price', 'text' ) )
+	protected function getAttributes(array $attributeIds, array $domains = array('price', 'text'))
 	{
-		if( empty( $attributeIds ) ) {
+		if (empty($attributeIds)) {
 			return [];
 		}
 
-		$attributeManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'attribute' );
+		$attributeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'attribute');
 
-		$search = $attributeManager->createSearch( true );
+		$search = $attributeManager->createSearch(true);
 		$expr = array(
-			$search->compare( '==', 'attribute.id', $attributeIds ),
+			$search->compare('==', 'attribute.id', $attributeIds),
 			$search->getConditions(),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, 0x7fffffff );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, 0x7fffffff);
 
-		$attrItems = $attributeManager->searchItems( $search, $domains );
+		$attrItems = $attributeManager->searchItems($search, $domains);
 
-		if( count( $attrItems ) !== count( $attributeIds ) )
+		if (count($attrItems) !== count($attributeIds))
 		{
 			$i18n = $this->getContext()->getI18n();
-			$expected = implode( ',', $attributeIds );
-			$actual = implode( ',', array_keys( $attrItems ) );
-			$msg = $i18n->dt( 'controller/frontend', 'Available attribute IDs "%1$s" do not match the given attribute IDs "%2$s"' );
+			$expected = implode(',', $attributeIds);
+			$actual = implode(',', array_keys($attrItems));
+			$msg = $i18n->dt('controller/frontend', 'Available attribute IDs "%1$s" do not match the given attribute IDs "%2$s"');
 
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $actual, $expected ) );
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $actual, $expected));
 		}
 
 		return $attrItems;
@@ -365,31 +365,31 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Base\Product\Attribute\Item[] $orderAttributes List of order product attribute items
 	 * @return \Aimeos\MShop\Attribute\Item\Iface[] Associative list of attribute IDs as key and attribute items as values
 	 */
-	protected function getAttributeItems( array $orderAttributes )
+	protected function getAttributeItems(array $orderAttributes)
 	{
-		if( empty( $orderAttributes ) ) {
+		if (empty($orderAttributes)) {
 			return [];
 		}
 
-		$attributeManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'attribute' );
-		$search = $attributeManager->createSearch( true );
+		$attributeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'attribute');
+		$search = $attributeManager->createSearch(true);
 		$expr = [];
 
-		foreach( $orderAttributes as $item )
+		foreach ($orderAttributes as $item)
 		{
 			$tmp = array(
-				$search->compare( '==', 'attribute.domain', 'product' ),
-				$search->compare( '==', 'attribute.code', $item->getValue() ),
-				$search->compare( '==', 'attribute.type.domain', 'product' ),
-				$search->compare( '==', 'attribute.type.code', $item->getCode() ),
-				$search->compare( '>', 'attribute.type.status', 0 ),
+				$search->compare('==', 'attribute.domain', 'product'),
+				$search->compare('==', 'attribute.code', $item->getValue()),
+				$search->compare('==', 'attribute.type.domain', 'product'),
+				$search->compare('==', 'attribute.type.code', $item->getCode()),
+				$search->compare('>', 'attribute.type.status', 0),
 				$search->getConditions(),
 			);
-			$expr[] = $search->combine( '&&', $tmp );
+			$expr[] = $search->combine('&&', $tmp);
 		}
 
-		$search->setConditions( $search->combine( '||', $expr ) );
-		return $attributeManager->searchItems( $search, array( 'price' ) );
+		$search->setConditions($search->combine('||', $expr));
+		return $attributeManager->searchItems($search, array('price'));
 	}
 
 
@@ -402,24 +402,24 @@ 
 	 * @param array $quantities Associative list of attribute IDs as keys and their quantities as values
 	 * @return array List of items implementing \Aimeos\MShop\Order\Item\Product\Attribute\Iface
 	 */
-	protected function getOrderProductAttributes( $type, array $ids, array $values = [], array $quantities = [] )
+	protected function getOrderProductAttributes($type, array $ids, array $values = [], array $quantities = [])
 	{
-		if( empty( $ids ) ) {
+		if (empty($ids)) {
 			return [];
 		}
 
 		$list = [];
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order/base/product/attribute' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'order/base/product/attribute');
 
-		foreach( $this->getAttributes( $ids ) as $id => $attrItem )
+		foreach ($this->getAttributes($ids) as $id => $attrItem)
 		{
 			$item = $manager->createItem();
-			$item->copyFrom( $attrItem );
-			$item->setType( $type );
-			$item->setQuantity( isset( $quantities[$id] ) ? $quantities[$id] : 1 );
+			$item->copyFrom($attrItem);
+			$item->setType($type);
+			$item->setQuantity(isset($quantities[$id]) ? $quantities[$id] : 1);
 
-			if( isset( $values[$id] ) ) {
-				$item->setValue( $values[$id] );
+			if (isset($values[$id])) {
+				$item->setValue($values[$id]);
 			}
 
 			$list[] = $item;
@@ -436,23 +436,23 @@ 
 	 * @param string $code Code of the list type
 	 * @return \Aimeos\MShop\Common\Item\Type\Iface List type item
 	 */
-	protected function getProductListTypeItem( $domain, $code )
+	protected function getProductListTypeItem($domain, $code)
 	{
 		$context = $this->getContext();
 
-		if( empty( $this->listTypeItems ) )
+		if (empty($this->listTypeItems))
 		{
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists/type' );
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'product/lists/type');
 
-			foreach( $manager->searchItems( $manager->createSearch( true ) ) as $item ) {
-				$this->listTypeItems[ $item->getDomain() ][ $item->getCode() ] = $item;
+			foreach ($manager->searchItems($manager->createSearch(true)) as $item) {
+				$this->listTypeItems[$item->getDomain()][$item->getCode()] = $item;
 			}
 		}
 
-		if( !isset( $this->listTypeItems[$domain][$code] ) )
+		if (!isset($this->listTypeItems[$domain][$code]))
 		{
-			$msg = $context->getI18n()->dt( 'controller/frontend', 'List type for domain "%1$s" and code "%2$s" not found' );
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $domain, $code ) );
+			$msg = $context->getI18n()->dt('controller/frontend', 'List type for domain "%1$s" and code "%2$s" not found');
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf($msg, $domain, $code));
 		}
 
 		return $this->listTypeItems[$domain][$code];
@@ -467,43 +467,43 @@ 
 	 * @param array $domains Names of the domain items that should be fetched too
 	 * @return array List of products matching the given attributes
 	 */
-	protected function getProductVariants( \Aimeos\MShop\Product\Item\Iface $productItem, array $variantAttributeIds,
-			array $domains = array( 'attribute', 'media', 'price', 'text' ) )
+	protected function getProductVariants(\Aimeos\MShop\Product\Item\Iface $productItem, array $variantAttributeIds,
+			array $domains = array('attribute', 'media', 'price', 'text'))
 	{
 		$subProductIds = [];
-		foreach( $productItem->getRefItems( 'product', 'default', 'default' ) as $item ) {
+		foreach ($productItem->getRefItems('product', 'default', 'default') as $item) {
 			$subProductIds[] = $item->getId();
 		}
 
-		if( count( $subProductIds ) === 0 ) {
+		if (count($subProductIds) === 0) {
 			return [];
 		}
 
-		$productManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product' );
-		$search = $productManager->createSearch( true );
+		$productManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product');
+		$search = $productManager->createSearch(true);
 
 		$expr = array(
-			$search->compare( '==', 'product.id', $subProductIds ),
+			$search->compare('==', 'product.id', $subProductIds),
 			$search->getConditions(),
 		);
 
-		if( count( $variantAttributeIds ) > 0 )
+		if (count($variantAttributeIds) > 0)
 		{
-			foreach( $variantAttributeIds as $key => $id ) {
+			foreach ($variantAttributeIds as $key => $id) {
 				$variantAttributeIds[$key] = (string) $id;
 			}
 
-			$listTypeItem = $this->getProductListTypeItem( 'attribute', 'variant' );
+			$listTypeItem = $this->getProductListTypeItem('attribute', 'variant');
 
-			$param = array( 'attribute', $listTypeItem->getId(), $variantAttributeIds );
-			$cmpfunc = $search->createFunction( 'product.contains', $param );
+			$param = array('attribute', $listTypeItem->getId(), $variantAttributeIds);
+			$cmpfunc = $search->createFunction('product.contains', $param);
 
-			$expr[] = $search->compare( '==', $cmpfunc, count( $variantAttributeIds ) );
+			$expr[] = $search->compare('==', $cmpfunc, count($variantAttributeIds));
 		}
 
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		return $productManager->searchItems( $search, $domains );
+		return $productManager->searchItems($search, $domains);
 	}
 
 
@@ -515,9 +515,9 @@ 
 	 * @param mixed $default Default value if no value is available for the given name
 	 * @return mixed Value from the array or default value
 	 */
-	protected function getValue( array $values, $name, $default = null )
+	protected function getValue(array $values, $name, $default = null)
 	{
-		if( isset( $values[$name] ) ) {
+		if (isset($values[$name])) {
 			return $values[$name];
 		}
 

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

Spacing +37 added lines, -37 removed lines

@@ -29,11 +29,11 @@ 
 	 * @param string $type Arbitrary order type (max. eight chars)
 	 * @return \Aimeos\MShop\Order\Item\Iface Created order object
 	 */
-	public function addItem( $baseId, $type )
+	public function addItem($baseId, $type)
 	{
 		$total = 0;
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'order');
 
 		/** controller/frontend/order/limit-seconds
 		 * Order limitation time frame in seconds
@@ -51,24 +51,24 @@ 
 		 * @see controller/frontend/basket/limit-count
 		 * @see controller/frontend/basket/limit-seconds
 		 */
-		$seconds = $context->getConfig()->get( 'controller/frontend/order/limit-seconds', 300 );
+		$seconds = $context->getConfig()->get('controller/frontend/order/limit-seconds', 300);
 
 		$search = $manager->createSearch();
 		$expr = [
-			$search->compare( '==', 'order.baseid', $baseId ),
-			$search->compare( '>=', 'order.ctime', date( 'Y-m-d H:i:s', time() - $seconds ) ),
+			$search->compare('==', 'order.baseid', $baseId),
+			$search->compare('>=', 'order.ctime', date('Y-m-d H:i:s', time() - $seconds)),
 		];
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, 0 );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, 0);
 
-		$manager->searchItems( $search, [], $total );
+		$manager->searchItems($search, [], $total);
 
-		if( $total > 0 ) {
-			throw new \Aimeos\Controller\Frontend\Order\Exception( sprintf( 'The order has already been created' ) );
+		if ($total > 0) {
+			throw new \Aimeos\Controller\Frontend\Order\Exception(sprintf('The order has already been created'));
 		}
 
-		$item = $manager->createItem()->setBaseId( $baseId )->setType( $type );
-		return $manager->saveItem( $item );
+		$item = $manager->createItem()->setBaseId($baseId)->setType($type);
+		return $manager->saveItem($item);
 	}
 
 
@@ -79,7 +79,7 @@ 
 	 */
 	public function createFilter()
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order' )->createSearch( true );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'order')->createSearch(true);
 	}
 
 
@@ -90,30 +90,30 @@ 
 	 * @param boolean $default Use default criteria to limit orders
 	 * @return \Aimeos\MShop\Order\Item\Iface Order object
 	 */
-	public function getItem( $id, $default = true )
+	public function getItem($id, $default = true)
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'order');
 
-		$search = $manager->createSearch( true );
+		$search = $manager->createSearch(true);
 		$expr = [
-			$search->compare( '==', 'order.id', $id ),
+			$search->compare('==', 'order.id', $id),
 			$search->getConditions(),
 		];
 
-		if( $default !== false ) {
-			$expr[] = $search->compare( '==', 'order.editor', $context->getEditor() );
+		if ($default !== false) {
+			$expr[] = $search->compare('==', 'order.editor', $context->getEditor());
 		}
 
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		$items = $manager->searchItems( $search );
+		$items = $manager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) !== false ) {
+		if (($item = reset($items)) !== false) {
 			return $item;
 		}
 
-		throw new \Aimeos\Controller\Frontend\Order\Exception( sprintf( 'No order item for ID "%1$s" found', $id ) );
+		throw new \Aimeos\Controller\Frontend\Order\Exception(sprintf('No order item for ID "%1$s" found', $id));
 	}
 
 
@@ -123,10 +123,10 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Iface $item Order object
 	 * @return \Aimeos\MShop\Order\Item\Iface Saved order item
 	 */
-	public function saveItem( \Aimeos\MShop\Order\Item\Iface $item )
+	public function saveItem(\Aimeos\MShop\Order\Item\Iface $item)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order' );
-		return $manager->saveItem( $item );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'order');
+		return $manager->saveItem($item);
 	}
 
 
@@ -137,18 +137,18 @@ 
 	 * @param integer|null &$total Variable that will contain the total number of available items
 	 * @return \Aimeos\MShop\Order\Item\Iface[] Associative list of IDs as keys and order objects as values
 	 */
-	public function searchItems( \Aimeos\MW\Criteria\Iface $filter, &$total = null )
+	public function searchItems(\Aimeos\MW\Criteria\Iface $filter, &$total = null)
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'order');
 
 		$expr = [
 			$filter->getConditions(),
-			$filter->compare( '==', 'order.base.customerid', $context->getUserId() ),
+			$filter->compare('==', 'order.base.customerid', $context->getUserId()),
 		];
-		$filter->setConditions( $filter->combine( '&&', $expr ) );
+		$filter->setConditions($filter->combine('&&', $expr));
 
-		return $manager->searchItems( $filter, [], $total );
+		return $manager->searchItems($filter, [], $total);
 	}
 
 
@@ -170,9 +170,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);
 	}
 
 
@@ -194,9 +194,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);
 	}
 
 
@@ -214,8 +214,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/Order/StandardTest.php

Spacing +59 added lines, -59 removed lines

@@ -18,165 +18,165 @@
 
 	protected function setUp()
 	{
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 
 		$this->context = \TestHelperFrontend::getContext();
-		$this->object = new \Aimeos\Controller\Frontend\Order\Standard( $this->context );
+		$this->object = new \Aimeos\Controller\Frontend\Order\Standard($this->context);
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object, $this->context );
+		unset($this->object, $this->context);
 
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 	}
 
 
 	public function testAddItem()
 	{
-		$manager = $this->getMockBuilder( '\\Aimeos\\MShop\\Order\\Manager\\Standard' )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( ['saveItem'] )
+		$manager = $this->getMockBuilder('\\Aimeos\\MShop\\Order\\Manager\\Standard')
+			->setConstructorArgs([$this->context])
+			->setMethods(['saveItem'])
 			->getMock();
 
-		\Aimeos\MShop\Factory::injectManager( $this->context, 'order', $manager );
+		\Aimeos\MShop\Factory::injectManager($this->context, 'order', $manager);
 
-		$manager->expects( $this->once() )->method( 'saveItem' )
-			->will( $this->returnValue( $manager->createItem() ) );
+		$manager->expects($this->once())->method('saveItem')
+			->will($this->returnValue($manager->createItem()));
 
-		$this->assertInstanceOf( '\Aimeos\MShop\Order\Item\Iface', $this->object->addItem( -1, 'test' ) );
+		$this->assertInstanceOf('\Aimeos\MShop\Order\Item\Iface', $this->object->addItem( -1, 'test' ));
 	}
 
 
 	public function testAddItemLimit()
 	{
-		$this->context->getConfig()->set( 'controller/frontend/order/limit-seconds', 86400 * 365 );
+		$this->context->getConfig()->set('controller/frontend/order/limit-seconds', 86400 * 365);
 
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'order/base' );
-		$result = $manager->searchItems( $manager->createSearch()->setSlice( 0, 1 ) );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'order/base');
+		$result = $manager->searchItems($manager->createSearch()->setSlice(0, 1));
 
-		if( ( $item = reset( $result ) ) === false ) {
-			throw new \RuntimeException( 'No order item found' );
+		if (($item = reset($result)) === false) {
+			throw new \RuntimeException('No order item found');
 		}
 
-		$this->setExpectedException( '\Aimeos\Controller\Frontend\Order\Exception' );
-		$this->object->addItem( $item->getId(), 'test' );
+		$this->setExpectedException('\Aimeos\Controller\Frontend\Order\Exception');
+		$this->object->addItem($item->getId(), 'test');
 	}
 
 
 	public function testCreateFilter()
 	{
-		$this->assertInstanceOf( '\Aimeos\MW\Criteria\Iface', $this->object->createFilter() );
+		$this->assertInstanceOf('\Aimeos\MW\Criteria\Iface', $this->object->createFilter());
 	}
 
 
 	public function testGetItem()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'customer' );
-		$customerItem = $manager->findItem( 'UTC001' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'customer');
+		$customerItem = $manager->findItem('UTC001');
 
-		$this->context->setEditor( 'core:unittest' );
+		$this->context->setEditor('core:unittest');
 
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'order' );
-		$search = $manager->createSearch()->setSlice( 0, 1 );
-		$search->setConditions( $search->compare( '==', 'order.base.customerid', $customerItem->getId() ) );
-		$result = $manager->searchItems( $search );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'order');
+		$search = $manager->createSearch()->setSlice(0, 1);
+		$search->setConditions($search->compare('==', 'order.base.customerid', $customerItem->getId()));
+		$result = $manager->searchItems($search);
 
-		if( ( $item = reset( $result ) ) === false ) {
-			throw new \RuntimeException( 'No order item found' );
+		if (($item = reset($result)) === false) {
+			throw new \RuntimeException('No order item found');
 		}
 
-		$this->assertInstanceOf( '\Aimeos\MShop\Order\Item\Iface', $this->object->getItem( $item->getId() ) );
+		$this->assertInstanceOf('\Aimeos\MShop\Order\Item\Iface', $this->object->getItem($item->getId()));
 	}
 
 
 	public function testGetItemException()
 	{
-		$this->setExpectedException( '\Aimeos\Controller\Frontend\Order\Exception' );
+		$this->setExpectedException('\Aimeos\Controller\Frontend\Order\Exception');
 		$this->object->getItem( -1 );
 	}
 
 
 	public function testSaveItem()
 	{
-		$manager = $this->getMockBuilder( '\\Aimeos\\MShop\\Order\\Manager\\Standard' )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( ['saveItem'] )
+		$manager = $this->getMockBuilder('\\Aimeos\\MShop\\Order\\Manager\\Standard')
+			->setConstructorArgs([$this->context])
+			->setMethods(['saveItem'])
 			->getMock();
 
-		\Aimeos\MShop\Factory::injectManager( $this->context, 'order', $manager );
+		\Aimeos\MShop\Factory::injectManager($this->context, 'order', $manager);
 
-		$manager->expects( $this->once() )->method( 'saveItem' )
-			->will( $this->returnValue( $manager->createItem() ) );
+		$manager->expects($this->once())->method('saveItem')
+			->will($this->returnValue($manager->createItem()));
 
-		$this->assertInstanceOf( '\Aimeos\MShop\Order\Item\Iface', $this->object->saveItem( $manager->createItem() ) );
+		$this->assertInstanceOf('\Aimeos\MShop\Order\Item\Iface', $this->object->saveItem($manager->createItem()));
 	}
 
 
 	public function testSearchItems()
 	{
-		$this->assertGreaterThan( 1, $this->object->searchItems( $this->object->createFilter() ) );
+		$this->assertGreaterThan(1, $this->object->searchItems($this->object->createFilter()));
 	}
 
 
 	public function testBlock()
 	{
 		$name = 'ControllerFrontendOrderBlock';
-		$this->context->getConfig()->set( 'controller/common/order/name', $name );
+		$this->context->getConfig()->set('controller/common/order/name', $name);
 
 
-		$orderCntlStub = $this->getMockBuilder( '\\Aimeos\\Controller\\Common\\Order\\Standard' )
-			->setMethods( array( 'block' ) )
-			->setConstructorArgs( array( $this->context ) )
+		$orderCntlStub = $this->getMockBuilder('\\Aimeos\\Controller\\Common\\Order\\Standard')
+			->setMethods(array('block'))
+			->setConstructorArgs(array($this->context))
 			->getMock();
 
-		\Aimeos\Controller\Common\Order\Factory::injectController( '\\Aimeos\\Controller\\Common\\Order\\' . $name, $orderCntlStub );
+		\Aimeos\Controller\Common\Order\Factory::injectController('\\Aimeos\\Controller\\Common\\Order\\' . $name, $orderCntlStub);
 
-		$orderCntlStub->expects( $this->once() )->method( 'block' );
+		$orderCntlStub->expects($this->once())->method('block');
 
 
-		$this->object->block( \Aimeos\MShop\Factory::createManager( $this->context, 'order' )->createItem() );
+		$this->object->block(\Aimeos\MShop\Factory::createManager($this->context, 'order')->createItem());
 	}
 
 
 	public function testUnblock()
 	{
 		$name = 'ControllerFrontendOrderUnblock';
-		$this->context->getConfig()->set( 'controller/common/order/name', $name );
+		$this->context->getConfig()->set('controller/common/order/name', $name);
 
 
-		$orderCntlStub = $this->getMockBuilder( '\\Aimeos\\Controller\\Common\\Order\\Standard' )
-			->setMethods( array( 'unblock' ) )
-			->setConstructorArgs( array( $this->context ) )
+		$orderCntlStub = $this->getMockBuilder('\\Aimeos\\Controller\\Common\\Order\\Standard')
+			->setMethods(array('unblock'))
+			->setConstructorArgs(array($this->context))
 			->getMock();
 
-		\Aimeos\Controller\Common\Order\Factory::injectController( '\\Aimeos\\Controller\\Common\\Order\\' . $name, $orderCntlStub );
+		\Aimeos\Controller\Common\Order\Factory::injectController('\\Aimeos\\Controller\\Common\\Order\\' . $name, $orderCntlStub);
 
-		$orderCntlStub->expects( $this->once() )->method( 'unblock' );
+		$orderCntlStub->expects($this->once())->method('unblock');
 
 
-		$this->object->unblock( \Aimeos\MShop\Factory::createManager( $this->context, 'order' )->createItem() );
+		$this->object->unblock(\Aimeos\MShop\Factory::createManager($this->context, 'order')->createItem());
 	}
 
 
 	public function testUpdate()
 	{
 		$name = 'ControllerFrontendOrderUpdate';
-		$this->context->getConfig()->set( 'controller/common/order/name', $name );
+		$this->context->getConfig()->set('controller/common/order/name', $name);
 
 
-		$orderCntlStub = $this->getMockBuilder( '\\Aimeos\\Controller\\Common\\Order\\Standard' )
-			->setMethods( array( 'update' ) )
-			->setConstructorArgs( array( $this->context ) )
+		$orderCntlStub = $this->getMockBuilder('\\Aimeos\\Controller\\Common\\Order\\Standard')
+			->setMethods(array('update'))
+			->setConstructorArgs(array($this->context))
 			->getMock();
 
-		\Aimeos\Controller\Common\Order\Factory::injectController( '\\Aimeos\\Controller\\Common\\Order\\' . $name, $orderCntlStub );
+		\Aimeos\Controller\Common\Order\Factory::injectController('\\Aimeos\\Controller\\Common\\Order\\' . $name, $orderCntlStub);
 
-		$orderCntlStub->expects( $this->once() )->method( 'update' );
+		$orderCntlStub->expects($this->once())->method('update');
 
 
-		$this->object->update( \Aimeos\MShop\Factory::createManager( $this->context, 'order' )->createItem() );
+		$this->object->update(\Aimeos\MShop\Factory::createManager($this->context, 'order')->createItem());
 	}
 }

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

Spacing +6 added lines, -6 removed lines

@@ -30,7 +30,7 @@ 
 	 * @param string[] $attributes List of attribute codes as keys and strings entered by the customer as value
 	 * @return string[] List of attributes codes as keys and error messages as values for invalid or missing values
 	 */
-	public function checkAttributes( $serviceId, array $attributes );
+	public function checkAttributes($serviceId, array $attributes);
 
 	/**
 	 * Returns the service item for the given ID
@@ -39,7 +39,7 @@ 
 	 * @param array $ref List of domains for which the items referenced by the services should be fetched too
 	 * @return \Aimeos\MShop\Service\Provider\Iface Service provider object
 	 */
-	public function getProvider( $serviceId, $ref = ['media', 'price', 'text'] );
+	public function getProvider($serviceId, $ref = ['media', 'price', 'text']);
 
 	/**
 	 * Returns the service providers for the given type
@@ -48,7 +48,7 @@ 
 	 * @param array $ref List of domains for which the items referenced by the services should be fetched too
 	 * @return \Aimeos\MShop\Service\Provider\Iface[] List of service IDs as keys and service provider objects as values
 	 */
-	public function getProviders( $type = null, $ref = ['media', 'price', 'text'] );
+	public function getProviders($type = null, $ref = ['media', 'price', 'text']);
 
 	/**
 	 * Processes the service for the given order, e.g. payment and delivery services
@@ -61,7 +61,7 @@ 
 	 * @return \Aimeos\MShop\Common\Item\Helper\Form\Iface|null Form object with URL, parameters, etc.
 	 * 	or null if no form data is required
 	 */
-	public function process( \Aimeos\MShop\Order\Item\Iface $orderItem, $serviceId, array $urls, array $params );
+	public function process(\Aimeos\MShop\Order\Item\Iface $orderItem, $serviceId, array $urls, array $params);
 
 
 	/**
@@ -72,7 +72,7 @@ 
 	 * @param string $code Unique code of the service used for the current order
 	 * @return \Psr\Http\Message\ResponseInterface Response object
 	 */
-	public function updatePush( ServerRequestInterface $request, ResponseInterface $response, $code );
+	public function updatePush(ServerRequestInterface $request, ResponseInterface $response, $code);
 
 
 	/**
@@ -83,5 +83,5 @@ 
 	 * @param string $orderid ID of the order whose payment status should be updated
 	 * @return \Aimeos\MShop\Order\Item\Iface $orderItem Order item that has been updated
 	 */
-	public function updateSync( ServerRequestInterface $request, $code, $orderid );
+	public function updateSync(ServerRequestInterface $request, $code, $orderid);
 }

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

Spacing +50 added lines, -50 removed lines

@@ -19,124 +19,124 @@ 
 
 	protected function setUp()
 	{
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 
 		$this->context = \TestHelperFrontend::getContext();
-		$this->object = new \Aimeos\Controller\Frontend\Service\Standard( $this->context );
+		$this->object = new \Aimeos\Controller\Frontend\Service\Standard($this->context);
 	}
 
 
 	public static function setUpBeforeClass()
 	{
-		$orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
-		$orderBaseMgr = $orderManager->getSubManager( 'base' );
+		$orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager(\TestHelperFrontend::getContext());
+		$orderBaseMgr = $orderManager->getSubManager('base');
 		self::$basket = $orderBaseMgr->createItem();
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object, $this->context );
+		unset($this->object, $this->context);
 
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 	}
 
 
 	public function testCheckAttributes()
 	{
-		$attributes = $this->object->checkAttributes( $this->getServiceItem()->getId(), [] );
-		$this->assertEquals( [], $attributes );
+		$attributes = $this->object->checkAttributes($this->getServiceItem()->getId(), []);
+		$this->assertEquals([], $attributes);
 	}
 
 
 	public function testGetProviders()
 	{
-		$providers = $this->object->getProviders( 'delivery' );
-		$this->assertGreaterThan( 0, count( $providers ) );
+		$providers = $this->object->getProviders('delivery');
+		$this->assertGreaterThan(0, count($providers));
 
-		foreach( $providers as $provider ) {
-			$this->assertInstanceOf( '\\Aimeos\\MShop\\Service\\Provider\\Iface', $provider );
+		foreach ($providers as $provider) {
+			$this->assertInstanceOf('\\Aimeos\\MShop\\Service\\Provider\\Iface', $provider);
 		}
 	}
 
 
 	public function testGetProvider()
 	{
-		$provider = $this->object->getProvider( $this->getServiceItem()->getId() );
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Service\\Provider\\Iface', $provider );
+		$provider = $this->object->getProvider($this->getServiceItem()->getId());
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Service\\Provider\\Iface', $provider);
 	}
 
 
 	public function testProcess()
 	{
 		$form = new \Aimeos\MShop\Common\Item\Helper\Form\Standard();
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'order' )->createItem();
-		$serviceId = \Aimeos\MShop\Factory::createManager( $this->context, 'service' )->findItem( 'unitcode' )->getId();
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'order')->createItem();
+		$serviceId = \Aimeos\MShop\Factory::createManager($this->context, 'service')->findItem('unitcode')->getId();
 
-		$provider = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Provider\\Delivery\\Standard' )
+		$provider = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Provider\\Delivery\\Standard')
 			->disableOriginalConstructor()
-			->setMethods( ['process'] )
+			->setMethods(['process'])
 			->getMock();
 
-		$manager = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Manager\\Standard' )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( ['getProvider'] )
+		$manager = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Manager\\Standard')
+			->setConstructorArgs([$this->context])
+			->setMethods(['getProvider'])
 			->getMock();
 
-		\Aimeos\MShop\Factory::injectManager( $this->context, 'service', $manager );
+		\Aimeos\MShop\Factory::injectManager($this->context, 'service', $manager);
 
-		$provider->expects( $this->once() )->method( 'process' )->will( $this->returnValue( $form ) );
-		$manager->expects( $this->once() )->method( 'getProvider' )->will( $this->returnValue( $provider ) );
+		$provider->expects($this->once())->method('process')->will($this->returnValue($form));
+		$manager->expects($this->once())->method('getProvider')->will($this->returnValue($provider));
 
 
-		$result = $this->object->process( $item, $serviceId, [], [] );
-		$this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Helper\Form\Iface', $result );
+		$result = $this->object->process($item, $serviceId, [], []);
+		$this->assertInstanceOf('\Aimeos\MShop\Common\Item\Helper\Form\Iface', $result);
 	}
 
 
 	public function testUpdatePush()
 	{
-		$request = $this->getMockBuilder( '\Psr\Http\Message\ServerRequestInterface' )->getMock();
-		$response = $this->getMockBuilder( '\Psr\Http\Message\ResponseInterface' )->getMock();
+		$request = $this->getMockBuilder('\Psr\Http\Message\ServerRequestInterface')->getMock();
+		$response = $this->getMockBuilder('\Psr\Http\Message\ResponseInterface')->getMock();
 
-		$response->expects( $this->once() )->method( 'withStatus' )->will( $this->returnValue( $response ) );
+		$response->expects($this->once())->method('withStatus')->will($this->returnValue($response));
 
-		$this->assertInstanceOf( '\Psr\Http\Message\ResponseInterface', $this->object->updatePush( $request, $response, 'unitcode' ) );
+		$this->assertInstanceOf('\Psr\Http\Message\ResponseInterface', $this->object->updatePush($request, $response, 'unitcode'));
 	}
 
 
 	public function testUpdateSync()
 	{
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'order' )->createItem();
-		$request = $this->getMockBuilder( '\Psr\Http\Message\ServerRequestInterface' )->getMock();
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'order')->createItem();
+		$request = $this->getMockBuilder('\Psr\Http\Message\ServerRequestInterface')->getMock();
 
-		$provider = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Provider\\Delivery\\Standard' )
-			->setMethods( ['updateSync', 'query', 'isImplemented'] )
+		$provider = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Provider\\Delivery\\Standard')
+			->setMethods(['updateSync', 'query', 'isImplemented'])
 			->disableOriginalConstructor()
 			->getMock();
 
-		$orderManager = $this->getMockBuilder( '\\Aimeos\\MShop\\Order\\Manager\\Standard' )
-			->setConstructorArgs( array( $this->context ) )
-			->setMethods( ['getItem'] )
+		$orderManager = $this->getMockBuilder('\\Aimeos\\MShop\\Order\\Manager\\Standard')
+			->setConstructorArgs(array($this->context))
+			->setMethods(['getItem'])
 			->getMock();
 
-		$serviceManager = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Manager\\Standard' )
-			->setConstructorArgs( array( $this->context ) )
-			->setMethods( ['getProvider'] )
+		$serviceManager = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Manager\\Standard')
+			->setConstructorArgs(array($this->context))
+			->setMethods(['getProvider'])
 			->getMock();
 
-		\Aimeos\MShop\Factory::injectManager( $this->context, 'order', $orderManager );
-		\Aimeos\MShop\Factory::injectManager( $this->context, 'service', $serviceManager );
+		\Aimeos\MShop\Factory::injectManager($this->context, 'order', $orderManager);
+		\Aimeos\MShop\Factory::injectManager($this->context, 'service', $serviceManager);
 
 
-		$orderManager->expects( $this->once() )->method( 'getItem' )->will( $this->returnValue( $item ) );
-		$serviceManager->expects( $this->once() )->method( 'getProvider' )->will( $this->returnValue( $provider ) );
-		$provider->expects( $this->once() )->method( 'updateSync' )->will( $this->returnValue( $item ) );
-		$provider->expects( $this->once() )->method( 'isImplemented' )->will( $this->returnValue( true ) );
-		$provider->expects( $this->once() )->method( 'query' );
+		$orderManager->expects($this->once())->method('getItem')->will($this->returnValue($item));
+		$serviceManager->expects($this->once())->method('getProvider')->will($this->returnValue($provider));
+		$provider->expects($this->once())->method('updateSync')->will($this->returnValue($item));
+		$provider->expects($this->once())->method('isImplemented')->will($this->returnValue(true));
+		$provider->expects($this->once())->method('query');
 
-		$this->object->updateSync( $request, 'unitcode', -1 );
+		$this->object->updateSync($request, 'unitcode', -1);
 	}
 
 
@@ -145,7 +145,7 @@ 
 	 */
 	protected function getServiceItem()
 	{
-		$manager = \Aimeos\MShop\Service\Manager\Factory::createManager( \TestHelperFrontend::getContext() );
-		return $manager->findItem( 'unitcode' );
+		$manager = \Aimeos\MShop\Service\Manager\Factory::createManager(\TestHelperFrontend::getContext());
+		return $manager->findItem('unitcode');
 	}
 }

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

Spacing +40 added lines, -40 removed lines

@@ -35,14 +35,14 @@ 
 	 * @param string[] $attributes List of attribute codes as keys and strings entered by the customer as value
 	 * @return string[] List of attributes codes as keys and error messages as values for invalid or missing values
 	 */
-	public function checkAttributes( $serviceId, array $attributes )
+	public function checkAttributes($serviceId, array $attributes)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service');
 
-		$item = $manager->getItem( $serviceId, [], true );
-		$provider = $manager->getProvider( $item, $item->getType() );
+		$item = $manager->getItem($serviceId, [], true);
+		$provider = $manager->getProvider($item, $item->getType());
 
-		return array_filter( $provider->checkConfigFE( $attributes ) );
+		return array_filter($provider->checkConfigFE($attributes));
 	}
 
 
@@ -53,12 +53,12 @@ 
 	 * @param string[] $ref List of domain names whose items should be fetched too
 	 * @return \Aimeos\MShop\Service\Provider\Iface Service provider object
 	 */
-	public function getProvider( $serviceId, $ref = ['media', 'price', 'text'] )
+	public function getProvider($serviceId, $ref = ['media', 'price', 'text'])
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
-		$item = $manager->getItem( $serviceId, $ref, true );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service');
+		$item = $manager->getItem($serviceId, $ref, true);
 
-		return $manager->getProvider( $item, $item->getType() );
+		return $manager->getProvider($item, $item->getType());
 	}
 
 
@@ -69,26 +69,26 @@ 
 	 * @param string[] $ref List of domain names whose items should be fetched too
 	 * @return \Aimeos\MShop\Service\Provider\Iface[] List of service IDs as keys and service provider objects as values
 	 */
-	public function getProviders( $type = null, $ref = ['media', 'price', 'text'] )
+	public function getProviders($type = null, $ref = ['media', 'price', 'text'])
 	{
 		$list = [];
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service');
 
-		$search = $manager->createSearch( true );
-		$search->setSortations( array( $search->sort( '+', 'service.position' ) ) );
+		$search = $manager->createSearch(true);
+		$search->setSortations(array($search->sort('+', 'service.position')));
 
-		if( $type != null )
+		if ($type != null)
 		{
 			$expr = array(
 				$search->getConditions(),
-				$search->compare( '==', 'service.type.code', $type ),
-				$search->compare( '==', 'service.type.domain', 'service' ),
+				$search->compare('==', 'service.type.code', $type),
+				$search->compare('==', 'service.type.domain', 'service'),
 			);
-			$search->setConditions( $search->combine( '&&', $expr ) );
+			$search->setConditions($search->combine('&&', $expr));
 		}
 
-		foreach( $manager->searchItems( $search, $ref ) as $id => $item ) {
-			$list[$id] = $manager->getProvider( $item, $item->getType() );
+		foreach ($manager->searchItems($search, $ref) as $id => $item) {
+			$list[$id] = $manager->getProvider($item, $item->getType());
 		}
 
 		return $list;
@@ -106,15 +106,15 @@ 
 	 * @return \Aimeos\MShop\Common\Item\Helper\Form\Iface|null Form object with URL, parameters, etc.
 	 * 	or null if no form data is required
 	 */
-	public function process( \Aimeos\MShop\Order\Item\Iface $orderItem, $serviceId, array $urls, array $params )
+	public function process(\Aimeos\MShop\Order\Item\Iface $orderItem, $serviceId, array $urls, array $params)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
-		$item = $manager->getItem( $serviceId, [], true );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service');
+		$item = $manager->getItem($serviceId, [], true);
 
-		$provider = $manager->getProvider( $item, $item->getType() );
-		$provider->injectGlobalConfigBE( $urls );
+		$provider = $manager->getProvider($item, $item->getType());
+		$provider->injectGlobalConfigBE($urls);
 
-		return $provider->process( $orderItem, $params );
+		return $provider->process($orderItem, $params);
 	}
 
 
@@ -126,14 +126,14 @@ 
 	 * @param string $code Unique code of the service used for the current order
 	 * @return \Psr\Http\Message\ResponseInterface Response object
 	 */
-	public function updatePush( ServerRequestInterface $request, ResponseInterface $response, $code )
+	public function updatePush(ServerRequestInterface $request, ResponseInterface $response, $code)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
-		$item = $manager->findItem( $code );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service');
+		$item = $manager->findItem($code);
 
-		$provider = $manager->getProvider( $item, $item->getType() );
+		$provider = $manager->getProvider($item, $item->getType());
 
-		return $provider->updatePush( $request, $response );
+		return $provider->updatePush($request, $response);
 	}
 
 
@@ -145,24 +145,24 @@ 
 	 * @param string $orderid ID of the order whose payment status should be updated
 	 * @return \Aimeos\MShop\Order\Item\Iface $orderItem Order item that has been updated
 	 */
-	public function updateSync( ServerRequestInterface $request, $code, $orderid )
+	public function updateSync(ServerRequestInterface $request, $code, $orderid)
 	{
 		$context = $this->getContext();
-		$orderManager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
-		$serviceManager = \Aimeos\MShop\Factory::createManager( $context, 'service' );
+		$orderManager = \Aimeos\MShop\Factory::createManager($context, 'order');
+		$serviceManager = \Aimeos\MShop\Factory::createManager($context, 'service');
 
-		$orderItem = $orderManager->getItem( $orderid );
-		$serviceItem = $serviceManager->findItem( $code );
+		$orderItem = $orderManager->getItem($orderid);
+		$serviceItem = $serviceManager->findItem($code);
 
-		$provider = $serviceManager->getProvider( $serviceItem, $serviceItem->getType() );
+		$provider = $serviceManager->getProvider($serviceItem, $serviceItem->getType());
 
 
-		if( ( $orderItem = $provider->updateSync( $request, $orderItem ) ) !== null )
+		if (($orderItem = $provider->updateSync($request, $orderItem)) !== null)
 		{
-			if( $orderItem->getPaymentStatus() === \Aimeos\MShop\Order\Item\Base::PAY_UNFINISHED
-				&& $provider->isImplemented( \Aimeos\MShop\Service\Provider\Payment\Base::FEAT_QUERY )
+			if ($orderItem->getPaymentStatus() === \Aimeos\MShop\Order\Item\Base::PAY_UNFINISHED
+				&& $provider->isImplemented(\Aimeos\MShop\Service\Provider\Payment\Base::FEAT_QUERY)
 			) {
-				$provider->query( $orderItem );
+				$provider->query($orderItem);
 			}
 		}
 

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

Spacing +46 added lines, -46 removed lines

@@ -20,130 +20,130 @@
 	{
 		$this->context = \TestHelperFrontend::getContext();
 
-		$this->stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Service\Standard' )
+		$this->stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Service\Standard')
 			->disableOriginalConstructor()
 			->getMock();
 
-		$this->object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Service\Decorator\Base' )
-			->setConstructorArgs( [$this->stub, $this->context] )
+		$this->object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Service\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\Service\Decorator\Base' )
-			->setConstructorArgs( [$stub, $this->context] )
+		$this->getMockBuilder('\Aimeos\Controller\Frontend\Service\Decorator\Base')
+			->setConstructorArgs([$stub, $this->context])
 			->getMockForAbstractClass();
 	}
 
 
 	public function testCall()
 	{
-		$stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Service\Standard' )
+		$stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Service\Standard')
 			->disableOriginalConstructor()
-			->setMethods( ['invalid'] )
+			->setMethods(['invalid'])
 			->getMock();
 
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Service\Decorator\Base' )
-			->setConstructorArgs( [$stub, $this->context] )
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Service\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 testCheckAttributes()
 	{
-		$this->stub->expects( $this->once() )->method( 'checkAttributes' )
-			->will( $this->returnValue( [] ) );
+		$this->stub->expects($this->once())->method('checkAttributes')
+			->will($this->returnValue([]));
 
-		$this->assertEquals( [], $this->object->checkAttributes( -1, [] ) );
+		$this->assertEquals([], $this->object->checkAttributes( -1, [] ));
 	}
 
 
 	public function testGetProvider()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'service' );
-		$provider = $manager->getProvider( $manager->findItem( 'unitcode', [], 'service', 'delivery' ), 'delivery' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'service');
+		$provider = $manager->getProvider($manager->findItem('unitcode', [], 'service', 'delivery'), 'delivery');
 
-		$this->stub->expects( $this->once() )->method( 'getProvider' )
-			->will( $this->returnValue( $provider ) );
+		$this->stub->expects($this->once())->method('getProvider')
+			->will($this->returnValue($provider));
 
-		$this->assertSame( $provider, $this->object->getProvider( -1 ) );
+		$this->assertSame($provider, $this->object->getProvider( -1 ));
 	}
 
 
 	public function testGetProviders()
 	{
-		$this->stub->expects( $this->once() )->method( 'getProviders' )
-			->will( $this->returnValue( [] ) );
+		$this->stub->expects($this->once())->method('getProviders')
+			->will($this->returnValue([]));
 
-		$this->assertEquals( [], $this->object->getProviders( 'payment' ) );
+		$this->assertEquals([], $this->object->getProviders('payment'));
 	}
 
 
 	public function testProcess()
 	{
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'order' )->createItem();
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'order')->createItem();
 
-		$this->stub->expects( $this->once() )->method( 'process' )
-			->will( $this->returnValue( new \Aimeos\MShop\Common\Item\Helper\Form\Standard() ) );
+		$this->stub->expects($this->once())->method('process')
+			->will($this->returnValue(new \Aimeos\MShop\Common\Item\Helper\Form\Standard()));
 
-		$this->assertInstanceOf( 'Aimeos\MShop\Common\Item\Helper\Form\Iface', $this->object->process( $item, -1, [], [] ) );
+		$this->assertInstanceOf('Aimeos\MShop\Common\Item\Helper\Form\Iface', $this->object->process($item, -1, [], []));
 	}
 
 
 	public function testUpdatePush()
 	{
-		$response = $this->getMockBuilder( '\Psr\Http\Message\ResponseInterface' )->getMock();
-		$request = $this->getMockBuilder( '\Psr\Http\Message\ServerRequestInterface' )->getMock();
+		$response = $this->getMockBuilder('\Psr\Http\Message\ResponseInterface')->getMock();
+		$request = $this->getMockBuilder('\Psr\Http\Message\ServerRequestInterface')->getMock();
 
-		$this->stub->expects( $this->once() )->method( 'updatePush' )
-			->will( $this->returnValue( $response ) );
+		$this->stub->expects($this->once())->method('updatePush')
+			->will($this->returnValue($response));
 
-		$this->assertInstanceOf( '\Psr\Http\Message\ResponseInterface', $this->object->updatePush( $request, $response, 'test' ) );
+		$this->assertInstanceOf('\Psr\Http\Message\ResponseInterface', $this->object->updatePush($request, $response, 'test'));
 	}
 
 
 	public function testUpdateSync()
 	{
-		$response = $this->getMockBuilder( '\Psr\Http\Message\ResponseInterface' )->getMock();
-		$request = $this->getMockBuilder( '\Psr\Http\Message\ServerRequestInterface' )->getMock();
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'order' )->createItem();
+		$response = $this->getMockBuilder('\Psr\Http\Message\ResponseInterface')->getMock();
+		$request = $this->getMockBuilder('\Psr\Http\Message\ServerRequestInterface')->getMock();
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'order')->createItem();
 
-		$this->stub->expects( $this->once() )->method( 'updateSync' )
-			->will( $this->returnValue( $item ) );
+		$this->stub->expects($this->once())->method('updateSync')
+			->will($this->returnValue($item));
 
-		$this->assertInstanceOf( 'Aimeos\MShop\Order\Item\Iface', $this->object->updateSync( $request, $response, [], 'test', -1 ) );
+		$this->assertInstanceOf('Aimeos\MShop\Order\Item\Iface', $this->object->updateSync($request, $response, [], 'test', -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\Service\Decorator\Base' );
-		$method = $class->getMethod( $name );
-		$method->setAccessible( true );
+		$class = new \ReflectionClass('\Aimeos\Controller\Frontend\Service\Decorator\Base');
+		$method = $class->getMethod($name);
+		$method->setAccessible(true);
 
 		return $method;
 	}