aimeos / ai-controller-jobs

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;

Braces +1 added lines, -2 removed lines

@@ -114,8 +114,7 @@
 				{
 					$listItem = $listMap[$code][$typecode];
 					unset( $listItems[ $listItem->getId() ] );
-				}
-				else
+				} else
 				{
 					$listItem = $listManager->createItem( $typecode, 'attribute' );
 				}

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());
 	}
 }

Braces +2 added lines, -4 removed lines

@@ -153,15 +153,13 @@
 
 						$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 );
 					}
 
 					$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() ) );

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

controller/jobs/src/Controller/Jobs/Order/Service/Delivery/Standard.php

Spacing +30 added lines, -30 removed lines

@@ -29,7 +29,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Process order delivery services' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Process order delivery services');
 	}
 
 
@@ -40,7 +40,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Sends paid orders to the ERP system or logistic partner' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Sends paid orders to the ERP system or logistic partner');
 	}
 
 
@@ -69,8 +69,8 @@ 
 		 * @see controller/jobs/order/email/delivery/standard/limit-days
 		 * @see controller/jobs/order/service/delivery/batch-max
 		 */
-		$days = $context->getConfig()->get( 'controller/jobs/order/service/delivery/limit-days', 90 );
-		$date = date( 'Y-m-d 00:00:00', time() - 86400 * $days );
+		$days = $context->getConfig()->get('controller/jobs/order/service/delivery/limit-days', 90);
+		$date = date('Y-m-d 00:00:00', time() - 86400 * $days);
 
 		/** controller/jobs/order/service/delivery/batch-max
 		 * Maximum number of orders processed at once by the delivery service provider
@@ -85,71 +85,71 @@ 
 		 * @category Developer
 		 * @see controller/jobs/order/service/delivery/limit-days
 		 */
-		$maxItems = $context->getConfig()->get( 'controller/jobs/order/service/delivery/batch-max', 100 );
+		$maxItems = $context->getConfig()->get('controller/jobs/order/service/delivery/batch-max', 100);
 
 
-		$serviceManager = \Aimeos\MShop\Service\Manager\Factory::createManager( $context );
+		$serviceManager = \Aimeos\MShop\Service\Manager\Factory::createManager($context);
 		$serviceSearch = $serviceManager->createSearch();
-		$serviceSearch->setConditions( $serviceSearch->compare( '==', 'service.type.code', 'delivery' ) );
+		$serviceSearch->setConditions($serviceSearch->compare('==', 'service.type.code', 'delivery'));
 
-		$orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager( $context );
+		$orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager($context);
 		$orderSearch = $orderManager->createSearch();
 
 		$start = 0;
 
 		do
 		{
-			$serviceItems = $serviceManager->searchItems( $serviceSearch );
+			$serviceItems = $serviceManager->searchItems($serviceSearch);
 
-			foreach( $serviceItems as $serviceItem )
+			foreach ($serviceItems as $serviceItem)
 			{
 				try
 				{
-					$serviceProvider = $serviceManager->getProvider( $serviceItem, $serviceItem->getType() );
+					$serviceProvider = $serviceManager->getProvider($serviceItem, $serviceItem->getType());
 
 					$expr = array(
-						$orderSearch->compare( '>', 'order.datepayment', $date ),
-						$orderSearch->compare( '>', 'order.statuspayment', \Aimeos\MShop\Order\Item\Base::PAY_PENDING ),
-						$orderSearch->compare( '==', 'order.statusdelivery', \Aimeos\MShop\Order\Item\Base::STAT_UNFINISHED ),
-						$orderSearch->compare( '==', 'order.base.service.code', $serviceItem->getCode() ),
-						$orderSearch->compare( '==', 'order.base.service.type', 'delivery' ),
+						$orderSearch->compare('>', 'order.datepayment', $date),
+						$orderSearch->compare('>', 'order.statuspayment', \Aimeos\MShop\Order\Item\Base::PAY_PENDING),
+						$orderSearch->compare('==', 'order.statusdelivery', \Aimeos\MShop\Order\Item\Base::STAT_UNFINISHED),
+						$orderSearch->compare('==', 'order.base.service.code', $serviceItem->getCode()),
+						$orderSearch->compare('==', 'order.base.service.type', 'delivery'),
 					);
-					$orderSearch->setConditions( $orderSearch->combine( '&&', $expr ) );
+					$orderSearch->setConditions($orderSearch->combine('&&', $expr));
 
 					$orderStart = 0;
 
 					do
 					{
-						$orderSearch->setSlice( $orderStart, $maxItems );
-						$orderItems = $orderManager->searchItems( $orderSearch );
+						$orderSearch->setSlice($orderStart, $maxItems);
+						$orderItems = $orderManager->searchItems($orderSearch);
 
 						try
 						{
-							$serviceProvider->processBatch( $orderItems );
-							$orderManager->saveItems( $orderItems );
+							$serviceProvider->processBatch($orderItems);
+							$orderManager->saveItems($orderItems);
 						}
-						catch( \Exception $e )
+						catch (\Exception $e)
 						{
 							$str = 'Error while processing orders by delivery service "%1$s": %2$s';
-							$context->getLogger()->log( sprintf( $str, $serviceItem->getLabel(), $e->getMessage() ) );
+							$context->getLogger()->log(sprintf($str, $serviceItem->getLabel(), $e->getMessage()));
 						}
 
-						$orderCount = count( $orderItems );
+						$orderCount = count($orderItems);
 						$orderStart += $orderCount;
 					}
-					while( $orderCount >= $orderSearch->getSliceSize() );
+					while ($orderCount >= $orderSearch->getSliceSize());
 				}
-				catch( \Exception $e )
+				catch (\Exception $e)
 				{
 					$str = 'Error while processing service with ID "%1$s": %2$s';
-					$context->getLogger()->log( sprintf( $str, $serviceItem->getId(), $e->getMessage() ) );
+					$context->getLogger()->log(sprintf($str, $serviceItem->getId(), $e->getMessage()));
 				}
 			}
 
-			$count = count( $serviceItems );
+			$count = count($serviceItems);
 			$start += $count;
-			$serviceSearch->setSlice( $start );
+			$serviceSearch->setSlice($start);
 		}
-		while( $count >= $serviceSearch->getSliceSize() );
+		while ($count >= $serviceSearch->getSliceSize());
 	}
 }

Braces +2 added lines, -4 removed lines

@@ -127,8 +127,7 @@ 
 						{
 							$serviceProvider->processBatch( $orderItems );
 							$orderManager->saveItems( $orderItems );
-						}
-						catch( \Exception $e )
+						} catch( \Exception $e )
 						{
 							$str = 'Error while processing orders by delivery service "%1$s": %2$s';
 							$context->getLogger()->log( sprintf( $str, $serviceItem->getLabel(), $e->getMessage() ) );
@@ -138,8 +137,7 @@ 
 						$orderStart += $orderCount;
 					}
 					while( $orderCount >= $orderSearch->getSliceSize() );
-				}
-				catch( \Exception $e )
+				} catch( \Exception $e )
 				{
 					$str = 'Error while processing service with ID "%1$s": %2$s';
 					$context->getLogger()->log( sprintf( $str, $serviceItem->getId(), $e->getMessage() ) );

controller/common/src/Controller/Common/Subscription/Export/Csv/Processor/Product/Standard.php

Spacing +9 added lines, -9 removed lines

@@ -40,24 +40,24 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Base\Iface $order Full order with associated items
 	 * @return array Two dimensional associative list of order data representing the lines in CSV
 	 */
-	public function process( \Aimeos\MShop\Subscription\Item\Iface $subscription, \Aimeos\MShop\Order\Item\Base\Iface $order )
+	public function process(\Aimeos\MShop\Subscription\Item\Iface $subscription, \Aimeos\MShop\Order\Item\Base\Iface $order)
 	{
 		$result = [];
 
-		foreach( $order->getProducts() as $item )
+		foreach ($order->getProducts() as $item)
 		{
-			if( $subscription->getOrderProductId() != $item->getId() ) {
+			if ($subscription->getOrderProductId() != $item->getId()) {
 				continue;
 			}
 
 			$data = [];
 			$list = $item->toArray();
 
-			foreach( $item->getAttributeItems() as $attrItem )
+			foreach ($item->getAttributeItems() as $attrItem)
 			{
-				foreach( $attrItem->toArray() as $key => $value )
+				foreach ($attrItem->toArray() as $key => $value)
 				{
-					if( isset( $list[$key] ) ) {
+					if (isset($list[$key])) {
 						$list[$key] .= "\n" . $value;
 					} else {
 						$list[$key] = $value;
@@ -65,16 +65,16 @@ 
 				}
 			}
 
-			foreach( $this->getMapping() as $pos => $key )
+			foreach ($this->getMapping() as $pos => $key)
 			{
-				if( array_key_exists( $key, $list ) ) {
+				if (array_key_exists($key, $list)) {
 					$data[$pos] = $list[$key];
 				} else {
 					$data[$pos] = '';
 				}
 			}
 
-			ksort( $data );
+			ksort($data);
 			$result[] = $data;
 		}
 

controller/common/src/Controller/Common/Order/Export/Csv/Processor/Product/Standard.php

Spacing +8 added lines, -8 removed lines

@@ -40,20 +40,20 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Base\Iface $order Full order with associated items
 	 * @return array Two dimensional associative list of order data representing the lines in CSV
 	 */
-	public function process( \Aimeos\MShop\Order\Item\Iface $invoice, \Aimeos\MShop\Order\Item\Base\Iface $order )
+	public function process(\Aimeos\MShop\Order\Item\Iface $invoice, \Aimeos\MShop\Order\Item\Base\Iface $order)
 	{
 		$result = [];
 
-		foreach( $order->getProducts() as $item )
+		foreach ($order->getProducts() as $item)
 		{
 			$data = [];
 			$list = $item->toArray();
 
-			foreach( $item->getAttributeItems() as $attrItem )
+			foreach ($item->getAttributeItems() as $attrItem)
 			{
-				foreach( $attrItem->toArray() as $key => $value )
+				foreach ($attrItem->toArray() as $key => $value)
 				{
-					if( isset( $list[$key] ) ) {
+					if (isset($list[$key])) {
 						$list[$key] .= "\n" . $value;
 					} else {
 						$list[$key] = $value;
@@ -61,16 +61,16 @@ 
 				}
 			}
 
-			foreach( $this->getMapping() as $pos => $key )
+			foreach ($this->getMapping() as $pos => $key)
 			{
-				if( array_key_exists( $key, $list ) ) {
+				if (array_key_exists($key, $list)) {
 					$data[$pos] = $list[$key];
 				} else {
 					$data[$pos] = '';
 				}
 			}
 
-			ksort( $data );
+			ksort($data);
 			$result[] = $data;
 		}
 

controller/common/src/Controller/Common/Order/Export/Csv/Processor/Service/Standard.php

Spacing +10 added lines, -10 removed lines

@@ -40,25 +40,25 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Base\Iface $order Full order with associated items
 	 * @return array Two dimensional associative list of order data representing the lines in CSV
 	 */
-	public function process( \Aimeos\MShop\Order\Item\Iface $invoice, \Aimeos\MShop\Order\Item\Base\Iface $order )
+	public function process(\Aimeos\MShop\Order\Item\Iface $invoice, \Aimeos\MShop\Order\Item\Base\Iface $order)
 	{
 		$result = [];
 		$services = $order->getServices();
 
-		krsort( $services );
+		krsort($services);
 
-		foreach( $services as $list )
+		foreach ($services as $list)
 		{
-			foreach( $list as $item )
+			foreach ($list as $item)
 			{
 				$data = [];
 				$list = $item->toArray();
 
-				foreach( $item->getAttributeItems() as $attrItem )
+				foreach ($item->getAttributeItems() as $attrItem)
 				{
-					foreach( $attrItem->toArray() as $key => $value )
+					foreach ($attrItem->toArray() as $key => $value)
 					{
-						if( isset( $list[$key] ) ) {
+						if (isset($list[$key])) {
 							$list[$key] .= "\n" . $value;
 						} else {
 							$list[$key] = $value;
@@ -66,16 +66,16 @@ 
 					}
 				}
 
-				foreach( $this->getMapping() as $pos => $key )
+				foreach ($this->getMapping() as $pos => $key)
 				{
-					if( array_key_exists( $key, $list ) ) {
+					if (array_key_exists($key, $list)) {
 						$data[$pos] = $list[$key];
 					} else {
 						$data[$pos] = '';
 					}
 				}
 
-				ksort( $data );
+				ksort($data);
 				$result[] = $data;
 			}
 		}