aimeos / ai-controller-frontend

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

Spacing +33 added lines, -33 removed lines

@@ -17,104 +17,104 @@
 
 	protected function setUp()
 	{
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 
 		$this->context = \TestHelperFrontend::getContext();
-		$this->object = new \Aimeos\Controller\Frontend\Subscription\Standard( $this->context );
+		$this->object = new \Aimeos\Controller\Frontend\Subscription\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 testCancel()
 	{
-		$this->context->setUserId( $this->getCustomerId() );
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'subscription' )->createItem();
+		$this->context->setUserId($this->getCustomerId());
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'subscription')->createItem();
 
-		$cntl = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Subscription\Standard' )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( ['saveItem'] )
+		$cntl = $this->getMockBuilder('\Aimeos\Controller\Frontend\Subscription\Standard')
+			->setConstructorArgs([$this->context])
+			->setMethods(['saveItem'])
 			->getMock();
 
-		$cntl->expects( $this->once() )->method( 'saveItem' )
-			->will( $this->returnValue( $item ) );
+		$cntl->expects($this->once())->method('saveItem')
+			->will($this->returnValue($item));
 
-		$this->assertInstanceOf( '\Aimeos\MShop\Subscription\Item\Iface', $cntl->cancel( $this->getSubscriptionId() ) );
+		$this->assertInstanceOf('\Aimeos\MShop\Subscription\Item\Iface', $cntl->cancel($this->getSubscriptionId()));
 	}
 
 
 	public function testCreateFilter()
 	{
-		$this->assertInstanceOf( '\Aimeos\MW\Criteria\Iface', $this->object->createFilter() );
+		$this->assertInstanceOf('\Aimeos\MW\Criteria\Iface', $this->object->createFilter());
 	}
 
 
 	public function testGetIntervals()
 	{
-		$this->assertGreaterThan( 0, count( $this->object->getIntervals() ) );
+		$this->assertGreaterThan(0, count($this->object->getIntervals()));
 	}
 
 
 	public function testGetItem()
 	{
 		$id = $this->getSubscriptionId();
-		$this->context->setUserId( $this->getCustomerId() );
+		$this->context->setUserId($this->getCustomerId());
 
-		$this->assertInstanceOf( '\Aimeos\MShop\Subscription\Item\Iface', $this->object->getItem( $id ) );
+		$this->assertInstanceOf('\Aimeos\MShop\Subscription\Item\Iface', $this->object->getItem($id));
 	}
 
 
 	public function testGetItemException()
 	{
-		$this->setExpectedException( '\Aimeos\Controller\Frontend\Subscription\Exception' );
+		$this->setExpectedException('\Aimeos\Controller\Frontend\Subscription\Exception');
 		$this->object->getItem( -1 );
 	}
 
 
 	public function testSaveItem()
 	{
-		$manager = $this->getMockBuilder( '\\Aimeos\\MShop\\Subscription\\Manager\\Standard' )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( ['saveItem'] )
+		$manager = $this->getMockBuilder('\\Aimeos\\MShop\\Subscription\\Manager\\Standard')
+			->setConstructorArgs([$this->context])
+			->setMethods(['saveItem'])
 			->getMock();
 
-		\Aimeos\MShop\Factory::injectManager( $this->context, 'subscription', $manager );
+		\Aimeos\MShop\Factory::injectManager($this->context, 'subscription', $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\Subscription\Item\Iface', $this->object->saveItem( $manager->createItem() ) );
+		$this->assertInstanceOf('\Aimeos\MShop\Subscription\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()));
 	}
 
 	protected function getCustomerId()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'customer' );
-		return $manager->findItem( 'UTC001' )->getId();
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'customer');
+		return $manager->findItem('UTC001')->getId();
 	}
 
 
 	protected function getSubscriptionId()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'subscription' );
-		$search = $manager->createSearch()->setSlice( 0, 1 );
-		$search->setConditions( $search->compare( '==', 'order.base.customerid', $this->getCustomerId() ) );
-		$result = $manager->searchItems( $search );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'subscription');
+		$search = $manager->createSearch()->setSlice(0, 1);
+		$search->setConditions($search->compare('==', 'order.base.customerid', $this->getCustomerId()));
+		$result = $manager->searchItems($search);
 
-		if( ( $item = reset( $result ) ) === false ) {
-			throw new \RuntimeException( 'No subscription item found' );
+		if (($item = reset($result)) === false) {
+			throw new \RuntimeException('No subscription item found');
 		}
 
 		return $item->getId();

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

Spacing +10 added lines, -10 removed lines

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

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

Spacing +150 added lines, -150 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
 			}
 		}
 
@@ -324,21 +324,21 @@ 
 	 *
 	 * @param \Aimeos\MShop\Order\Item\Base\Iface $basket Basket object
 	 */
-	protected function createSubscriptions( \Aimeos\MShop\Order\Item\Base\Iface $basket )
+	protected function createSubscriptions(\Aimeos\MShop\Order\Item\Base\Iface $basket)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'subscription' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'subscription');
 
-		foreach( $basket->getProducts() as $orderProduct )
+		foreach ($basket->getProducts() as $orderProduct)
 		{
-			if( ( $interval = $orderProduct->getAttribute( 'interval', 'config' ) ) !== null )
+			if (($interval = $orderProduct->getAttribute('interval', 'config')) !== null)
 			{
 				$item = $manager->createItem();
-				$item->setOrderBaseId( $basket->getId() );
-				$item->setOrderProductId( $orderProduct->getId() );
-				$item->setInterval( $interval );
-				$item->setStatus( 1 );
+				$item->setOrderBaseId($basket->getId());
+				$item->setOrderProductId($orderProduct->getId());
+				$item->setInterval($interval);
+				$item->setStatus(1);
 
-				$manager->saveItem( $item, false );
+				$manager->saveItem($item, false);
 			}
 		}
 	}
@@ -352,32 +352,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;
@@ -390,31 +390,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'));
 	}
 
 
@@ -427,24 +427,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;
@@ -461,23 +461,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];
@@ -492,43 +492,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);
 	}
 
 
@@ -540,9 +540,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/Subscription/Standard.php

Spacing +27 added lines, -27 removed lines

@@ -27,12 +27,12 @@ 
 	 * @param string $id Unique subscription ID
 	 * @return \Aimeos\MShop\Subscription\Item\Iface Canceled subscription item
 	 */
-	public function cancel( $id )
+	public function cancel($id)
 	{
-		$item = $this->getItem( $id );
-		$item->setDateEnd( $item->getDateNext() );
+		$item = $this->getItem($id);
+		$item->setDateEnd($item->getDateNext());
 
-		return $this->saveItem( $item );
+		return $this->saveItem($item);
 	}
 
 
@@ -43,7 +43,7 @@ 
 	 */
 	public function createFilter()
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'subscription' )->createSearch();
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'subscription')->createSearch();
 	}
 
 
@@ -53,25 +53,25 @@ 
 	 * @param string $id Unique subscription ID
 	 * @return \Aimeos\MShop\Subscription\Item\Iface Subscription object
 	 */
-	public function getItem( $id )
+	public function getItem($id)
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'subscription' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'subscription');
 
 		$filter = $manager->createSearch();
 		$expr = [
-			$filter->compare( '==', 'subscription.id', $id ),
-			$filter->compare( '==', 'order.base.customerid', $context->getUserId() ),
+			$filter->compare('==', 'subscription.id', $id),
+			$filter->compare('==', 'order.base.customerid', $context->getUserId()),
 			$filter->getConditions(),
 		];
-		$filter->setConditions( $filter->combine( '&&', $expr ) );
+		$filter->setConditions($filter->combine('&&', $expr));
 
-		$items = $this->searchItems( $filter );
+		$items = $this->searchItems($filter);
 
-		if( ( $item = reset( $items ) ) === false )
+		if (($item = reset($items)) === false)
 		{
 			$msg = 'Invalid subscription ID "%1$s" for customer ID "%2$s"';
-			throw new \Aimeos\Controller\Frontend\Subscription\Exception( sprintf( $msg, $id, $context->getUserId() ) );
+			throw new \Aimeos\Controller\Frontend\Subscription\Exception(sprintf($msg, $id, $context->getUserId()));
 		}
 
 		return $item;
@@ -86,18 +86,18 @@ 
 	public function getIntervals()
 	{
 		$intervals = [];
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'attribute' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'attribute');
 
-		$search = $manager->createSearch( true );
+		$search = $manager->createSearch(true);
 		$expr = array(
 			$search->getConditions(),
-			$search->compare( '==', 'attribute.domain', 'product' ),
-			$search->compare( '==', 'attribute.type.code', 'interval' ),
+			$search->compare('==', 'attribute.domain', 'product'),
+			$search->compare('==', 'attribute.type.code', 'interval'),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice( 0, 0x7fffffff );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSlice(0, 0x7fffffff);
 
-		foreach( $manager->searchItems( $search, ['text'] ) as $attrItem ) {
+		foreach ($manager->searchItems($search, ['text']) as $attrItem) {
 			$intervals[$attrItem->getCode()] = $attrItem;
 		}
 
@@ -110,9 +110,9 @@ 
 	 * @param \Aimeos\MShop\Subscription\Item\Iface $item Subscription object
 	 * @return \Aimeos\MShop\Subscription\Item\Iface Saved subscription item
 	 */
-	public function saveItem( \Aimeos\MShop\Subscription\Item\Iface $item )
+	public function saveItem(\Aimeos\MShop\Subscription\Item\Iface $item)
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'subscription' )->saveItem( $item );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'subscription')->saveItem($item);
 	}
 
 
@@ -123,17 +123,17 @@ 
 	 * @param integer &$total|null Variable that will contain the total number of available items
 	 * @return \Aimeos\MShop\Subscription\Item\Iface[] Associative list of IDs as keys and subscription 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, 'subscription' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'subscription');
 
 		$expr = [
-			$filter->compare( '==', 'order.base.customerid', $context->getUserId() ),
+			$filter->compare('==', 'order.base.customerid', $context->getUserId()),
 			$filter->getConditions(),
 		];
-		$filter->setConditions( $filter->combine( '&&', $expr ) );
+		$filter->setConditions($filter->combine('&&', $expr));
 
-		return $manager->searchItems( $filter, [], $total );
+		return $manager->searchItems($filter, [], $total);
 	}
 }

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

Spacing +10 added lines, -10 removed lines

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

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

Spacing +17 added lines, -17 removed lines

@@ -16,13 +16,13 @@ 
 
 	protected function setUp()
 	{
-		$this->object = new \Aimeos\Controller\Frontend\Supplier\Standard( \TestHelperFrontend::getContext() );
+		$this->object = new \Aimeos\Controller\Frontend\Supplier\Standard(\TestHelperFrontend::getContext());
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object );
+		unset($this->object);
 	}
 
 
@@ -30,34 +30,34 @@ 
 	{
 		$filter = $this->object->createFilter();
 
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
-		$this->assertEquals( 0, $filter->getSliceStart() );
-		$this->assertEquals( 100, $filter->getSliceSize() );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
+		$this->assertEquals(0, $filter->getSliceStart());
+		$this->assertEquals(100, $filter->getSliceSize());
 	}
 
 
 	public function testGetItem()
 	{
 		$context = \TestHelperFrontend::getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'supplier' );
-		$id = $manager->findItem( 'unitCode001' )->getId();
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'supplier');
+		$id = $manager->findItem('unitCode001')->getId();
 
-		$result = $this->object->getItem( $id );
+		$result = $this->object->getItem($id);
 
-		$this->assertInstanceOf( '\Aimeos\MShop\Supplier\Item\Iface', $result );
+		$this->assertInstanceOf('\Aimeos\MShop\Supplier\Item\Iface', $result);
 	}
 
 
 	public function testGetItems()
 	{
 		$context = \TestHelperFrontend::getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'supplier' );
-		$id = $manager->findItem( 'unitCode001' )->getId();
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'supplier');
+		$id = $manager->findItem('unitCode001')->getId();
 
-		$result = $this->object->getItems( [$id] );
+		$result = $this->object->getItems([$id]);
 
-		$this->assertInternalType( 'array', $result );
-		$this->assertEquals( 1, count( $result ) );
+		$this->assertInternalType('array', $result);
+		$this->assertEquals(1, count($result));
 	}
 
 
@@ -66,9 +66,9 @@ 
 		$filter = $this->object->createFilter();
 
 		$total = 0;
-		$results = $this->object->searchItems( $filter, [], $total );
+		$results = $this->object->searchItems($filter, [], $total);
 
-		$this->assertEquals( 2, $total );
-		$this->assertEquals( 2, count( $results ) );
+		$this->assertEquals(2, $total);
+		$this->assertEquals(2, count($results));
 	}
 }

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

Spacing +35 added lines, -35 removed lines

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

controller/frontend/src/Controller/Frontend/Supplier/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\Supplier\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/supplier/name
 		 * Class name of the used supplier frontend controller implementation
@@ -63,20 +63,20 @@ 
 		 * @since 2018.07
 		 * @category Developer
 		 */
-		if( $name === null ) {
-			$name = $context->getConfig()->get( 'controller/frontend/supplier/name', 'Standard' );
+		if ($name === null) {
+			$name = $context->getConfig()->get('controller/frontend/supplier/name', 'Standard');
 		}
 
-		if( ctype_alnum( $name ) === false )
+		if (ctype_alnum($name) === false)
 		{
-			$classname = is_string( $name ) ? '\\Aimeos\\Controller\\Frontend\\Supplier\\' . $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\\Supplier\\' . $name : '<not a string>';
+			throw new \Aimeos\Controller\Frontend\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 		}
 
 		$iface = '\\Aimeos\\Controller\\Frontend\\Supplier\\Iface';
 		$classname = '\\Aimeos\\Controller\\Frontend\\Supplier\\' . $name;
 
-		$manager = self::createControllerBase( $context, $classname, $iface );
+		$manager = self::createControllerBase($context, $classname, $iface);
 
 		/** controller/frontend/supplier/decorators/excludes
 		 * Excludes decorators added by the "common" option from the supplier frontend controllers
@@ -152,7 +152,7 @@ 
 		 * @see controller/frontend/supplier/decorators/excludes
 		 * @see controller/frontend/supplier/decorators/global
 		 */
-		return self::addControllerDecorators( $context, $manager, 'supplier' );
+		return self::addControllerDecorators($context, $manager, 'supplier');
 	}
 
 }

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

Spacing +11 added lines, -11 removed lines

@@ -30,7 +30,7 @@ 
 	 */
 	public function createFilter()
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'supplier' )->createSearch( true );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'supplier')->createSearch(true);
 	}
 
 
@@ -42,9 +42,9 @@ 
 	 * @return \Aimeos\MShop\Supplier\Item\Iface Supplier item including the referenced domains items
 	 * @since 2018.07
 	 */
-	public function getItem( $id, array $domains = array( 'media', 'text' ) )
+	public function getItem($id, array $domains = array('media', 'text'))
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'supplier' )->getItem( $id, $domains, true );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'supplier')->getItem($id, $domains, true);
 	}
 
 
@@ -56,18 +56,18 @@ 
 	 * @return \Aimeos\MShop\Supplier\Item\Iface[] Associative list of supplier item including the referenced domains items
 	 * @since 2018.07
 	 */
-	public function getItems( array $ids, array $domains = array( 'media', 'text' ) )
+	public function getItems(array $ids, array $domains = array('media', 'text'))
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'supplier' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'supplier');
 
-		$filter = $manager->createSearch( true );
+		$filter = $manager->createSearch(true);
 		$expr = [
-			$filter->compare( '==', 'supplier.id', $ids ),
+			$filter->compare('==', 'supplier.id', $ids),
 			$filter->getConditions(),
 		];
-		$filter->setConditions( $filter->combine( '&&', $expr ) );
+		$filter->setConditions($filter->combine('&&', $expr));
 
-		return $manager->searchItems( $filter, $domains );
+		return $manager->searchItems($filter, $domains);
 	}
 
 
@@ -80,8 +80,8 @@ 
 	 * @return array Ordered list of supplier items implementing \Aimeos\MShop\Supplier\Item\Iface
 	 * @since 2018.07
 	 */
-	public function searchItems( \Aimeos\MW\Criteria\Iface $filter, array $domains = array( 'media', 'text' ), &$total = null )
+	public function searchItems(\Aimeos\MW\Criteria\Iface $filter, array $domains = array('media', 'text'), &$total = null)
 	{
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'supplier' )->searchItems( $filter, $domains, $total );
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'supplier')->searchItems($filter, $domains, $total);
 	}
 }