aimeos / ai-controller-jobs

controller/jobs/tests/Controller/Jobs/Catalog/Import/Csv/FactoryTest.php

Spacing +8 added lines, -8 removed lines

@@ -16,8 +16,8 @@ 
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$obj = \Aimeos\Controller\Jobs\Catalog\Import\Csv\Factory::createController( $context, $aimeos );
-		$this->assertInstanceOf( '\\Aimeos\\Controller\\Jobs\\Iface', $obj);
+		$obj = \Aimeos\Controller\Jobs\Catalog\Import\Csv\Factory::createController($context, $aimeos);
+		$this->assertInstanceOf('\\Aimeos\\Controller\\Jobs\\Iface', $obj);
 	}
 
 
@@ -26,8 +26,8 @@ 
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		\Aimeos\Controller\Jobs\Catalog\Import\Csv\Factory::createController( $context, $aimeos, 'Wrong$$$Name' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		\Aimeos\Controller\Jobs\Catalog\Import\Csv\Factory::createController($context, $aimeos, 'Wrong$$$Name');
 	}
 
 
@@ -36,8 +36,8 @@ 
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		\Aimeos\Controller\Jobs\Catalog\Import\Csv\Factory::createController( $context, $aimeos, 'WrongClass' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		\Aimeos\Controller\Jobs\Catalog\Import\Csv\Factory::createController($context, $aimeos, 'WrongClass');
 	}
 
 
@@ -46,7 +46,7 @@ 
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		\Aimeos\Controller\Jobs\Catalog\Import\Csv\Factory::createController( $context, $aimeos, 'Factory' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		\Aimeos\Controller\Jobs\Catalog\Import\Csv\Factory::createController($context, $aimeos, 'Factory');
 	}
 }
\ No newline at end of file

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

Spacing +66 added lines, -66 removed lines

@@ -18,65 +18,65 @@ 
 
 	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/catalog/import/csv/skip-lines', 1 );
-		$config->set( 'controller/jobs/catalog/import/csv/location', __DIR__ . '/_testfiles/valid' );
+		$config->set('controller/jobs/catalog/import/csv/skip-lines', 1);
+		$config->set('controller/jobs/catalog/import/csv/location', __DIR__ . '/_testfiles/valid');
 
-		$this->object = new \Aimeos\Controller\Jobs\Catalog\Import\Csv\Standard( $this->context, $this->aimeos );
+		$this->object = new \Aimeos\Controller\Jobs\Catalog\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( 'Catalog import CSV', $this->object->getName() );
+		$this->assertEquals('Catalog import CSV', $this->object->getName());
 	}
 
 
 	public function testGetDescription()
 	{
 		$text = 'Imports new and updates existing categories from CSV files';
-		$this->assertEquals( $text, $this->object->getDescription() );
+		$this->assertEquals($text, $this->object->getDescription());
 	}
 
 
 	public function testRun()
 	{
-		$catcodes = array( 'job_csv_test', 'job_csv_test2', 'job_csv_test3', 'job_csv_test4' );
-		$domains = array( 'media', 'text' );
+		$catcodes = array('job_csv_test', 'job_csv_test2', 'job_csv_test3', 'job_csv_test4');
+		$domains = array('media', 'text');
 
 		$convert = array(
 			1 => 'Text/LatinUTF8',
 		);
 
-		$this->context->getConfig()->set( 'controller/jobs/catalog/import/csv/converter', $convert );
+		$this->context->getConfig()->set('controller/jobs/catalog/import/csv/converter', $convert);
 
 		$this->object->run();
 
-		$tree = $this->get( 'job_csv_test', $domains );
-		$this->delete( $tree, $domains );
+		$tree = $this->get('job_csv_test', $domains);
+		$this->delete($tree, $domains);
 
-		$this->assertEquals( 2, count( $tree->getListItems() ) );
+		$this->assertEquals(2, count($tree->getListItems()));
 
-		foreach( $tree->getChildren() as $node ) {
-			$this->assertEquals( 2, count( $node->getListItems() ) );
+		foreach ($tree->getChildren() as $node) {
+			$this->assertEquals(2, count($node->getListItems()));
 		}
 	}
 
@@ -86,13 +86,13 @@ 
 		$this->object->run();
 		$this->object->run();
 
-		$tree = $this->get( 'job_csv_test', ['media', 'text'] );
-		$this->delete( $tree, ['media', 'text'] );
+		$tree = $this->get('job_csv_test', ['media', 'text']);
+		$this->delete($tree, ['media', 'text']);
 
-		$this->assertEquals( 2, count( $tree->getListItems() ) );
+		$this->assertEquals(2, count($tree->getListItems()));
 
-		foreach( $tree->getChildren() as $node ) {
-			$this->assertEquals( 2, count( $node->getListItems() ) );
+		foreach ($tree->getChildren() as $node) {
+			$this->assertEquals(2, count($node->getListItems()));
 		}
 	}
 
@@ -100,18 +100,18 @@ 
 	public function testRunPosition()
 	{
 		$config = $this->context->getConfig();
-		$mapping = $config->set( 'controller/jobs/catalog/import/csv/mapping', [] );
-		$mapping['item'] = array( 0 => 'catalog.label', 1 => 'catalog.code', 2 => 'catalog.parent' );
+		$mapping = $config->set('controller/jobs/catalog/import/csv/mapping', []);
+		$mapping['item'] = array(0 => 'catalog.label', 1 => 'catalog.code', 2 => 'catalog.parent');
 
-		$config->set( 'controller/jobs/catalog/import/csv/mapping', $mapping );
-		$config->set( 'controller/jobs/catalog/import/csv/location', __DIR__ . '/_testfiles/position' );
+		$config->set('controller/jobs/catalog/import/csv/mapping', $mapping);
+		$config->set('controller/jobs/catalog/import/csv/location', __DIR__ . '/_testfiles/position');
 
 		$this->object->run();
 
-		$tree = $this->get( 'job_csv_test' );
-		$this->delete( $tree );
+		$tree = $this->get('job_csv_test');
+		$this->delete($tree);
 
-		$this->assertEquals( 1, count( $tree->getChildren() ) );
+		$this->assertEquals(1, count($tree->getChildren()));
 	}
 
 
@@ -135,12 +135,12 @@ 
 			),
 		);
 
-		$this->context->getConfig()->set( 'controller/jobs/catalog/import/csv/mapping', $mapping );
+		$this->context->getConfig()->set('controller/jobs/catalog/import/csv/mapping', $mapping);
 
 		$this->object->run();
 
-		$tree = $this->get( 'job_csv_test' );
-		$this->delete( $tree );
+		$tree = $this->get('job_csv_test');
+		$this->delete($tree);
 	}
 
 
@@ -152,9 +152,9 @@ 
 			),
 		);
 
-		$this->context->getConfig()->set( 'controller/jobs/catalog/import/csv/mapping', $mapping );
+		$this->context->getConfig()->set('controller/jobs/catalog/import/csv/mapping', $mapping);
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
 		$this->object->run();
 	}
 
@@ -178,15 +178,15 @@ 
 			),
 		);
 
-		$this->context->getConfig()->set( 'controller/jobs/catalog/import/csv/mapping', $mapping );
+		$this->context->getConfig()->set('controller/jobs/catalog/import/csv/mapping', $mapping);
 
 		$config = $this->context->getConfig();
-		$config->set( 'controller/jobs/catalog/import/csv/skip-lines', 0 );
-		$config->set( 'controller/jobs/catalog/import/csv/location', __DIR__ . '/_testfiles/invalid' );
+		$config->set('controller/jobs/catalog/import/csv/skip-lines', 0);
+		$config->set('controller/jobs/catalog/import/csv/location', __DIR__ . '/_testfiles/invalid');
 
-		$this->object = new \Aimeos\Controller\Jobs\Catalog\Import\Csv\Standard( $this->context, $this->aimeos );
+		$this->object = new \Aimeos\Controller\Jobs\Catalog\Import\Csv\Standard($this->context, $this->aimeos);
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
 		$this->object->run();
 	}
 
@@ -194,65 +194,65 @@ 
 	public function testRunBackup()
 	{
 		$config = $this->context->getConfig();
-		$config->set( 'controller/jobs/catalog/import/csv/container/type', 'Zip' );
-		$config->set( 'controller/jobs/catalog/import/csv/location', 'tmp/import.zip' );
-		$config->set( 'controller/jobs/catalog/import/csv/backup', 'tmp/test-%Y-%m-%d.zip' );
+		$config->set('controller/jobs/catalog/import/csv/container/type', 'Zip');
+		$config->set('controller/jobs/catalog/import/csv/location', 'tmp/import.zip');
+		$config->set('controller/jobs/catalog/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/catalog/import/csv/container/type', 'Zip' );
-		$config->set( 'controller/jobs/catalog/import/csv/location', 'tmp/import.zip' );
-		$config->set( 'controller/jobs/catalog/import/csv/backup', 'tmp/notexist/import.zip' );
+		$config->set('controller/jobs/catalog/import/csv/container/type', 'Zip');
+		$config->set('controller/jobs/catalog/import/csv/location', 'tmp/import.zip');
+		$config->set('controller/jobs/catalog/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( \Aimeos\MShop\Catalog\Item\Iface $tree, array $domains = [] )
+	protected function delete(\Aimeos\MShop\Catalog\Item\Iface $tree, array $domains = [])
 	{
-		$catalogManager = \Aimeos\MShop\Catalog\Manager\Factory::createManager( $this->context );
+		$catalogManager = \Aimeos\MShop\Catalog\Manager\Factory::createManager($this->context);
 
-		foreach( $domains as $domain )
+		foreach ($domains as $domain)
 		{
-			$manager = \Aimeos\MShop\Factory::createManager( $this->context, $domain );
+			$manager = \Aimeos\MShop\Factory::createManager($this->context, $domain);
 
-			foreach( $tree->getListItems( $domain ) as $listItem ) {
-				$manager->deleteItem( $listItem->getRefItem()->getId() );
+			foreach ($tree->getListItems($domain) as $listItem) {
+				$manager->deleteItem($listItem->getRefItem()->getId());
 			}
 		}
 
-		foreach( $tree->getChildren() as $node ) {
-			$this->delete( $node, $domains );
+		foreach ($tree->getChildren() as $node) {
+			$this->delete($node, $domains);
 		}
 
-		$catalogManager->deleteItem( $tree->getId() );
+		$catalogManager->deleteItem($tree->getId());
 	}
 
 
-	protected function get( $catcode, array $domains = [] )
+	protected function get($catcode, array $domains = [])
 	{
-		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager( $this->context );
-		$root = $manager->findItem( $catcode );
+		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager($this->context);
+		$root = $manager->findItem($catcode);
 
-		return $manager->getTree( $root->getId(), $domains, \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE );
+		return $manager->getTree($root->getId(), $domains, \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE);
 	}
 }
\ No newline at end of file

controller/jobs/src/Controller/Jobs/Catalog/Import/Csv/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/catalog/import/csv/name
 		 * Class name of the used catalog suggestions scheduler controller implementation
@@ -64,20 +64,20 @@ 
 		 * @since 2018.04
 		 * @category Developer
 		 */
-		if ( $name === null ) {
+		if ($name === null) {
 			$name = $context->getConfig()->get('controller/jobs/catalog/import/csv/name', 'Standard');
 		}
 
-		if ( ctype_alnum($name) === false )
+		if (ctype_alnum($name) === false)
 		{
 			$classname = is_string($name) ? '\\Aimeos\\Controller\\Jobs\\Catalog\\Import\\Csv\\' . $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\\Catalog\\Import\\Csv\\' . $name;
 
-		$controller = self::createControllerBase( $context, $aimeos, $classname, $iface );
+		$controller = self::createControllerBase($context, $aimeos, $classname, $iface);
 
 		/** controller/jobs/catalog/import/csv/decorators/excludes
 		 * Excludes decorators added by the "common" option from the catalog import CSV job controller
@@ -154,6 +154,6 @@ 
 		 * @see controller/jobs/catalog/import/csv/decorators/excludes
 		 * @see controller/jobs/catalog/import/csv/decorators/global
 		 */
-		return self::addControllerDecorators( $context, $aimeos, $controller, 'catalog/import/csv' );
+		return self::addControllerDecorators($context, $aimeos, $controller, 'catalog/import/csv');
 	}
 }
\ No newline at end of file

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

Spacing +83 added lines, -83 removed lines

@@ -28,7 +28,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Catalog import CSV' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Catalog import CSV');
 	}
 
 
@@ -39,7 +39,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Imports new and updates existing categories from CSV files' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Imports new and updates existing categories from CSV files');
 	}
 
 
@@ -54,7 +54,7 @@ 
 		$context = $this->getContext();
 		$config = $context->getConfig();
 		$logger = $context->getLogger();
-		$domains = array( 'media', 'text' );
+		$domains = array('media', 'text');
 		$mappings = $this->getDefaultMapping();
 
 
@@ -74,7 +74,7 @@ 
 		 * @see controller/common/catalog/import/csv/converter
 		 * @see controller/common/catalog/import/csv/max-size
 		 */
-		$domains = $config->get( 'controller/common/catalog/import/csv/domains', $domains );
+		$domains = $config->get('controller/common/catalog/import/csv/domains', $domains);
 
 		/** controller/jobs/catalog/import/csv/domains
 		 * List of item domain names that should be retrieved along with the catalog items
@@ -94,7 +94,7 @@ 
 		 * @see controller/jobs/catalog/import/csv/backup
 		 * @see controller/common/catalog/import/csv/max-size
 		 */
-		$domains = $config->get( 'controller/jobs/catalog/import/csv/domains', $domains );
+		$domains = $config->get('controller/jobs/catalog/import/csv/domains', $domains);
 
 
 		/** controller/common/catalog/import/csv/mapping
@@ -122,7 +122,7 @@ 
 		 * @see controller/common/catalog/import/csv/converter
 		 * @see controller/common/catalog/import/csv/max-size
 		 */
-		$mappings = $config->get( 'controller/common/catalog/import/csv/mapping', $mappings );
+		$mappings = $config->get('controller/common/catalog/import/csv/mapping', $mappings);
 
 		/** controller/jobs/catalog/import/csv/mapping
 		 * List of mappings between the position in the CSV file and item keys
@@ -142,7 +142,7 @@ 
 		 * @see controller/jobs/catalog/import/csv/backup
 		 * @see controller/common/catalog/import/csv/max-size
 		 */
-		$mappings = $config->get( 'controller/jobs/catalog/import/csv/mapping', $mappings );
+		$mappings = $config->get('controller/jobs/catalog/import/csv/mapping', $mappings);
 
 
 		/** controller/common/catalog/import/csv/converter
@@ -184,7 +184,7 @@ 
 		 * @see controller/common/catalog/import/csv/mapping
 		 * @see controller/common/catalog/import/csv/max-size
 		 */
-		$converters = $config->get( 'controller/common/catalog/import/csv/converter', [] );
+		$converters = $config->get('controller/common/catalog/import/csv/converter', []);
 
 		/** controller/jobs/catalog/import/csv/converter
 		 * List of converter names for the values at the position in the CSV file
@@ -204,7 +204,7 @@ 
 		 * @see controller/jobs/catalog/import/csv/backup
 		 * @see controller/common/catalog/import/csv/max-size
 		 */
-		$converters = $config->get( 'controller/jobs/catalog/import/csv/converter', $converters );
+		$converters = $config->get('controller/jobs/catalog/import/csv/converter', $converters);
 
 
 		/** controller/common/catalog/import/csv/max-size
@@ -224,7 +224,7 @@ 
 		 * @see controller/common/catalog/import/csv/mapping
 		 * @see controller/common/catalog/import/csv/converter
 		 */
-		$maxcnt = (int) $config->get( 'controller/common/catalog/import/csv/max-size', 1000 );
+		$maxcnt = (int) $config->get('controller/common/catalog/import/csv/max-size', 1000);
 
 
 		/** controller/jobs/catalog/import/csv/skip-lines
@@ -246,7 +246,7 @@ 
 		 * @see controller/jobs/catalog/import/csv/backup
 		 * @see controller/common/catalog/import/csv/max-size
 		 */
-		$skiplines = (int) $config->get( 'controller/jobs/catalog/import/csv/skip-lines', 0 );
+		$skiplines = (int) $config->get('controller/jobs/catalog/import/csv/skip-lines', 0);
 
 
 		/** controller/jobs/catalog/import/csv/strict
@@ -270,7 +270,7 @@ 
 		 * @see controller/jobs/catalog/import/csv/backup
 		 * @see controller/common/catalog/import/csv/max-size
 		 */
-		$strict = (bool) $config->get( 'controller/jobs/catalog/import/csv/strict', true );
+		$strict = (bool) $config->get('controller/jobs/catalog/import/csv/strict', true);
 
 
 		/** controller/jobs/catalog/import/csv/backup
@@ -303,75 +303,75 @@ 
 		 * @see controller/jobs/catalog/import/csv/strict
 		 * @see controller/common/catalog/import/csv/max-size
 		 */
-		$backup = $config->get( 'controller/jobs/catalog/import/csv/backup' );
+		$backup = $config->get('controller/jobs/catalog/import/csv/backup');
 
 
-		if( !isset( $mappings['item'] ) || !is_array( $mappings['item'] ) )
+		if (!isset($mappings['item']) || !is_array($mappings['item']))
 		{
-			$msg = sprintf( 'Required mapping key "%1$s" is missing or contains no array', 'item' );
-			throw new \Aimeos\Controller\Jobs\Exception( $msg );
+			$msg = sprintf('Required mapping key "%1$s" is missing or contains no array', 'item');
+			throw new \Aimeos\Controller\Jobs\Exception($msg);
 		}
 
 		try
 		{
 			$procMappings = $mappings;
-			unset( $procMappings['item'] );
+			unset($procMappings['item']);
 
-			$codePos = $this->getCodePosition( $mappings['item'] );
-			$convlist = $this->getConverterList( $converters );
-			$processor = $this->getProcessors( $procMappings );
-			$catalogMap = $this->getCatalogMap( $domains );
+			$codePos = $this->getCodePosition($mappings['item']);
+			$convlist = $this->getConverterList($converters);
+			$processor = $this->getProcessors($procMappings);
+			$catalogMap = $this->getCatalogMap($domains);
 			$container = $this->getContainer();
 			$path = $container->getName();
 
 
-			$msg = sprintf( 'Started catalog import from "%1$s" (%2$s)', $path, __CLASS__ );
-			$logger->log( $msg, \Aimeos\MW\Logger\Base::NOTICE );
+			$msg = sprintf('Started catalog import from "%1$s" (%2$s)', $path, __CLASS__);
+			$logger->log($msg, \Aimeos\MW\Logger\Base::NOTICE);
 
-			foreach( $container as $content )
+			foreach ($container as $content)
 			{
 				$name = $content->getName();
 
-				for( $i = 0; $i < $skiplines; $i++ ) {
+				for ($i = 0; $i < $skiplines; $i++) {
 					$content->next();
 				}
 
-				while( ( $data = $this->getData( $content, $maxcnt, $codePos ) ) !== [] )
+				while (($data = $this->getData($content, $maxcnt, $codePos)) !== [])
 				{
-					$data = $this->convertData( $convlist, $data );
-					$errcnt = $this->import( $catalogMap, $data, $mappings['item'], $processor, $strict );
-					$chunkcnt = count( $data );
+					$data = $this->convertData($convlist, $data);
+					$errcnt = $this->import($catalogMap, $data, $mappings['item'], $processor, $strict);
+					$chunkcnt = count($data);
 
 					$msg = 'Imported catalog lines from "%1$s": %2$d/%3$d (%4$s)';
-					$logger->log( sprintf( $msg, $name, $chunkcnt - $errcnt, $chunkcnt, __CLASS__ ), \Aimeos\MW\Logger\Base::NOTICE );
+					$logger->log(sprintf($msg, $name, $chunkcnt - $errcnt, $chunkcnt, __CLASS__), \Aimeos\MW\Logger\Base::NOTICE);
 
 					$errors += $errcnt;
 					$total += $chunkcnt;
-					unset( $data );
+					unset($data);
 				}
 			}
 
 			$container->close();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$logger->log( 'Catalog import error: ' . $e->getMessage() );
-			$logger->log( $e->getTraceAsString() );
+			$logger->log('Catalog import error: ' . $e->getMessage());
+			$logger->log($e->getTraceAsString());
 
-			throw new \Aimeos\Controller\Jobs\Exception( $e->getMessage() );
+			throw new \Aimeos\Controller\Jobs\Exception($e->getMessage());
 		}
 
 		$msg = 'Finished catalog import from "%1$s": %2$d successful, %3$s errors, %4$s total (%5$s)';
-		$logger->log( sprintf( $msg, $path, $total - $errors, $errors, $total, __CLASS__ ), \Aimeos\MW\Logger\Base::NOTICE );
+		$logger->log(sprintf($msg, $path, $total - $errors, $errors, $total, __CLASS__), \Aimeos\MW\Logger\Base::NOTICE);
 
-		if( $errors > 0 )
+		if ($errors > 0)
 		{
-			$msg = sprintf( 'Invalid catalog lines in "%1$s": %2$d/%3$d', $path, $errors, $total );
-			throw new \Aimeos\Controller\Jobs\Exception( $msg );
+			$msg = sprintf('Invalid catalog lines in "%1$s": %2$d/%3$d', $path, $errors, $total);
+			throw new \Aimeos\Controller\Jobs\Exception($msg);
 		}
 
-		if( !empty( $backup ) && @rename( $path, strftime( $backup ) ) === false ) {
-			throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Unable to move imported file' ) );
+		if (!empty($backup) && @rename($path, strftime($backup)) === false) {
+			throw new \Aimeos\Controller\Jobs\Exception(sprintf('Unable to move imported file'));
 		}
 	}
 
@@ -383,16 +383,16 @@ 
 	 * @return integer Position of the "catalog.code" column
 	 * @throws \Aimeos\Controller\Jobs\Exception If no mapping for "catalog.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 === 'catalog.code' ) {
+			if ($key === 'catalog.code') {
 				return $pos;
 			}
 		}
 
-		throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'No "catalog.code" column in CSV mapping found' ) );
+		throw new \Aimeos\Controller\Jobs\Exception(sprintf('No "catalog.code" column in CSV mapping found'));
 	}
 
 
@@ -427,7 +427,7 @@ 
 		 * @see controller/jobs/catalog/import/csv/container/content
 		 * @see controller/jobs/catalog/import/csv/container/options
 		 */
-		$location = $config->get( 'controller/jobs/catalog/import/csv/location', '.' );
+		$location = $config->get('controller/jobs/catalog/import/csv/location', '.');
 
 		/** controller/jobs/catalog/import/csv/container/type
 		 * Nave of the container type to read the data from
@@ -450,7 +450,7 @@ 
 		 * @see controller/jobs/catalog/import/csv/container/content
 		 * @see controller/jobs/catalog/import/csv/container/options
 		 */
-		$container = $config->get( 'controller/jobs/catalog/import/csv/container/type', 'Directory' );
+		$container = $config->get('controller/jobs/catalog/import/csv/container/type', 'Directory');
 
 		/** controller/jobs/catalog/import/csv/container/content
 		 * Name of the content type inside the container to read the data from
@@ -471,7 +471,7 @@ 
 		 * @see controller/jobs/catalog/import/csv/container/type
 		 * @see controller/jobs/catalog/import/csv/container/options
 		 */
-		$content = $config->get( 'controller/jobs/catalog/import/csv/container/content', 'CSV' );
+		$content = $config->get('controller/jobs/catalog/import/csv/container/content', 'CSV');
 
 		/** controller/jobs/catalog/import/csv/container/options
 		 * List of file container options for the catalog import files
@@ -489,9 +489,9 @@ 
 		 * @see controller/jobs/catalog/import/csv/container/content
 		 * @see controller/jobs/catalog/import/csv/container/type
 		 */
-		$options = $config->get( 'controller/jobs/catalog/import/csv/container/options', [] );
+		$options = $config->get('controller/jobs/catalog/import/csv/container/options', []);
 
-		return \Aimeos\MW\Container\Factory::getContainer( $location, $container, $content, $options );
+		return \Aimeos\MW\Container\Factory::getContainer($location, $container, $content, $options);
 	}
 
 
@@ -501,13 +501,13 @@ 
 	 * @param array $domains List of domain names whose items should be fetched too
 	 * @return array Associative list of catalog codes as keys and items implementing \Aimeos\MShop\Catalog\Item\Iface as values
 	 */
-	protected function getCatalogMap( array $domains )
+	protected function getCatalogMap(array $domains)
 	{
 		$map = [];
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog' );
-		$search = $manager->createSearch()->setSlice( 0, 0x7fffffff );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog');
+		$search = $manager->createSearch()->setSlice(0, 0x7fffffff);
 
-		foreach( $manager->searchItems( $search, $domains ) as $item ) {
+		foreach ($manager->searchItems($search, $domains) as $item) {
 			$map[$item->getCode()] = $item;
 		}
 
@@ -523,21 +523,21 @@ 
 	 * @param string $code Catalog item code of the parent category
 	 * @return string|null ID of the parent category or null for top level nodes
 	 */
-	protected function getParentId( array $catalogMap, array $map, $code )
+	protected function getParentId(array $catalogMap, array $map, $code)
 	{
-		if( !isset( $map['catalog.parent'] ) )
+		if (!isset($map['catalog.parent']))
 		{
-			$msg = sprintf( 'Required column "%1$s" not found for code "%2$s"', 'catalog.parent', $code );
-			throw new \Aimeos\Controller\Jobs\Exception( $msg );
+			$msg = sprintf('Required column "%1$s" not found for code "%2$s"', 'catalog.parent', $code);
+			throw new \Aimeos\Controller\Jobs\Exception($msg);
 		}
 
-		if( $map['catalog.parent'] != '' && !isset( $catalogMap[$map['catalog.parent']] ) )
+		if ($map['catalog.parent'] != '' && !isset($catalogMap[$map['catalog.parent']]))
 		{
-			$msg = sprintf( 'Parent node for code "%1$s" not found', $map['catalog.parent'] );
-			throw new \Aimeos\Controller\Jobs\Exception( $msg );
+			$msg = sprintf('Parent node for code "%1$s" not found', $map['catalog.parent']);
+			throw new \Aimeos\Controller\Jobs\Exception($msg);
 		}
 
-		return ( $map['catalog.parent'] != '' ? $catalogMap[$map['catalog.parent']]->getId() : null );
+		return ($map['catalog.parent'] != '' ? $catalogMap[$map['catalog.parent']]->getId() : null);
 	}
 
 
@@ -552,61 +552,61 @@ 
 	 * @return integer Number of catalogs that couldn't be imported
 	 * @throws \Aimeos\Controller\Jobs\Exception
 	 */
-	protected function import( array &$catalogMap, array $data, array $mapping,
-		\Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Iface $processor, $strict )
+	protected function import(array &$catalogMap, array $data, array $mapping,
+		\Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Iface $processor, $strict)
 	{
 		$errors = 0;
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'catalog' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'catalog');
 
-		foreach( $data as $code => $list )
+		foreach ($data as $code => $list)
 		{
 			$manager->begin();
 
 			try
 			{
-				if( isset( $catalogMap[$code] )  ) {
+				if (isset($catalogMap[$code])) {
 					$catalogItem = $catalogMap[$code];
 				} else {
 					$catalogItem = $manager->createItem();
 				}
 
-				$map = $this->getMappedChunk( $list, $mapping );
+				$map = $this->getMappedChunk($list, $mapping);
 
-				if( isset( $map[0] ) )
+				if (isset($map[0]))
 				{
 					$map = $map[0]; // there can only be one chunk for the base catalog data
-					$parentid = $this->getParentId( $catalogMap, $map, $code );
-					$catalogItem->fromArray( $this->addItemDefaults( $map ) );
+					$parentid = $this->getParentId($catalogMap, $map, $code);
+					$catalogItem->fromArray($this->addItemDefaults($map));
 
-					if( isset( $catalogMap[$code] ) )
+					if (isset($catalogMap[$code]))
 					{
-						$manager->moveItem( $catalogItem->getId(), $catalogItem->getParentId(), $parentid );
-						$catalogItem = $manager->saveItem( $catalogItem );
+						$manager->moveItem($catalogItem->getId(), $catalogItem->getParentId(), $parentid);
+						$catalogItem = $manager->saveItem($catalogItem);
 					}
 					else
 					{
-						$catalogItem = $manager->insertItem( $catalogItem, $parentid );
+						$catalogItem = $manager->insertItem($catalogItem, $parentid);
 					}
 
-					$list = $processor->process( $catalogItem, $list );
+					$list = $processor->process($catalogItem, $list);
 					$catalogMap[$code] = $catalogItem;
 				}
 
 				$manager->commit();
 			}
-			catch( \Exception $e )
+			catch (\Exception $e)
 			{
 				$manager->rollback();
 
-				$msg = sprintf( 'Unable to import catalog with code "%1$s": %2$s', $code, $e->getMessage() );
-				$context->getLogger()->log( $msg );
+				$msg = sprintf('Unable to import catalog with code "%1$s": %2$s', $code, $e->getMessage());
+				$context->getLogger()->log($msg);
 
 				$errors++;
 			}
 
-			if( $strict && !empty( $list ) ) {
-				$context->getLogger()->log( 'Not imported: ' . print_r( $list, true ) );
+			if ($strict && !empty($list)) {
+				$context->getLogger()->log('Not imported: ' . print_r($list, true));
 			}
 		}
 
@@ -620,9 +620,9 @@ 
 	 * @param array $list Associative list of domain item keys and their values, e.g. "catalog.status" => 1
 	 * @return array Given associative list enriched by default values if they were not already set
 	 */
-	protected function addItemDefaults( array $list )
+	protected function addItemDefaults(array $list)
 	{
-		if( !isset( $list['catalog.status'] ) ) {
+		if (!isset($list['catalog.status'])) {
 			$list['catalog.status'] = 1;
 		}
 

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

Spacing +6 added lines, -6 removed lines

@@ -40,28 +40,28 @@
 	 * @param \Aimeos\MShop\Order\Item\Base\Iface $order Full subscription with associated items
 	 * @return array Two dimensional associative list of subscription data representing the lines in CSV
 	 */
-	public function process( \Aimeos\MShop\Subscription\Item\Iface $subscription, \Aimeos\MShop\Order\Item\Base\Iface $order )
+	public function process(\Aimeos\MShop\Subscription\Item\Iface $subscription, \Aimeos\MShop\Order\Item\Base\Iface $order)
 	{
 		$result = [];
 		$addresses = $order->getAddresses();
 
-		krsort( $addresses );
+		krsort($addresses);
 
-		foreach( $addresses as $item )
+		foreach ($addresses as $item)
 		{
 			$data = [];
 			$list = $item->toArray();
 
-			foreach( $this->getMapping() as $pos => $key )
+			foreach ($this->getMapping() as $pos => $key)
 			{
-				if( array_key_exists( $key, $list ) ) {
+				if (array_key_exists($key, $list)) {
 					$data[$pos] = $list[$key];
 				} else {
 					$data[$pos] = '';
 				}
 			}
 
-			ksort( $data );
+			ksort($data);
 			$result[] = $data;
 		}
 

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

Spacing +9 added lines, -9 removed lines

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

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

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 	 * @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
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping)
 	{
 		$this->context = $context;
 		$this->mapping = $mapping;

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

Spacing +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
 	 * @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
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping );
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping);
 
 
 	/**
@@ -35,5 +35,5 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Base\Iface $order Full order with associated items
 	 * @return array Two dimensional associative list of order data representing the lines in CSV
 	 */
-	public function process( \Aimeos\MShop\Subscription\Item\Iface $subscription, \Aimeos\MShop\Order\Item\Base\Iface $order );
+	public function process(\Aimeos\MShop\Subscription\Item\Iface $subscription, \Aimeos\MShop\Order\Item\Base\Iface $order);
 }
\ No newline at end of file

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

Spacing +4 added lines, -4 removed lines

@@ -40,21 +40,21 @@
 	 * @param \Aimeos\MShop\Order\Item\Base\Iface $order Full order with associated items
 	 * @return array Two dimensional associative list of subscription data representing the lines in CSV
 	 */
-	public function process( \Aimeos\MShop\Subscription\Item\Iface $subscription, \Aimeos\MShop\Order\Item\Base\Iface $order )
+	public function process(\Aimeos\MShop\Subscription\Item\Iface $subscription, \Aimeos\MShop\Order\Item\Base\Iface $order)
 	{
 		$result = [];
 		$list = $subscription->toArray() + $order->toArray();
 
-		foreach( $this->getMapping() as $pos => $key )
+		foreach ($this->getMapping() as $pos => $key)
 		{
-			if( array_key_exists( $key, $list ) ) {
+			if (array_key_exists($key, $list)) {
 				$result[$pos] = $list[$key];
 			} else {
 				$result[$pos] = '';
 			}
 		}
 
-		ksort( $result );
+		ksort($result);
 
 		return [$result];
 	}