aimeos / ai-controller-jobs

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

Doc Comments +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 	 * Initializes the object
 	 *
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
-	 * @param array $mapping Associative list of field position in CSV as key and domain item key as value
+	 * @param string[] $mapping Associative list of field position in CSV as key and domain item key as value
 	 * @param \Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Iface $object Decorated processor
 	 */
 	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,

Spacing +4 added lines, -4 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\Coupon\Import\Csv\Processor\Iface $object Decorated processor
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
-		\Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Iface $object = null )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
+		\Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Iface $object = null)
 	{
 		$this->context = $context;
 		$this->mapping = $mapping;
@@ -71,8 +71,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/common/src/Controller/Common/Coupon/Import/Csv/Base.php

Spacing +28 added lines, -28 removed lines

@@ -26,17 +26,17 @@ 
 	 * @param array $codes List of coupon codes
 	 * @return array Associative list of coupon codes as key and coupon code items as value
 	 */
-	protected function getCouponCodeItems( array $codes )
+	protected function getCouponCodeItems(array $codes)
 	{
 		$result = [];
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'coupon/code' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'coupon/code');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'coupon.code.code', $codes ) );
-		$search->setSlice( 0, count( $codes ) );
+		$search->setConditions($search->compare('==', 'coupon.code.code', $codes));
+		$search->setSlice(0, count($codes));
 
-		foreach( $manager->searchItems( $search ) as $item ) {
-			$result[ $item->getCode() ] = $item;
+		foreach ($manager->searchItems($search) as $item) {
+			$result[$item->getCode()] = $item;
 		}
 
 		return $result;
@@ -51,15 +51,15 @@ 
 	 * @param integer $codePos Column position which contains the unique coupon code (starting from 0)
 	 * @return array List of arrays with coupon 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();
 		}
 
@@ -98,21 +98,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]);
 			}
 		}
 
@@ -126,39 +126,39 @@ 
 	 * @param array $mappings Associative list of processor types as keys and index/data mappings as values
 	 * @return \Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Iface Processor object
 	 */
-	protected function getProcessors( array $mappings )
+	protected function getProcessors(array $mappings)
 	{
 		$context = $this->getContext();
 		$config = $context->getConfig();
 		$iface = '\\Aimeos\\Controller\\Common\\Coupon\\Import\\Csv\\Processor\\Iface';
-		$object = new \Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Done( $context, [] );
+		$object = new \Aimeos\Controller\Common\Coupon\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\\Coupon\\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/coupon/import/csv/processor/' . $type . '/name', 'Standard' );
+			$name = $config->get('controller/common/coupon/import/csv/processor/' . $type . '/name', 'Standard');
 
-			if( ctype_alnum( $name ) === false )
+			if (ctype_alnum($name) === false)
 			{
 				$classname = is_string($name) ? '\\Aimeos\\Controller\\Common\\Coupon\\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\\Coupon\\Import\\Csv\\Processor\\' . ucfirst( $type ) . '\\' . $name;
+			$classname = '\\Aimeos\\Controller\\Common\\Coupon\\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);
 
-			if( !( $object instanceof $iface ) ) {
-				throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Class "%1$s" does not implement interface "%2$s"', $classname, $iface ) );
+			if (!($object instanceof $iface)) {
+				throw new \Aimeos\Controller\Jobs\Exception(sprintf('Class "%1$s" does not implement interface "%2$s"', $classname, $iface));
 			}
 		}
 

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

Spacing +8 added lines, -8 removed lines

@@ -40,21 +40,21 @@
 	 * @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\Coupon\Item\Code\Iface $item, array $data )
+	public function process(\Aimeos\MShop\Coupon\Item\Code\Iface $item, array $data)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'coupon/code' );
-		$map = $this->getMappedChunk( $data, $this->getMapping() );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'coupon/code');
+		$map = $this->getMappedChunk($data, $this->getMapping());
 
-		foreach( $map as $list )
+		foreach ($map as $list)
 		{
-			if( $list['coupon.code.code'] == '' ) {
+			if ($list['coupon.code.code'] == '') {
 				continue;
 			}
 
-			$item->fromArray( $list );
-			$manager->saveItem( $item );
+			$item->fromArray($list);
+			$manager->saveItem($item);
 		}
 
-		return $this->getObject()->process( $item, $data );
+		return $this->getObject()->process($item, $data);
 	}
 }

controller/common/src/Controller/Common/Coupon/Import/Csv/Processor/Done.php

Spacing +3 added lines, -3 removed lines

@@ -27,8 +27,8 @@ 
 	 * @param array $mapping Associative list of field position in CSV as key and domain item key as value
 	 * @param \Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Iface $object Decorated processor
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
-		\Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Iface $object = null )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
+		\Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Iface $object = null)
 	{
 	}
 
@@ -40,7 +40,7 @@ 
 	 * @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\Coupon\Item\Code\Iface $item, array $data )
+	public function process(\Aimeos\MShop\Coupon\Item\Code\Iface $item, array $data)
 	{
 		return $data;
 	}

controller/common/src/Controller/Common/Coupon/Import/Csv/Processor/Iface.php

Spacing +3 added lines, -3 removed lines

@@ -26,8 +26,8 @@ 
 	 * @param array $mapping Associative list of field position in CSV as key and domain item key as value
 	 * @param \Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Iface $object Decorated processor
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
-		\Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Iface $object = null );
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
+		\Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Iface $object = null);
 
 
 	/**
@@ -37,5 +37,5 @@ 
 	 * @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\Coupon\Item\Code\Iface $item, array $data );
+	public function process(\Aimeos\MShop\Coupon\Item\Code\Iface $item, array $data);
 }
\ No newline at end of file

controller/common/tests/Controller/Common/Coupon/Import/Csv/Processor/Code/StandardTest.php

Spacing +35 added lines, -35 removed lines

@@ -17,16 +17,16 @@ 
 
 	protected function setUp()
 	{
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 
 		$this->context = \TestHelperCntl::getContext();
-		$this->endpoint = new \Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Done( $this->context, [] );
+		$this->endpoint = new \Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Done($this->context, []);
 	}
 
 
 	protected function tearDown()
 	{
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 	}
 
@@ -47,24 +47,24 @@ 
 			3 => '',
 		);
 
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'coupon' );
-		$codeManager = \Aimeos\MShop\Factory::createManager( $this->context, 'coupon/code' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'coupon');
+		$codeManager = \Aimeos\MShop\Factory::createManager($this->context, 'coupon/code');
 
-		$coupon = $manager->saveItem( $manager->createItem()->setProvider( 'test' ) );
+		$coupon = $manager->saveItem($manager->createItem()->setProvider('test'));
 		$couponCode = $codeManager->createItem();
-		$couponCode->setParentId( $coupon->getId() );
+		$couponCode->setParentId($coupon->getId());
 
-		$object = new \Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Code\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $couponCode, $data );
+		$object = new \Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Code\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($couponCode, $data);
 
-		$codeManager->deleteItem( $couponCode->getId() );
-		$manager->deleteItem( $coupon->getId() );
+		$codeManager->deleteItem($couponCode->getId());
+		$manager->deleteItem($coupon->getId());
 
 
-		$this->assertEquals( 10, $couponCode->getCount() );
-		$this->assertEquals( 'jobimporttest', $couponCode->getCode() );
-		$this->assertEquals( '2000-01-01 00:00:00', $couponCode->getDateStart() );
-		$this->assertEquals( null, $couponCode->getDateEnd() );
+		$this->assertEquals(10, $couponCode->getCount());
+		$this->assertEquals('jobimporttest', $couponCode->getCode());
+		$this->assertEquals('2000-01-01 00:00:00', $couponCode->getDateStart());
+		$this->assertEquals(null, $couponCode->getDateEnd());
 	}
 
 
@@ -86,23 +86,23 @@ 
 		);
 
 
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'coupon' );
-		$codeManager = \Aimeos\MShop\Factory::createManager( $this->context, 'coupon/code' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'coupon');
+		$codeManager = \Aimeos\MShop\Factory::createManager($this->context, 'coupon/code');
 
-		$coupon = $manager->saveItem( $manager->createItem()->setProvider( 'test' ) );
+		$coupon = $manager->saveItem($manager->createItem()->setProvider('test'));
 		$couponCode = $codeManager->createItem();
-		$couponCode->setParentId( $coupon->getId() );
+		$couponCode->setParentId($coupon->getId());
 
-		$object = new \Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Code\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $couponCode, $data );
-		$object->process( $couponCode, $dataUpdate );
+		$object = new \Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Code\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($couponCode, $data);
+		$object->process($couponCode, $dataUpdate);
 
-		$codeManager->deleteItem( $couponCode->getId() );
-		$manager->deleteItem( $coupon->getId() );
+		$codeManager->deleteItem($couponCode->getId());
+		$manager->deleteItem($coupon->getId());
 
 
-		$this->assertEquals( 5, $couponCode->getCount() );
-		$this->assertEquals( 'jobimporttest', $couponCode->getCode() );
+		$this->assertEquals(5, $couponCode->getCount());
+		$this->assertEquals('jobimporttest', $couponCode->getCode());
 	}
 
 
@@ -119,20 +119,20 @@ 
 		);
 
 
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'coupon' );
-		$codeManager = \Aimeos\MShop\Factory::createManager( $this->context, 'coupon/code' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'coupon');
+		$codeManager = \Aimeos\MShop\Factory::createManager($this->context, 'coupon/code');
 
-		$coupon = $manager->saveItem( $manager->createItem()->setProvider( 'test' ) );
+		$coupon = $manager->saveItem($manager->createItem()->setProvider('test'));
 		$couponCode = $codeManager->createItem();
-		$couponCode->setParentId( $coupon->getId() );
+		$couponCode->setParentId($coupon->getId());
 
-		$object = new \Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Code\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $couponCode, $data );
+		$object = new \Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Code\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($couponCode, $data);
 
-		$codeManager->deleteItem( $couponCode->getId() );
-		$manager->deleteItem( $coupon->getId() );
+		$codeManager->deleteItem($couponCode->getId());
+		$manager->deleteItem($coupon->getId());
 
 
-		$this->assertEquals( 0, $couponCode->getCount() );
+		$this->assertEquals(0, $couponCode->getCount());
 	}
 }
\ No newline at end of file

controller/jobs/src/Controller/Jobs/Coupon/Import/Csv/Code/Standard.php

Spacing +49 added lines, -49 removed lines

@@ -28,7 +28,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Coupon code import CSV' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Coupon code import CSV');
 	}
 
 
@@ -39,7 +39,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Imports new and updates existing coupon code from CSV files' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Imports new and updates existing coupon code from CSV files');
 	}
 
 
@@ -71,7 +71,7 @@ 
 		 * @see controller/jobs/coupon/import/csv/code/skip-lines
 		 * @see controller/jobs/coupon/import/csv/code/max-size
 		 */
-		$mappings = $config->get( 'controller/jobs/coupon/import/csv/code/mapping', $mappings );
+		$mappings = $config->get('controller/jobs/coupon/import/csv/code/mapping', $mappings);
 
 
 		/** controller/jobs/coupon/import/csv/code/max-size
@@ -90,7 +90,7 @@ 
 		 * @see controller/jobs/coupon/import/csv/code/skip-lines
 		 * @see controller/jobs/coupon/import/csv/code/mapping
 		 */
-		$maxcnt = (int) $config->get( 'controller/jobs/coupon/import/csv/code/max-size', 1000 );
+		$maxcnt = (int) $config->get('controller/jobs/coupon/import/csv/code/max-size', 1000);
 
 
 		/** controller/jobs/coupon/import/csv/code/skip-lines
@@ -108,63 +108,63 @@ 
 		 * @see controller/jobs/coupon/import/csv/code/mapping
 		 * @see controller/jobs/coupon/import/csv/code/max-size
 		 */
-		$skiplines = (int) $config->get( 'controller/jobs/coupon/import/csv/code/skip-lines', 0 );
+		$skiplines = (int) $config->get('controller/jobs/coupon/import/csv/code/skip-lines', 0);
 
 
 		try
 		{
-			$processor = $this->getProcessors( $mappings );
-			$codePos = $this->getCodePosition( $mappings['code'] );
-			$fs = $context->getFileSystemManager()->get( 'fs-import' );
+			$processor = $this->getProcessors($mappings);
+			$codePos = $this->getCodePosition($mappings['code']);
+			$fs = $context->getFileSystemManager()->get('fs-import');
 			$dir = 'couponcode/' . $context->getLocale()->getSite()->getCode();
 
-			if( $fs->isDir( $dir ) === false ) {
+			if ($fs->isDir($dir) === false) {
 				return;
 			}
 
-			foreach( $fs->scan( $dir ) as $filename )
+			foreach ($fs->scan($dir) as $filename)
 			{
-				if( $filename == '.' || $filename == '..' ) {
+				if ($filename == '.' || $filename == '..') {
 					continue;
 				}
 
-				list( $couponId, $ext ) = explode( '.', $filename );
-				$container = $this->getContainer( $fs->readf( $dir . '/' . $filename ) );
+				list($couponId, $ext) = explode('.', $filename);
+				$container = $this->getContainer($fs->readf($dir . '/' . $filename));
 
-				$msg = sprintf( 'Started coupon import from "%1$s" (%2$s)', $filename, __CLASS__ );
-				$logger->log( $msg, \Aimeos\MW\Logger\Base::NOTICE );
+				$msg = sprintf('Started coupon import from "%1$s" (%2$s)', $filename, __CLASS__);
+				$logger->log($msg, \Aimeos\MW\Logger\Base::NOTICE);
 
-				foreach( $container as $content )
+				foreach ($container as $content)
 				{
-					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)) !== [])
 					{
-						$items = $this->getCouponCodeItems( array_keys( $data ) );
-						$errcnt = $this->import( $items, $data, $couponId, $processor );
-						$chunkcnt = count( $data );
+						$items = $this->getCouponCodeItems(array_keys($data));
+						$errcnt = $this->import($items, $data, $couponId, $processor);
+						$chunkcnt = count($data);
 
 						$msg = 'Imported coupon lines from "%1$s": %2$d/%3$d (%4$s)';
-						$logger->log( sprintf( $msg, $filename, $chunkcnt - $errcnt, $chunkcnt, __CLASS__ ), \Aimeos\MW\Logger\Base::NOTICE );
+						$logger->log(sprintf($msg, $filename, $chunkcnt - $errcnt, $chunkcnt, __CLASS__), \Aimeos\MW\Logger\Base::NOTICE);
 
 						$errors += $errcnt;
 						$total += $chunkcnt;
-						unset( $items, $data );
+						unset($items, $data);
 					}
 				}
 
-				$this->closeContainer( $container );
+				$this->closeContainer($container);
 
 				$msg = 'Finished coupon import: %1$d successful, %2$s errors, %3$s total (%4$s)';
-				$logger->log( sprintf( $msg, $total - $errors, $errors, $total, __CLASS__ ), \Aimeos\MW\Logger\Base::NOTICE );
+				$logger->log(sprintf($msg, $total - $errors, $errors, $total, __CLASS__), \Aimeos\MW\Logger\Base::NOTICE);
 			}
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$logger->log( 'Coupon import error: ' . $e->getMessage() );
-			$logger->log( $e->getTraceAsString() );
+			$logger->log('Coupon import error: ' . $e->getMessage());
+			$logger->log($e->getTraceAsString());
 
 			throw $e;
 		}
@@ -176,10 +176,10 @@ 
 	 *
 	 * @param \Aimeos\MW\Container\Iface $container Container object
 	 */
-	protected function closeContainer( \Aimeos\MW\Container\Iface $container )
+	protected function closeContainer(\Aimeos\MW\Container\Iface $container)
 	{
 		$container->close();
-		unlink( $container->getName() );
+		unlink($container->getName());
 	}
 
 
@@ -190,16 +190,16 @@ 
 	 * @return integer Position of the "coupon.code" column
 	 * @throws \Aimeos\Controller\Jobs\Exception If no mapping for "coupon.code.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 === 'coupon.code.code' ) {
+			if ($key === 'coupon.code.code') {
 				return $pos;
 			}
 		}
 
-		throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'No "coupon.code.code" column in CSV mapping found' ) );
+		throw new \Aimeos\Controller\Jobs\Exception(sprintf('No "coupon.code.code" column in CSV mapping found'));
 	}
 
 
@@ -209,7 +209,7 @@ 
 	 * @param string $filepath Path to the container file
 	 * @return \Aimeos\MW\Container\Iface Container object
 	 */
-	protected function getContainer( $filepath )
+	protected function getContainer($filepath)
 	{
 		$config = $this->getContext()->getConfig();
 
@@ -233,7 +233,7 @@ 
 		 * @see controller/jobs/coupon/import/csv/code/container/content
 		 * @see controller/jobs/coupon/import/csv/code/container/options
 		 */
-		$container = $config->get( 'controller/jobs/coupon/import/csv/code/container/type', 'File' );
+		$container = $config->get('controller/jobs/coupon/import/csv/code/container/type', 'File');
 
 		/** controller/jobs/coupon/import/csv/code/container/content
 		 * Name of the content type inside the container to read the data from
@@ -253,7 +253,7 @@ 
 		 * @see controller/jobs/coupon/import/csv/code/container/type
 		 * @see controller/jobs/coupon/import/csv/code/container/options
 		 */
-		$content = $config->get( 'controller/jobs/coupon/import/csv/code/container/content', 'CSV' );
+		$content = $config->get('controller/jobs/coupon/import/csv/code/container/content', 'CSV');
 
 		/** controller/jobs/coupon/import/csv/code/container/options
 		 * List of file container options for the coupon import files
@@ -270,9 +270,9 @@ 
 		 * @see controller/jobs/coupon/import/csv/code/container/content
 		 * @see controller/jobs/coupon/import/csv/code/container/type
 		 */
-		$options = $config->get( 'controller/jobs/coupon/import/csv/code/container/options', [] );
+		$options = $config->get('controller/jobs/coupon/import/csv/code/container/options', []);
 
-		return \Aimeos\MW\Container\Factory::getContainer( $filepath, $container, $content, $options );
+		return \Aimeos\MW\Container\Factory::getContainer($filepath, $container, $content, $options);
 	}
 
 
@@ -286,36 +286,36 @@ 
 	 * @return integer Number of coupons that couldn't be imported
 	 * @throws \Aimeos\Controller\Jobs\Exception
 	 */
-	protected function import( array $items, array $data, $couponId,
-		\Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Iface $processor )
+	protected function import(array $items, array $data, $couponId,
+		\Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Iface $processor)
 	{
 		$errors = 0;
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'coupon/code' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'coupon/code');
 
-		foreach( $data as $code => $list )
+		foreach ($data as $code => $list)
 		{
 			$manager->begin();
 
 			try
 			{
-				if( isset( $items[$code] ) ) {
+				if (isset($items[$code])) {
 					$item = $items[$code];
 				} else {
 					$item = $manager->createItem();
 				}
 
-				$item->setParentId( $couponId );
-				$list = $processor->process( $item, $list );
+				$item->setParentId($couponId);
+				$list = $processor->process($item, $list);
 
 				$manager->commit();
 			}
-			catch( \Exception $e )
+			catch (\Exception $e)
 			{
 				$manager->rollback();
 
-				$msg = sprintf( 'Unable to import coupon with code "%1$s": %2$s', $code, $e->getMessage() );
-				$context->getLogger()->log( $msg );
+				$msg = sprintf('Unable to import coupon with code "%1$s": %2$s', $code, $e->getMessage());
+				$context->getLogger()->log($msg);
 
 				$errors++;
 			}

Braces +2 added lines, -4 removed lines

@@ -160,8 +160,7 @@ 
 				$msg = 'Finished coupon import: %1$d successful, %2$s errors, %3$s total (%4$s)';
 				$logger->log( sprintf( $msg, $total - $errors, $errors, $total, __CLASS__ ), \Aimeos\MW\Logger\Base::NOTICE );
 			}
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$logger->log( 'Coupon import error: ' . $e->getMessage() );
 			$logger->log( $e->getTraceAsString() );
@@ -309,8 +308,7 @@ 
 				$list = $processor->process( $item, $list );
 
 				$manager->commit();
-			}
-			catch( \Exception $e )
+			} catch( \Exception $e )
 			{
 				$manager->rollback();
 

controller/jobs/src/Controller/Jobs/Coupon/Import/Csv/Code/Factory.php

Spacing +6 added lines, -6 removed lines

@@ -29,7 +29,7 @@ 
 	 * @param string|null $name Name of the controller or "Standard" if null
 	 * @return \Aimeos\Controller\Jobs\Iface New controller object
 	 */
-	public static function createController( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\Bootstrap $aimeos, $name = null )
+	public static function createController(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\Bootstrap $aimeos, $name = null)
 	{
 		/** controller/jobs/coupon/import/csv/code/name
 		 * Class name of the used coupon code import job controller implementation
@@ -64,20 +64,20 @@ 
 		 * @since 2017.10
 		 * @category Developer
 		 */
-		if ( $name === null ) {
+		if ($name === null) {
 			$name = $context->getConfig()->get('controller/jobs/coupon/import/csv/code/name', 'Standard');
 		}
 
-		if ( ctype_alnum($name) === false )
+		if (ctype_alnum($name) === false)
 		{
 			$classname = is_string($name) ? '\\Aimeos\\Controller\\Jobs\\Coupon\\Import\\Csv\\Code\\' . $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));
 		}
 
 		$iface = '\\Aimeos\\Controller\\Jobs\\Iface';
 		$classname = '\\Aimeos\\Controller\\Jobs\\Coupon\\Import\\Csv\\Code\\' . $name;
 
-		$controller = self::createControllerBase( $context, $aimeos, $classname, $iface );
+		$controller = self::createControllerBase($context, $aimeos, $classname, $iface);
 
 		/** controller/jobs/coupon/import/csv/code/decorators/excludes
 		 * Excludes decorators added by the "common" option from the coupon code import CSV job controller
@@ -154,6 +154,6 @@ 
 		 * @see controller/jobs/coupon/import/csv/code/decorators/excludes
 		 * @see controller/jobs/coupon/import/csv/code/decorators/global
 		 */
-		return self::addControllerDecorators( $context, $aimeos, $controller, 'coupon/import/csv/code' );
+		return self::addControllerDecorators($context, $aimeos, $controller, 'coupon/import/csv/code');
 	}
 }
\ No newline at end of file

controller/jobs/tests/Controller/Jobs/Product/Import/Csv/StandardTest.php

Spacing +94 added lines, -94 removed lines

@@ -18,119 +18,119 @@ 
 
 	protected function setUp()
 	{
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 
 		$this->context = \TestHelperJobs::getContext();
 		$this->aimeos = \TestHelperJobs::getAimeos();
 		$config = $this->context->getConfig();
 
-		$config->set( 'controller/jobs/product/import/csv/skip-lines', 1 );
-		$config->set( 'controller/jobs/product/import/csv/location', __DIR__ . '/_testfiles/valid' );
+		$config->set('controller/jobs/product/import/csv/skip-lines', 1);
+		$config->set('controller/jobs/product/import/csv/location', __DIR__ . '/_testfiles/valid');
 
-		$this->object = new \Aimeos\Controller\Jobs\Product\Import\Csv\Standard( $this->context, $this->aimeos );
+		$this->object = new \Aimeos\Controller\Jobs\Product\Import\Csv\Standard($this->context, $this->aimeos);
 	}
 
 
 	protected function tearDown()
 	{
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 
 		$this->object = null;
 
-		if( file_exists( 'tmp/import.zip' ) ) {
-			unlink( 'tmp/import.zip' );
+		if (file_exists('tmp/import.zip')) {
+			unlink('tmp/import.zip');
 		}
 	}
 
 
 	public function testGetName()
 	{
-		$this->assertEquals( 'Product import CSV', $this->object->getName() );
+		$this->assertEquals('Product import CSV', $this->object->getName());
 	}
 
 
 	public function testGetDescription()
 	{
 		$text = 'Imports new and updates existing products from CSV files';
-		$this->assertEquals( $text, $this->object->getDescription() );
+		$this->assertEquals($text, $this->object->getDescription());
 	}
 
 
 	public function testRun()
 	{
-		$prodcodes = array( 'job_csv_test', 'job_csv_test2' );
-		$nondelete = array( 'attribute', 'product' );
-		$delete = array( 'media', 'price', 'text' );
+		$prodcodes = array('job_csv_test', 'job_csv_test2');
+		$nondelete = array('attribute', 'product');
+		$delete = array('media', 'price', 'text');
 
 		$convert = array(
 			1 => 'Text/LatinUTF8',
 		);
 
-		$this->context->getConfig()->set( 'controller/jobs/product/import/csv/converter', $convert );
+		$this->context->getConfig()->set('controller/jobs/product/import/csv/converter', $convert);
 
 		$this->object->run();
 
-		$result = $this->get( $prodcodes, array_merge( $delete, $nondelete ) );
-		$properties = $this->getProperties( array_keys( $result ) );
-		$this->delete( $prodcodes, $delete, $nondelete );
+		$result = $this->get($prodcodes, array_merge($delete, $nondelete));
+		$properties = $this->getProperties(array_keys($result));
+		$this->delete($prodcodes, $delete, $nondelete);
 
-		$this->assertEquals( 2, count( $result ) );
-		$this->assertEquals( 2, count( $properties ) );
+		$this->assertEquals(2, count($result));
+		$this->assertEquals(2, count($properties));
 
-		foreach( $result as $product ) {
-			$this->assertEquals( 5, count( $product->getListItems() ) );
+		foreach ($result as $product) {
+			$this->assertEquals(5, count($product->getListItems()));
 		}
 	}
 
 
 	public function testRunUpdate()
 	{
-		$prodcodes = array( 'job_csv_test', 'job_csv_test2' );
-		$nondelete = array( 'attribute', 'product' );
-		$delete = array( 'media', 'price', 'text' );
+		$prodcodes = array('job_csv_test', 'job_csv_test2');
+		$nondelete = array('attribute', 'product');
+		$delete = array('media', 'price', 'text');
 
 		$this->object->run();
 		$this->object->run();
 
-		$result = $this->get( $prodcodes, array_merge( $delete, $nondelete ) );
-		$properties = $this->getProperties( array_keys( $result ) );
-		$this->delete( $prodcodes, $delete, $nondelete );
+		$result = $this->get($prodcodes, array_merge($delete, $nondelete));
+		$properties = $this->getProperties(array_keys($result));
+		$this->delete($prodcodes, $delete, $nondelete);
 
-		$this->assertEquals( 2, count( $result ) );
-		$this->assertEquals( 2, count( $properties ) );
+		$this->assertEquals(2, count($result));
+		$this->assertEquals(2, count($properties));
 
-		foreach( $result as $product ) {
-			$this->assertEquals( 5, count( $product->getListItems() ) );
+		foreach ($result as $product) {
+			$this->assertEquals(5, count($product->getListItems()));
 		}
 	}
 
 
 	public function testRunPosition()
 	{
-		$prodcodes = array( 'job_csv_test', 'job_csv_test2' );
-		$nondelete = array( 'attribute', 'product' );
-		$delete = array( 'media', 'price', 'text' );
+		$prodcodes = array('job_csv_test', 'job_csv_test2');
+		$nondelete = array('attribute', 'product');
+		$delete = array('media', 'price', 'text');
 
 		$config = $this->context->getConfig();
-		$mapping = $config->set( 'controller/jobs/product/import/csv/mapping', [] );
-		$mapping['item'] = array( 0 => 'product.label', 1 => 'product.code' );
+		$mapping = $config->set('controller/jobs/product/import/csv/mapping', []);
+		$mapping['item'] = array(0 => 'product.label', 1 => 'product.code');
 
-		$config->set( 'controller/jobs/product/import/csv/mapping', $mapping );
-		$config->set( 'controller/jobs/product/import/csv/location', __DIR__ . '/_testfiles/position' );
+		$config->set('controller/jobs/product/import/csv/mapping', $mapping);
+		$config->set('controller/jobs/product/import/csv/location', __DIR__ . '/_testfiles/position');
 
 		$this->object->run();
 
-		$result = $this->get( $prodcodes, array_merge( $delete, $nondelete ) );
-		$this->delete( $prodcodes, $delete, $nondelete );
+		$result = $this->get($prodcodes, array_merge($delete, $nondelete));
+		$this->delete($prodcodes, $delete, $nondelete);
 
-		$this->assertEquals( 2, count( $result ) );
+		$this->assertEquals(2, count($result));
 	}
 
 
 	public function testRunProcessorInvalidPosition()
 	{
-		$prodcodes = array( 'job_csv_test', 'job_csv_test2' );
+		$prodcodes = array('job_csv_test', 'job_csv_test2');
 
 		$mapping = array(
 			'item' => array(
@@ -150,11 +150,11 @@ 
 			),
 		);
 
-		$this->context->getConfig()->set( 'controller/jobs/product/import/csv/mapping', $mapping );
+		$this->context->getConfig()->set('controller/jobs/product/import/csv/mapping', $mapping);
 
 		$this->object->run();
 
-		$this->delete( $prodcodes, array( 'text', 'media' ), [] );
+		$this->delete($prodcodes, array('text', 'media'), []);
 	}
 
 
@@ -166,9 +166,9 @@ 
 			),
 		);
 
-		$this->context->getConfig()->set( 'controller/jobs/product/import/csv/mapping', $mapping );
+		$this->context->getConfig()->set('controller/jobs/product/import/csv/mapping', $mapping);
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
 		$this->object->run();
 	}
 
@@ -208,15 +208,15 @@ 
 			),
 		);
 
-		$this->context->getConfig()->set( 'controller/jobs/product/import/csv/mapping', $mapping );
+		$this->context->getConfig()->set('controller/jobs/product/import/csv/mapping', $mapping);
 
 		$config = $this->context->getConfig();
-		$config->set( 'controller/jobs/product/import/csv/skip-lines', 0 );
-		$config->set( 'controller/jobs/product/import/csv/location', __DIR__ . '/_testfiles/invalid' );
+		$config->set('controller/jobs/product/import/csv/skip-lines', 0);
+		$config->set('controller/jobs/product/import/csv/location', __DIR__ . '/_testfiles/invalid');
 
-		$this->object = new \Aimeos\Controller\Jobs\Product\Import\Csv\Standard( $this->context, $this->aimeos );
+		$this->object = new \Aimeos\Controller\Jobs\Product\Import\Csv\Standard($this->context, $this->aimeos);
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
 		$this->object->run();
 	}
 
@@ -224,104 +224,104 @@ 
 	public function testRunBackup()
 	{
 		$config = $this->context->getConfig();
-		$config->set( 'controller/jobs/product/import/csv/container/type', 'Zip' );
-		$config->set( 'controller/jobs/product/import/csv/location', 'tmp/import.zip' );
-		$config->set( 'controller/jobs/product/import/csv/backup', 'tmp/test-%Y-%m-%d.zip' );
+		$config->set('controller/jobs/product/import/csv/container/type', 'Zip');
+		$config->set('controller/jobs/product/import/csv/location', 'tmp/import.zip');
+		$config->set('controller/jobs/product/import/csv/backup', 'tmp/test-%Y-%m-%d.zip');
 
-		if( copy( __DIR__ . '/_testfiles/import.zip', 'tmp/import.zip' ) === false ) {
-			throw new \RuntimeException( 'Unable to copy test file' );
+		if (copy(__DIR__ . '/_testfiles/import.zip', 'tmp/import.zip') === false) {
+			throw new \RuntimeException('Unable to copy test file');
 		}
 
 		$this->object->run();
 
-		$filename = strftime( 'tmp/test-%Y-%m-%d.zip' );
-		$this->assertTrue( file_exists( $filename ) );
+		$filename = strftime('tmp/test-%Y-%m-%d.zip');
+		$this->assertTrue(file_exists($filename));
 
-		unlink( $filename );
+		unlink($filename);
 	}
 
 
 	public function testRunBackupInvalid()
 	{
 		$config = $this->context->getConfig();
-		$config->set( 'controller/jobs/product/import/csv/container/type', 'Zip' );
-		$config->set( 'controller/jobs/product/import/csv/location', 'tmp/import.zip' );
-		$config->set( 'controller/jobs/product/import/csv/backup', 'tmp/notexist/import.zip' );
+		$config->set('controller/jobs/product/import/csv/container/type', 'Zip');
+		$config->set('controller/jobs/product/import/csv/location', 'tmp/import.zip');
+		$config->set('controller/jobs/product/import/csv/backup', 'tmp/notexist/import.zip');
 
-		if( copy( __DIR__ . '/_testfiles/import.zip', 'tmp/import.zip' ) === false ) {
-			throw new \RuntimeException( 'Unable to copy test file' );
+		if (copy(__DIR__ . '/_testfiles/import.zip', 'tmp/import.zip') === false) {
+			throw new \RuntimeException('Unable to copy test file');
 		}
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
 		$this->object->run();
 	}
 
 
-	protected function delete( array $prodcodes, array $delete, array $nondelete )
+	protected function delete(array $prodcodes, array $delete, array $nondelete)
 	{
-		$catListManager = \Aimeos\MShop\Catalog\Manager\Factory::createManager( $this->context )->getSubmanager( 'lists' );
-		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
-		$listManager = $productManager->getSubManager( 'lists' );
+		$catListManager = \Aimeos\MShop\Catalog\Manager\Factory::createManager($this->context)->getSubmanager('lists');
+		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
+		$listManager = $productManager->getSubManager('lists');
 
-		foreach( $this->get( $prodcodes, $delete + $nondelete ) as $id => $product )
+		foreach ($this->get($prodcodes, $delete + $nondelete) as $id => $product)
 		{
-			foreach( $delete as $domain )
+			foreach ($delete as $domain)
 			{
-				$manager = \Aimeos\MShop\Factory::createManager( $this->context, $domain );
+				$manager = \Aimeos\MShop\Factory::createManager($this->context, $domain);
 
-				foreach( $product->getListItems( $domain ) as $listItem )
+				foreach ($product->getListItems($domain) as $listItem)
 				{
-					$manager->deleteItem( $listItem->getRefItem()->getId() );
-					$listManager->deleteItem( $listItem->getId() );
+					$manager->deleteItem($listItem->getRefItem()->getId());
+					$listManager->deleteItem($listItem->getId());
 				}
 			}
 
-			foreach( $nondelete as $domain )
+			foreach ($nondelete as $domain)
 			{
-				$ids = array_keys( $product->getListItems( $domain ) );
-				$listManager->deleteItems( $ids );
+				$ids = array_keys($product->getListItems($domain));
+				$listManager->deleteItems($ids);
 			}
 
-			$productManager->deleteItem( $product->getId() );
+			$productManager->deleteItem($product->getId());
 
 			$search = $catListManager->createSearch();
-			$search->setConditions( $search->compare( '==', 'catalog.lists.refid', $id ) );
-			$result = $catListManager->searchItems( $search );
+			$search->setConditions($search->compare('==', 'catalog.lists.refid', $id));
+			$result = $catListManager->searchItems($search);
 
-			$catListManager->deleteItems( array_keys( $result ) );
+			$catListManager->deleteItems(array_keys($result));
 		}
 
 
-		$attrManager = \Aimeos\MShop\Attribute\Manager\Factory::createManager( $this->context );
+		$attrManager = \Aimeos\MShop\Attribute\Manager\Factory::createManager($this->context);
 
 		$search = $attrManager->createSearch();
-		$search->setConditions( $search->compare( '==', 'attribute.code', 'import-test' ) );
+		$search->setConditions($search->compare('==', 'attribute.code', 'import-test'));
 
-		$result = $attrManager->searchItems( $search );
+		$result = $attrManager->searchItems($search);
 
-		$attrManager->deleteItems( array_keys( $result ) );
+		$attrManager->deleteItems(array_keys($result));
 	}
 
 
-	protected function get( array $prodcodes, array $domains )
+	protected function get(array $prodcodes, array $domains)
 	{
-		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
+		$productManager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
 
 		$search = $productManager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', $prodcodes ) );
+		$search->setConditions($search->compare('==', 'product.code', $prodcodes));
 
-		return $productManager->searchItems( $search, $domains );
+		return $productManager->searchItems($search, $domains);
 	}
 
 
-	protected function getProperties( array $prodids )
+	protected function getProperties(array $prodids)
 	{
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context )->getSubManager( 'property' );
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context)->getSubManager('property');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.property.parentid', $prodids ) );
-		$search->setSortations( array( $search->sort( '+', 'product.property.type.code' ) ) );
+		$search->setConditions($search->compare('==', 'product.property.parentid', $prodids));
+		$search->setSortations(array($search->sort('+', 'product.property.type.code')));
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 }
\ No newline at end of file