aimeos / ai-controller-jobs

controller/common/src/Controller/Common/Product/Import/Csv/Processor/Text/Standard.php

Spacing +33 added lines, -33 removed lines

@@ -42,10 +42,10 @@ 
 	 * @param array $mapping Associative list of field position in CSV as key and domain item key as value
 	 * @param \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object Decorated processor
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
-			\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
+			\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null)
 	{
-		parent::__construct( $context, $mapping, $object );
+		parent::__construct($context, $mapping, $object);
 
 		/** controller/common/product/import/csv/processor/text/listtypes
 		 * Names of the product list types for texts that are updated or removed
@@ -66,7 +66,7 @@ 
 		 * @see controller/common/product/import/csv/processor/price/listtypes
 		 * @see controller/common/product/import/csv/processor/product/listtypes
 		 */
-		$this->listTypes = $context->getConfig()->get( 'controller/common/product/import/csv/processor/text/listtypes' );
+		$this->listTypes = $context->getConfig()->get('controller/common/product/import/csv/processor/text/listtypes');
 	}
 
 
@@ -77,53 +77,53 @@ 
 	 * @param array $data List of CSV fields with position as key and data as value
 	 * @return array List of data which hasn't been imported
 	 */
-	public function process( \Aimeos\MShop\Product\Item\Iface $product, array $data )
+	public function process(\Aimeos\MShop\Product\Item\Iface $product, array $data)
 	{
-		$listManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/lists' );
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'text' );
+		$listManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/lists');
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'text');
 
 		$listMap = [];
-		$map = $this->getMappedChunk( $data, $this->getMapping() );
-		$listItems = $product->getListItems( 'text', $this->listTypes );
+		$map = $this->getMappedChunk($data, $this->getMapping());
+		$listItems = $product->getListItems('text', $this->listTypes);
 
-		foreach( $listItems as $listItem )
+		foreach ($listItems as $listItem)
 		{
-			if( ( $refItem = $listItem->getRefItem() ) !== null ) {
-				$listMap[ $refItem->getContent() ][ $refItem->getType() ][ $listItem->getType() ] = $listItem;
+			if (($refItem = $listItem->getRefItem()) !== null) {
+				$listMap[$refItem->getContent()][$refItem->getType()][$listItem->getType()] = $listItem;
 			}
 		}
 
-		foreach( $map as $pos => $list )
+		foreach ($map as $pos => $list)
 		{
-			if( $this->checkEntry( $list ) === false ) {
+			if ($this->checkEntry($list) === false) {
 				continue;
 			}
 
-			$content = trim( $list['text.content'] );
-			$type = trim( isset( $list['text.type'] ) ? $list['text.type'] : 'name' );
-			$typecode = trim( isset( $list['product.lists.type'] ) ? $list['product.lists.type'] : 'default' );
+			$content = trim($list['text.content']);
+			$type = trim(isset($list['text.type']) ? $list['text.type'] : 'name');
+			$typecode = trim(isset($list['product.lists.type']) ? $list['product.lists.type'] : 'default');
 
-			if( isset( $listMap[$content][$type][$typecode] ) )
+			if (isset($listMap[$content][$type][$typecode]))
 			{
 				$listItem = $listMap[$content][$type][$typecode];
 				$refItem = $listItem->getRefItem();
-				unset( $listItems[ $listItem->getId() ] );
+				unset($listItems[$listItem->getId()]);
 			}
 			else
 			{
-				$listItem = $listManager->createItem( $typecode, 'text' );
-				$refItem = $manager->createItem( $type, 'product' );
+				$listItem = $listManager->createItem($typecode, 'text');
+				$refItem = $manager->createItem($type, 'product');
 			}
 
-			$refItem->fromArray( $this->addItemDefaults( $list ) );
-			$listItem->fromArray( $this->addListItemDefaults( $list, $pos ) );
+			$refItem->fromArray($this->addItemDefaults($list));
+			$listItem->fromArray($this->addListItemDefaults($list, $pos));
 
-			$product->addListItem( 'text', $listItem, $refItem );
+			$product->addListItem('text', $listItem, $refItem);
 		}
 
-		$product->deleteListItems( $listItems, true );
+		$product->deleteListItems($listItems, true);
 
-		return $this->getObject()->process( $product, $data );
+		return $this->getObject()->process($product, $data);
 	}
 
 
@@ -133,13 +133,13 @@ 
 	 * @param array $list Associative list of domain item keys and their values, e.g. "text.status" => 1
 	 * @return array Given associative list enriched by default values if they were not already set
 	 */
-	protected function addItemDefaults( array $list )
+	protected function addItemDefaults(array $list)
 	{
-		if( !isset( $list['text.label'] ) ) {
-			$list['text.label'] = mb_strcut( trim( $list['text.content'] ), 0, 255 );
+		if (!isset($list['text.label'])) {
+			$list['text.label'] = mb_strcut(trim($list['text.content']), 0, 255);
 		}
 
-		if( !isset( $list['text.status'] ) ) {
+		if (!isset($list['text.status'])) {
 			$list['text.status'] = 1;
 		}
 
@@ -153,10 +153,10 @@ 
 	 * @param array $list Associative list of key/value pairs from the mapping
 	 * @return boolean True if valid, false if not
 	 */
-	protected function checkEntry( array $list )
+	protected function checkEntry(array $list)
 	{
-		if( !isset( $list['text.content'] ) || trim( $list['text.content'] ) === '' || isset( $list['product.lists.type'] )
-			&& $this->listTypes !== null && !in_array( trim( $list['product.lists.type'] ), (array) $this->listTypes )
+		if (!isset($list['text.content']) || trim($list['text.content']) === '' || isset($list['product.lists.type'])
+			&& $this->listTypes !== null && !in_array(trim($list['product.lists.type']), (array) $this->listTypes)
 		) {
 			return false;
 		}

controller/common/src/Controller/Common/Product/Import/Csv/Processor/Attribute/Standard.php

Spacing +43 added lines, -43 removed lines

@@ -43,10 +43,10 @@ 
 	 * @param array $mapping Associative list of field position in CSV as key and domain item key as value
 	 * @param \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object Decorated processor
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
-		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
+		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null)
 	{
-		parent::__construct( $context, $mapping, $object );
+		parent::__construct($context, $mapping, $object);
 
 		/** controller/common/product/import/csv/processor/attribute/listtypes
 		 * Names of the product list types for attributes that are updated or removed
@@ -67,9 +67,9 @@ 
 		 * @see controller/common/product/import/csv/processor/price/listtypes
 		 * @see controller/common/product/import/csv/processor/text/listtypes
 		 */
-		$this->listTypes = $context->getConfig()->get( 'controller/common/product/import/csv/processor/attribute/listtypes');
+		$this->listTypes = $context->getConfig()->get('controller/common/product/import/csv/processor/attribute/listtypes');
 
-		$this->cache = $this->getCache( 'attribute' );
+		$this->cache = $this->getCache('attribute');
 	}
 
 
@@ -80,59 +80,59 @@ 
 	 * @param array $data List of CSV fields with position as key and data as value
 	 * @return array List of data which hasn't been imported
 	 */
-	public function process( \Aimeos\MShop\Product\Item\Iface $product, array $data )
+	public function process(\Aimeos\MShop\Product\Item\Iface $product, array $data)
 	{
 		$context = $this->getContext();
-		$listManager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists' );
-		$separator = $context->getConfig()->get( 'controller/common/product/import/csv/separator', "\n" );
+		$listManager = \Aimeos\MShop\Factory::createManager($context, 'product/lists');
+		$separator = $context->getConfig()->get('controller/common/product/import/csv/separator', "\n");
 
 		$listMap = [];
-		$map = $this->getMappedChunk( $data, $this->getMapping() );
-		$listItems = $product->getListItems( 'attribute', $this->listTypes );
+		$map = $this->getMappedChunk($data, $this->getMapping());
+		$listItems = $product->getListItems('attribute', $this->listTypes);
 
-		foreach( $listItems as $listItem )
+		foreach ($listItems as $listItem)
 		{
-			if( ( $refItem = $listItem->getRefItem() ) !== null ) {
-				$listMap[ $refItem->getCode() ][ $listItem->getType() ] = $listItem;
+			if (($refItem = $listItem->getRefItem()) !== null) {
+				$listMap[$refItem->getCode()][$listItem->getType()] = $listItem;
 			}
 		}
 
-		foreach( $map as $pos => $list )
+		foreach ($map as $pos => $list)
 		{
-			if( $this->checkEntry( $list ) === false ) {
+			if ($this->checkEntry($list) === false) {
 				continue;
 			}
 
-			$codes = explode( $separator, trim( $list['attribute.code'] ) );
+			$codes = explode($separator, trim($list['attribute.code']));
 
-			foreach( $codes as $code )
+			foreach ($codes as $code)
 			{
-				$code = trim( $code );
-				$typecode = trim( $this->getValue( $list, 'product.lists.type', 'default' ) );
+				$code = trim($code);
+				$typecode = trim($this->getValue($list, 'product.lists.type', 'default'));
 
-				if( isset( $listMap[$code][$typecode] ) )
+				if (isset($listMap[$code][$typecode]))
 				{
 					$listItem = $listMap[$code][$typecode];
-					unset( $listItems[ $listItem->getId() ] );
+					unset($listItems[$listItem->getId()]);
 				}
 				else
 				{
-					$listItem = $listManager->createItem( $typecode, 'attribute' );
+					$listItem = $listManager->createItem($typecode, 'attribute');
 				}
 
-				$attrItem = $this->getAttributeItem( $code, trim( $list['attribute.type'] ) );
-				$attrItem->fromArray( $list );
-				$attrItem->setCode( $code );
+				$attrItem = $this->getAttributeItem($code, trim($list['attribute.type']));
+				$attrItem->fromArray($list);
+				$attrItem->setCode($code);
 
-				$listItem->fromArray( $this->addListItemDefaults( $list, $pos ) );
+				$listItem->fromArray($this->addListItemDefaults($list, $pos));
 
-				$product->addListItem( 'attribute', $listItem, $attrItem );
+				$product->addListItem('attribute', $listItem, $attrItem);
 			}
 		}
 
-		$product->deleteListItems( $listItems );
+		$product->deleteListItems($listItems);
 
-		return $this->getObject()->process( $product, $data );
+		return $this->getObject()->process($product, $data);
 	}
 
 
@@ -142,11 +142,11 @@ 
 	 * @param array $list Associative list of key/value pairs from the mapped data
 	 * @return boolean True if the entry is valid, false if not
 	 */
-	protected function checkEntry( array $list )
+	protected function checkEntry(array $list)
 	{
-		if( !isset( $list['attribute.code'] ) || trim( $list['attribute.code'] ) === ''
-			|| trim( $list['attribute.type'] ) === '' || isset( $list['product.lists.type'] )
-			&& $this->listTypes !== null && !in_array( trim( $list['product.lists.type'] ), (array) $this->listTypes )
+		if (!isset($list['attribute.code']) || trim($list['attribute.code']) === ''
+			|| trim($list['attribute.type']) === '' || isset($list['product.lists.type'])
+			&& $this->listTypes !== null && !in_array(trim($list['product.lists.type']), (array) $this->listTypes)
 		) {
 			return false;
 		}
@@ -162,22 +162,22 @@ 
 	 * @param string $type Attribute type
 	 * @return \Aimeos\MShop\Attribute\Item\Iface Attribute item object
 	 */
-	protected function getAttributeItem( $code, $type )
+	protected function getAttributeItem($code, $type)
 	{
-		if( ( $item = $this->cache->get( $code, $type ) ) === null )
+		if (($item = $this->cache->get($code, $type)) === null)
 		{
-			$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'attribute' );
+			$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'attribute');
 
 			$item = $manager->createItem();
-			$item->setTypeId( $this->getTypeId( 'attribute/type', 'product', $type ) );
-			$item->setDomain( 'product' );
-			$item->setLabel( $code );
-			$item->setCode( $code );
-			$item->setStatus( 1 );
+			$item->setTypeId($this->getTypeId('attribute/type', 'product', $type));
+			$item->setDomain('product');
+			$item->setLabel($code);
+			$item->setCode($code);
+			$item->setStatus(1);
 
-			$item = $manager->saveItem( $item );
+			$item = $manager->saveItem($item);
 
-			$this->cache->set( $item );
+			$this->cache->set($item);
 		}
 
 		return $item;

controller/jobs/src/Controller/Jobs/Subscription/Process/Renew/Standard.php

Spacing +84 added lines, -84 removed lines

@@ -28,7 +28,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Subscription process renew' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Subscription process renew');
 	}
 
 
@@ -39,7 +39,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Renews subscriptions at next date' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Renews subscriptions at next date');
 	}
 
 
@@ -54,73 +54,73 @@ 
 		$config = $context->getConfig();
 		$logger = $context->getLogger();
 
-		$names = (array) $config->get( 'controller/common/subscription/process/processors', [] );
+		$names = (array) $config->get('controller/common/subscription/process/processors', []);
 
-		$date = date( 'Y-m-d' );
-		$processors = $this->getProcessors( $names );
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'subscription' );
+		$date = date('Y-m-d');
+		$processors = $this->getProcessors($names);
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'subscription');
 
-		$search = $manager->createSearch( true );
+		$search = $manager->createSearch(true);
 		$expr = [
-			$search->compare( '<=', 'subscription.datenext', $date ),
-			$search->combine( '||', [
-				$search->compare( '==', 'subscription.dateend', null ),
-				$search->compare( '>', 'subscription.dateend', $date ),
-			] ),
+			$search->compare('<=', 'subscription.datenext', $date),
+			$search->combine('||', [
+				$search->compare('==', 'subscription.dateend', null),
+				$search->compare('>', 'subscription.dateend', $date),
+			]),
 			$search->getConditions(),
 		];
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSortations( [$search->sort( '+', 'subscription.id' )] );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSortations([$search->sort('+', 'subscription.id')]);
 
 		$start = 0;
 
 		do
 		{
-			$search->setSlice( $start, 100 );
-			$items = $manager->searchItems( $search );
+			$search->setSlice($start, 100);
+			$items = $manager->searchItems($search);
 
-			foreach( $items as $item )
+			foreach ($items as $item)
 			{
 				try
 				{
-					$context = $this->createContext( $item->getOrderBaseId() );
-					$newOrder = $this->createOrderBase( $context, $item );
-					$newInvoice = $this->createOrderInvoice( $context, $newOrder );
+					$context = $this->createContext($item->getOrderBaseId());
+					$newOrder = $this->createOrderBase($context, $item);
+					$newInvoice = $this->createOrderInvoice($context, $newOrder);
 
 					try
 					{
-						$this->createPayment( $context, $newOrder, $newInvoice );
+						$this->createPayment($context, $newOrder, $newInvoice);
 
-						$interval = new \DateInterval( $item->getInterval() );
-						$item->setDateNext( date_create()->add( $interval )->format( 'Y-m-d' ) );
+						$interval = new \DateInterval($item->getInterval());
+						$item->setDateNext(date_create()->add($interval)->format('Y-m-d'));
 					}
-					catch( \Exception $e )
+					catch (\Exception $e)
 					{
-						$item->setReason( \Aimeos\MShop\Subscription\Item\Iface::REASON_PAYMENT );
-						$item->setDateEnd( date_create()->format( 'Y-m-d' ) );
-						$manager->saveItem( $item );
+						$item->setReason(\Aimeos\MShop\Subscription\Item\Iface::REASON_PAYMENT);
+						$item->setDateEnd(date_create()->format('Y-m-d'));
+						$manager->saveItem($item);
 
 						throw $e;
 					}
 
-					$manager->saveItem( $item );
+					$manager->saveItem($item);
 
-					foreach( $processors as $processor ) {
-						$processor->renew( $item, $newInvoice );
+					foreach ($processors as $processor) {
+						$processor->renew($item, $newInvoice);
 					}
 				}
-				catch( \Exception $e )
+				catch (\Exception $e)
 				{
 					$msg = 'Unable to process subscription with ID "%1$s": %2$s';
-					$logger->log( sprintf( $msg, $item->getId(), $e->getMessage() ) );
-					$logger->log( $e->getTraceAsString() );
+					$logger->log(sprintf($msg, $item->getId(), $e->getMessage()));
+					$logger->log($e->getTraceAsString());
 				}
 			}
 
-			$count = count( $items );
+			$count = count($items);
 			$start += $count;
 		}
-		while( $count === $search->getSliceSize() );
+		while ($count === $search->getSliceSize());
 	}
 
 
@@ -131,25 +131,25 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Base\Iface $basket Order including product and addresses
 	 * @return \Aimeos\MShop\Order\Item\Base\Iface Order with delivery service added
 	 */
-	protected function addDeliveryService( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Order\Item\Base\Iface $basket )
+	protected function addDeliveryService(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Order\Item\Base\Iface $basket)
 	{
 		$type = \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_DELIVERY;
 
-		$serviceManager = \Aimeos\MShop\Factory::createManager( $context, 'service' );
-		$orderServiceManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base/service' );
+		$serviceManager = \Aimeos\MShop\Factory::createManager($context, 'service');
+		$orderServiceManager = \Aimeos\MShop\Factory::createManager($context, 'order/base/service');
 
-		$search = $serviceManager->createSearch( true );
-		$search->setSortations( [$search->sort( '+', 'service.position' )] );
-		$search->setConditions( $search->compare( '==', 'service.type.code', $type ) );
+		$search = $serviceManager->createSearch(true);
+		$search->setSortations([$search->sort('+', 'service.position')]);
+		$search->setConditions($search->compare('==', 'service.type.code', $type));
 
-		foreach( $serviceManager->searchItems( $search, ['media', 'price', 'text'] ) as $item )
+		foreach ($serviceManager->searchItems($search, ['media', 'price', 'text']) as $item)
 		{
-			$provider = $serviceManager->getProvider( $item, $item->getType() );
+			$provider = $serviceManager->getProvider($item, $item->getType());
 
-			if( $provider->isAvailable( $basket ) === true )
+			if ($provider->isAvailable($basket) === true)
 			{
-				$orderServiceItem = $orderServiceManager->createItem()->copyFrom( $item );
-				$basket->addService( $orderServiceItem, $type );
+				$orderServiceItem = $orderServiceManager->createItem()->copyFrom($item);
+				$basket->addService($orderServiceItem, $type);
 
 				return $basket;
 			}
@@ -165,30 +165,30 @@ 
 	 * @param string $baseId Unique order base ID
 	 * @return \Aimeos\MShop\Context\Item\Iface New context object
 	 */
-	protected function createContext( $baseId )
+	protected function createContext($baseId)
 	{
 		$context = clone $this->getContext();
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' );
-		$baseItem = $manager->getItem( $baseId );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'order/base');
+		$baseItem = $manager->getItem($baseId);
 
 		$locale = $baseItem->getLocale();
 		$level = \Aimeos\MShop\Locale\Manager\Base::SITE_ALL;
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
-		$locale = $manager->bootstrap( $baseItem->getSiteCode(), $locale->getLanguageId(), $locale->getCurrencyId(), false, $level );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'locale');
+		$locale = $manager->bootstrap($baseItem->getSiteCode(), $locale->getLanguageId(), $locale->getCurrencyId(), false, $level);
 
-		$context->setLocale( $locale );
+		$context->setLocale($locale);
 
 		try
 		{
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );
-			$customerItem = $manager->getItem( $baseItem->getCustomerId(), ['customer/group'] );
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'customer');
+			$customerItem = $manager->getItem($baseItem->getCustomerId(), ['customer/group']);
 
-			$context->setUserId( $baseItem->getCustomerId() );
-			$context->setGroupIds( $customerItem->getGroups() );
+			$context->setUserId($baseItem->getCustomerId());
+			$context->setGroupIds($customerItem->getGroups());
 		}
-		catch( \Exception $e ) {} // Subscription without account
+		catch (\Exception $e) {} // Subscription without account
 
 		return $context;
 	}
@@ -201,39 +201,39 @@ 
 	 * @param \Aimeos\MShop\Subscription\Item\Iface $subscription Subscription item with order base ID and order product ID
 	 * @return \Aimeos\MShop\Order\Item\Base\Iface Complete order with product, addresses and services saved to the storage
 	 */
-	protected function createOrderBase( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Subscription\Item\Iface $subscription )
+	protected function createOrderBase(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Subscription\Item\Iface $subscription)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'order/base');
 
-		$basket = $manager->load( $subscription->getOrderBaseId() );
+		$basket = $manager->load($subscription->getOrderBaseId());
 
 		$newBasket = $manager->createItem();
-		$newBasket->setCustomerId( $basket->getCustomerId() );
+		$newBasket->setCustomerId($basket->getCustomerId());
 
-		foreach( $basket->getProducts() as $orderProduct )
+		foreach ($basket->getProducts() as $orderProduct)
 		{
-			if( $orderProduct->getId() === $subscription->getOrderProductId() )
+			if ($orderProduct->getId() === $subscription->getOrderProductId())
 			{
-				foreach( $orderProduct->getAttributeItems() as $attrItem ) {
-					$attrItem->setId( null );
+				foreach ($orderProduct->getAttributeItems() as $attrItem) {
+					$attrItem->setId(null);
 				}
-				$newBasket->addProduct( $orderProduct->setId( null ) );
+				$newBasket->addProduct($orderProduct->setId(null));
 			}
 		}
 
-		foreach( $basket->getAddresses() as $type => $orderAddress ) {
-			$newBasket->setAddress( $orderAddress, $type );
+		foreach ($basket->getAddresses() as $type => $orderAddress) {
+			$newBasket->setAddress($orderAddress, $type);
 		}
 
 		$type = \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT;
 
-		foreach( $basket->getService( $type ) as $orderService ) {
-			$newBasket->addService( $orderService, $type );
+		foreach ($basket->getService($type) as $orderService) {
+			$newBasket->addService($orderService, $type);
 		}
 
-		$newBasket = $this->addDeliveryService( $context, $newBasket );
+		$newBasket = $this->addDeliveryService($context, $newBasket);
 
-		return $manager->store( $newBasket );
+		return $manager->store($newBasket);
 	}
 
 
@@ -244,15 +244,15 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Base\Iface $basket Complete order with product, addresses and services saved to the storage
 	 * @return \Aimeos\MShop\Order\Item\Iface New invoice item associated to the order saved to the storage
 	 */
-	protected function createOrderInvoice( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Order\Item\Base\Iface $basket )
+	protected function createOrderInvoice(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Order\Item\Base\Iface $basket)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'order');
 
 		$item = $manager->createItem();
-		$item->setBaseId( $basket->getId() );
-		$item->setType( 'subscription' );
+		$item->setBaseId($basket->getId());
+		$item->setType('subscription');
 
-		return $manager->saveItem( $item );
+		return $manager->saveItem($item);
 	}
 
 
@@ -263,17 +263,17 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Base\Iface $basket Complete order with product, addresses and services
 	 * @param \Aimeos\MShop\Order\Item\Iface New invoice item associated to the order
 	 */
-	protected function createPayment( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Order\Item\Base\Iface $basket,
-		\Aimeos\MShop\Order\Item\Iface $invoice )
+	protected function createPayment(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Order\Item\Base\Iface $basket,
+		\Aimeos\MShop\Order\Item\Iface $invoice)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'service' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'service');
 
-		foreach( $basket->getService( \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT ) as $service )
+		foreach ($basket->getService(\Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT) as $service)
 		{
-			$item = $manager->getItem( $service->getServiceId() );
-			$provider = $manager->getProvider( $item, 'payment' );
+			$item = $manager->getItem($service->getServiceId());
+			$provider = $manager->getProvider($item, 'payment');
 
-			$provider->repay( $invoice );
+			$provider->repay($invoice);
 		}
 	}
 }

controller/jobs/src/Controller/Jobs/Order/Export/Csv/Standard.php

Spacing +60 added lines, -60 removed lines

@@ -28,7 +28,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Order export CSV' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Order export CSV');
 	}
 
 
@@ -39,7 +39,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Exports orders to CSV file' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Exports orders to CSV file');
 	}
 
 
@@ -73,7 +73,7 @@ 
 		 * @category Developer
 		 * @see controller/common/order/export/csv/max-size
 		 */
-		$mappings = $config->get( 'controller/common/order/export/csv/mapping', $mappings );
+		$mappings = $config->get('controller/common/order/export/csv/mapping', $mappings);
 
 		/** controller/jobs/order/export/csv/mapping
 		 * List of mappings between the position in the CSV file and item keys
@@ -88,7 +88,7 @@ 
 		 * @category Developer
 		 * @see controller/common/order/export/csv/max-size
 		 */
-		$mappings = $config->get( 'controller/jobs/order/export/csv/mapping', $mappings );
+		$mappings = $config->get('controller/jobs/order/export/csv/mapping', $mappings);
 
 
 		/** controller/common/order/export/csv/max-size
@@ -106,29 +106,29 @@ 
 		 * @category Developer
 		 * @see controller/common/order/export/csv/mapping
 		 */
-		$maxcnt = (int) $config->get( 'controller/common/order/export/csv/max-size', 1000 );
+		$maxcnt = (int) $config->get('controller/common/order/export/csv/max-size', 1000);
 
 
-		$processors = $this->getProcessors( $mappings );
-		$mq = $context->getMessageQueueManager()->get( 'mq-admin' )->getQueue( 'order-export' );
+		$processors = $this->getProcessors($mappings);
+		$mq = $context->getMessageQueueManager()->get('mq-admin')->getQueue('order-export');
 
-		while( ( $msg = $mq->get() ) !== null )
+		while (($msg = $mq->get()) !== null)
 		{
 			try
 			{
-				if( ( $data = json_decode( $msg->getBody(), true ) ) === null ) {
-					throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Invalid message: %1$s', $msg->getBody() ) );
+				if (($data = json_decode($msg->getBody(), true)) === null) {
+					throw new \Aimeos\Controller\Jobs\Exception(sprintf('Invalid message: %1$s', $msg->getBody()));
 				}
 
-				$this->export( $processors, $data, $maxcnt );
+				$this->export($processors, $data, $maxcnt);
 			}
-			catch( \Exception $e )
+			catch (\Exception $e)
 			{
-				$logger->log( 'Order export error: ' . $e->getMessage() );
-				$logger->log( $e->getTraceAsString() );
+				$logger->log('Order export error: ' . $e->getMessage());
+				$logger->log($e->getTraceAsString());
 			}
 
-			$mq->del( $msg );
+			$mq->del($msg);
 		}
 	}
 
@@ -139,15 +139,15 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context item
 	 * @param string $path Absolute path to the exported file
 	 */
-	protected function addJob( $context, $path )
+	protected function addJob($context, $path)
 	{
-		$manager = \Aimeos\MAdmin\Factory::createManager( $context, 'job' );
+		$manager = \Aimeos\MAdmin\Factory::createManager($context, 'job');
 
 		$item = $manager->createItem();
-		$item->setResult( ['file' => $path] );
-		$item->setLabel( $path );
+		$item->setResult(['file' => $path]);
+		$item->setLabel($path);
 
-		$manager->saveItem( $item, false );
+		$manager->saveItem($item, false);
 	}
 
 
@@ -177,7 +177,7 @@ 
 		 * @see controller/jobs/order/export/csv/container/content
 		 * @see controller/jobs/order/export/csv/container/options
 		 */
-		$location = $config->get( 'controller/jobs/order/export/csv/location', sys_get_temp_dir() );
+		$location = $config->get('controller/jobs/order/export/csv/location', sys_get_temp_dir());
 
 		/** controller/jobs/order/export/csv/container/type
 		 * Nave of the container type to read the data from
@@ -200,7 +200,7 @@ 
 		 * @see controller/jobs/order/export/csv/container/content
 		 * @see controller/jobs/order/export/csv/container/options
 		 */
-		$container = $config->get( 'controller/jobs/order/export/csv/container/type', 'Directory' );
+		$container = $config->get('controller/jobs/order/export/csv/container/type', 'Directory');
 
 		/** controller/jobs/order/export/csv/container/content
 		 * Name of the content type inside the container to read the data from
@@ -221,7 +221,7 @@ 
 		 * @see controller/jobs/order/export/csv/container/type
 		 * @see controller/jobs/order/export/csv/container/options
 		 */
-		$content = $config->get( 'controller/jobs/order/export/csv/container/content', 'CSV' );
+		$content = $config->get('controller/jobs/order/export/csv/container/content', 'CSV');
 
 		/** controller/jobs/order/export/csv/container/options
 		 * List of file container options for the order export files
@@ -239,9 +239,9 @@ 
 		 * @see controller/jobs/order/export/csv/container/content
 		 * @see controller/jobs/order/export/csv/container/type
 		 */
-		$options = $config->get( 'controller/jobs/order/export/csv/container/options', [] );
+		$options = $config->get('controller/jobs/order/export/csv/container/options', []);
 
-		return \Aimeos\MW\Container\Factory::getContainer( $location, $container, $content, $options );
+		return \Aimeos\MW\Container\Factory::getContainer($location, $container, $content, $options);
 	}
 
 
@@ -253,56 +253,56 @@ 
 	 * @param integer $maxcnt Maximum number of retrieved orders at once
 	 * @return string Path of the file containing the exported data
 	 */
-	protected function export( array $processors, $msg, $maxcnt )
+	protected function export(array $processors, $msg, $maxcnt)
 	{
-		$lcontext = $this->getLocaleContext( $msg );
+		$lcontext = $this->getLocaleContext($msg);
 		$baseRef = ['order/base/address', 'order/base/coupon', 'order/base/product', 'order/base/service'];
 
-		$manager = \Aimeos\MShop\Factory::createManager( $lcontext, 'order' );
-		$baseManager = \Aimeos\MShop\Factory::createManager( $lcontext, 'order/base' );
+		$manager = \Aimeos\MShop\Factory::createManager($lcontext, 'order');
+		$baseManager = \Aimeos\MShop\Factory::createManager($lcontext, 'order/base');
 
 		$container = $this->getContainer();
-		$content = $container->create( 'order-export_' . date( 'Y-m-d_H-i-s' ) );
-		$search = $this->initCriteria( $manager->createSearch()->setSlice( 0, 0x7fffffff ), $msg );
+		$content = $container->create('order-export_' . date('Y-m-d_H-i-s'));
+		$search = $this->initCriteria($manager->createSearch()->setSlice(0, 0x7fffffff), $msg);
 		$start = 0;
 
 		do
 		{
 			$baseIds = [];
-			$search->setSlice( $start, $maxcnt );
-			$items = $manager->searchItems( $search );
+			$search->setSlice($start, $maxcnt);
+			$items = $manager->searchItems($search);
 
-			foreach( $items as $item ) {
+			foreach ($items as $item) {
 				$baseIds[] = $item->getBaseId();
 			}
 
 			$baseSearch = $baseManager->createSearch();
-			$baseSearch->setConditions( $baseSearch->compare( '==', 'order.base.id', $baseIds ) );
-			$baseSearch->setSlice( 0, count( $baseIds ) );
+			$baseSearch->setConditions($baseSearch->compare('==', 'order.base.id', $baseIds));
+			$baseSearch->setSlice(0, count($baseIds));
 
-			$baseItems = $baseManager->searchItems( $baseSearch, $baseRef );
+			$baseItems = $baseManager->searchItems($baseSearch, $baseRef);
 
-			foreach( $items as $id => $item )
+			foreach ($items as $id => $item)
 			{
-				foreach( $processors as $type => $processor )
+				foreach ($processors as $type => $processor)
 				{
-					foreach( $processor->process( $item, $baseItems[$item->getBaseId()] ) as $line ) {
-						$content->add( [0 => $type, 1 => $id] + $line );
+					foreach ($processor->process($item, $baseItems[$item->getBaseId()]) as $line) {
+						$content->add([0 => $type, 1 => $id] + $line);
 					}
 				}
 			}
 
-			$count = count( $items );
+			$count = count($items);
 			$start += $count;
 		}
-		while( $count === $search->getSliceSize() );
+		while ($count === $search->getSliceSize());
 
 		$path = $content->getResource();
-		$container->add( $content );
+		$container->add($content);
 		$container->close();
 
-		$path = $this->moveFile( $lcontext, $path );
-		$this->addJob( $lcontext, $path );
+		$path = $this->moveFile($lcontext, $path);
+		$this->addJob($lcontext, $path);
 	}
 
 
@@ -312,15 +312,15 @@ 
 	 * @param array $msg Message data including a "sitecode" value
 	 * @return \Aimeos\MShop\Context\Item\Iface New context item with updated locale
 	 */
-	protected function getLocaleContext( array $msg )
+	protected function getLocaleContext(array $msg)
 	{
 		$lcontext = clone $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $lcontext, 'locale' );
+		$manager = \Aimeos\MShop\Factory::createManager($lcontext, 'locale');
 
-		$sitecode = ( isset( $msg['sitecode'] ) ? $msg['sitecode'] : 'default' );
-		$localeItem = $manager->bootstrap( $sitecode, '', '', false, \Aimeos\MShop\Locale\Manager\Base::SITE_PATH );
+		$sitecode = (isset($msg['sitecode']) ? $msg['sitecode'] : 'default');
+		$localeItem = $manager->bootstrap($sitecode, '', '', false, \Aimeos\MShop\Locale\Manager\Base::SITE_PATH);
 
-		return $lcontext->setLocale( $localeItem );
+		return $lcontext->setLocale($localeItem);
 	}
 
 
@@ -331,14 +331,14 @@ 
 	 * @param array $msg Message data
 	 * @return \Aimeos\MW\Criteria\Iface Initialized criteria object
 	 */
-	protected function initCriteria( \Aimeos\MW\Criteria\Iface $criteria, array $msg )
+	protected function initCriteria(\Aimeos\MW\Criteria\Iface $criteria, array $msg)
 	{
-		if( isset( $msg['filter'] ) ) {
-			$criteria->setConditions( $criteria->toConditions( $msg['filter'] ) );
+		if (isset($msg['filter'])) {
+			$criteria->setConditions($criteria->toConditions($msg['filter']));
 		}
 
-		if( isset( $msg['sort'] ) ) {
-			$criteria->setSortations( $criteria->toSortations( $msg['sort'] ) );
+		if (isset($msg['sort'])) {
+			$criteria->setSortations($criteria->toSortations($msg['sort']));
 		}
 
 		return $criteria;
@@ -352,12 +352,12 @@ 
 	 * @param string $path Absolute path to the exported file
 	 * @return string Relative path of the file in the storage
 	 */
-	protected function moveFile( $context, $path )
+	protected function moveFile($context, $path)
 	{
-		$filename = basename( $path );
-		$context->getFileSystemManager()->get( 'fs-admin' )->writef( $filename, $path );
+		$filename = basename($path);
+		$context->getFileSystemManager()->get('fs-admin')->writef($filename, $path);
 
-		unlink( $path );
+		unlink($path);
 		return $filename;
 	}
 }

controller/jobs/src/Controller/Jobs/Subscription/Process/Begin/Standard.php

Spacing +34 added lines, -34 removed lines

@@ -28,7 +28,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Subscription process start' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Subscription process start');
 	}
 
 
@@ -39,7 +39,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Process subscriptions initially' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Process subscriptions initially');
 	}
 
 
@@ -67,7 +67,7 @@ 
 		 * @see controller/common/subscription/process/payment-status
 		 * @see controller/common/subscription/process/payment-days
 		 */
-		$names = (array) $config->get( 'controller/common/subscription/process/processors', [] );
+		$names = (array) $config->get('controller/common/subscription/process/processors', []);
 
 		/** controller/common/subscription/process/payment-status
 		 * Minimum payment status that will activate the subscription
@@ -86,7 +86,7 @@ 
 		 * @see controller/common/subscription/process/payment-days
 		 */
 		$status = \Aimeos\MShop\Order\Item\Base::PAY_AUTHORIZED;
-		$status = $config->get( 'controller/common/subscription/process/payment-status', $status );
+		$status = $config->get('controller/common/subscription/process/payment-status', $status);
 
 		/** controller/common/subscription/process/payment-days
 		 * Number of days to wait for the payment until subscription is removed
@@ -104,74 +104,74 @@ 
 		 * @see controller/common/subscription/process/processors
 		 * @see controller/common/subscription/process/payment-status
 		 */
-		$days = (float) $config->get( 'controller/common/subscription/process/payment-days', 3 );
+		$days = (float) $config->get('controller/common/subscription/process/payment-days', 3);
 
 
-		$processors = $this->getProcessors( $names );
-		$orderManager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'subscription' );
+		$processors = $this->getProcessors($names);
+		$orderManager = \Aimeos\MShop\Factory::createManager($context, 'order');
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'subscription');
 
-		$search = $manager->createSearch( true );
+		$search = $manager->createSearch(true);
 		$expr = [
-			$search->compare( '==', 'subscription.datenext', null ),
+			$search->compare('==', 'subscription.datenext', null),
 			$search->getConditions(),
 		];
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSortations( [$search->sort( '+', 'subscription.id' )] );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSortations([$search->sort('+', 'subscription.id')]);
 
-		$date = date( 'Y-m-d H:i:s', time() - 86400 * $days );
+		$date = date('Y-m-d H:i:s', time() - 86400 * $days);
 		$start = 0;
 
 		do
 		{
 			$ordBaseIds = $payStatus = [];
 
-			$search->setSlice( $start, 100 );
-			$items = $manager->searchItems( $search );
+			$search->setSlice($start, 100);
+			$items = $manager->searchItems($search);
 
-			foreach( $items as $item ) {
+			foreach ($items as $item) {
 				$ordBaseIds[] = $item->getOrderBaseId();
 			}
 
-			$orderSearch = $orderManager->createSearch()->setSlice( 0, $search->getSliceSize() );
-			$orderSearch->setConditions( $orderSearch->compare( '==', 'order.base.id', $ordBaseIds ) );
-			$orderSearch->setSortations( [$orderSearch->sort( '+', 'order.id' )] );
+			$orderSearch = $orderManager->createSearch()->setSlice(0, $search->getSliceSize());
+			$orderSearch->setConditions($orderSearch->compare('==', 'order.base.id', $ordBaseIds));
+			$orderSearch->setSortations([$orderSearch->sort('+', 'order.id')]);
 
-			foreach( $orderManager->searchItems( $orderSearch ) as $orderItem ) {
+			foreach ($orderManager->searchItems($orderSearch) as $orderItem) {
 				$payStatus[$orderItem->getBaseId()] = $orderItem->getPaymentStatus();
 			}
 
-			foreach( $items as $item )
+			foreach ($items as $item)
 			{
 				try
 				{
-					if( isset( $payStatus[$item->getOrderBaseId()] ) && $payStatus[$item->getOrderBaseId()] >= $status )
+					if (isset($payStatus[$item->getOrderBaseId()]) && $payStatus[$item->getOrderBaseId()] >= $status)
 					{
-						foreach( $processors as $processor ) {
-							$processor->begin( $item );
+						foreach ($processors as $processor) {
+							$processor->begin($item);
 						}
 
-						$interval = new \DateInterval( $item->getInterval() );
-						$item->setDateNext( date_create( $item->getTimeCreated() )->add( $interval )->format( 'Y-m-d' ) );
+						$interval = new \DateInterval($item->getInterval());
+						$item->setDateNext(date_create($item->getTimeCreated())->add($interval)->format('Y-m-d'));
 					}
-					elseif( $item->getTimeCreated() < $date )
+					elseif ($item->getTimeCreated() < $date)
 					{
-						$item->setStatus( 0 );
+						$item->setStatus(0);
 					}
 
-					$manager->saveItem( $item );
+					$manager->saveItem($item);
 				}
-				catch( \Exception $e )
+				catch (\Exception $e)
 				{
 					$msg = 'Unable to process subscription with ID "%1$S": %2$s';
-					$logger->log( sprintf( $msg, $item->getId(), $e->getMessage() ) );
-					$logger->log( $e->getTraceAsString() );
+					$logger->log(sprintf($msg, $item->getId(), $e->getMessage()));
+					$logger->log($e->getTraceAsString());
 				}
 			}
 
-			$count = count( $items );
+			$count = count($items);
 			$start += $count;
 		}
-		while( $count === $search->getSliceSize() );
+		while ($count === $search->getSliceSize());
 	}
 }

controller/jobs/src/Controller/Jobs/Product/Import/Csv/Standard.php

Spacing +76 added lines, -76 removed lines

@@ -31,7 +31,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Product import CSV' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Product import CSV');
 	}
 
 
@@ -42,7 +42,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Imports new and updates existing products from CSV files' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Imports new and updates existing products from CSV files');
 	}
 
 
@@ -57,7 +57,7 @@ 
 		$context = $this->getContext();
 		$config = $context->getConfig();
 		$logger = $context->getLogger();
-		$domains = array( 'attribute', 'media', 'price', 'product', 'product/property', 'text' );
+		$domains = array('attribute', 'media', 'price', 'product', 'product/property', 'text');
 		$mappings = $this->getDefaultMapping();
 
 
@@ -77,7 +77,7 @@ 
 		 * @see controller/common/product/import/csv/converter
 		 * @see controller/common/product/import/csv/max-size
 		 */
-		$domains = $config->get( 'controller/common/product/import/csv/domains', $domains );
+		$domains = $config->get('controller/common/product/import/csv/domains', $domains);
 
 		/** controller/jobs/product/import/csv/domains
 		 * List of item domain names that should be retrieved along with the product items
@@ -97,7 +97,7 @@ 
 		 * @see controller/jobs/product/import/csv/backup
 		 * @see controller/common/product/import/csv/max-size
 		 */
-		$domains = $config->get( 'controller/jobs/product/import/csv/domains', $domains );
+		$domains = $config->get('controller/jobs/product/import/csv/domains', $domains);
 
 
 		/** controller/common/product/import/csv/mapping
@@ -125,7 +125,7 @@ 
 		 * @see controller/common/product/import/csv/converter
 		 * @see controller/common/product/import/csv/max-size
 		 */
-		$mappings = $config->get( 'controller/common/product/import/csv/mapping', $mappings );
+		$mappings = $config->get('controller/common/product/import/csv/mapping', $mappings);
 
 		/** controller/jobs/product/import/csv/mapping
 		 * List of mappings between the position in the CSV file and item keys
@@ -145,7 +145,7 @@ 
 		 * @see controller/jobs/product/import/csv/backup
 		 * @see controller/common/product/import/csv/max-size
 		 */
-		$mappings = $config->get( 'controller/jobs/product/import/csv/mapping', $mappings );
+		$mappings = $config->get('controller/jobs/product/import/csv/mapping', $mappings);
 
 
 		/** controller/common/product/import/csv/converter
@@ -187,7 +187,7 @@ 
 		 * @see controller/common/product/import/csv/mapping
 		 * @see controller/common/product/import/csv/max-size
 		 */
-		$converters = $config->get( 'controller/common/product/import/csv/converter', [] );
+		$converters = $config->get('controller/common/product/import/csv/converter', []);
 
 		/** controller/jobs/product/import/csv/converter
 		 * List of converter names for the values at the position in the CSV file
@@ -207,7 +207,7 @@ 
 		 * @see controller/jobs/product/import/csv/backup
 		 * @see controller/common/product/import/csv/max-size
 		 */
-		$converters = $config->get( 'controller/jobs/product/import/csv/converter', $converters );
+		$converters = $config->get('controller/jobs/product/import/csv/converter', $converters);
 
 
 		/** controller/common/product/import/csv/max-size
@@ -227,7 +227,7 @@ 
 		 * @see controller/common/product/import/csv/mapping
 		 * @see controller/common/product/import/csv/converter
 		 */
-		$maxcnt = (int) $config->get( 'controller/common/product/import/csv/max-size', 1000 );
+		$maxcnt = (int) $config->get('controller/common/product/import/csv/max-size', 1000);
 
 
 		/** controller/jobs/product/import/csv/skip-lines
@@ -249,7 +249,7 @@ 
 		 * @see controller/jobs/product/import/csv/backup
 		 * @see controller/common/product/import/csv/max-size
 		 */
-		$skiplines = (int) $config->get( 'controller/jobs/product/import/csv/skip-lines', 0 );
+		$skiplines = (int) $config->get('controller/jobs/product/import/csv/skip-lines', 0);
 
 
 		/** controller/jobs/product/import/csv/strict
@@ -273,7 +273,7 @@ 
 		 * @see controller/jobs/product/import/csv/backup
 		 * @see controller/common/product/import/csv/max-size
 		 */
-		$strict = (bool) $config->get( 'controller/jobs/product/import/csv/strict', true );
+		$strict = (bool) $config->get('controller/jobs/product/import/csv/strict', true);
 
 
 		/** controller/jobs/product/import/csv/backup
@@ -306,74 +306,74 @@ 
 		 * @see controller/jobs/product/import/csv/strict
 		 * @see controller/common/product/import/csv/max-size
 		 */
-		$backup = $config->get( 'controller/jobs/product/import/csv/backup' );
+		$backup = $config->get('controller/jobs/product/import/csv/backup');
 
 
-		if( !isset( $mappings['item'] ) || !is_array( $mappings['item'] ) )
+		if (!isset($mappings['item']) || !is_array($mappings['item']))
 		{
-			$msg = sprintf( 'Required mapping key "%1$s" is missing or contains no array', 'item' );
-			throw new \Aimeos\Controller\Jobs\Exception( $msg );
+			$msg = sprintf('Required mapping key "%1$s" is missing or contains no array', 'item');
+			throw new \Aimeos\Controller\Jobs\Exception($msg);
 		}
 
 		try
 		{
 			$procMappings = $mappings;
-			unset( $procMappings['item'] );
+			unset($procMappings['item']);
 
-			$codePos = $this->getCodePosition( $mappings['item'] );
-			$convlist = $this->getConverterList( $converters );
-			$processor = $this->getProcessors( $procMappings );
+			$codePos = $this->getCodePosition($mappings['item']);
+			$convlist = $this->getConverterList($converters);
+			$processor = $this->getProcessors($procMappings);
 			$container = $this->getContainer();
 			$path = $container->getName();
 
-			$msg = sprintf( 'Started product import from "%1$s" (%2$s)', $path, __CLASS__ );
-			$logger->log( $msg, \Aimeos\MW\Logger\Base::NOTICE );
+			$msg = sprintf('Started product import from "%1$s" (%2$s)', $path, __CLASS__);
+			$logger->log($msg, \Aimeos\MW\Logger\Base::NOTICE);
 
-			foreach( $container as $content )
+			foreach ($container as $content)
 			{
 				$name = $content->getName();
 
-				for( $i = 0; $i < $skiplines; $i++ ) {
+				for ($i = 0; $i < $skiplines; $i++) {
 					$content->next();
 				}
 
-				while( ( $data = $this->getData( $content, $maxcnt, $codePos ) ) !== [] )
+				while (($data = $this->getData($content, $maxcnt, $codePos)) !== [])
 				{
-					$data = $this->convertData( $convlist, $data );
-					$products = $this->getProducts( array_keys( $data ), $domains );
-					$errcnt = $this->import( $products, $data, $mappings['item'], $processor, $strict );
-					$chunkcnt = count( $data );
+					$data = $this->convertData($convlist, $data);
+					$products = $this->getProducts(array_keys($data), $domains);
+					$errcnt = $this->import($products, $data, $mappings['item'], $processor, $strict);
+					$chunkcnt = count($data);
 
 					$msg = 'Imported product lines from "%1$s": %2$d/%3$d (%4$s)';
-					$logger->log( sprintf( $msg, $name, $chunkcnt - $errcnt, $chunkcnt, __CLASS__ ), \Aimeos\MW\Logger\Base::NOTICE );
+					$logger->log(sprintf($msg, $name, $chunkcnt - $errcnt, $chunkcnt, __CLASS__), \Aimeos\MW\Logger\Base::NOTICE);
 
 					$errors += $errcnt;
 					$total += $chunkcnt;
-					unset( $products, $data );
+					unset($products, $data);
 				}
 			}
 
 			$container->close();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$logger->log( 'Product import error: ' . $e->getMessage() );
-			$logger->log( $e->getTraceAsString() );
+			$logger->log('Product import error: ' . $e->getMessage());
+			$logger->log($e->getTraceAsString());
 
-			throw new \Aimeos\Controller\Jobs\Exception( $e->getMessage() );
+			throw new \Aimeos\Controller\Jobs\Exception($e->getMessage());
 		}
 
 		$msg = 'Finished product import from "%1$s": %2$d successful, %3$s errors, %4$s total (%5$s)';
-		$logger->log( sprintf( $msg, $path, $total - $errors, $errors, $total, __CLASS__ ), \Aimeos\MW\Logger\Base::NOTICE );
+		$logger->log(sprintf($msg, $path, $total - $errors, $errors, $total, __CLASS__), \Aimeos\MW\Logger\Base::NOTICE);
 
-		if( $errors > 0 )
+		if ($errors > 0)
 		{
-			$msg = sprintf( 'Invalid product lines in "%1$s": %2$d/%3$d', $path, $errors, $total );
-			throw new \Aimeos\Controller\Jobs\Exception( $msg );
+			$msg = sprintf('Invalid product lines in "%1$s": %2$d/%3$d', $path, $errors, $total);
+			throw new \Aimeos\Controller\Jobs\Exception($msg);
 		}
 
-		if( !empty( $backup ) && @rename( $path, strftime( $backup ) ) === false ) {
-			throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Unable to move imported file' ) );
+		if (!empty($backup) && @rename($path, strftime($backup)) === false) {
+			throw new \Aimeos\Controller\Jobs\Exception(sprintf('Unable to move imported file'));
 		}
 	}
 
@@ -385,16 +385,16 @@ 
 	 * @return integer Position of the "product.code" column
 	 * @throws \Aimeos\Controller\Jobs\Exception If no mapping for "product.code" is found
 	 */
-	protected function getCodePosition( array $mapping )
+	protected function getCodePosition(array $mapping)
 	{
-		foreach( $mapping as $pos => $key )
+		foreach ($mapping as $pos => $key)
 		{
-			if( $key === 'product.code' ) {
+			if ($key === 'product.code') {
 				return $pos;
 			}
 		}
 
-		throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'No "product.code" column in CSV mapping found' ) );
+		throw new \Aimeos\Controller\Jobs\Exception(sprintf('No "product.code" column in CSV mapping found'));
 	}
 
 
@@ -429,7 +429,7 @@ 
 		 * @see controller/jobs/product/import/csv/container/content
 		 * @see controller/jobs/product/import/csv/container/options
 		 */
-		$location = $config->get( 'controller/jobs/product/import/csv/location' );
+		$location = $config->get('controller/jobs/product/import/csv/location');
 
 		/** controller/jobs/product/import/csv/container/type
 		 * Nave of the container type to read the data from
@@ -452,7 +452,7 @@ 
 		 * @see controller/jobs/product/import/csv/container/content
 		 * @see controller/jobs/product/import/csv/container/options
 		 */
-		$container = $config->get( 'controller/jobs/product/import/csv/container/type', 'Directory' );
+		$container = $config->get('controller/jobs/product/import/csv/container/type', 'Directory');
 
 		/** controller/jobs/product/import/csv/container/content
 		 * Name of the content type inside the container to read the data from
@@ -473,7 +473,7 @@ 
 		 * @see controller/jobs/product/import/csv/container/type
 		 * @see controller/jobs/product/import/csv/container/options
 		 */
-		$content = $config->get( 'controller/jobs/product/import/csv/container/content', 'CSV' );
+		$content = $config->get('controller/jobs/product/import/csv/container/content', 'CSV');
 
 		/** controller/jobs/product/import/csv/container/options
 		 * List of file container options for the product import files
@@ -491,15 +491,15 @@ 
 		 * @see controller/jobs/product/import/csv/container/content
 		 * @see controller/jobs/product/import/csv/container/type
 		 */
-		$options = $config->get( 'controller/jobs/product/import/csv/container/options', [] );
+		$options = $config->get('controller/jobs/product/import/csv/container/options', []);
 
-		if( $location === null )
+		if ($location === null)
 		{
-			$msg = sprintf( 'Required configuration for "%1$s" is missing', 'controller/jobs/product/import/csv/location' );
-			throw new \Aimeos\Controller\Jobs\Exception( $msg );
+			$msg = sprintf('Required configuration for "%1$s" is missing', 'controller/jobs/product/import/csv/location');
+			throw new \Aimeos\Controller\Jobs\Exception($msg);
 		}
 
-		return \Aimeos\MW\Container\Factory::getContainer( $location, $container, $content, $options );
+		return \Aimeos\MW\Container\Factory::getContainer($location, $container, $content, $options);
 	}
 
 
@@ -514,65 +514,65 @@ 
 	 * @return integer Number of products that couldn't be imported
 	 * @throws \Aimeos\Controller\Jobs\Exception
 	 */
-	protected function import( array $products, array $data, array $mapping,
-		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $processor, $strict )
+	protected function import(array $products, array $data, array $mapping,
+		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $processor, $strict)
 	{
 		$items = [];
 		$errors = 0;
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
-		$indexManager = \Aimeos\MShop\Factory::createManager( $context, 'index' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product');
+		$indexManager = \Aimeos\MShop\Factory::createManager($context, 'index');
 
-		foreach( $data as $code => $list )
+		foreach ($data as $code => $list)
 		{
 			$manager->begin();
 
 			try
 			{
-				$code = trim( $code );
+				$code = trim($code);
 
-				if( isset( $products[$code] ) ) {
+				if (isset($products[$code])) {
 					$product = $products[$code];
 				} else {
 					$product = $manager->createItem();
 				}
 
-				$map = $this->getMappedChunk( $list, $mapping );
+				$map = $this->getMappedChunk($list, $mapping);
 
-				if( isset( $map[0] ) )
+				if (isset($map[0]))
 				{
 					$map = $map[0]; // there can only be one chunk for the base product data
 
-					$typecode = trim( isset( $map['product.type'] ) ? $map['product.type'] : 'default' );
-					$map['product.typeid'] = $this->getTypeId( 'product/type', 'product', $typecode );
+					$typecode = trim(isset($map['product.type']) ? $map['product.type'] : 'default');
+					$map['product.typeid'] = $this->getTypeId('product/type', 'product', $typecode);
 
-					$product->fromArray( $this->addItemDefaults( $map ) );
-					$product = $manager->saveItem( $product );
+					$product->fromArray($this->addItemDefaults($map));
+					$product = $manager->saveItem($product);
 
-					$list = $processor->process( $product, $list );
+					$list = $processor->process($product, $list);
 
-					$product = $manager->saveItem( $product );
+					$product = $manager->saveItem($product);
 					$items[$product->getId()] = $product;
 				}
 
 				$manager->commit();
 			}
-			catch( \Exception $e )
+			catch (\Exception $e)
 			{
 				$manager->rollback();
 
-				$msg = sprintf( 'Unable to import product with code "%1$s": %2$s', $code, $e->getMessage() );
-				$context->getLogger()->log( $msg );
+				$msg = sprintf('Unable to import product with code "%1$s": %2$s', $code, $e->getMessage());
+				$context->getLogger()->log($msg);
 
 				$errors++;
 			}
 
-			if( $strict && !empty( $list ) ) {
-				$context->getLogger()->log( 'Not imported: ' . print_r( $list, true ) );
+			if ($strict && !empty($list)) {
+				$context->getLogger()->log('Not imported: ' . print_r($list, true));
 			}
 		}
 
-		$indexManager->rebuildIndex( $items );
+		$indexManager->rebuildIndex($items);
 
 		return $errors;
 	}
@@ -584,9 +584,9 @@ 
 	 * @param array $list Associative list of domain item keys and their values, e.g. "product.status" => 1
 	 * @return array Given associative list enriched by default values if they were not already set
 	 */
-	protected function addItemDefaults( array $list )
+	protected function addItemDefaults(array $list)
 	{
-		if( !isset( $list['product.status'] ) ) {
+		if (!isset($list['product.status'])) {
 			$list['product.status'] = 1;
 		}
 

controller/jobs/tests/TestHelperJobs.php

Spacing +48 added lines, -48 removed lines

@@ -15,14 +15,14 @@ 
 	public static function bootstrap()
 	{
 		self::getAimeos();
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 	}
 
 
-	public static function getContext( $site = 'unittest' )
+	public static function getContext($site = 'unittest')
 	{
-		if( !isset( self::$context[$site] ) ) {
-			self::$context[$site] = self::createContext( $site );
+		if (!isset(self::$context[$site])) {
+			self::$context[$site] = self::createContext($site);
 		}
 
 		return clone self::$context[$site];
@@ -31,13 +31,13 @@ 
 
 	public static function getAimeos()
 	{
-		if( !isset( self::$aimeos ) )
+		if (!isset(self::$aimeos))
 		{
 			require_once 'Bootstrap.php';
-			spl_autoload_register( 'Aimeos\\Bootstrap::autoload' );
+			spl_autoload_register('Aimeos\\Bootstrap::autoload');
 
-			$extdir = dirname( dirname( dirname( dirname( dirname( __FILE__ ) ) ) ) );
-			self::$aimeos = new \Aimeos\Bootstrap( array( $extdir ), true );
+			$extdir = dirname(dirname(dirname(dirname(dirname(__FILE__)))));
+			self::$aimeos = new \Aimeos\Bootstrap(array($extdir), true);
 		}
 
 		return self::$aimeos;
@@ -46,14 +46,14 @@ 
 
 	public static function getControllerPaths()
 	{
-		return self::getAimeos()->getCustomPaths( 'controller/jobs' );
+		return self::getAimeos()->getCustomPaths('controller/jobs');
 	}
 
 
 	/**
 	 * @param string $site
 	 */
-	private static function createContext( $site )
+	private static function createContext($site)
 	{
 		$ctx = new \Aimeos\MShop\Context\Item\Standard();
 		$aimeos = self::getAimeos();
@@ -63,80 +63,80 @@ 
 		$paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config';
 		$file = __DIR__ . DIRECTORY_SEPARATOR . 'confdoc.ser';
 
-		$conf = new \Aimeos\MW\Config\PHPArray( [], $paths );
-		$conf = new \Aimeos\MW\Config\Decorator\Memory( $conf );
-		$conf = new \Aimeos\MW\Config\Decorator\Documentor( $conf, $file );
-		$ctx->setConfig( $conf );
+		$conf = new \Aimeos\MW\Config\PHPArray([], $paths);
+		$conf = new \Aimeos\MW\Config\Decorator\Memory($conf);
+		$conf = new \Aimeos\MW\Config\Decorator\Documentor($conf, $file);
+		$ctx->setConfig($conf);
 
 
-		$logger = new \Aimeos\MW\Logger\File( $site . '.log', \Aimeos\MW\Logger\Base::DEBUG );
-		$ctx->setLogger( $logger );
+		$logger = new \Aimeos\MW\Logger\File($site . '.log', \Aimeos\MW\Logger\Base::DEBUG);
+		$ctx->setLogger($logger);
 
 
-		$dbm = new \Aimeos\MW\DB\Manager\PDO( $conf );
-		$ctx->setDatabaseManager( $dbm );
+		$dbm = new \Aimeos\MW\DB\Manager\PDO($conf);
+		$ctx->setDatabaseManager($dbm);
 
 
-		$fs = new \Aimeos\MW\Filesystem\Manager\Standard( $conf );
-		$ctx->setFilesystemManager( $fs );
+		$fs = new \Aimeos\MW\Filesystem\Manager\Standard($conf);
+		$ctx->setFilesystemManager($fs);
 
 
-		$mq = new \Aimeos\MW\MQueue\Manager\Standard( $conf );
-		$ctx->setMessageQueueManager( $mq );
+		$mq = new \Aimeos\MW\MQueue\Manager\Standard($conf);
+		$ctx->setMessageQueueManager($mq);
 
 
 		$cache = new \Aimeos\MW\Cache\None();
-		$ctx->setCache( $cache );
+		$ctx->setCache($cache);
 
 
 		$session = new \Aimeos\MW\Session\None();
-		$ctx->setSession( $session );
+		$ctx->setSession($session);
 
 
-		$i18n = new \Aimeos\MW\Translation\None( 'de' );
-		$ctx->setI18n( array( 'de' => $i18n ) );
+		$i18n = new \Aimeos\MW\Translation\None('de');
+		$ctx->setI18n(array('de' => $i18n));
 
 
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $ctx );
-		$locale = $localeManager->bootstrap( $site, 'de', '', false );
-		$ctx->setLocale( $locale );
+		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($ctx);
+		$locale = $localeManager->bootstrap($site, 'de', '', false);
+		$ctx->setLocale($locale);
 
 
-		$view = self::createView( $conf );
-		$ctx->setView( $view );
+		$view = self::createView($conf);
+		$ctx->setView($view);
 
 
-		$ctx->setEditor( 'core:controller/jobs' );
+		$ctx->setEditor('core:controller/jobs');
 
 		return $ctx;
 	}
 
 
-	protected static function createView( \Aimeos\MW\Config\Iface $config )
+	protected static function createView(\Aimeos\MW\Config\Iface $config)
 	{
 		$tmplpaths = array_merge_recursive(
-			self::getAimeos()->getCustomPaths( 'client/html/templates' ),
-			self::getAimeos()->getCustomPaths( 'controller/jobs/templates' )
+			self::getAimeos()->getCustomPaths('client/html/templates'),
+			self::getAimeos()->getCustomPaths('controller/jobs/templates')
 		);
 
-		$view = new \Aimeos\MW\View\Standard( $tmplpaths );
+		$view = new \Aimeos\MW\View\Standard($tmplpaths);
 
-		$trans = new \Aimeos\MW\Translation\None( 'de_DE' );
-		$helper = new \Aimeos\MW\View\Helper\Translate\Standard( $view, $trans );
-		$view->addHelper( 'translate', $helper );
+		$trans = new \Aimeos\MW\Translation\None('de_DE');
+		$helper = new \Aimeos\MW\View\Helper\Translate\Standard($view, $trans);
+		$view->addHelper('translate', $helper);
 
-		$helper = new \Aimeos\MW\View\Helper\Url\Standard( $view, 'http://baseurl' );
-		$view->addHelper( 'url', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Url\Standard($view, 'http://baseurl');
+		$view->addHelper('url', $helper);
 
-		$helper = new \Aimeos\MW\View\Helper\Number\Standard( $view, '.', '' );
-		$view->addHelper( 'number', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Number\Standard($view, '.', '');
+		$view->addHelper('number', $helper);
 
-		$helper = new \Aimeos\MW\View\Helper\Date\Standard( $view, 'Y-m-d' );
-		$view->addHelper( 'date', $helper );
+		$helper = new \Aimeos\MW\View\Helper\Date\Standard($view, 'Y-m-d');
+		$view->addHelper('date', $helper);
 
-		$config = new \Aimeos\MW\Config\Decorator\Protect( $config, array( 'controller/jobs', 'client/html' ) );
-		$helper = new \Aimeos\MW\View\Helper\Config\Standard( $view, $config );
-		$view->addHelper( 'config', $helper );
+		$config = new \Aimeos\MW\Config\Decorator\Protect($config, array('controller/jobs', 'client/html'));
+		$helper = new \Aimeos\MW\View\Helper\Config\Standard($view, $config);
+		$view->addHelper('config', $helper);
 
 		return $view;
 	}