aimeos / ai-controller-jobs

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

controller/jobs/tests/Controller/Jobs/Order/Service/Delivery/StandardTest.php

Spacing +62 added lines, -62 removed lines

@@ -20,7 +20,7 @@ 
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$this->object = new \Aimeos\Controller\Jobs\Order\Service\Delivery\Standard( $context, $aimeos );
+		$this->object = new \Aimeos\Controller\Jobs\Order\Service\Delivery\Standard($context, $aimeos);
 	}
 
 
@@ -32,14 +32,14 @@ 
 
 	public function testGetName()
 	{
-		$this->assertEquals( 'Process order delivery services', $this->object->getName() );
+		$this->assertEquals('Process order delivery services', $this->object->getName());
 	}
 
 
 	public function testGetDescription()
 	{
 		$text = 'Sends paid orders to the ERP system or logistic partner';
-		$this->assertEquals( $text, $this->object->getDescription() );
+		$this->assertEquals($text, $this->object->getDescription());
 	}
 
 
@@ -50,47 +50,47 @@ 
 
 
 		$name = 'ControllerJobsServiceDeliveryProcessDefaultRun';
-		$context->getConfig()->set( 'mshop/service/manager/name', $name );
-		$context->getConfig()->set( 'mshop/order/manager/name', $name );
+		$context->getConfig()->set('mshop/service/manager/name', $name);
+		$context->getConfig()->set('mshop/order/manager/name', $name);
 
 
-		$serviceManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Manager\\Standard' )
-			->setMethods( array( 'getProvider', 'searchItems' ) )
-			->setConstructorArgs( array( $context ) )
+		$serviceManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Manager\\Standard')
+			->setMethods(array('getProvider', 'searchItems'))
+			->setConstructorArgs(array($context))
 			->getMock();
 
-		$orderManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Order\\Manager\\Standard' )
-			->setMethods( array( 'saveItems', 'searchItems' ) )
-			->setConstructorArgs( array( $context ) )
+		$orderManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Order\\Manager\\Standard')
+			->setMethods(array('saveItems', 'searchItems'))
+			->setConstructorArgs(array($context))
 			->getMock();
 
-		\Aimeos\MShop\Service\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub );
-		\Aimeos\MShop\Order\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub );
+		\Aimeos\MShop\Service\Manager\Factory::injectManager('\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub);
+		\Aimeos\MShop\Order\Manager\Factory::injectManager('\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub);
 
 
 		$serviceItem = $serviceManagerStub->createItem();
 		$orderItem = $orderManagerStub->createItem();
 
-		$serviceProviderStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Provider\\Delivery\\Standard' )
-			->setConstructorArgs( array( $context, $serviceItem ) )
+		$serviceProviderStub = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Provider\\Delivery\\Standard')
+			->setConstructorArgs(array($context, $serviceItem))
 			->getMock();
 
 
-		$serviceManagerStub->expects( $this->once() )->method( 'searchItems' )
-			->will( $this->onConsecutiveCalls( array( $serviceItem ), [] ) );
+		$serviceManagerStub->expects($this->once())->method('searchItems')
+			->will($this->onConsecutiveCalls(array($serviceItem), []));
 
-		$serviceManagerStub->expects( $this->once() )->method( 'getProvider' )
-			->will( $this->returnValue( $serviceProviderStub ) );
+		$serviceManagerStub->expects($this->once())->method('getProvider')
+			->will($this->returnValue($serviceProviderStub));
 
-		$orderManagerStub->expects( $this->once() )->method( 'searchItems' )
-			->will( $this->onConsecutiveCalls( array( $orderItem ), [] ) );
+		$orderManagerStub->expects($this->once())->method('searchItems')
+			->will($this->onConsecutiveCalls(array($orderItem), []));
 
-		$serviceProviderStub->expects( $this->once() )->method( 'processBatch' );
+		$serviceProviderStub->expects($this->once())->method('processBatch');
 
-		$orderManagerStub->expects( $this->once() )->method( 'saveItems' );
+		$orderManagerStub->expects($this->once())->method('saveItems');
 
 
-		$object = new \Aimeos\Controller\Jobs\Order\Service\Delivery\Standard( $context, $aimeos );
+		$object = new \Aimeos\Controller\Jobs\Order\Service\Delivery\Standard($context, $aimeos);
 		$object->run();
 	}
 
@@ -102,48 +102,48 @@ 
 
 
 		$name = 'ControllerJobsServiceDeliveryProcessDefaultRun';
-		$context->getConfig()->set( 'mshop/service/manager/name', $name );
-		$context->getConfig()->set( 'mshop/order/manager/name', $name );
+		$context->getConfig()->set('mshop/service/manager/name', $name);
+		$context->getConfig()->set('mshop/order/manager/name', $name);
 
 
-		$orderManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Order\\Manager\\Standard' )
-			->setMethods( array( 'saveItems', 'searchItems' ) )
-			->setConstructorArgs( array( $context ) )
+		$orderManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Order\\Manager\\Standard')
+			->setMethods(array('saveItems', 'searchItems'))
+			->setConstructorArgs(array($context))
 			->getMock();
 
-		$serviceManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Manager\\Standard' )
-			->setMethods( array( 'getProvider', 'searchItems' ) )
-			->setConstructorArgs( array( $context ) )
+		$serviceManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Manager\\Standard')
+			->setMethods(array('getProvider', 'searchItems'))
+			->setConstructorArgs(array($context))
 			->getMock();
 
-		\Aimeos\MShop\Service\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub );
-		\Aimeos\MShop\Order\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub );
+		\Aimeos\MShop\Service\Manager\Factory::injectManager('\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub);
+		\Aimeos\MShop\Order\Manager\Factory::injectManager('\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub);
 
 
 		$serviceItem = $serviceManagerStub->createItem();
 		$orderItem = $orderManagerStub->createItem();
 
-		$serviceProviderStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Provider\\Delivery\\Standard' )
-			->setConstructorArgs( array( $context, $serviceItem ) )
+		$serviceProviderStub = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Provider\\Delivery\\Standard')
+			->setConstructorArgs(array($context, $serviceItem))
 			->getMock();
 
 
-		$serviceManagerStub->expects( $this->once() )->method( 'searchItems' )
-			->will( $this->onConsecutiveCalls( array( $serviceItem ), [] ) );
+		$serviceManagerStub->expects($this->once())->method('searchItems')
+			->will($this->onConsecutiveCalls(array($serviceItem), []));
 
-		$serviceManagerStub->expects( $this->once() )->method( 'getProvider' )
-			->will( $this->returnValue( $serviceProviderStub ) );
+		$serviceManagerStub->expects($this->once())->method('getProvider')
+			->will($this->returnValue($serviceProviderStub));
 
-		$orderManagerStub->expects( $this->once() )->method( 'searchItems' )
-			->will( $this->onConsecutiveCalls( array( $orderItem ), [] ) );
+		$orderManagerStub->expects($this->once())->method('searchItems')
+			->will($this->onConsecutiveCalls(array($orderItem), []));
 
-		$serviceProviderStub->expects( $this->once() )->method( 'processBatch' )
-			->will( $this->throwException( new \Aimeos\MShop\Service\Exception( 'test order service delivery: process' ) ) );
+		$serviceProviderStub->expects($this->once())->method('processBatch')
+			->will($this->throwException(new \Aimeos\MShop\Service\Exception('test order service delivery: process')));
 
-		$orderManagerStub->expects( $this->never() )->method( 'saveItems' );
+		$orderManagerStub->expects($this->never())->method('saveItems');
 
 
-		$object = new \Aimeos\Controller\Jobs\Order\Service\Delivery\Standard( $context, $aimeos );
+		$object = new \Aimeos\Controller\Jobs\Order\Service\Delivery\Standard($context, $aimeos);
 		$object->run();
 	}
 
@@ -155,36 +155,36 @@ 
 
 
 		$name = 'ControllerJobsServiceDeliveryProcessDefaultRun';
-		$context->getConfig()->set( 'mshop/service/manager/name', $name );
-		$context->getConfig()->set( 'mshop/order/manager/name', $name );
+		$context->getConfig()->set('mshop/service/manager/name', $name);
+		$context->getConfig()->set('mshop/order/manager/name', $name);
 
 
-		$orderManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Order\\Manager\\Standard' )
-			->setMethods( array( 'saveItem', 'searchItems' ) )
-			->setConstructorArgs( array( $context ) )
+		$orderManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Order\\Manager\\Standard')
+			->setMethods(array('saveItem', 'searchItems'))
+			->setConstructorArgs(array($context))
 			->getMock();
 
-		$serviceManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Manager\\Standard' )
-			->setMethods( array( 'getProvider', 'searchItems' ) )
-			->setConstructorArgs( array( $context ) )
+		$serviceManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Manager\\Standard')
+			->setMethods(array('getProvider', 'searchItems'))
+			->setConstructorArgs(array($context))
 			->getMock();
 
-		\Aimeos\MShop\Service\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub );
-		\Aimeos\MShop\Order\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub );
+		\Aimeos\MShop\Service\Manager\Factory::injectManager('\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub);
+		\Aimeos\MShop\Order\Manager\Factory::injectManager('\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub);
 
 
 		$serviceItem = $serviceManagerStub->createItem();
 
-		$serviceManagerStub->expects( $this->once() )->method( 'searchItems' )
-			->will( $this->onConsecutiveCalls( array( $serviceItem ), [] ) );
+		$serviceManagerStub->expects($this->once())->method('searchItems')
+			->will($this->onConsecutiveCalls(array($serviceItem), []));
 
-		$serviceManagerStub->expects( $this->once() )->method( 'getProvider' )
-			->will( $this->throwException( new \Aimeos\MShop\Service\Exception( 'test sorder service delivery: getProvider' ) ) );
+		$serviceManagerStub->expects($this->once())->method('getProvider')
+			->will($this->throwException(new \Aimeos\MShop\Service\Exception('test sorder service delivery: getProvider')));
 
-		$orderManagerStub->expects( $this->never() )->method( 'searchItems' );
+		$orderManagerStub->expects($this->never())->method('searchItems');
 
 
-		$object = new \Aimeos\Controller\Jobs\Order\Service\Delivery\Standard( $context, $aimeos );
+		$object = new \Aimeos\Controller\Jobs\Order\Service\Delivery\Standard($context, $aimeos);
 		$object->run();
 	}
 }

controller/jobs/tests/Controller/Jobs/Order/Service/Async/StandardTest.php

Spacing +26 added lines, -26 removed lines

@@ -20,7 +20,7 @@ 
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$this->object = new \Aimeos\Controller\Jobs\Order\Service\Async\Standard( $context, $aimeos );
+		$this->object = new \Aimeos\Controller\Jobs\Order\Service\Async\Standard($context, $aimeos);
 	}
 
 
@@ -32,14 +32,14 @@ 
 
 	public function testGetName()
 	{
-		$this->assertEquals( 'Batch update of payment/delivery status', $this->object->getName() );
+		$this->assertEquals('Batch update of payment/delivery status', $this->object->getName());
 	}
 
 
 	public function testGetDescription()
 	{
 		$text = 'Executes payment or delivery service providers that uses batch updates';
-		$this->assertEquals( $text, $this->object->getDescription() );
+		$this->assertEquals($text, $this->object->getDescription());
 	}
 
 
@@ -50,34 +50,34 @@ 
 
 
 		$name = 'ControllerJobsServiceAsyncProcessDefaultRun';
-		$context->getConfig()->set( 'mshop/service/manager/name', $name );
+		$context->getConfig()->set('mshop/service/manager/name', $name);
 
 
-		$serviceManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Manager\\Standard' )
-			->setMethods( array( 'getProvider', 'searchItems' ) )
-			->setConstructorArgs( array( $context ) )
+		$serviceManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Manager\\Standard')
+			->setMethods(array('getProvider', 'searchItems'))
+			->setConstructorArgs(array($context))
 			->getMock();
 
-		\Aimeos\MShop\Service\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub );
+		\Aimeos\MShop\Service\Manager\Factory::injectManager('\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub);
 
 
 		$serviceItem = $serviceManagerStub->createItem();
 
-		$serviceProviderStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Provider\\Delivery\\Standard' )
-			->setConstructorArgs( array( $context, $serviceItem ) )
+		$serviceProviderStub = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Provider\\Delivery\\Standard')
+			->setConstructorArgs(array($context, $serviceItem))
 			->getMock();
 
 
-		$serviceManagerStub->expects( $this->once() )->method( 'searchItems' )
-			->will( $this->onConsecutiveCalls( array( $serviceItem ), [] ) );
+		$serviceManagerStub->expects($this->once())->method('searchItems')
+			->will($this->onConsecutiveCalls(array($serviceItem), []));
 
-		$serviceManagerStub->expects( $this->once() )->method( 'getProvider' )
-			->will( $this->returnValue( $serviceProviderStub ) );
+		$serviceManagerStub->expects($this->once())->method('getProvider')
+			->will($this->returnValue($serviceProviderStub));
 
-		$serviceProviderStub->expects( $this->once() )->method( 'updateAsync' );
+		$serviceProviderStub->expects($this->once())->method('updateAsync');
 
 
-		$object = new \Aimeos\Controller\Jobs\Order\Service\Async\Standard( $context, $aimeos );
+		$object = new \Aimeos\Controller\Jobs\Order\Service\Async\Standard($context, $aimeos);
 		$object->run();
 	}
 
@@ -89,27 +89,27 @@ 
 
 
 		$name = 'ControllerJobsServiceAsyncProcessDefaultRun';
-		$context->getConfig()->set( 'mshop/service/manager/name', $name );
+		$context->getConfig()->set('mshop/service/manager/name', $name);
 
 
-		$serviceManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Manager\\Standard' )
-			->setMethods( array( 'getProvider', 'searchItems' ) )
-			->setConstructorArgs( array( $context ) )
+		$serviceManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Manager\\Standard')
+			->setMethods(array('getProvider', 'searchItems'))
+			->setConstructorArgs(array($context))
 			->getMock();
 
-		\Aimeos\MShop\Service\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub );
+		\Aimeos\MShop\Service\Manager\Factory::injectManager('\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub);
 
 
 		$serviceItem = $serviceManagerStub->createItem();
 
-		$serviceManagerStub->expects( $this->once() )->method( 'searchItems' )
-			->will( $this->onConsecutiveCalls( array( $serviceItem ), [] ) );
+		$serviceManagerStub->expects($this->once())->method('searchItems')
+			->will($this->onConsecutiveCalls(array($serviceItem), []));
 
-		$serviceManagerStub->expects( $this->once() )->method( 'getProvider' )
-			->will( $this->throwException( new \Aimeos\MShop\Service\Exception() ) );
+		$serviceManagerStub->expects($this->once())->method('getProvider')
+			->will($this->throwException(new \Aimeos\MShop\Service\Exception()));
 
 
-		$object = new \Aimeos\Controller\Jobs\Order\Service\Async\Standard( $context, $aimeos );
+		$object = new \Aimeos\Controller\Jobs\Order\Service\Async\Standard($context, $aimeos);
 		$object->run();
 	}
 }

controller/jobs/templates/product/export/sitemap-items-body-standard.php

Spacing +10 added lines, -10 removed lines

@@ -7,19 +7,19 @@
 
 $enc = $this->encoder();
 
-$detailTarget = $this->config( 'client/html/catalog/detail/url/target' );
-$detailCntl = $this->config( 'client/html/catalog/detail/url/controller', 'catalog' );
-$detailAction = $this->config( 'client/html/catalog/detail/url/action', 'detail' );
-$detailConfig = $this->config( 'client/html/catalog/detail/url/config', [] );
+$detailTarget = $this->config('client/html/catalog/detail/url/target');
+$detailCntl = $this->config('client/html/catalog/detail/url/controller', 'catalog');
+$detailAction = $this->config('client/html/catalog/detail/url/action', 'detail');
+$detailConfig = $this->config('client/html/catalog/detail/url/config', []);
 
-$freq = $enc->xml( $this->get( 'siteFreq', 'daily' ) );
+$freq = $enc->xml($this->get('siteFreq', 'daily'));
 
 ?>
-<?php foreach( $this->get( 'siteItems', [] ) as $id => $item ) : ?>
+<?php foreach ($this->get('siteItems', []) as $id => $item) : ?>
 <?php
-		$date = str_replace( ' ', 'T', $item->getTimeModified() ) . date( 'P' );
-		$params = array( 'd_name' => $item->getName( 'url' ), 'd_prodid' => $id );
-		$url = $this->url( $detailTarget, $detailCntl, $detailAction, $params, [], $detailConfig );
+		$date = str_replace(' ', 'T', $item->getTimeModified()) . date('P');
+		$params = array('d_name' => $item->getName('url'), 'd_prodid' => $id);
+		$url = $this->url($detailTarget, $detailCntl, $detailAction, $params, [], $detailConfig);
 ?>
-	<url><loc><?php echo $enc->xml( $url ); ?></loc><lastmod><?php echo $date; ?></lastmod><changefreq><?php echo $freq; ?></changefreq></url>
+	<url><loc><?php echo $enc->xml($url); ?></loc><lastmod><?php echo $date; ?></lastmod><changefreq><?php echo $freq; ?></changefreq></url>
 <?php endforeach; ?>

controller/jobs/templates/product/export/sitemap-index-standard.php

Spacing +3 added lines, -3 removed lines

@@ -6,16 +6,16 @@
  */
 
 $enc = $this->encoder();
-$date = date( 'c' );
+$date = date('c');
 
 ?>
 <?php echo '<?xml version="1.0" encoding="UTF-8"?>'; ?>
 
 
 <sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-<?php foreach( $this->get( 'siteFiles', [] ) as $name ) : ?>
+<?php foreach ($this->get('siteFiles', []) as $name) : ?>
 	<sitemap>
-		<loc><?php echo $enc->xml( basename( $name ) ); ?></loc>
+		<loc><?php echo $enc->xml(basename($name)); ?></loc>
 		<lastmod><?php echo $date; ?></lastmod>
 	</sitemap>
 <?php endforeach; ?>

controller/common/src/Controller/Common/Catalog/Import/Csv/Base.php

Spacing +41 added lines, -41 removed lines

@@ -27,14 +27,14 @@ 
 	 * @param array $data Associative list of catalog codes and lists of CSV field indexes and their data
 	 * @return array Associative list of CSV field indexes and their converted data
 	 */
-	protected function convertData( array $convlist, array $data )
+	protected function convertData(array $convlist, array $data)
 	{
-		foreach( $convlist as $idx => $converter )
+		foreach ($convlist as $idx => $converter)
 		{
-			foreach( $data as $code => $list )
+			foreach ($data as $code => $list)
 			{
-				if( isset( $list[$idx] ) ) {
-					$data[$code][$idx] = $converter->translate( $list[$idx] );
+				if (isset($list[$idx])) {
+					$data[$code][$idx] = $converter->translate($list[$idx]);
 				}
 			}
 		}
@@ -50,36 +50,36 @@ 
 	 * @param string|null Name of the cache implementation
 	 * @return \Aimeos\Controller\Common\Catalog\Import\Csv\Cache\Iface Cache object
 	 */
-	protected function getCache( $type, $name = null )
+	protected function getCache($type, $name = null)
 	{
 		$context = $this->getContext();
 		$config = $context->getConfig();
 
-		if( ctype_alnum( $type ) === false )
+		if (ctype_alnum($type) === false)
 		{
 			$classname = is_string($name) ? '\\Aimeos\\Controller\\Common\\Catalog\\Import\\Csv\\Cache\\' . $type : '<not a string>';
-			throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+			throw new \Aimeos\Controller\Jobs\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 		}
 
-		if( $name === null ) {
-			$name = $config->get( 'controller/common/catalog/import/csv/cache/' . $type . '/name', 'Standard' );
+		if ($name === null) {
+			$name = $config->get('controller/common/catalog/import/csv/cache/' . $type . '/name', 'Standard');
 		}
 
-		if( ctype_alnum( $name ) === false )
+		if (ctype_alnum($name) === false)
 		{
 			$classname = is_string($name) ? '\\Aimeos\\Controller\\Common\\Catalog\\Import\\Csv\\Cache\\' . $type . '\\' . $name : '<not a string>';
-			throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+			throw new \Aimeos\Controller\Jobs\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 		}
 
-		$classname = '\\Aimeos\\Controller\\Common\\Catalog\\Import\\Csv\\Cache\\' . ucfirst( $type ) . '\\' . $name;
+		$classname = '\\Aimeos\\Controller\\Common\\Catalog\\Import\\Csv\\Cache\\' . ucfirst($type) . '\\' . $name;
 
-		if( class_exists( $classname ) === false ) {
-			throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Class "%1$s" not found', $classname ) );
+		if (class_exists($classname) === false) {
+			throw new \Aimeos\Controller\Jobs\Exception(sprintf('Class "%1$s" not found', $classname));
 		}
 
-		$object = new $classname( $context );
+		$object = new $classname($context);
 
-		\Aimeos\MW\Common\Base::checkClass( '\\Aimeos\\Controller\\Common\\Catalog\\Import\\Csv\\Cache\\Iface', $object );
+		\Aimeos\MW\Common\Base::checkClass('\\Aimeos\\Controller\\Common\\Catalog\\Import\\Csv\\Cache\\Iface', $object);
 
 		return $object;
 	}
@@ -91,12 +91,12 @@ 
 	 * @param array $convmap List of converter names for the values at the position in the CSV file
 	 * @return array Associative list of positions and converter objects
 	 */
-	protected function getConverterList( array $convmap )
+	protected function getConverterList(array $convmap)
 	{
 		$convlist = [];
 
-		foreach( $convmap as $idx => $name ) {
-			$convlist[$idx] = \Aimeos\MW\Convert\Factory::createConverter( $name );
+		foreach ($convmap as $idx => $name) {
+			$convlist[$idx] = \Aimeos\MW\Convert\Factory::createConverter($name);
 		}
 
 		return $convlist;
@@ -111,15 +111,15 @@ 
 	 * @param integer $codePos Column position which contains the unique catalog code (starting from 0)
 	 * @return array List of arrays with catalog codes as keys and list of values from the CSV file
 	 */
-	protected function getData( \Aimeos\MW\Container\Content\Iface $content, $maxcnt, $codePos )
+	protected function getData(\Aimeos\MW\Container\Content\Iface $content, $maxcnt, $codePos)
 	{
 		$count = 0;
 		$data = [];
 
-		while( $content->valid() && $count++ < $maxcnt )
+		while ($content->valid() && $count++ < $maxcnt)
 		{
 			$row = $content->current();
-			$data[ $row[$codePos] ] = $row;
+			$data[$row[$codePos]] = $row;
 			$content->next();
 		}
 
@@ -175,21 +175,21 @@ 
 	 * @param array $mapping List of domain item keys with the CSV field position as key
 	 * @return array List of associative arrays containing the chunked properties
 	 */
-	protected function getMappedChunk( array &$data, array $mapping )
+	protected function getMappedChunk(array &$data, array $mapping)
 	{
 		$idx = 0;
 		$map = [];
 
-		foreach( $mapping as $pos => $key )
+		foreach ($mapping as $pos => $key)
 		{
-			if( isset( $map[$idx][$key] ) ) {
+			if (isset($map[$idx][$key])) {
 				$idx++;
 			}
 
-			if( isset( $data[$pos] ) )
+			if (isset($data[$pos]))
 			{
 				$map[$idx][$key] = $data[$pos];
-				unset( $data[$pos] );
+				unset($data[$pos]);
 			}
 		}
 
@@ -203,37 +203,37 @@ 
 	 * @param array $mappings Associative list of processor types as keys and index/data mappings as values
 	 * @return \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Iface Processor object
 	 */
-	protected function getProcessors( array $mappings )
+	protected function getProcessors(array $mappings)
 	{
 		$context = $this->getContext();
 		$config = $context->getConfig();
-		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Done( $context, [] );
+		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Done($context, []);
 
-		foreach( $mappings as $type => $mapping )
+		foreach ($mappings as $type => $mapping)
 		{
-			if( ctype_alnum( $type ) === false )
+			if (ctype_alnum($type) === false)
 			{
 				$classname = is_string($type) ? '\\Aimeos\\Controller\\Common\\Catalog\\Import\\Csv\\Processor\\' . $type : '<not a string>';
-				throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+				throw new \Aimeos\Controller\Jobs\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 			}
 
-			$name = $config->get( 'controller/common/catalog/import/csv/processor/' . $type . '/name', 'Standard' );
+			$name = $config->get('controller/common/catalog/import/csv/processor/' . $type . '/name', 'Standard');
 
-			if( ctype_alnum( $name ) === false )
+			if (ctype_alnum($name) === false)
 			{
 				$classname = is_string($name) ? '\\Aimeos\\Controller\\Common\\Catalog\\Import\\Csv\\Processor\\' . $type . '\\' . $name : '<not a string>';
-				throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+				throw new \Aimeos\Controller\Jobs\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 			}
 
-			$classname = '\\Aimeos\\Controller\\Common\\Catalog\\Import\\Csv\\Processor\\' . ucfirst( $type ) . '\\' . $name;
+			$classname = '\\Aimeos\\Controller\\Common\\Catalog\\Import\\Csv\\Processor\\' . ucfirst($type) . '\\' . $name;
 
-			if( class_exists( $classname ) === false ) {
-				throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Class "%1$s" not found', $classname ) );
+			if (class_exists($classname) === false) {
+				throw new \Aimeos\Controller\Jobs\Exception(sprintf('Class "%1$s" not found', $classname));
 			}
 
-			$object = new $classname( $context, $mapping, $object );
+			$object = new $classname($context, $mapping, $object);
 
-			\Aimeos\MW\Common\Base::checkClass( '\\Aimeos\\Controller\\Common\\Catalog\\Import\\Csv\\Processor\\Iface', $object );
+			\Aimeos\MW\Common\Base::checkClass('\\Aimeos\\Controller\\Common\\Catalog\\Import\\Csv\\Processor\\Iface', $object);
 		}
 
 		return $object;

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

Spacing +7 added lines, -7 removed lines

@@ -32,8 +32,8 @@ 
 	 * @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)
 	{
 		$this->context = $context;
 		$this->mapping = $mapping;
@@ -48,13 +48,13 @@ 
 	 * @param integer $pos Computed position of the list item in the associated list of items
 	 * @return array Given associative list enriched by default values if they were not already set
 	 */
-	protected function addListItemDefaults( array $list, $pos )
+	protected function addListItemDefaults(array $list, $pos)
 	{
-		if( !isset( $list['product.lists.position'] ) ) {
+		if (!isset($list['product.lists.position'])) {
 			$list['product.lists.position'] = $pos;
 		}
 
-		if( !isset( $list['product.lists.status'] ) ) {
+		if (!isset($list['product.lists.status'])) {
 			$list['product.lists.status'] = 1;
 		}
 
@@ -92,8 +92,8 @@ 
 	 */
 	protected function getObject()
 	{
-		if( $this->object === null ) {
-			throw new \Aimeos\Controller\Jobs\Exception( 'No processor object available' );
+		if ($this->object === null) {
+			throw new \Aimeos\Controller\Jobs\Exception('No processor object available');
 		}
 
 		return $this->object;

controller/jobs/templates/product/export/items-body-standard.php

Spacing +13 added lines, -13 removed lines

@@ -9,10 +9,10 @@ 
 
 ?>
 <productlist>
-    <?php foreach( $this->get( 'exportItems', [] ) as $id => $item ) : ?>
+    <?php foreach ($this->get('exportItems', []) as $id => $item) : ?>
 
-        <product-content id="<?php echo $enc->attr( $id ); ?>" >
-            <productitem id="<?php echo $enc->attr( $id ); ?>" siteid="<?php echo $enc->attr( $item->getSiteId() ); ?>" ctime="<?php echo $enc->attr( $item->getTimeCreated() ); ?>" mtime="<?php echo $enc->attr( $item->getTimeModified() ); ?>" editor="<?php echo $enc->attr( $item->getEditor() ); ?>">
+        <product-content id="<?php echo $enc->attr($id); ?>" >
+            <productitem id="<?php echo $enc->attr($id); ?>" siteid="<?php echo $enc->attr($item->getSiteId()); ?>" ctime="<?php echo $enc->attr($item->getTimeCreated()); ?>" mtime="<?php echo $enc->attr($item->getTimeModified()); ?>" editor="<?php echo $enc->attr($item->getEditor()); ?>">
                 <type><![CDATA[<?php echo $item->getType(); ?>]]></type>
                 <code><![CDATA[<?php echo $item->getCode(); ?>]]></code>
                 <label><![CDATA[<?php echo $item->getCode(); ?>]]></label>
@@ -22,10 +22,10 @@ 
             </productitem>
             <list>
                 <text>
-                    <?php foreach( $item->getListItems( 'text' ) as $listItem ) : ?>
+                    <?php foreach ($item->getListItems('text') as $listItem) : ?>
                         <?php if ($refItem = $listItem->getRefItem()) { ?>
 
-                            <textitem id="<?php echo $enc->attr( $refItem->getId() ); ?>" siteid="<?php echo $enc->attr( $refItem->getSiteId() ); ?>" ctime="<?php echo $enc->attr( $refItem->getTimeCreated() ); ?>" mtime="<?php echo $enc->attr( $refItem->getTimeModified() ); ?>" editor="<?php echo $enc->attr( $refItem->getEditor() ); ?>" list.id="<?php echo $enc->attr( $listItem->getId() ); ?>" list.siteid="<?php echo $enc->attr( $listItem->getSiteId() ); ?>" list.parentid="<?php echo $enc->attr( $listItem->getParentId() ); ?>" list.type="<?php echo $enc->attr( $listItem->getType() ); ?>" list.domain="<?php echo $enc->attr( $listItem->getDomain() ); ?>" list.config="<?php echo $enc->attr( json_encode( $listItem->getConfig() ) ); ?>" list.start="<?php echo $enc->attr( $listItem->getDateStart() ); ?>" list.end="<?php echo $enc->attr( $listItem->getDateEnd() ); ?>" list.position="<?php echo $enc->attr( $listItem->getPosition() ); ?>" list.status="<?php echo $enc->attr( $listItem->getStatus() ); ?>" list.ctime="<?php echo $enc->attr( $listItem->getTimeCreated() ); ?>" list.mtime="<?php echo $enc->attr( $listItem->getTimeModified() ); ?>" list.editor="<?php echo $enc->attr( $listItem->getEditor() ); ?>">
+                            <textitem id="<?php echo $enc->attr($refItem->getId()); ?>" siteid="<?php echo $enc->attr($refItem->getSiteId()); ?>" ctime="<?php echo $enc->attr($refItem->getTimeCreated()); ?>" mtime="<?php echo $enc->attr($refItem->getTimeModified()); ?>" editor="<?php echo $enc->attr($refItem->getEditor()); ?>" list.id="<?php echo $enc->attr($listItem->getId()); ?>" list.siteid="<?php echo $enc->attr($listItem->getSiteId()); ?>" list.parentid="<?php echo $enc->attr($listItem->getParentId()); ?>" list.type="<?php echo $enc->attr($listItem->getType()); ?>" list.domain="<?php echo $enc->attr($listItem->getDomain()); ?>" list.config="<?php echo $enc->attr(json_encode($listItem->getConfig())); ?>" list.start="<?php echo $enc->attr($listItem->getDateStart()); ?>" list.end="<?php echo $enc->attr($listItem->getDateEnd()); ?>" list.position="<?php echo $enc->attr($listItem->getPosition()); ?>" list.status="<?php echo $enc->attr($listItem->getStatus()); ?>" list.ctime="<?php echo $enc->attr($listItem->getTimeCreated()); ?>" list.mtime="<?php echo $enc->attr($listItem->getTimeModified()); ?>" list.editor="<?php echo $enc->attr($listItem->getEditor()); ?>">
                                 <type><![CDATA[<?php echo $refItem->getType(); ?>]]></type>
                                 <languageid><![CDATA[<?php echo $refItem->getLanguageId(); ?>]]></languageid>
                                 <label><![CDATA[<?php echo $refItem->getLabel(); ?>]]></label>
@@ -37,10 +37,10 @@ 
 
                 </text>
                 <media>
-                    <?php foreach( $item->getListItems( 'media' ) as $listItem ) : ?>
+                    <?php foreach ($item->getListItems('media') as $listItem) : ?>
                         <?php if ($refItem = $listItem->getRefItem()) { ?>
 
-                            <mediaitem id="<?php echo $enc->attr( $refItem->getId() ); ?>" siteid="<?php echo $enc->attr( $refItem->getSiteId() ); ?>" ctime="<?php echo $enc->attr( $refItem->getTimeCreated() ); ?>" mtime="<?php echo $enc->attr( $refItem->getTimeModified() ); ?>" editor="<?php echo $enc->attr( $refItem->getEditor() ); ?>" list.id="<?php echo $enc->attr( $listItem->getId() ); ?>" list.siteid="<?php echo $enc->attr( $listItem->getSiteId() ); ?>" list.parentid="<?php echo $enc->attr( $listItem->getParentId() ); ?>" list.type="<?php echo $enc->attr( $listItem->getType() ); ?>" list.config="<?php echo $enc->attr( json_encode( $listItem->getConfig() ) ); ?>" list.start="<?php echo $enc->attr( $listItem->getDateStart() ); ?>" list.end="<?php echo $enc->attr( $listItem->getDateEnd() ); ?>" list.position="<?php echo $enc->attr( $listItem->getPosition() ); ?>" list.status="<?php echo $enc->attr( $listItem->getStatus() ); ?>" list.ctime="<?php echo $enc->attr( $listItem->getTimeCreated() ); ?>" list.mtime="<?php echo $enc->attr( $listItem->getTimeModified() ); ?>" list.editor="<?php echo $enc->attr( $listItem->getEditor() ); ?>">
+                            <mediaitem id="<?php echo $enc->attr($refItem->getId()); ?>" siteid="<?php echo $enc->attr($refItem->getSiteId()); ?>" ctime="<?php echo $enc->attr($refItem->getTimeCreated()); ?>" mtime="<?php echo $enc->attr($refItem->getTimeModified()); ?>" editor="<?php echo $enc->attr($refItem->getEditor()); ?>" list.id="<?php echo $enc->attr($listItem->getId()); ?>" list.siteid="<?php echo $enc->attr($listItem->getSiteId()); ?>" list.parentid="<?php echo $enc->attr($listItem->getParentId()); ?>" list.type="<?php echo $enc->attr($listItem->getType()); ?>" list.config="<?php echo $enc->attr(json_encode($listItem->getConfig())); ?>" list.start="<?php echo $enc->attr($listItem->getDateStart()); ?>" list.end="<?php echo $enc->attr($listItem->getDateEnd()); ?>" list.position="<?php echo $enc->attr($listItem->getPosition()); ?>" list.status="<?php echo $enc->attr($listItem->getStatus()); ?>" list.ctime="<?php echo $enc->attr($listItem->getTimeCreated()); ?>" list.mtime="<?php echo $enc->attr($listItem->getTimeModified()); ?>" list.editor="<?php echo $enc->attr($listItem->getEditor()); ?>">
                                 <type><![CDATA[<?php echo $refItem->getType(); ?>]]></type>
                                 <languageid><![CDATA[<?php echo $refItem->getLanguageId(); ?>]]></languageid>
                                 <label><![CDATA[<?php echo $refItem->getLabel(); ?>]]></label>
@@ -54,10 +54,10 @@ 
 
                 </media>
                 <price>
-                    <?php foreach( $item->getListItems( 'price' ) as $listItem ) : ?>
+                    <?php foreach ($item->getListItems('price') as $listItem) : ?>
                         <?php if ($refItem = $listItem->getRefItem()) { ?>
 
-                            <priceitem id="<?php echo $enc->attr( $refItem->getId() ); ?>" siteid="<?php echo $enc->attr( $refItem->getSiteId() ); ?>" ctime="<?php echo $enc->attr( $refItem->getTimeCreated() ); ?>" mtime="<?php echo $enc->attr( $refItem->getTimeModified() ); ?>" editor="<?php echo $enc->attr( $refItem->getEditor() ); ?>" list.id="<?php echo $enc->attr( $listItem->getId() ); ?>" list.siteid="<?php echo $enc->attr( $listItem->getSiteId() ); ?>" list.parentid="<?php echo $enc->attr( $listItem->getParentId() ); ?>" list.type="<?php echo $enc->attr( $listItem->getType() ); ?>" list.config="<?php echo $enc->attr( json_encode( $listItem->getConfig() ) ); ?>" list.start="<?php echo $enc->attr( $listItem->getDateStart() ); ?>" list.end="<?php echo $enc->attr( $listItem->getDateEnd() ); ?>" list.position="<?php echo $enc->attr( $listItem->getPosition() ); ?>" list.status="<?php echo $enc->attr( $listItem->getStatus() ); ?>" list.ctime="<?php echo $enc->attr( $listItem->getTimeCreated() ); ?>" list.mtime="<?php echo $enc->attr( $listItem->getTimeModified() ); ?>" list.editor="<?php echo $enc->attr( $listItem->getEditor() ); ?>">
+                            <priceitem id="<?php echo $enc->attr($refItem->getId()); ?>" siteid="<?php echo $enc->attr($refItem->getSiteId()); ?>" ctime="<?php echo $enc->attr($refItem->getTimeCreated()); ?>" mtime="<?php echo $enc->attr($refItem->getTimeModified()); ?>" editor="<?php echo $enc->attr($refItem->getEditor()); ?>" list.id="<?php echo $enc->attr($listItem->getId()); ?>" list.siteid="<?php echo $enc->attr($listItem->getSiteId()); ?>" list.parentid="<?php echo $enc->attr($listItem->getParentId()); ?>" list.type="<?php echo $enc->attr($listItem->getType()); ?>" list.config="<?php echo $enc->attr(json_encode($listItem->getConfig())); ?>" list.start="<?php echo $enc->attr($listItem->getDateStart()); ?>" list.end="<?php echo $enc->attr($listItem->getDateEnd()); ?>" list.position="<?php echo $enc->attr($listItem->getPosition()); ?>" list.status="<?php echo $enc->attr($listItem->getStatus()); ?>" list.ctime="<?php echo $enc->attr($listItem->getTimeCreated()); ?>" list.mtime="<?php echo $enc->attr($listItem->getTimeModified()); ?>" list.editor="<?php echo $enc->attr($listItem->getEditor()); ?>">
                                 <type><![CDATA[<?php echo $refItem->getType(); ?>]]></type>
                                 <currencyid><![CDATA[<?php echo $refItem->getCurrencyId(); ?>]]></currencyid>
                                 <quantity><![CDATA[<?php echo $refItem->getQuantity(); ?>]]></quantity>
@@ -73,10 +73,10 @@ 
 
                 </price>
                 <attribute>
-                    <?php foreach( $item->getListItems( 'attribute' ) as $listItem ) : ?>
+                    <?php foreach ($item->getListItems('attribute') as $listItem) : ?>
                         <?php if ($refItem = $listItem->getRefItem()) { ?>
 
-                            <attributeitem id="<?php echo $enc->attr( $refItem->getId() ); ?>" siteid="<?php echo $enc->attr( $refItem->getSiteId() ); ?>" ctime="<?php echo $enc->attr( $refItem->getTimeCreated() ); ?>" mtime="<?php echo $enc->attr( $refItem->getTimeModified() ); ?>" editor="<?php echo $enc->attr( $refItem->getEditor() ); ?>" list.id="<?php echo $enc->attr( $listItem->getId() ); ?>" list.siteid="<?php echo $enc->attr( $listItem->getSiteId() ); ?>" list.parentid="<?php echo $enc->attr( $listItem->getParentId() ); ?>" list.type="<?php echo $enc->attr( $listItem->getType() ); ?>" list.config="<?php echo $enc->attr( json_encode( $listItem->getConfig() ) ); ?>" list.start="<?php echo $enc->attr( $listItem->getDateStart() ); ?>" list.end="<?php echo $enc->attr( $listItem->getDateEnd() ); ?>" list.position="<?php echo $enc->attr( $listItem->getPosition() ); ?>" list.status="<?php echo $enc->attr( $listItem->getStatus() ); ?>" list.ctime="<?php echo $enc->attr( $listItem->getTimeCreated() ); ?>" list.mtime="<?php echo $enc->attr( $listItem->getTimeModified() ); ?>" list.editor="<?php echo $enc->attr( $listItem->getEditor() ); ?>">
+                            <attributeitem id="<?php echo $enc->attr($refItem->getId()); ?>" siteid="<?php echo $enc->attr($refItem->getSiteId()); ?>" ctime="<?php echo $enc->attr($refItem->getTimeCreated()); ?>" mtime="<?php echo $enc->attr($refItem->getTimeModified()); ?>" editor="<?php echo $enc->attr($refItem->getEditor()); ?>" list.id="<?php echo $enc->attr($listItem->getId()); ?>" list.siteid="<?php echo $enc->attr($listItem->getSiteId()); ?>" list.parentid="<?php echo $enc->attr($listItem->getParentId()); ?>" list.type="<?php echo $enc->attr($listItem->getType()); ?>" list.config="<?php echo $enc->attr(json_encode($listItem->getConfig())); ?>" list.start="<?php echo $enc->attr($listItem->getDateStart()); ?>" list.end="<?php echo $enc->attr($listItem->getDateEnd()); ?>" list.position="<?php echo $enc->attr($listItem->getPosition()); ?>" list.status="<?php echo $enc->attr($listItem->getStatus()); ?>" list.ctime="<?php echo $enc->attr($listItem->getTimeCreated()); ?>" list.mtime="<?php echo $enc->attr($listItem->getTimeModified()); ?>" list.editor="<?php echo $enc->attr($listItem->getEditor()); ?>">
                                 <type><![CDATA[<?php echo $refItem->getType(); ?>]]></type>
                                 <code><![CDATA[<?php echo $refItem->getCode(); ?>]]></code>
                                 <label><![CDATA[<?php echo $refItem->getLabel(); ?>]]></label>
@@ -88,10 +88,10 @@ 
 
                 </attribute>
                 <product>
-                    <?php foreach( $item->getListItems( 'product' ) as $listItem ) : ?>
+                    <?php foreach ($item->getListItems('product') as $listItem) : ?>
                         <?php if ($refItem = $listItem->getRefItem()) { ?>
 
-                            <productitem id="<?php echo $enc->attr( $refItem->getId() ); ?>" siteid="<?php echo $enc->attr( $refItem->getSiteId() ); ?>" ctime="<?php echo $enc->attr( $refItem->getTimeCreated() ); ?>" mtime="<?php echo $enc->attr( $refItem->getTimeModified() ); ?>" editor="<?php echo $enc->attr( $refItem->getEditor() ); ?>" list.id="<?php echo $enc->attr( $listItem->getId() ); ?>" list.siteid="<?php echo $enc->attr( $listItem->getSiteId() ); ?>" list.parentid="<?php echo $enc->attr( $listItem->getParentId() ); ?>" list.type="<?php echo $enc->attr( $listItem->getType() ); ?>" list.config="<?php echo $enc->attr( json_encode( $listItem->getConfig() ) ); ?>" list.start="<?php echo $enc->attr( $listItem->getDateStart() ); ?>" list.end="<?php echo $enc->attr( $listItem->getDateEnd() ); ?>" list.position="<?php echo $enc->attr( $listItem->getPosition() ); ?>" list.status="<?php echo $enc->attr( $listItem->getStatus() ); ?>" list.ctime="<?php echo $enc->attr( $listItem->getTimeCreated() ); ?>" list.mtime="<?php echo $enc->attr( $listItem->getTimeModified() ); ?>" list.editor="<?php echo $enc->attr( $listItem->getEditor() ); ?>">
+                            <productitem id="<?php echo $enc->attr($refItem->getId()); ?>" siteid="<?php echo $enc->attr($refItem->getSiteId()); ?>" ctime="<?php echo $enc->attr($refItem->getTimeCreated()); ?>" mtime="<?php echo $enc->attr($refItem->getTimeModified()); ?>" editor="<?php echo $enc->attr($refItem->getEditor()); ?>" list.id="<?php echo $enc->attr($listItem->getId()); ?>" list.siteid="<?php echo $enc->attr($listItem->getSiteId()); ?>" list.parentid="<?php echo $enc->attr($listItem->getParentId()); ?>" list.type="<?php echo $enc->attr($listItem->getType()); ?>" list.config="<?php echo $enc->attr(json_encode($listItem->getConfig())); ?>" list.start="<?php echo $enc->attr($listItem->getDateStart()); ?>" list.end="<?php echo $enc->attr($listItem->getDateEnd()); ?>" list.position="<?php echo $enc->attr($listItem->getPosition()); ?>" list.status="<?php echo $enc->attr($listItem->getStatus()); ?>" list.ctime="<?php echo $enc->attr($listItem->getTimeCreated()); ?>" list.mtime="<?php echo $enc->attr($listItem->getTimeModified()); ?>" list.editor="<?php echo $enc->attr($listItem->getEditor()); ?>">
                                 <type><![CDATA[<?php echo $item->getType(); ?>]]></type>
                                 <code><![CDATA[<?php echo $item->getCode(); ?>]]></code>
                                 <label><![CDATA[<?php echo $item->getCode(); ?>]]></label>

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

Braces +1 added lines, -2 removed lines

@@ -87,8 +87,7 @@
 			foreach( $manager->searchItems( $search ) as $item ) {
 				$this->listTypes[$item->getCode()] = $item->getCode();
 			}
-		}
-		else
+		} else
 		{
 			$this->listTypes = array_flip( $this->listTypes );
 		}

Spacing +35 added lines, -35 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/product/listtypes
 		 * Names of the product list types that are updated or removed
@@ -74,26 +74,26 @@ 
 		 * @see controller/common/product/import/csv/processor/text/listtypes
 		 */
 		$key = 'controller/common/product/import/csv/processor/product/listtypes';
-		$this->listTypes = $context->getConfig()->get( $key, ['default', 'suggestion'] );
+		$this->listTypes = $context->getConfig()->get($key, ['default', 'suggestion']);
 
-		if( $this->listTypes === null )
+		if ($this->listTypes === null)
 		{
 			$this->listTypes = [];
-			$manager = \Aimeos\MShop::create( $context, 'product/lists/type' );
+			$manager = \Aimeos\MShop::create($context, 'product/lists/type');
 
-			$search = $manager->createSearch()->setSlice( 0, 0x7fffffff );
-			$search->setConditions( $search->compare( '==', 'product.lists.type.domain', 'product' ) );
+			$search = $manager->createSearch()->setSlice(0, 0x7fffffff);
+			$search->setConditions($search->compare('==', 'product.lists.type.domain', 'product'));
 
-			foreach( $manager->searchItems( $search ) as $item ) {
+			foreach ($manager->searchItems($search) as $item) {
 				$this->listTypes[$item->getCode()] = $item->getCode();
 			}
 		}
 		else
 		{
-			$this->listTypes = array_flip( $this->listTypes );
+			$this->listTypes = array_flip($this->listTypes);
 		}
 
-		$this->cache = $this->getCache( 'product' );
+		$this->cache = $this->getCache('product');
 	}
 
 
@@ -104,47 +104,47 @@ 
 	 * @param array $data List of CSV fields with position as key and data as value
 	 * @return array List of data which has not 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();
-		$manager = \Aimeos\MShop::create( $context, 'product/lists' );
-		$separator = $context->getConfig()->get( 'controller/common/product/import/csv/separator', "\n" );
+		$manager = \Aimeos\MShop::create($context, 'product/lists');
+		$separator = $context->getConfig()->get('controller/common/product/import/csv/separator', "\n");
 
-		$listItems = $product->getListItems( 'product', null, null, false );
-		$this->cache->set( $product );
+		$listItems = $product->getListItems('product', null, null, false);
+		$this->cache->set($product);
 
-		foreach( $this->getMappedChunk( $data, $this->getMapping() ) as $list )
+		foreach ($this->getMappedChunk($data, $this->getMapping()) as $list)
 		{
-			if( $this->checkEntry( $list ) === false ) {
+			if ($this->checkEntry($list) === false) {
 				continue;
 			}
 
-			$listtype = $this->getValue( $list, 'product.lists.type', 'default' );
+			$listtype = $this->getValue($list, 'product.lists.type', 'default');
 
-			foreach( explode( $separator, $this->getValue( $list, 'product.code', '' ) ) as $code )
+			foreach (explode($separator, $this->getValue($list, 'product.code', '')) as $code)
 			{
-				$code = trim( $code );
+				$code = trim($code);
 
-				if( ( $prodid = $this->cache->get( $code ) ) === null )
+				if (($prodid = $this->cache->get($code)) === null)
 				{
 					$msg = 'No product for code "%1$s" available when importing product with code "%2$s"';
-					throw new \Aimeos\Controller\Jobs\Exception( sprintf( $msg, $code, $product->getCode() ) );
+					throw new \Aimeos\Controller\Jobs\Exception(sprintf($msg, $code, $product->getCode()));
 				}
 
-				if( ( $listItem = $product->getListItem( 'product', $listtype, $prodid ) ) === null ) {
-					$listItem = $manager->createItem()->setType( $listtype );
+				if (($listItem = $product->getListItem('product', $listtype, $prodid)) === null) {
+					$listItem = $manager->createItem()->setType($listtype);
 				} else {
-					unset( $listItems[$listItem->getId()] );
+					unset($listItems[$listItem->getId()]);
 				}
 
-				$listItem = $listItem->fromArray( $list )->setRefId( $prodid );
-				$product->addListItem( 'product', $listItem );
+				$listItem = $listItem->fromArray($list)->setRefId($prodid);
+				$product->addListItem('product', $listItem);
 			}
 		}
 
-		$product->deleteListItems( $listItems );
+		$product->deleteListItems($listItems);
 
-		return $this->getObject()->process( $product, $data );
+		return $this->getObject()->process($product, $data);
 	}
 
 
@@ -154,16 +154,16 @@ 
 	 * @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( $this->getValue( $list, 'product.code' ) === null ) {
+		if ($this->getValue($list, 'product.code') === null) {
 			return false;
 		}
 
-		if( ( $type = $this->getValue( $list, 'product.lists.type' ) ) && !isset( $this->listTypes[$type] ) )
+		if (($type = $this->getValue($list, 'product.lists.type')) && !isset($this->listTypes[$type]))
 		{
-			$msg = sprintf( 'Invalid type "%1$s" (%2$s)', $type, 'product list' );
-			throw new \Aimeos\Controller\Common\Exception( $msg );
+			$msg = sprintf('Invalid type "%1$s" (%2$s)', $type, 'product list');
+			throw new \Aimeos\Controller\Common\Exception($msg);
 		}
 
 		return true;