aimeos / ai-controller-jobs

controller/jobs/src/Controller/Jobs/Index/Optimize/Standard.php

Spacing +3 added lines, -3 removed lines

@@ -29,7 +29,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Index optimization' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Index optimization');
 	}
 
 
@@ -40,7 +40,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Optimizes the index for searching products faster' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Optimizes the index for searching products faster');
 	}
 
 
@@ -51,6 +51,6 @@ 
 	 */
 	public function run()
 	{
-		\Aimeos\MShop\Index\Manager\Factory::createManager( $this->getContext() )->optimize();
+		\Aimeos\MShop\Index\Manager\Factory::createManager($this->getContext())->optimize();
 	}
 }

controller/jobs/src/Controller/Jobs/Index/Rebuild/Standard.php

Spacing +7 added lines, -7 removed lines

@@ -29,7 +29,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Index rebuild' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Index rebuild');
 	}
 
 
@@ -40,7 +40,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Rebuilds the index for searching products' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Rebuilds the index for searching products');
 	}
 
 
@@ -51,15 +51,15 @@ 
 	 */
 	public function run()
 	{
-		$timestamp = date( 'Y-m-d H:i:s' );
+		$timestamp = date('Y-m-d H:i:s');
 		$context = clone $this->getContext();
 
-		$context->getLocale()->setLanguageId( null );
-		$context->getLocale()->setCurrencyId( null );
+		$context->getLocale()->setLanguageId(null);
+		$context->getLocale()->setCurrencyId(null);
 
-		$manager = \Aimeos\MShop\Index\Manager\Factory::createManager( $context );
+		$manager = \Aimeos\MShop\Index\Manager\Factory::createManager($context);
 
 		$manager->rebuildIndex();
-		$manager->cleanupIndex( $timestamp );
+		$manager->cleanupIndex($timestamp);
 	}
 }

controller/jobs/tests/Controller/Jobs/Index/Optimize/StandardTest.php

Spacing +10 added lines, -10 removed lines

@@ -24,7 +24,7 @@ 
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$this->object = new \Aimeos\Controller\Jobs\Index\Optimize\Standard( $context, $aimeos );
+		$this->object = new \Aimeos\Controller\Jobs\Index\Optimize\Standard($context, $aimeos);
 	}
 
 
@@ -42,14 +42,14 @@ 
 
 	public function testGetName()
 	{
-		$this->assertEquals( 'Index optimization', $this->object->getName() );
+		$this->assertEquals('Index optimization', $this->object->getName());
 	}
 
 
 	public function testGetDescription()
 	{
 		$text = 'Optimizes the index for searching products faster';
-		$this->assertEquals( $text, $this->object->getDescription() );
+		$this->assertEquals($text, $this->object->getDescription());
 	}
 
 
@@ -60,21 +60,21 @@ 
 
 
 		$name = 'ControllerJobsCatalogIndexOptimizeDefaultRun';
-		$context->getConfig()->set( 'mshop/index/manager/name', $name );
+		$context->getConfig()->set('mshop/index/manager/name', $name);
 
 
-		$indexManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Index\\Manager\\Standard' )
-			->setMethods( array( 'optimize' ) )
-			->setConstructorArgs( array( $context ) )
+		$indexManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Index\\Manager\\Standard')
+			->setMethods(array('optimize'))
+			->setConstructorArgs(array($context))
 			->getMock();
 
-		\Aimeos\MShop\Catalog\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Index\\Manager\\' . $name, $indexManagerStub );
+		\Aimeos\MShop\Catalog\Manager\Factory::injectManager('\\Aimeos\\MShop\\Index\\Manager\\' . $name, $indexManagerStub);
 
 
-		$indexManagerStub->expects( $this->once() )->method( 'optimize' );
+		$indexManagerStub->expects($this->once())->method('optimize');
 
 
-		$object = new \Aimeos\Controller\Jobs\Index\Optimize\Standard( $context, $aimeos );
+		$object = new \Aimeos\Controller\Jobs\Index\Optimize\Standard($context, $aimeos);
 		$object->run();
 	}
 }

controller/jobs/tests/Controller/Jobs/Index/Rebuild/StandardTest.php

Spacing +11 added lines, -11 removed lines

@@ -24,7 +24,7 @@ 
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$this->object = new \Aimeos\Controller\Jobs\Index\Rebuild\Standard( $context, $aimeos );
+		$this->object = new \Aimeos\Controller\Jobs\Index\Rebuild\Standard($context, $aimeos);
 	}
 
 
@@ -42,14 +42,14 @@ 
 
 	public function testGetName()
 	{
-		$this->assertEquals( 'Index rebuild', $this->object->getName() );
+		$this->assertEquals('Index rebuild', $this->object->getName());
 	}
 
 
 	public function testGetDescription()
 	{
 		$text = 'Rebuilds the index for searching products';
-		$this->assertEquals( $text, $this->object->getDescription() );
+		$this->assertEquals($text, $this->object->getDescription());
 	}
 
 
@@ -60,22 +60,22 @@ 
 
 
 		$name = 'ControllerJobsCatalogIndexRebuildDefaultRun';
-		$context->getConfig()->set( 'mshop/index/manager/name', $name );
+		$context->getConfig()->set('mshop/index/manager/name', $name);
 
 
-		$indexManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Index\\Manager\\Standard' )
-			->setMethods( array( 'rebuildIndex', 'cleanupIndex' ) )
-			->setConstructorArgs( array( $context ) )
+		$indexManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Index\\Manager\\Standard')
+			->setMethods(array('rebuildIndex', 'cleanupIndex'))
+			->setConstructorArgs(array($context))
 			->getMock();
 
-		\Aimeos\MShop\Catalog\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Index\\Manager\\' . $name, $indexManagerStub );
+		\Aimeos\MShop\Catalog\Manager\Factory::injectManager('\\Aimeos\\MShop\\Index\\Manager\\' . $name, $indexManagerStub);
 
 
-		$indexManagerStub->expects( $this->once() )->method( 'rebuildIndex' );
-		$indexManagerStub->expects( $this->once() )->method( 'cleanupIndex' );
+		$indexManagerStub->expects($this->once())->method('rebuildIndex');
+		$indexManagerStub->expects($this->once())->method('cleanupIndex');
 
 
-		$object = new \Aimeos\Controller\Jobs\Index\Rebuild\Standard( $context, $aimeos );
+		$object = new \Aimeos\Controller\Jobs\Index\Rebuild\Standard($context, $aimeos);
 		$object->run();
 	}
 }

controller/jobs/src/Controller/Jobs/Media/Scale/Factory.php

Spacing +8 added lines, -8 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/media/scale/name
 		 * Class name of the used media scale job controller implementation
@@ -64,20 +64,20 @@ 
 		 * @since 2017.01
 		 * @category Developer
 		 */
-		if( $name === null ) {
-			$name = $context->getConfig()->get( 'controller/jobs/media/scale/name', 'Standard' );
+		if ($name === null) {
+			$name = $context->getConfig()->get('controller/jobs/media/scale/name', 'Standard');
 		}
 
-		if( ctype_alnum( $name ) === false )
+		if (ctype_alnum($name) === false)
 		{
-			$classname = is_string( $name ) ? '\\Aimeos\\Controller\\Jobs\\Media\\Scale\\' . $name : '<not a string>';
-			throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+			$classname = is_string($name) ? '\\Aimeos\\Controller\\Jobs\\Media\\Scale\\' . $name : '<not a string>';
+			throw new \Aimeos\Controller\Jobs\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 		}
 
 		$iface = '\\Aimeos\\Controller\\Jobs\\Iface';
 		$classname = '\\Aimeos\\Controller\\Jobs\\Media\\Scale\\' . $name;
 
-		$controller = self::createControllerBase( $context, $aimeos, $classname, $iface );
+		$controller = self::createControllerBase($context, $aimeos, $classname, $iface);
 
 		/** controller/jobs/media/scale/decorators/excludes
 		 * Excludes decorators added by the "common" option from the media scale controllers
@@ -153,6 +153,6 @@ 
 		 * @see controller/jobs/media/scale/decorators/excludes
 		 * @see controller/jobs/media/scale/decorators/global
 		 */
-		return self::addControllerDecorators( $context, $aimeos, $controller, 'media/scale' );
+		return self::addControllerDecorators($context, $aimeos, $controller, 'media/scale');
 	}
 }
\ No newline at end of file

controller/jobs/tests/Controller/Jobs/Media/Scale/FactoryTest.php

Spacing +8 added lines, -8 removed lines

@@ -16,8 +16,8 @@ 
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$obj = \Aimeos\Controller\Jobs\Media\Scale\Factory::createController( $context, $aimeos );
-		$this->assertInstanceOf( '\\Aimeos\\Controller\\Jobs\\Iface', $obj );
+		$obj = \Aimeos\Controller\Jobs\Media\Scale\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\Media\Scale\Factory::createController( $context, $aimeos, 'Wrong$$$Name' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		\Aimeos\Controller\Jobs\Media\Scale\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\Media\Scale\Factory::createController( $context, $aimeos, 'WrongClass' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		\Aimeos\Controller\Jobs\Media\Scale\Factory::createController($context, $aimeos, 'WrongClass');
 	}
 
 
@@ -46,8 +46,8 @@ 
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		\Aimeos\Controller\Jobs\Media\Scale\Factory::createController( $context, $aimeos, 'Factory' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		\Aimeos\Controller\Jobs\Media\Scale\Factory::createController($context, $aimeos, 'Factory');
 	}
 
 }

controller/jobs/tests/Controller/Jobs/Media/Scale/StandardTest.php

Spacing +16 added lines, -16 removed lines

@@ -19,7 +19,7 @@ 
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$this->object = new \Aimeos\Controller\Jobs\Media\Scale\Standard( $context, $aimeos );
+		$this->object = new \Aimeos\Controller\Jobs\Media\Scale\Standard($context, $aimeos);
 	}
 
 
@@ -31,14 +31,14 @@ 
 
 	public function testGetName()
 	{
-		$this->assertEquals( 'Rescale product images', $this->object->getName() );
+		$this->assertEquals('Rescale product images', $this->object->getName());
 	}
 
 
 	public function testGetDescription()
 	{
 		$text = 'Rescales product images to the new sizes';
-		$this->assertEquals( $text, $this->object->getDescription() );
+		$this->assertEquals($text, $this->object->getDescription());
 	}
 
 
@@ -49,31 +49,31 @@ 
 
 
 		$name = 'ControllerJobsMediaScaleStandardRun';
-		$context->getConfig()->set( 'mshop/media/manager/name', $name );
-		$context->getConfig()->set( 'controller/common/media/name', $name );
+		$context->getConfig()->set('mshop/media/manager/name', $name);
+		$context->getConfig()->set('controller/common/media/name', $name);
 
 
-		$managerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Media\\Manager\\Standard' )
-			->setMethods( array( 'saveItem' ) )
-			->setConstructorArgs( array( $context ) )
+		$managerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Media\\Manager\\Standard')
+			->setMethods(array('saveItem'))
+			->setConstructorArgs(array($context))
 			->getMock();
 
-		\Aimeos\MShop\Media\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Media\\Manager\\' . $name, $managerStub );
+		\Aimeos\MShop\Media\Manager\Factory::injectManager('\\Aimeos\\MShop\\Media\\Manager\\' . $name, $managerStub);
 
-		$managerStub->expects( $this->atLeast( 1 ) )->method( 'saveItem' );
+		$managerStub->expects($this->atLeast(1))->method('saveItem');
 
 
-		$cntlStub = $this->getMockBuilder( '\\Aimeos\\Controller\\Common\\Media\\Standard' )
-			->setMethods( array( 'scale' ) )
-			->setConstructorArgs( array( $context ) )
+		$cntlStub = $this->getMockBuilder('\\Aimeos\\Controller\\Common\\Media\\Standard')
+			->setMethods(array('scale'))
+			->setConstructorArgs(array($context))
 			->getMock();
 
-		\Aimeos\Controller\Common\Media\Factory::injectController( '\\Aimeos\\Controller\\Common\\Media\\' . $name, $cntlStub );
+		\Aimeos\Controller\Common\Media\Factory::injectController('\\Aimeos\\Controller\\Common\\Media\\' . $name, $cntlStub);
 
-		$cntlStub->expects( $this->atLeast( 1 ) )->method( 'scale' );
+		$cntlStub->expects($this->atLeast(1))->method('scale');
 
 
-		$object = new \Aimeos\Controller\Jobs\Media\Scale\Standard( $context, $aimeos );
+		$object = new \Aimeos\Controller\Jobs\Media\Scale\Standard($context, $aimeos);
 		$object->run();
 	}
 }

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

Braces +2 added lines, -4 removed lines

@@ -351,8 +351,7 @@ 
 			}
 
 			$container->close();
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$logger->log( 'Product import error: ' . $e->getMessage() );
 			$logger->log( $e->getTraceAsString() );
@@ -540,8 +539,7 @@ 
 				}
 
 				$manager->commit();
-			}
-			catch( \Exception $e )
+			} catch( \Exception $e )
 			{
 				$manager->rollback();
 

Spacing +80 added lines, -80 removed lines

@@ -30,14 +30,14 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context MShop context object
 	 * @param \Aimeos\Bootstrap $aimeos \Aimeos\Bootstrap main object
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\Bootstrap $aimeos )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\Bootstrap $aimeos)
 	{
-		parent::__construct( $context, $aimeos );
+		parent::__construct($context, $aimeos);
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product/type' );
-		$search = $manager->createSearch()->setSlice( 0, 0x7fffffff );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product/type');
+		$search = $manager->createSearch()->setSlice(0, 0x7fffffff);
 
-		foreach( $manager->searchItems( $search ) as $item ) {
+		foreach ($manager->searchItems($search) as $item) {
 			$this->types[$item->getCode()] = $item->getCode();
 		}
 	}
@@ -50,7 +50,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Product import CSV' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Product import CSV');
 	}
 
 
@@ -61,7 +61,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Imports new and updates existing products from CSV files' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Imports new and updates existing products from CSV files');
 	}
 
 
@@ -76,7 +76,7 @@ 
 		$context = $this->getContext();
 		$config = $context->getConfig();
 		$logger = $context->getLogger();
-		$domains = array( 'attribute', 'media', 'price', 'product', 'product/property', 'text' );
+		$domains = array('attribute', 'media', 'price', 'product', 'product/property', 'text');
 		$mappings = $this->getDefaultMapping();
 
 
@@ -96,7 +96,7 @@ 
 		 * @see controller/common/product/import/csv/converter
 		 * @see controller/common/product/import/csv/max-size
 		 */
-		$domains = $config->get( 'controller/common/product/import/csv/domains', $domains );
+		$domains = $config->get('controller/common/product/import/csv/domains', $domains);
 
 		/** controller/jobs/product/import/csv/domains
 		 * List of item domain names that should be retrieved along with the product items
@@ -116,7 +116,7 @@ 
 		 * @see controller/jobs/product/import/csv/backup
 		 * @see controller/common/product/import/csv/max-size
 		 */
-		$domains = $config->get( 'controller/jobs/product/import/csv/domains', $domains );
+		$domains = $config->get('controller/jobs/product/import/csv/domains', $domains);
 
 
 		/** controller/common/product/import/csv/mapping
@@ -141,7 +141,7 @@ 
 		 * @see controller/common/product/import/csv/converter
 		 * @see controller/common/product/import/csv/max-size
 		 */
-		$mappings = $config->get( 'controller/common/product/import/csv/mapping', $mappings );
+		$mappings = $config->get('controller/common/product/import/csv/mapping', $mappings);
 
 		/** controller/jobs/product/import/csv/mapping
 		 * List of mappings between the position in the CSV file and item keys
@@ -161,7 +161,7 @@ 
 		 * @see controller/jobs/product/import/csv/backup
 		 * @see controller/common/product/import/csv/max-size
 		 */
-		$mappings = $config->get( 'controller/jobs/product/import/csv/mapping', $mappings );
+		$mappings = $config->get('controller/jobs/product/import/csv/mapping', $mappings);
 
 
 		/** controller/common/product/import/csv/converter
@@ -203,7 +203,7 @@ 
 		 * @see controller/common/product/import/csv/mapping
 		 * @see controller/common/product/import/csv/max-size
 		 */
-		$converters = $config->get( 'controller/common/product/import/csv/converter', [] );
+		$converters = $config->get('controller/common/product/import/csv/converter', []);
 
 		/** controller/jobs/product/import/csv/converter
 		 * List of converter names for the values at the position in the CSV file
@@ -223,7 +223,7 @@ 
 		 * @see controller/jobs/product/import/csv/backup
 		 * @see controller/common/product/import/csv/max-size
 		 */
-		$converters = $config->get( 'controller/jobs/product/import/csv/converter', $converters );
+		$converters = $config->get('controller/jobs/product/import/csv/converter', $converters);
 
 
 		/** controller/common/product/import/csv/max-size
@@ -243,7 +243,7 @@ 
 		 * @see controller/common/product/import/csv/mapping
 		 * @see controller/common/product/import/csv/converter
 		 */
-		$maxcnt = (int) $config->get( 'controller/common/product/import/csv/max-size', 1000 );
+		$maxcnt = (int) $config->get('controller/common/product/import/csv/max-size', 1000);
 
 
 		/** controller/jobs/product/import/csv/skip-lines
@@ -265,7 +265,7 @@ 
 		 * @see controller/jobs/product/import/csv/backup
 		 * @see controller/common/product/import/csv/max-size
 		 */
-		$skiplines = (int) $config->get( 'controller/jobs/product/import/csv/skip-lines', 0 );
+		$skiplines = (int) $config->get('controller/jobs/product/import/csv/skip-lines', 0);
 
 
 		/** controller/jobs/product/import/csv/strict
@@ -289,7 +289,7 @@ 
 		 * @see controller/jobs/product/import/csv/backup
 		 * @see controller/common/product/import/csv/max-size
 		 */
-		$strict = (bool) $config->get( 'controller/jobs/product/import/csv/strict', true );
+		$strict = (bool) $config->get('controller/jobs/product/import/csv/strict', true);
 
 
 		/** controller/jobs/product/import/csv/backup
@@ -322,74 +322,74 @@ 
 		 * @see controller/jobs/product/import/csv/strict
 		 * @see controller/common/product/import/csv/max-size
 		 */
-		$backup = $config->get( 'controller/jobs/product/import/csv/backup' );
+		$backup = $config->get('controller/jobs/product/import/csv/backup');
 
 
-		if( !isset( $mappings['item'] ) || !is_array( $mappings['item'] ) )
+		if (!isset($mappings['item']) || !is_array($mappings['item']))
 		{
-			$msg = sprintf( 'Required mapping key "%1$s" is missing or contains no array', 'item' );
-			throw new \Aimeos\Controller\Jobs\Exception( $msg );
+			$msg = sprintf('Required mapping key "%1$s" is missing or contains no array', 'item');
+			throw new \Aimeos\Controller\Jobs\Exception($msg);
 		}
 
 		try
 		{
 			$procMappings = $mappings;
-			unset( $procMappings['item'] );
+			unset($procMappings['item']);
 
-			$codePos = $this->getCodePosition( $mappings['item'] );
-			$convlist = $this->getConverterList( $converters );
-			$processor = $this->getProcessors( $procMappings );
+			$codePos = $this->getCodePosition($mappings['item']);
+			$convlist = $this->getConverterList($converters);
+			$processor = $this->getProcessors($procMappings);
 			$container = $this->getContainer();
 			$path = $container->getName();
 
-			$msg = sprintf( 'Started product import from "%1$s" (%2$s)', $path, __CLASS__ );
-			$logger->log( $msg, \Aimeos\MW\Logger\Base::NOTICE );
+			$msg = sprintf('Started product import from "%1$s" (%2$s)', $path, __CLASS__);
+			$logger->log($msg, \Aimeos\MW\Logger\Base::NOTICE);
 
-			foreach( $container as $content )
+			foreach ($container as $content)
 			{
 				$name = $content->getName();
 
-				for( $i = 0; $i < $skiplines; $i++ ) {
+				for ($i = 0; $i < $skiplines; $i++) {
 					$content->next();
 				}
 
-				while( ( $data = $this->getData( $content, $maxcnt, $codePos ) ) !== [] )
+				while (($data = $this->getData($content, $maxcnt, $codePos)) !== [])
 				{
-					$data = $this->convertData( $convlist, $data );
-					$products = $this->getProducts( array_keys( $data ), $domains );
-					$errcnt = $this->import( $products, $data, $mappings['item'], $processor, $strict );
-					$chunkcnt = count( $data );
+					$data = $this->convertData($convlist, $data);
+					$products = $this->getProducts(array_keys($data), $domains);
+					$errcnt = $this->import($products, $data, $mappings['item'], $processor, $strict);
+					$chunkcnt = count($data);
 
 					$msg = 'Imported product lines from "%1$s": %2$d/%3$d (%4$s)';
-					$logger->log( sprintf( $msg, $name, $chunkcnt - $errcnt, $chunkcnt, __CLASS__ ), \Aimeos\MW\Logger\Base::NOTICE );
+					$logger->log(sprintf($msg, $name, $chunkcnt - $errcnt, $chunkcnt, __CLASS__), \Aimeos\MW\Logger\Base::NOTICE);
 
 					$errors += $errcnt;
 					$total += $chunkcnt;
-					unset( $products, $data );
+					unset($products, $data);
 				}
 			}
 
 			$container->close();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$logger->log( 'Product import error: ' . $e->getMessage() );
-			$logger->log( $e->getTraceAsString() );
+			$logger->log('Product import error: ' . $e->getMessage());
+			$logger->log($e->getTraceAsString());
 
-			throw new \Aimeos\Controller\Jobs\Exception( $e->getMessage() );
+			throw new \Aimeos\Controller\Jobs\Exception($e->getMessage());
 		}
 
 		$msg = 'Finished product import from "%1$s": %2$d successful, %3$s errors, %4$s total (%5$s)';
-		$logger->log( sprintf( $msg, $path, $total - $errors, $errors, $total, __CLASS__ ), \Aimeos\MW\Logger\Base::NOTICE );
+		$logger->log(sprintf($msg, $path, $total - $errors, $errors, $total, __CLASS__), \Aimeos\MW\Logger\Base::NOTICE);
 
-		if( $errors > 0 )
+		if ($errors > 0)
 		{
-			$msg = sprintf( 'Invalid product lines in "%1$s": %2$d/%3$d', $path, $errors, $total );
-			throw new \Aimeos\Controller\Jobs\Exception( $msg );
+			$msg = sprintf('Invalid product lines in "%1$s": %2$d/%3$d', $path, $errors, $total);
+			throw new \Aimeos\Controller\Jobs\Exception($msg);
 		}
 
-		if( !empty( $backup ) && @rename( $path, strftime( $backup ) ) === false ) {
-			throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Unable to move imported file' ) );
+		if (!empty($backup) && @rename($path, strftime($backup)) === false) {
+			throw new \Aimeos\Controller\Jobs\Exception(sprintf('Unable to move imported file'));
 		}
 	}
 
@@ -401,16 +401,16 @@ 
 	 * @return integer Position of the "product.code" column
 	 * @throws \Aimeos\Controller\Jobs\Exception If no mapping for "product.code" is found
 	 */
-	protected function getCodePosition( array $mapping )
+	protected function getCodePosition(array $mapping)
 	{
-		foreach( $mapping as $pos => $key )
+		foreach ($mapping as $pos => $key)
 		{
-			if( $key === 'product.code' ) {
+			if ($key === 'product.code') {
 				return $pos;
 			}
 		}
 
-		throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'No "product.code" column in CSV mapping found' ) );
+		throw new \Aimeos\Controller\Jobs\Exception(sprintf('No "product.code" column in CSV mapping found'));
 	}
 
 
@@ -445,7 +445,7 @@ 
 		 * @see controller/jobs/product/import/csv/container/content
 		 * @see controller/jobs/product/import/csv/container/options
 		 */
-		$location = $config->get( 'controller/jobs/product/import/csv/location' );
+		$location = $config->get('controller/jobs/product/import/csv/location');
 
 		/** controller/jobs/product/import/csv/container/type
 		 * Nave of the container type to read the data from
@@ -468,7 +468,7 @@ 
 		 * @see controller/jobs/product/import/csv/container/content
 		 * @see controller/jobs/product/import/csv/container/options
 		 */
-		$container = $config->get( 'controller/jobs/product/import/csv/container/type', 'Directory' );
+		$container = $config->get('controller/jobs/product/import/csv/container/type', 'Directory');
 
 		/** controller/jobs/product/import/csv/container/content
 		 * Name of the content type inside the container to read the data from
@@ -489,7 +489,7 @@ 
 		 * @see controller/jobs/product/import/csv/container/type
 		 * @see controller/jobs/product/import/csv/container/options
 		 */
-		$content = $config->get( 'controller/jobs/product/import/csv/container/content', 'CSV' );
+		$content = $config->get('controller/jobs/product/import/csv/container/content', 'CSV');
 
 		/** controller/jobs/product/import/csv/container/options
 		 * List of file container options for the product import files
@@ -507,15 +507,15 @@ 
 		 * @see controller/jobs/product/import/csv/container/content
 		 * @see controller/jobs/product/import/csv/container/type
 		 */
-		$options = $config->get( 'controller/jobs/product/import/csv/container/options', [] );
+		$options = $config->get('controller/jobs/product/import/csv/container/options', []);
 
-		if( $location === null )
+		if ($location === null)
 		{
-			$msg = sprintf( 'Required configuration for "%1$s" is missing', 'controller/jobs/product/import/csv/location' );
-			throw new \Aimeos\Controller\Jobs\Exception( $msg );
+			$msg = sprintf('Required configuration for "%1$s" is missing', 'controller/jobs/product/import/csv/location');
+			throw new \Aimeos\Controller\Jobs\Exception($msg);
 		}
 
-		return \Aimeos\MW\Container\Factory::getContainer( $location, $container, $content, $options );
+		return \Aimeos\MW\Container\Factory::getContainer($location, $container, $content, $options);
 	}
 
 
@@ -530,68 +530,68 @@ 
 	 * @return integer Number of products that couldn't be imported
 	 * @throws \Aimeos\Controller\Jobs\Exception
 	 */
-	protected function import( array $products, array $data, array $mapping,
-		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $processor, $strict )
+	protected function import(array $products, array $data, array $mapping,
+		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $processor, $strict)
 	{
 		$items = [];
 		$errors = 0;
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
-		$indexManager = \Aimeos\MShop\Factory::createManager( $context, 'index' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product');
+		$indexManager = \Aimeos\MShop\Factory::createManager($context, 'index');
 
-		foreach( $data as $code => $list )
+		foreach ($data as $code => $list)
 		{
 			$manager->begin();
 
 			try
 			{
-				$code = trim( $code );
+				$code = trim($code);
 
-				if( isset( $products[$code] ) ) {
+				if (isset($products[$code])) {
 					$product = $products[$code];
 				} else {
 					$product = $manager->createItem();
 				}
 
-				$map = $this->getMappedChunk( $list, $mapping );
+				$map = $this->getMappedChunk($list, $mapping);
 
-				if( isset( $map[0] ) )
+				if (isset($map[0]))
 				{
 					$map = $map[0]; // there can only be one chunk for the base product data
-					$map['product.type'] = $this->getValue( $map, 'product.type', 'default' );
+					$map['product.type'] = $this->getValue($map, 'product.type', 'default');
 
-					if( !in_array( $map['product.type'], $this->types ) )
+					if (!in_array($map['product.type'], $this->types))
 					{
-						$msg = sprintf( 'Invalid product type "%1$s"', $map['product.type'] );
-						throw new \Aimeos\Controller\Jobs\Exception( $msg );
+						$msg = sprintf('Invalid product type "%1$s"', $map['product.type']);
+						throw new \Aimeos\Controller\Jobs\Exception($msg);
 					}
 
-					$product = $manager->saveItem( $product->fromArray( $map ) );
+					$product = $manager->saveItem($product->fromArray($map));
 
-					$list = $processor->process( $product, $list );
+					$list = $processor->process($product, $list);
 
-					$product = $manager->saveItem( $product );
+					$product = $manager->saveItem($product);
 					$items[$product->getId()] = $product;
 				}
 
 				$manager->commit();
 			}
-			catch( \Exception $e )
+			catch (\Exception $e)
 			{
 				$manager->rollback();
 
-				$msg = sprintf( 'Unable to import product with code "%1$s": %2$s', $code, $e->getMessage() );
-				$context->getLogger()->log( $msg );
+				$msg = sprintf('Unable to import product with code "%1$s": %2$s', $code, $e->getMessage());
+				$context->getLogger()->log($msg);
 
 				$errors++;
 			}
 
-			if( $strict && !empty( $list ) ) {
-				$context->getLogger()->log( 'Not imported: ' . print_r( $list, true ) );
+			if ($strict && !empty($list)) {
+				$context->getLogger()->log('Not imported: ' . print_r($list, true));
 			}
 		}
 
-		$indexManager->rebuildIndex( $items );
+		$indexManager->rebuildIndex($items);
 
 		return $errors;
 	}

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

Braces +1 added lines, -2 removed lines

@@ -131,8 +131,7 @@
 			$data = $this->getObject()->process( $product, $data );
 
 			$manager->commit();
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$manager->rollback();
 			throw $e;

Spacing +27 added lines, -27 removed lines

@@ -42,15 +42,15 @@ 
 	 * @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);
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'stock/type' );
-		$search = $manager->createSearch()->setSlice( 0, 0x7fffffff );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'stock/type');
+		$search = $manager->createSearch()->setSlice(0, 0x7fffffff);
 
-		foreach( $manager->searchItems( $search ) as $item ) {
+		foreach ($manager->searchItems($search) as $item) {
 			$this->types[$item->getCode()] = $item->getCode();
 		}
 	}
@@ -63,47 +63,47 @@ 
 	 * @param array $data List of CSV fields with position as key and data as value
 	 * @return array List of data which hasn't been imported
 	 */
-	public function process( \Aimeos\MShop\Product\Item\Iface $product, array $data )
+	public function process(\Aimeos\MShop\Product\Item\Iface $product, array $data)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'stock' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'stock');
 		$manager->begin();
 
 		try
 		{
-			$map = $this->getMappedChunk( $data, $this->getMapping() );
-			$items = $this->getStockItems( $product->getCode() );
+			$map = $this->getMappedChunk($data, $this->getMapping());
+			$items = $this->getStockItems($product->getCode());
 
-			foreach( $map as $pos => $list )
+			foreach ($map as $pos => $list)
 			{
-				if( !array_key_exists( 'stock.stocklevel', $list ) ) {
+				if (!array_key_exists('stock.stocklevel', $list)) {
 					continue;
 				}
 
 				$list['stock.productcode'] = $product->getCode();
-				$list['stock.dateback'] = $this->getValue( $list, 'stock.dateback' );
-				$list['stock.stocklevel'] = $this->getValue( $list, 'stock.stocklevel' );
-				$list['stock.type'] = $this->getValue( $list, 'stock.type', 'default' );
+				$list['stock.dateback'] = $this->getValue($list, 'stock.dateback');
+				$list['stock.stocklevel'] = $this->getValue($list, 'stock.stocklevel');
+				$list['stock.type'] = $this->getValue($list, 'stock.type', 'default');
 
-				if( !in_array( $list['stock.type'], $this->types ) )
+				if (!in_array($list['stock.type'], $this->types))
 				{
-					$msg = sprintf( 'Invalid type "%1$s" (%2$s)', $list['stock.type'], 'stock' );
-					throw new \Aimeos\Controller\Common\Exception( $msg );
+					$msg = sprintf('Invalid type "%1$s" (%2$s)', $list['stock.type'], 'stock');
+					throw new \Aimeos\Controller\Common\Exception($msg);
 				}
 
-				if( ( $item = array_pop( $items ) ) === null ) {
+				if (($item = array_pop($items)) === null) {
 					$item = $manager->createItem();
 				}
 
-				$manager->saveItem( $item->fromArray( $list ), false );
+				$manager->saveItem($item->fromArray($list), false);
 			}
 
-			$manager->deleteItems( array_keys( $items ) );
+			$manager->deleteItems(array_keys($items));
 
-			$data = $this->getObject()->process( $product, $data );
+			$data = $this->getObject()->process($product, $data);
 
 			$manager->commit();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$manager->rollback();
 			throw $e;
@@ -119,13 +119,13 @@ 
 	 * @param string $code Unique product code
 	 * @return \Aimeos\MShop\Stock\Item\Iface[] Associative list of stock items
 	 */
-	protected function getStockItems( $code )
+	protected function getStockItems($code)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'stock' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'stock');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'stock.productcode', $code ) );
+		$search->setConditions($search->compare('==', 'stock.productcode', $code));
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 }