aimeos / ai-controller-jobs

controller/common/tests/Controller/Common/Catalog/Import/Csv/Processor/Text/StandardTest.php

Spacing +57 added lines, -57 removed lines

@@ -17,16 +17,16 @@ 
 
 	protected function setUp()
 	{
-		\Aimeos\MShop::cache( true );
+		\Aimeos\MShop::cache(true);
 
 		$this->context = \TestHelperCntl::getContext();
-		$this->endpoint = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Done( $this->context, [] );
+		$this->endpoint = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Done($this->context, []);
 	}
 
 
 	protected function tearDown()
 	{
-		\Aimeos\MShop::cache( false );
+		\Aimeos\MShop::cache(false);
 		\Aimeos\MShop::clear();
 	}
 
@@ -49,31 +49,31 @@ 
 			4 => 1,
 		);
 
-		$catalog = $this->create( 'job_csv_test' );
+		$catalog = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $catalog, $data );
+		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($catalog, $data);
 
 
 		$listItems = $catalog->getListItems();
-		$listItem = reset( $listItems );
+		$listItem = reset($listItems);
 
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem );
-		$this->assertEquals( 1, count( $listItems ) );
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem);
+		$this->assertEquals(1, count($listItems));
 
-		$this->assertEquals( 1, $listItem->getStatus() );
-		$this->assertEquals( 0, $listItem->getPosition() );
-		$this->assertEquals( 'text', $listItem->getDomain() );
-		$this->assertEquals( 'default', $listItem->getType() );
+		$this->assertEquals(1, $listItem->getStatus());
+		$this->assertEquals(0, $listItem->getPosition());
+		$this->assertEquals('text', $listItem->getDomain());
+		$this->assertEquals('default', $listItem->getType());
 
 		$refItem = $listItem->getRefItem();
 
-		$this->assertEquals( 1, $refItem->getStatus() );
-		$this->assertEquals( 'name', $refItem->getType() );
-		$this->assertEquals( 'test text', $refItem->getLabel() );
-		$this->assertEquals( 'Job CSV test', $refItem->getContent() );
-		$this->assertEquals( 'de', $refItem->getLanguageId() );
-		$this->assertEquals( 1, $refItem->getStatus() );
+		$this->assertEquals(1, $refItem->getStatus());
+		$this->assertEquals('name', $refItem->getType());
+		$this->assertEquals('test text', $refItem->getLabel());
+		$this->assertEquals('Job CSV test', $refItem->getContent());
+		$this->assertEquals('de', $refItem->getLanguageId());
+		$this->assertEquals(1, $refItem->getStatus());
 	}
 
 
@@ -101,27 +101,27 @@ 
 			7 => 'Long: Job CSV test 2',
 		);
 
-		$catalog = $this->create( 'job_csv_test' );
+		$catalog = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $catalog, $data );
+		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($catalog, $data);
 
 
 		$pos = 0;
 		$listItems = $catalog->getListItems();
 		$expected = array(
-			0 => array( 'name', 'Job CSV test' ),
-			1 => array( 'short', 'Short: Job CSV test' ),
-			2 => array( 'long', 'Long: Job CSV test' ),
-			3 => array( 'long', 'Long: Job CSV test 2' ),
+			0 => array('name', 'Job CSV test'),
+			1 => array('short', 'Short: Job CSV test'),
+			2 => array('long', 'Long: Job CSV test'),
+			3 => array('long', 'Long: Job CSV test 2'),
 		);
 
-		$this->assertEquals( 4, count( $listItems ) );
+		$this->assertEquals(4, count($listItems));
 
-		foreach( $listItems as $listItem )
+		foreach ($listItems as $listItem)
 		{
-			$this->assertEquals( $expected[$pos][0], $listItem->getRefItem()->getType() );
-			$this->assertEquals( $expected[$pos][1], $listItem->getRefItem()->getContent() );
+			$this->assertEquals($expected[$pos][0], $listItem->getRefItem()->getType());
+			$this->assertEquals($expected[$pos][1], $listItem->getRefItem()->getContent());
 			$pos++;
 		}
 	}
@@ -144,21 +144,21 @@ 
 			1 => 'Short: Job CSV test',
 		);
 
-		$catalog = $this->create( 'job_csv_test' );
+		$catalog = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $catalog, $data );
-		$object->process( $catalog, $dataUpdate );
+		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($catalog, $data);
+		$object->process($catalog, $dataUpdate);
 
 
 		$listItems = $catalog->getListItems();
-		$listItem = reset( $listItems );
+		$listItem = reset($listItems);
 
-		$this->assertEquals( 1, count( $listItems ) );
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem );
+		$this->assertEquals(1, count($listItems));
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem);
 
-		$this->assertEquals( 'short', $listItem->getRefItem()->getType() );
-		$this->assertEquals( 'Short: Job CSV test', $listItem->getRefItem()->getContent() );
+		$this->assertEquals('short', $listItem->getRefItem()->getType());
+		$this->assertEquals('Short: Job CSV test', $listItem->getRefItem()->getContent());
 	}
 
 
@@ -174,18 +174,18 @@ 
 			1 => 'Job CSV test',
 		);
 
-		$catalog = $this->create( 'job_csv_test' );
+		$catalog = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $catalog, $data );
+		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($catalog, $data);
 
-		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard( $this->context, [], $this->endpoint );
-		$object->process( $catalog, [] );
+		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard($this->context, [], $this->endpoint);
+		$object->process($catalog, []);
 
 
 		$listItems = $catalog->getListItems();
 
-		$this->assertEquals( 0, count( $listItems ) );
+		$this->assertEquals(0, count($listItems));
 	}
 
 
@@ -205,15 +205,15 @@ 
 			3 => '',
 		);
 
-		$catalog = $this->create( 'job_csv_test' );
+		$catalog = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $catalog, $data );
+		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($catalog, $data);
 
 
 		$listItems = $catalog->getListItems();
 
-		$this->assertEquals( 1, count( $listItems ) );
+		$this->assertEquals(1, count($listItems));
 	}
 
 
@@ -237,26 +237,26 @@ 
 			5 => 'default',
 		);
 
-		$this->context->getConfig()->set( 'controller/common/catalog/import/csv/processor/text/listtypes', array( 'default' ) );
+		$this->context->getConfig()->set('controller/common/catalog/import/csv/processor/text/listtypes', array('default'));
 
-		$catalog = $this->create( 'job_csv_test' );
+		$catalog = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint );
+		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint);
 
-		$this->setExpectedException( '\Aimeos\Controller\Common\Exception' );
-		$object->process( $catalog, $data );
+		$this->setExpectedException('\Aimeos\Controller\Common\Exception');
+		$object->process($catalog, $data);
 	}
 
 
 	/**
 	 * @param string $code
 	 */
-	protected function create( $code )
+	protected function create($code)
 	{
-		$manager = \Aimeos\MShop\Catalog\Manager\Factory::create( $this->context );
+		$manager = \Aimeos\MShop\Catalog\Manager\Factory::create($this->context);
 
 		$item = $manager->createItem();
-		$item->setCode( $code );
+		$item->setCode($code);
 
 		return $item;
 	}

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

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::create( $context, 'product/type' );
-		$search = $manager->createSearch()->setSlice( 0, 0x7fffffff );
+		$manager = \Aimeos\MShop::create($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::create( $context, 'product' );
-		$indexManager = \Aimeos\MShop::create( $context, 'index' );
+		$manager = \Aimeos\MShop::create($context, 'product');
+		$indexManager = \Aimeos\MShop::create($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/jobs/src/Controller/Jobs/Product/Export/Sitemap/Standard.php

Spacing +50 added lines, -50 removed lines

@@ -28,7 +28,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Product site map' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Product site map');
 	}
 
 
@@ -39,7 +39,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Creates a product site map for search engines' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Creates a product site map for search engines');
 	}
 
 
@@ -52,8 +52,8 @@ 
 	{
 		$container = $this->createContainer();
 
-		$files = $this->export( $container );
-		$this->createSitemapIndex( $container, $files );
+		$files = $this->export($container);
+		$this->createSitemapIndex($container, $files);
 
 		$container->close();
 	}
@@ -65,7 +65,7 @@ 
 	 * @param \Aimeos\MW\Container\Content\Iface $content File content object
 	 * @param \Aimeos\MShop\Product\Item\Iface[] $items List of product items
 	 */
-	protected function addItems( \Aimeos\MW\Container\Content\Iface $content, array $items )
+	protected function addItems(\Aimeos\MW\Container\Content\Iface $content, array $items)
 	{
 		$config = $this->getContext()->getConfig();
 
@@ -96,7 +96,7 @@ 
 		 * @see controller/jobs/product/export/sitemap/max-items
 		 * @see controller/jobs/product/export/sitemap/max-query
 		 */
-		$changefreq = $config->get( 'controller/jobs/product/export/sitemap/changefreq', 'daily' );
+		$changefreq = $config->get('controller/jobs/product/export/sitemap/changefreq', 'daily');
 
 		/** controller/jobs/product/export/sitemap/standard/template-items
 		 * Relative path to the XML items template of the product site map job controller.
@@ -129,7 +129,7 @@ 
 		$view->siteItems = $items;
 		$view->siteFreq = $changefreq;
 
-		$content->add( $view->render( $context->getConfig()->get( $tplconf, $default ) ) );
+		$content->add($view->render($context->getConfig()->get($tplconf, $default)));
 	}
 
 
@@ -175,7 +175,7 @@ 
 		 * @see controller/jobs/product/export/sitemap/max-query
 		 * @see controller/jobs/product/export/sitemap/changefreq
 		 */
-		$location = $config->get( 'controller/jobs/product/export/sitemap/location' );
+		$location = $config->get('controller/jobs/product/export/sitemap/location');
 
 		/** controller/jobs/product/export/sitemap/container/options
 		 * List of file container options for the site map files
@@ -196,16 +196,16 @@ 
 		 * @see controller/jobs/product/export/sitemap/max-query
 		 * @see controller/jobs/product/export/sitemap/changefreq
 		 */
-		$default = array( 'gzip-mode' => 'wb' );
-		$options = $config->get( 'controller/jobs/product/export/sitemap/container/options', $default );
+		$default = array('gzip-mode' => 'wb');
+		$options = $config->get('controller/jobs/product/export/sitemap/container/options', $default);
 
-		if( $location === null )
+		if ($location === null)
 		{
-			$msg = sprintf( 'Required configuration for "%1$s" is missing', 'controller/jobs/product/export/sitemap/location' );
-			throw new \Aimeos\Controller\Jobs\Exception( $msg );
+			$msg = sprintf('Required configuration for "%1$s" is missing', 'controller/jobs/product/export/sitemap/location');
+			throw new \Aimeos\Controller\Jobs\Exception($msg);
 		}
 
-		return \Aimeos\MW\Container\Factory::getContainer( $location, 'Directory', 'Gzip', $options );
+		return \Aimeos\MW\Container\Factory::getContainer($location, 'Directory', 'Gzip', $options);
 	}
 
 
@@ -216,7 +216,7 @@ 
 	 * @param integer $filenum New file number
 	 * @return \Aimeos\MW\Container\Content\Iface New content object
 	 */
-	protected function createContent( \Aimeos\MW\Container\Iface $container, $filenum )
+	protected function createContent(\Aimeos\MW\Container\Iface $container, $filenum)
 	{
 		/** controller/jobs/product/export/sitemap/standard/template-header
 		 * Relative path to the XML site map header template of the product site map job controller.
@@ -246,9 +246,9 @@ 
 		$context = $this->getContext();
 		$view = $context->getView();
 
-		$content = $container->create( $this->getFilename( $filenum ) );
-		$content->add( $view->render( $context->getConfig()->get( $tplconf, $default ) ) );
-		$container->add( $content );
+		$content = $container->create($this->getFilename($filenum));
+		$content->add($view->render($context->getConfig()->get($tplconf, $default)));
+		$container->add($content);
 
 		return $content;
 	}
@@ -259,7 +259,7 @@ 
 	 *
 	 * @param \Aimeos\MW\Container\Content\Iface $content
 	 */
-	protected function closeContent( \Aimeos\MW\Container\Content\Iface $content )
+	protected function closeContent(\Aimeos\MW\Container\Content\Iface $content)
 	{
 		/** controller/jobs/product/export/sitemap/standard/template-footer
 		 * Relative path to the XML site map footer template of the product site map job controller.
@@ -289,7 +289,7 @@ 
 		$context = $this->getContext();
 		$view = $context->getView();
 
-		$content->add( $view->render( $context->getConfig()->get( $tplconf, $default ) ) );
+		$content->add($view->render($context->getConfig()->get($tplconf, $default)));
 	}
 
 
@@ -299,7 +299,7 @@ 
 	 * @param \Aimeos\MW\Container\Iface $container File container object
 	 * @param array $files List of generated site map file names
 	 */
-	protected function createSitemapIndex( \Aimeos\MW\Container\Iface $container, array $files )
+	protected function createSitemapIndex(\Aimeos\MW\Container\Iface $container, array $files)
 	{
 		/** controller/jobs/product/export/sitemap/standard/template-index
 		 * Relative path to the XML site map index template of the product site map job controller.
@@ -331,9 +331,9 @@ 
 
 		$view->siteFiles = $files;
 
-		$content = $container->create( 'aimeos-sitemap-index.xml' );
-		$content->add( $view->render( $context->getConfig()->get( $tplconf, $default ) ) );
-		$container->add( $content );
+		$content = $container->create('aimeos-sitemap-index.xml');
+		$content->add($view->render($context->getConfig()->get($tplconf, $default)));
+		$container->add($content);
 	}
 
 
@@ -344,44 +344,44 @@ 
 	 * @param boolean $default True to filter exported products by default criteria
 	 * @return array List of content (file) names
 	 */
-	protected function export( \Aimeos\MW\Container\Iface $container, $default = true )
+	protected function export(\Aimeos\MW\Container\Iface $container, $default = true)
 	{
-		$domains = $this->getConfig( 'domains', [] );
-		$maxItems = $this->getConfig( 'max-items', 10000 );
-		$maxQuery = $this->getConfig( 'max-query', 1000 );
+		$domains = $this->getConfig('domains', []);
+		$maxItems = $this->getConfig('max-items', 10000);
+		$maxQuery = $this->getConfig('max-query', 1000);
 
 		$start = 0; $filenum = 1;
 		$names = [];
 
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'index' );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'index');
 
-		$search = $manager->createSearch( $default );
-		$search->setConditions( $search->compare( '!=', 'index.catalog.id', null ) );
-		$search->setSortations( array( $search->sort( '+', 'product.id' ) ) );
-		$search->setSlice( 0, $maxQuery );
+		$search = $manager->createSearch($default);
+		$search->setConditions($search->compare('!=', 'index.catalog.id', null));
+		$search->setSortations(array($search->sort('+', 'product.id')));
+		$search->setSlice(0, $maxQuery);
 
-		$content = $this->createContent( $container, $filenum );
+		$content = $this->createContent($container, $filenum);
 		$names[] = $content->getResource();
 
 		do
 		{
-			$items = $manager->searchItems( $search, $domains );
-			$this->addItems( $content, $items );
+			$items = $manager->searchItems($search, $domains);
+			$this->addItems($content, $items);
 
-			$count = count( $items );
+			$count = count($items);
 			$start += $count;
-			$search->setSlice( $start, $maxQuery );
+			$search->setSlice($start, $maxQuery);
 
-			if( $start + $maxQuery > $maxItems * $filenum )
+			if ($start + $maxQuery > $maxItems * $filenum)
 			{
-				$this->closeContent( $content );
-				$content = $this->createContent( $container, ++$filenum );
+				$this->closeContent($content);
+				$content = $this->createContent($container, ++$filenum);
 				$names[] = $content->getResource();
 			}
 		}
-		while( $count >= $search->getSliceSize() );
+		while ($count >= $search->getSliceSize());
 
-		$this->closeContent( $content );
+		$this->closeContent($content);
 
 		return $names;
 	}
@@ -394,11 +394,11 @@ 
 	 * @param mixed $default Default value if name is unknown
 	 * @return mixed Configuration value
 	 */
-	protected function getConfig( $name, $default = null )
+	protected function getConfig($name, $default = null)
 	{
 		$config = $this->getContext()->getConfig();
 
-		switch( $name )
+		switch ($name)
 		{
 			case 'domains':
 				/** controller/jobs/product/export/sitemap/domains
@@ -419,7 +419,7 @@ 
 				 * @see controller/jobs/product/export/sitemap/max-query
 				 * @see controller/jobs/product/export/sitemap/changefreq
 				 */
-				return $config->get( 'controller/jobs/product/export/sitemap/domains', $default );
+				return $config->get('controller/jobs/product/export/sitemap/domains', $default);
 
 			case 'max-items':
 				/** controller/jobs/product/export/sitemap/max-items
@@ -444,7 +444,7 @@ 
 				 * @see controller/jobs/product/export/sitemap/changefreq
 				 * @see controller/jobs/product/export/sitemap/domains
 				 */
-				return $config->get( 'controller/jobs/product/export/sitemap/max-items', 50000 );
+				return $config->get('controller/jobs/product/export/sitemap/max-items', 50000);
 
 			case 'max-query':
 				/** controller/jobs/product/export/sitemap/max-query
@@ -465,7 +465,7 @@ 
 				 * @see controller/jobs/product/export/sitemap/changefreq
 				 * @see controller/jobs/product/export/sitemap/domains
 				 */
-				return $config->get( 'controller/jobs/product/export/sitemap/max-query', 1000 );
+				return $config->get('controller/jobs/product/export/sitemap/max-query', 1000);
 		}
 
 		return $default;
@@ -478,8 +478,8 @@ 
 	 * @param integer $number Current file number
 	 * @return string New file name
 	 */
-	protected function getFilename( $number )
+	protected function getFilename($number)
 	{
-		return sprintf( 'aimeos-sitemap-%d.xml', $number );
+		return sprintf('aimeos-sitemap-%d.xml', $number);
 	}
 }

controller/jobs/src/Controller/Jobs/Product/Export/Standard.php

Spacing +46 added lines, -46 removed lines

@@ -28,7 +28,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Product export' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Product export');
 	}
 
 
@@ -39,7 +39,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Exports all available products' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Exports all available products');
 	}
 
 
@@ -51,7 +51,7 @@ 
 	public function run()
 	{
 		$container = $this->createContainer();
-		$this->export( $container, false );
+		$this->export($container, false);
 		$container->close();
 	}
 
@@ -62,7 +62,7 @@ 
 	 * @param \Aimeos\MW\Container\Content\Iface $content File content object
 	 * @param \Aimeos\MShop\Product\Item\Iface[] $items List of product items
 	 */
-	protected function addItems( \Aimeos\MW\Container\Content\Iface $content, array $items )
+	protected function addItems(\Aimeos\MW\Container\Content\Iface $content, array $items)
 	{
 		/** controller/jobs/product/export/standard/template-items
 		 * Relative path to the XML items template of the product site map job controller.
@@ -94,7 +94,7 @@ 
 
 		$view->exportItems = $items;
 
-		$content->add( $view->render( $context->getConfig()->get( $tplconf, $default ) ) );
+		$content->add($view->render($context->getConfig()->get($tplconf, $default)));
 	}
 
 
@@ -123,7 +123,7 @@ 
 		 * @see controller/jobs/product/export/max-items
 		 * @see controller/jobs/product/export/max-query
 		 */
-		$location = $config->get( 'controller/jobs/product/export/location' );
+		$location = $config->get('controller/jobs/product/export/location');
 
 		/** controller/jobs/product/export/standard/container/type
 		 * List of file container options for the export files
@@ -140,7 +140,7 @@ 
 		 * @see controller/jobs/product/export/max-items
 		 * @see controller/jobs/product/export/max-query
 		 */
-		$container = $config->get( 'controller/jobs/product/export/standard/container/type', 'Directory' );
+		$container = $config->get('controller/jobs/product/export/standard/container/type', 'Directory');
 
 		/** controller/jobs/product/export/standard/container/content
 		 * List of file container options for the export files
@@ -157,7 +157,7 @@ 
 		 * @see controller/jobs/product/export/max-items
 		 * @see controller/jobs/product/export/max-query
 		 */
-		$content = $config->get( 'controller/jobs/product/export/standard/container/content', 'Binary' );
+		$content = $config->get('controller/jobs/product/export/standard/container/content', 'Binary');
 
 		/** controller/jobs/product/export/standard/container/options
 		 * List of file container options for the export files
@@ -174,15 +174,15 @@ 
 		 * @see controller/jobs/product/export/max-items
 		 * @see controller/jobs/product/export/max-query
 		 */
-		$options = $config->get( 'controller/jobs/product/export/standard/container/options', [] );
+		$options = $config->get('controller/jobs/product/export/standard/container/options', []);
 
-		if( $location === null )
+		if ($location === null)
 		{
-			$msg = sprintf( 'Required configuration for "%1$s" is missing', 'controller/jobs/product/export/location' );
-			throw new \Aimeos\Controller\Jobs\Exception( $msg );
+			$msg = sprintf('Required configuration for "%1$s" is missing', 'controller/jobs/product/export/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);
 	}
 
 
@@ -193,7 +193,7 @@ 
 	 * @param integer $filenum New file number
 	 * @return \Aimeos\MW\Container\Content\Iface New content object
 	 */
-	protected function createContent( \Aimeos\MW\Container\Iface $container, $filenum )
+	protected function createContent(\Aimeos\MW\Container\Iface $container, $filenum)
 	{
 		/** controller/jobs/product/export/standard/template-header
 		 * Relative path to the XML site map header template of the product site map job controller.
@@ -223,9 +223,9 @@ 
 		$context = $this->getContext();
 		$view = $context->getView();
 
-		$content = $container->create( $this->getFilename( $filenum ) );
-		$content->add( $view->render( $context->getConfig()->get( $tplconf, $default ) ) );
-		$container->add( $content );
+		$content = $container->create($this->getFilename($filenum));
+		$content->add($view->render($context->getConfig()->get($tplconf, $default)));
+		$container->add($content);
 
 		return $content;
 	}
@@ -236,7 +236,7 @@ 
 	 *
 	 * @param \Aimeos\MW\Container\Content\Iface $content
 	 */
-	protected function closeContent( \Aimeos\MW\Container\Content\Iface $content )
+	protected function closeContent(\Aimeos\MW\Container\Content\Iface $content)
 	{
 		/** controller/jobs/product/export/standard/template-footer
 		 * Relative path to the XML site map footer template of the product site map job controller.
@@ -266,7 +266,7 @@ 
 		$context = $this->getContext();
 		$view = $context->getView();
 
-		$content->add( $view->render( $context->getConfig()->get( $tplconf, $default ) ) );
+		$content->add($view->render($context->getConfig()->get($tplconf, $default)));
 	}
 
 
@@ -277,45 +277,45 @@ 
 	 * @param boolean $default True to filter exported products by default criteria
 	 * @return array List of content (file) names
 	 */
-	protected function export( \Aimeos\MW\Container\Iface $container, $default = true )
+	protected function export(\Aimeos\MW\Container\Iface $container, $default = true)
 	{
-		$domains = array( 'attribute', 'media', 'price', 'product', 'text' );
+		$domains = array('attribute', 'media', 'price', 'product', 'text');
 
-		$domains = $this->getConfig( 'domains', $domains );
-		$maxItems = $this->getConfig( 'max-items', 10000 );
-		$maxQuery = $this->getConfig( 'max-query', 1000 );
+		$domains = $this->getConfig('domains', $domains);
+		$maxItems = $this->getConfig('max-items', 10000);
+		$maxQuery = $this->getConfig('max-query', 1000);
 
 		$start = 0; $filenum = 1;
 		$names = [];
 
-		$productManager = \Aimeos\MShop::create( $this->getContext(), 'product' );
+		$productManager = \Aimeos\MShop::create($this->getContext(), 'product');
 
-		$search = $productManager->createSearch( $default );
-		$search->setSortations( array( $search->sort( '+', 'product.id' ) ) );
-		$search->setSlice( 0, $maxQuery );
+		$search = $productManager->createSearch($default);
+		$search->setSortations(array($search->sort('+', 'product.id')));
+		$search->setSlice(0, $maxQuery);
 
-		$content = $this->createContent( $container, $filenum );
+		$content = $this->createContent($container, $filenum);
 		$names[] = $content->getResource();
 
 		do
 		{
-			$items = $productManager->searchItems( $search, $domains );
-			$this->addItems( $content, $items );
+			$items = $productManager->searchItems($search, $domains);
+			$this->addItems($content, $items);
 
-			$count = count( $items );
+			$count = count($items);
 			$start += $count;
-			$search->setSlice( $start, $maxQuery );
+			$search->setSlice($start, $maxQuery);
 
-			if( $start + $maxQuery > $maxItems * $filenum )
+			if ($start + $maxQuery > $maxItems * $filenum)
 			{
-				$this->closeContent( $content );
-				$content = $this->createContent( $container, ++$filenum );
+				$this->closeContent($content);
+				$content = $this->createContent($container, ++$filenum);
 				$names[] = $content->getResource();
 			}
 		}
-		while( $count >= $search->getSliceSize() );
+		while ($count >= $search->getSliceSize());
 
-		$this->closeContent( $content );
+		$this->closeContent($content);
 
 		return $names;
 	}
@@ -328,11 +328,11 @@ 
 	 * @param mixed $default Default value if name is unknown
 	 * @return mixed Configuration value
 	 */
-	protected function getConfig( $name, $default = null )
+	protected function getConfig($name, $default = null)
 	{
 		$config = $this->getContext()->getConfig();
 
-		switch( $name )
+		switch ($name)
 		{
 			case 'domain':
 				/** controller/jobs/product/export/domains
@@ -355,7 +355,7 @@ 
 				 * @see controller/jobs/product/export/max-items
 				 * @see controller/jobs/product/export/max-query
 				 */
-				return $config->get( 'controller/jobs/product/export/domains', $default );
+				return $config->get('controller/jobs/product/export/domains', $default);
 
 			case 'max-items':
 				/** controller/jobs/product/export/max-items
@@ -378,7 +378,7 @@ 
 				 * @see controller/jobs/product/export/max-query
 				 * @see controller/jobs/product/export/domains
 				 */
-				return $config->get( 'controller/jobs/product/export/max-items', $default );
+				return $config->get('controller/jobs/product/export/max-items', $default);
 
 			case 'max-query':
 				/** controller/jobs/product/export/max-query
@@ -401,7 +401,7 @@ 
 				 * @see controller/jobs/product/export/max-items
 				 * @see controller/jobs/product/export/domains
 				 */
-				return $config->get( 'controller/jobs/product/export/max-query', $default );
+				return $config->get('controller/jobs/product/export/max-query', $default);
 
 			case 'filename':
 				/** controller/jobs/product/export/filename
@@ -422,7 +422,7 @@ 
 				 * @see controller/jobs/product/export/max-query
 				 * @see controller/jobs/product/export/domains
 				 */
-				return $config->get( 'controller/jobs/product/export/filename', $default );
+				return $config->get('controller/jobs/product/export/filename', $default);
 		}
 
 		return $default;
@@ -435,8 +435,8 @@ 
 	 * @param integer $number Current file number
 	 * @return string New file name
 	 */
-	protected function getFilename( $number )
+	protected function getFilename($number)
 	{
-		return sprintf( $this->getConfig( 'filename', 'aimeos-products-%1$d_%2$s.xml' ), $number, date( 'Y-m-d_H:i:s' ) );
+		return sprintf($this->getConfig('filename', 'aimeos-products-%1$d_%2$s.xml'), $number, date('Y-m-d_H:i:s'));
 	}
 }

controller/jobs/src/Controller/Jobs/Product/Bought/Standard.php

Spacing +63 added lines, -63 removed lines

@@ -29,7 +29,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Products bought together' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Products bought together');
 	}
 
 
@@ -40,7 +40,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Creates bought together product suggestions' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Creates bought together product suggestions');
 	}
 
 
@@ -72,7 +72,7 @@ 
 		 * @see controller/jobs/product/bought/min-confidence
 		 * @see controller/jobs/product/bought/limit-days
 		 */
-		$maxItems = $config->get( 'controller/jobs/product/bought/max-items', 5 );
+		$maxItems = $config->get('controller/jobs/product/bought/max-items', 5);
 
 		/** controller/jobs/product/bought/min-support
 		 * Minimum support value to sort out all irrelevant combinations
@@ -101,7 +101,7 @@ 
 		 * @see controller/jobs/product/bought/min-confidence
 		 * @see controller/jobs/product/bought/limit-days
 		 */
-		$minSupport = $config->get( 'controller/jobs/product/bought/min-support', 0.02 );
+		$minSupport = $config->get('controller/jobs/product/bought/min-support', 0.02);
 
 		/** controller/jobs/product/bought/min-confidence
 		 * Minimum confidence value for high quality suggestions
@@ -126,7 +126,7 @@ 
 		 * @see controller/jobs/product/bought/min-support
 		 * @see controller/jobs/product/bought/limit-days
 		 */
-		$minConfidence = $config->get( 'controller/jobs/product/bought/min-confidence', 0.66 );
+		$minConfidence = $config->get('controller/jobs/product/bought/min-confidence', 0.66);
 
 		/** controller/jobs/product/bought/limit-days
 		 * Only use orders placed in the past within the configured number of days for calculating bought together products
@@ -150,43 +150,43 @@ 
 		 * @see controller/jobs/product/bought/min-support
 		 * @see controller/jobs/product/bought/min-confidence
 		 */
-		$days = $config->get( 'controller/jobs/product/bought/limit-days', 180 );
-		$date = date( 'Y-m-d H:i:s', time() - $days * 86400 );
+		$days = $config->get('controller/jobs/product/bought/limit-days', 180);
+		$date = date('Y-m-d H:i:s', time() - $days * 86400);
 
 
-		$baseManager = \Aimeos\MShop::create( $context, 'order/base' );
+		$baseManager = \Aimeos\MShop::create($context, 'order/base');
 		$search = $baseManager->createSearch();
-		$search->setConditions( $search->compare( '>', 'order.base.ctime', $date ) );
-		$search->setSlice( 0, 0 );
+		$search->setConditions($search->compare('>', 'order.base.ctime', $date));
+		$search->setSlice(0, 0);
 		$totalOrders = 0;
-		$baseManager->searchItems( $search, [], $totalOrders );
+		$baseManager->searchItems($search, [], $totalOrders);
 
-		$baseProductManager = \Aimeos\MShop::create( $context, 'order/base/product' );
+		$baseProductManager = \Aimeos\MShop::create($context, 'order/base/product');
 		$search = $baseProductManager->createSearch();
-		$search->setConditions( $search->compare( '>', 'order.base.product.ctime', $date ) );
+		$search->setConditions($search->compare('>', 'order.base.product.ctime', $date));
 		$start = 0;
 
 		do
 		{
-			$totalCounts = $baseProductManager->aggregate( $search, 'order.base.product.productid' );
-			$prodIds = array_keys( $totalCounts );
+			$totalCounts = $baseProductManager->aggregate($search, 'order.base.product.productid');
+			$prodIds = array_keys($totalCounts);
 
-			foreach( $totalCounts as $id => $count )
+			foreach ($totalCounts as $id => $count)
 			{
-				$this->removeListItems( $id );
+				$this->removeListItems($id);
 
-				if( $count / $totalOrders > $minSupport )
+				if ($count / $totalOrders > $minSupport)
 				{
-					$productIds = $this->getSuggestions( $id, $prodIds, $count, $totalOrders, $maxItems, $minSupport, $minConfidence, $date );
-					$this->addListItems( $id, $productIds );
+					$productIds = $this->getSuggestions($id, $prodIds, $count, $totalOrders, $maxItems, $minSupport, $minConfidence, $date);
+					$this->addListItems($id, $productIds);
 				}
 			}
 
-			$count = count( $totalCounts );
+			$count = count($totalCounts);
 			$start += $count;
-			$search->setSlice( $start );
+			$search->setSlice($start);
 		}
-		while( $count >= $search->getSliceSize() );
+		while ($count >= $search->getSliceSize());
 	}
 
 
@@ -203,59 +203,59 @@ 
 	 * @param string $date Date in YYYY-MM-DD HH:mm:ss format after which orders should be used for calculations
 	 * @return array List of suggested product IDs as key and their confidence as value
 	 */
-	protected function getSuggestions( $id, $prodIds, $count, $total, $maxItems, $minSupport, $minConfidence, $date )
+	protected function getSuggestions($id, $prodIds, $count, $total, $maxItems, $minSupport, $minConfidence, $date)
 	{
 		$refIds = [];
 		$context = $this->getContext();
 
-		$catalogListManager = \Aimeos\MShop::create( $context, 'catalog/lists' );
-		$baseProductManager = \Aimeos\MShop::create( $context, 'order/base/product' );
+		$catalogListManager = \Aimeos\MShop::create($context, 'catalog/lists');
+		$baseProductManager = \Aimeos\MShop::create($context, 'order/base/product');
 
 
 		$search = $baseProductManager->createSearch();
-		$func = $search->createFunction( 'order.base.product.count', array( (string) $id ) );
+		$func = $search->createFunction('order.base.product.count', array((string) $id));
 		$expr = array(
-			$search->compare( '==', 'order.base.product.productid', $prodIds ),
-			$search->compare( '>', 'order.base.product.ctime', $date ),
-			$search->compare( '==', $func, 1 ),
+			$search->compare('==', 'order.base.product.productid', $prodIds),
+			$search->compare('>', 'order.base.product.ctime', $date),
+			$search->compare('==', $func, 1),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		$relativeCounts = $baseProductManager->aggregate( $search, 'order.base.product.productid' );
+		$relativeCounts = $baseProductManager->aggregate($search, 'order.base.product.productid');
 
 
 		$search = $catalogListManager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'catalog.lists.refid', array_keys( $relativeCounts ) ),
-			$search->compare( '==', 'catalog.lists.domain', 'product' ),
+			$search->compare('==', 'catalog.lists.refid', array_keys($relativeCounts)),
+			$search->compare('==', 'catalog.lists.domain', 'product'),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		foreach( $catalogListManager->searchItems( $search ) as $listItem ) {
+		foreach ($catalogListManager->searchItems($search) as $listItem) {
 			$refIds[$listItem->getRefId()] = true;
 		}
 
 
-		unset( $relativeCounts[$id] );
+		unset($relativeCounts[$id]);
 		$supportA = $count / $total;
 		$products = [];
 
-		foreach( $relativeCounts as $prodId => $relCnt )
+		foreach ($relativeCounts as $prodId => $relCnt)
 		{
-			if( !isset( $refIds[$prodId] ) ) {
+			if (!isset($refIds[$prodId])) {
 				continue;
 			}
 
 			$supportAB = $relCnt / $total;
 
-			if( $supportAB > $minSupport && ( $conf = ( $supportAB / $supportA ) ) > $minConfidence ) {
+			if ($supportAB > $minSupport && ($conf = ($supportAB / $supportA)) > $minConfidence) {
 				$products[$prodId] = $conf;
 			}
 		}
 
-		arsort( $products );
+		arsort($products);
 
-		return array_keys( array_slice( $products, 0, $maxItems, true ) );
+		return array_keys(array_slice($products, 0, $maxItems, true));
 	}
 
 
@@ -265,26 +265,26 @@ 
 	 * @param string $productId Unique ID of the product the given products should be referenced to
 	 * @param array $productIds List of position as key and product ID as value
 	 */
-	protected function addListItems( $productId, array $productIds )
+	protected function addListItems($productId, array $productIds)
 	{
-		if( empty( $productIds ) ) {
+		if (empty($productIds)) {
 			return;
 		}
 
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'product/lists' );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'product/lists');
 		$item = $manager->createItem();
 
-		foreach( $productIds as $pos => $refid )
+		foreach ($productIds as $pos => $refid)
 		{
-			$item->setId( null );
-			$item->setParentId( $productId );
-			$item->setDomain( 'product' );
-			$item->setType( 'bought-together' );
-			$item->setPosition( $pos );
-			$item->setRefId( $refid );
-			$item->setStatus( 1 );
-
-			$manager->saveItem( $item, false );
+			$item->setId(null);
+			$item->setParentId($productId);
+			$item->setDomain('product');
+			$item->setType('bought-together');
+			$item->setPosition($pos);
+			$item->setRefId($refid);
+			$item->setStatus(1);
+
+			$manager->saveItem($item, false);
 		}
 	}
 
@@ -294,20 +294,20 @@ 
 	 *
 	 * @param string $productId Unique ID of the product the references should be removed from
 	 */
-	protected function removeListItems( $productId )
+	protected function removeListItems($productId)
 	{
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'product/lists' );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'product/lists');
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'product.lists.parentid', $productId ),
-			$search->compare( '==', 'product.lists.domain', 'product' ),
-			$search->compare( '==', 'product.lists.type', 'bought-together' ),
+			$search->compare('==', 'product.lists.parentid', $productId),
+			$search->compare('==', 'product.lists.domain', 'product'),
+			$search->compare('==', 'product.lists.type', 'bought-together'),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		$listItems = $manager->searchItems( $search );
+		$listItems = $manager->searchItems($search);
 
-		$manager->deleteItems( array_keys( $listItems ) );
+		$manager->deleteItems(array_keys($listItems));
 	}
 }

controller/jobs/src/Controller/Jobs/Subscription/Export/Csv/Standard.php

Spacing +60 added lines, -60 removed lines

@@ -28,7 +28,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Subscription export CSV' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Subscription export CSV');
 	}
 
 
@@ -39,7 +39,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Exports subscriptions to CSV file' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Exports subscriptions to CSV file');
 	}
 
 
@@ -73,7 +73,7 @@ 
 		 * @category Developer
 		 * @see controller/common/subscription/export/csv/max-size
 		 */
-		$mappings = $config->get( 'controller/common/subscription/export/csv/mapping', $mappings );
+		$mappings = $config->get('controller/common/subscription/export/csv/mapping', $mappings);
 
 		/** controller/jobs/subscription/export/csv/mapping
 		 * List of mappings between the position in the CSV file and item keys
@@ -88,7 +88,7 @@ 
 		 * @category Developer
 		 * @see controller/common/subscription/export/csv/max-size
 		 */
-		$mappings = $config->get( 'controller/jobs/subscription/export/csv/mapping', $mappings );
+		$mappings = $config->get('controller/jobs/subscription/export/csv/mapping', $mappings);
 
 
 		/** controller/common/subscription/export/csv/max-size
@@ -106,29 +106,29 @@ 
 		 * @category Developer
 		 * @see controller/common/subscription/export/csv/mapping
 		 */
-		$maxcnt = (int) $config->get( 'controller/common/subscription/export/csv/max-size', 1000 );
+		$maxcnt = (int) $config->get('controller/common/subscription/export/csv/max-size', 1000);
 
 
-		$processors = $this->getProcessors( $mappings );
-		$mq = $context->getMessageQueueManager()->get( 'mq-admin' )->getQueue( 'subscription-export' );
+		$processors = $this->getProcessors($mappings);
+		$mq = $context->getMessageQueueManager()->get('mq-admin')->getQueue('subscription-export');
 
-		while( ( $msg = $mq->get() ) !== null )
+		while (($msg = $mq->get()) !== null)
 		{
 			try
 			{
-				if( ( $data = json_decode( $msg->getBody(), true ) ) === null ) {
-					throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Invalid message: %1$s', $msg->getBody() ) );
+				if (($data = json_decode($msg->getBody(), true)) === null) {
+					throw new \Aimeos\Controller\Jobs\Exception(sprintf('Invalid message: %1$s', $msg->getBody()));
 				}
 
-				$this->export( $processors, $data, $maxcnt );
+				$this->export($processors, $data, $maxcnt);
 			}
-			catch( \Exception $e )
+			catch (\Exception $e)
 			{
-				$logger->log( 'Subscription export error: ' . $e->getMessage() );
-				$logger->log( $e->getTraceAsString() );
+				$logger->log('Subscription export error: ' . $e->getMessage());
+				$logger->log($e->getTraceAsString());
 			}
 
-			$mq->del( $msg );
+			$mq->del($msg);
 		}
 	}
 
@@ -139,15 +139,15 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context item
 	 * @param string $path Absolute path to the exported file
 	 */
-	protected function addJob( $context, $path )
+	protected function addJob($context, $path)
 	{
-		$manager = \Aimeos\MAdmin::create( $context, 'job' );
+		$manager = \Aimeos\MAdmin::create($context, 'job');
 
 		$item = $manager->createItem();
-		$item->setResult( ['file' => $path] );
-		$item->setLabel( $path );
+		$item->setResult(['file' => $path]);
+		$item->setLabel($path);
 
-		$manager->saveItem( $item, false );
+		$manager->saveItem($item, false);
 	}
 
 
@@ -177,7 +177,7 @@ 
 		 * @see controller/jobs/subscription/export/csv/container/content
 		 * @see controller/jobs/subscription/export/csv/container/options
 		 */
-		$location = $config->get( 'controller/jobs/subscription/export/csv/location', sys_get_temp_dir() );
+		$location = $config->get('controller/jobs/subscription/export/csv/location', sys_get_temp_dir());
 
 		/** controller/jobs/subscription/export/csv/container/type
 		 * Nave of the container type to read the data from
@@ -200,7 +200,7 @@ 
 		 * @see controller/jobs/subscription/export/csv/container/content
 		 * @see controller/jobs/subscription/export/csv/container/options
 		 */
-		$container = $config->get( 'controller/jobs/subscription/export/csv/container/type', 'Directory' );
+		$container = $config->get('controller/jobs/subscription/export/csv/container/type', 'Directory');
 
 		/** controller/jobs/subscription/export/csv/container/content
 		 * Name of the content type inside the container to read the data from
@@ -221,7 +221,7 @@ 
 		 * @see controller/jobs/subscription/export/csv/container/type
 		 * @see controller/jobs/subscription/export/csv/container/options
 		 */
-		$content = $config->get( 'controller/jobs/subscription/export/csv/container/content', 'CSV' );
+		$content = $config->get('controller/jobs/subscription/export/csv/container/content', 'CSV');
 
 		/** controller/jobs/subscription/export/csv/container/options
 		 * List of file container options for the subscription export files
@@ -239,9 +239,9 @@ 
 		 * @see controller/jobs/subscription/export/csv/container/content
 		 * @see controller/jobs/subscription/export/csv/container/type
 		 */
-		$options = $config->get( 'controller/jobs/subscription/export/csv/container/options', [] );
+		$options = $config->get('controller/jobs/subscription/export/csv/container/options', []);
 
-		return \Aimeos\MW\Container\Factory::getContainer( $location, $container, $content, $options );
+		return \Aimeos\MW\Container\Factory::getContainer($location, $container, $content, $options);
 	}
 
 
@@ -253,56 +253,56 @@ 
 	 * @param integer $maxcnt Maximum number of retrieved subscriptions at once
 	 * @return string Path of the file containing the exported data
 	 */
-	protected function export( array $processors, $msg, $maxcnt )
+	protected function export(array $processors, $msg, $maxcnt)
 	{
-		$lcontext = $this->getLocaleContext( $msg );
+		$lcontext = $this->getLocaleContext($msg);
 		$baseRef = ['order/base/address', 'order/base/product'];
 
-		$manager = \Aimeos\MShop::create( $lcontext, 'subscription' );
-		$baseManager = \Aimeos\MShop::create( $lcontext, 'order/base' );
+		$manager = \Aimeos\MShop::create($lcontext, 'subscription');
+		$baseManager = \Aimeos\MShop::create($lcontext, 'order/base');
 
 		$container = $this->getContainer();
-		$content = $container->create( 'subscription-export_' . date( 'Y-m-d_H-i-s' ) );
-		$search = $this->initCriteria( $manager->createSearch()->setSlice( 0, 0x7fffffff ), $msg );
+		$content = $container->create('subscription-export_' . date('Y-m-d_H-i-s'));
+		$search = $this->initCriteria($manager->createSearch()->setSlice(0, 0x7fffffff), $msg);
 		$start = 0;
 
 		do
 		{
 			$baseIds = [];
-			$search->setSlice( $start, $maxcnt );
-			$items = $manager->searchItems( $search );
+			$search->setSlice($start, $maxcnt);
+			$items = $manager->searchItems($search);
 
-			foreach( $items as $item ) {
+			foreach ($items as $item) {
 				$baseIds[] = $item->getOrderBaseId();
 			}
 
 			$baseSearch = $baseManager->createSearch();
-			$baseSearch->setConditions( $baseSearch->compare( '==', 'order.base.id', $baseIds ) );
-			$baseSearch->setSlice( 0, count( $baseIds ) );
+			$baseSearch->setConditions($baseSearch->compare('==', 'order.base.id', $baseIds));
+			$baseSearch->setSlice(0, count($baseIds));
 
-			$baseItems = $baseManager->searchItems( $baseSearch, $baseRef );
+			$baseItems = $baseManager->searchItems($baseSearch, $baseRef);
 
-			foreach( $items as $id => $item )
+			foreach ($items as $id => $item)
 			{
-				foreach( $processors as $type => $processor )
+				foreach ($processors as $type => $processor)
 				{
-					foreach( $processor->process( $item, $baseItems[$item->getOrderBaseId()] ) as $line ) {
-						$content->add( [0 => $type, 1 => $id] + $line );
+					foreach ($processor->process($item, $baseItems[$item->getOrderBaseId()]) as $line) {
+						$content->add([0 => $type, 1 => $id] + $line);
 					}
 				}
 			}
 
-			$count = count( $items );
+			$count = count($items);
 			$start += $count;
 		}
-		while( $count === $search->getSliceSize() );
+		while ($count === $search->getSliceSize());
 
 		$path = $content->getResource();
-		$container->add( $content );
+		$container->add($content);
 		$container->close();
 
-		$path = $this->moveFile( $lcontext, $path );
-		$this->addJob( $lcontext, $path );
+		$path = $this->moveFile($lcontext, $path);
+		$this->addJob($lcontext, $path);
 	}
 
 
@@ -312,15 +312,15 @@ 
 	 * @param array $msg Message data including a "sitecode" value
 	 * @return \Aimeos\MShop\Context\Item\Iface New context item with updated locale
 	 */
-	protected function getLocaleContext( array $msg )
+	protected function getLocaleContext(array $msg)
 	{
 		$lcontext = clone $this->getContext();
-		$manager = \Aimeos\MShop::create( $lcontext, 'locale' );
+		$manager = \Aimeos\MShop::create($lcontext, 'locale');
 
-		$sitecode = ( isset( $msg['sitecode'] ) ? $msg['sitecode'] : 'default' );
-		$localeItem = $manager->bootstrap( $sitecode, '', '', false, \Aimeos\MShop\Locale\Manager\Base::SITE_ONE );
+		$sitecode = (isset($msg['sitecode']) ? $msg['sitecode'] : 'default');
+		$localeItem = $manager->bootstrap($sitecode, '', '', false, \Aimeos\MShop\Locale\Manager\Base::SITE_ONE);
 
-		return $lcontext->setLocale( $localeItem );
+		return $lcontext->setLocale($localeItem);
 	}
 
 
@@ -331,14 +331,14 @@ 
 	 * @param array $msg Message data
 	 * @return \Aimeos\MW\Criteria\Iface Initialized criteria object
 	 */
-	protected function initCriteria( \Aimeos\MW\Criteria\Iface $criteria, array $msg )
+	protected function initCriteria(\Aimeos\MW\Criteria\Iface $criteria, array $msg)
 	{
-		if( isset( $msg['filter'] ) ) {
-			$criteria->setConditions( $criteria->toConditions( $msg['filter'] ) );
+		if (isset($msg['filter'])) {
+			$criteria->setConditions($criteria->toConditions($msg['filter']));
 		}
 
-		if( isset( $msg['sort'] ) ) {
-			$criteria->setSortations( $criteria->toSortations( $msg['sort'] ) );
+		if (isset($msg['sort'])) {
+			$criteria->setSortations($criteria->toSortations($msg['sort']));
 		}
 
 		return $criteria;
@@ -352,12 +352,12 @@ 
 	 * @param string $path Absolute path to the exported file
 	 * @return string Relative path of the file in the storage
 	 */
-	protected function moveFile( $context, $path )
+	protected function moveFile($context, $path)
 	{
-		$filename = basename( $path );
-		$context->getFileSystemManager()->get( 'fs-admin' )->writef( $filename, $path );
+		$filename = basename($path);
+		$context->getFileSystemManager()->get('fs-admin')->writef($filename, $path);
 
-		unlink( $path );
+		unlink($path);
 		return $filename;
 	}
 }

controller/jobs/src/Controller/Jobs/Subscription/Process/End/Standard.php

Spacing +21 added lines, -21 removed lines

@@ -28,7 +28,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Subscription process end' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Subscription process end');
 	}
 
 
@@ -39,7 +39,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Terminates expired subscriptions' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Terminates expired subscriptions');
 	}
 
 
@@ -65,51 +65,51 @@ 
 		 * @since 2018.04
 		 * @category Developer
 		 */
-		$names = (array) $config->get( 'controller/common/subscription/process/processors', [] );
+		$names = (array) $config->get('controller/common/subscription/process/processors', []);
 
-		$processors = $this->getProcessors( $names );
-		$manager = \Aimeos\MShop::create( $context, 'subscription' );
+		$processors = $this->getProcessors($names);
+		$manager = \Aimeos\MShop::create($context, 'subscription');
 
-		$search = $manager->createSearch( true );
+		$search = $manager->createSearch(true);
 		$expr = [
-			$search->compare( '<', 'subscription.dateend', date( 'Y-m-d' ) ),
+			$search->compare('<', 'subscription.dateend', date('Y-m-d')),
 			$search->getConditions(),
 		];
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSortations( [$search->sort( '+', 'subscription.id' )] );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSortations([$search->sort('+', 'subscription.id')]);
 
 		$start = 0;
 
 		do
 		{
-			$search->setSlice( $start, 100 );
-			$items = $manager->searchItems( $search );
+			$search->setSlice($start, 100);
+			$items = $manager->searchItems($search);
 
-			foreach( $items as $item )
+			foreach ($items as $item)
 			{
 				try
 				{
-					foreach( $processors as $processor ) {
-						$processor->end( $item );
+					foreach ($processors as $processor) {
+						$processor->end($item);
 					}
 
-					if( ( $reason = $item->getReason() ) === null ) {
+					if (($reason = $item->getReason()) === null) {
 						$reason = \Aimeos\MShop\Subscription\Item\Iface::REASON_END;
 					}
 
-					$manager->saveItem( $item->setReason( $reason )->setStatus( 0 ) );
+					$manager->saveItem($item->setReason($reason)->setStatus(0));
 				}
-				catch( \Exception $e )
+				catch (\Exception $e)
 				{
 					$msg = 'Unable to process subscription with ID "%1$S": %2$s';
-					$logger->log( sprintf( $msg, $item->getId(), $e->getMessage() ) );
-					$logger->log( $e->getTraceAsString() );
+					$logger->log(sprintf($msg, $item->getId(), $e->getMessage()));
+					$logger->log($e->getTraceAsString());
 				}
 			}
 
-			$count = count( $items );
+			$count = count($items);
 			$start += $count;
 		}
-		while( $count === $search->getSliceSize() );
+		while ($count === $search->getSliceSize());
 	}
 }

controller/jobs/src/Controller/Jobs/Subscription/Process/Renew/Standard.php

Spacing +108 added lines, -108 removed lines

@@ -28,7 +28,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Subscription process renew' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Subscription process renew');
 	}
 
 
@@ -39,7 +39,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Renews subscriptions at next date' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Renews subscriptions at next date');
 	}
 
 
@@ -54,73 +54,73 @@ 
 		$config = $context->getConfig();
 		$logger = $context->getLogger();
 
-		$names = (array) $config->get( 'controller/common/subscription/process/processors', [] );
+		$names = (array) $config->get('controller/common/subscription/process/processors', []);
 
-		$date = date( 'Y-m-d' );
-		$processors = $this->getProcessors( $names );
-		$manager = \Aimeos\MShop::create( $context, 'subscription' );
+		$date = date('Y-m-d');
+		$processors = $this->getProcessors($names);
+		$manager = \Aimeos\MShop::create($context, 'subscription');
 
-		$search = $manager->createSearch( true );
+		$search = $manager->createSearch(true);
 		$expr = [
-			$search->compare( '<=', 'subscription.datenext', $date ),
-			$search->combine( '||', [
-				$search->compare( '==', 'subscription.dateend', null ),
-				$search->compare( '>', 'subscription.dateend', $date ),
-			] ),
+			$search->compare('<=', 'subscription.datenext', $date),
+			$search->combine('||', [
+				$search->compare('==', 'subscription.dateend', null),
+				$search->compare('>', 'subscription.dateend', $date),
+			]),
 			$search->getConditions(),
 		];
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSortations( [$search->sort( '+', 'subscription.id' )] );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSortations([$search->sort('+', 'subscription.id')]);
 
 		$start = 0;
 
 		do
 		{
-			$search->setSlice( $start, 100 );
-			$items = $manager->searchItems( $search );
+			$search->setSlice($start, 100);
+			$items = $manager->searchItems($search);
 
-			foreach( $items as $item )
+			foreach ($items as $item)
 			{
 				try
 				{
-					$context = $this->createContext( $item->getOrderBaseId() );
-					$newOrder = $this->createOrderBase( $context, $item );
-					$newInvoice = $this->createOrderInvoice( $context, $newOrder );
+					$context = $this->createContext($item->getOrderBaseId());
+					$newOrder = $this->createOrderBase($context, $item);
+					$newInvoice = $this->createOrderInvoice($context, $newOrder);
 
 					try
 					{
-						$this->createPayment( $context, $newOrder, $newInvoice );
+						$this->createPayment($context, $newOrder, $newInvoice);
 
-						$interval = new \DateInterval( $item->getInterval() );
-						$item->setDateNext( date_create()->add( $interval )->format( 'Y-m-d' ) );
+						$interval = new \DateInterval($item->getInterval());
+						$item->setDateNext(date_create()->add($interval)->format('Y-m-d'));
 					}
-					catch( \Exception $e )
+					catch (\Exception $e)
 					{
-						$item->setReason( \Aimeos\MShop\Subscription\Item\Iface::REASON_PAYMENT );
-						$item->setDateEnd( date_create()->format( 'Y-m-d' ) );
-						$manager->saveItem( $item );
+						$item->setReason(\Aimeos\MShop\Subscription\Item\Iface::REASON_PAYMENT);
+						$item->setDateEnd(date_create()->format('Y-m-d'));
+						$manager->saveItem($item);
 
 						throw $e;
 					}
 
-					$manager->saveItem( $item );
+					$manager->saveItem($item);
 
-					foreach( $processors as $processor ) {
-						$processor->renew( $item, $newInvoice );
+					foreach ($processors as $processor) {
+						$processor->renew($item, $newInvoice);
 					}
 				}
-				catch( \Exception $e )
+				catch (\Exception $e)
 				{
 					$msg = 'Unable to process subscription with ID "%1$s": %2$s';
-					$logger->log( sprintf( $msg, $item->getId(), $e->getMessage() ) );
-					$logger->log( $e->getTraceAsString() );
+					$logger->log(sprintf($msg, $item->getId(), $e->getMessage()));
+					$logger->log($e->getTraceAsString());
 				}
 			}
 
-			$count = count( $items );
+			$count = count($items);
 			$start += $count;
 		}
-		while( $count === $search->getSliceSize() );
+		while ($count === $search->getSliceSize());
 	}
 
 
@@ -132,11 +132,11 @@ 
 	 * @param array $addresses Associative list of type as key and address object implementing \Aimeos\MShop\Order\Item\Base\Address\Iface as value
 	 * @return \Aimeos\MShop\Order\Item\Base\Iface Order with addresses added
 	 */
-	protected function addBasketAddresses( \Aimeos\MShop\Context\Item\Iface $context,
-		\Aimeos\MShop\Order\Item\Base\Iface $newBasket, array $addresses )
+	protected function addBasketAddresses(\Aimeos\MShop\Context\Item\Iface $context,
+		\Aimeos\MShop\Order\Item\Base\Iface $newBasket, array $addresses)
 	{
-		foreach( $addresses as $type => $orderAddress ) {
-			$newBasket->setAddress( $orderAddress, $type );
+		foreach ($addresses as $type => $orderAddress) {
+			$newBasket->setAddress($orderAddress, $type);
 		}
 
 		return $newBasket;
@@ -151,8 +151,8 @@ 
 	 * @param array $codes List of coupon codes that should be added to the given basket
 	 * @return \Aimeos\MShop\Order\Item\Base\Iface Basket, maybe with coupons added
 	 */
-	protected function addBasketCoupons( \Aimeos\MShop\Context\Item\Iface $context,
-		\Aimeos\MShop\Order\Item\Base\Iface $basket, array $codes )
+	protected function addBasketCoupons(\Aimeos\MShop\Context\Item\Iface $context,
+		\Aimeos\MShop\Order\Item\Base\Iface $basket, array $codes)
 	{
 		/** controller/jobs/subcription/process/renew/standard/use-coupons
 		 *
@@ -166,34 +166,34 @@ 
 		 * @category User
 		 * @since 2018.10
 		 */
-		if( $context->getConfig()->get( 'controller/jobs/subcription/process/renew/standard/use-coupons', false ) )
+		if ($context->getConfig()->get('controller/jobs/subcription/process/renew/standard/use-coupons', false))
 		{
-			$manager = \Aimeos\MShop::create( $context, 'coupon' );
-			$codeManager = \Aimeos\MShop::create( $context, 'coupon/code' );
+			$manager = \Aimeos\MShop::create($context, 'coupon');
+			$codeManager = \Aimeos\MShop::create($context, 'coupon/code');
 
-			foreach( $codes as $code )
+			foreach ($codes as $code)
 			{
-				$search = $manager->createSearch( true )->setSlice( 0, 1 );
+				$search = $manager->createSearch(true)->setSlice(0, 1);
 				$expr = [
-					$search->compare( '==', 'coupon.code.code', $code ),
-					$codeManager->createSearch( true )->getConditions(),
+					$search->compare('==', 'coupon.code.code', $code),
+					$codeManager->createSearch(true)->getConditions(),
 					$search->getConditions(),
 				];
-				$search->setConditions( $search->combine( '&&', $expr ) );
+				$search->setConditions($search->combine('&&', $expr));
 
-				$result = $manager->searchItems( $search );
+				$result = $manager->searchItems($search);
 
-				if( ( $item = reset( $result ) ) === false ) {
+				if (($item = reset($result)) === false) {
 					continue;
 				}
 
-				$provider = $manager->getProvider( $item, strtolower( $code ) );
+				$provider = $manager->getProvider($item, strtolower($code));
 
-				if( $provider->isAvailable( $basket ) !== true ) {
+				if ($provider->isAvailable($basket) !== true) {
 					continue;
 				}
 
-				$provider->addCoupon( $basket );
+				$provider->addCoupon($basket);
 			}
 		}
 
@@ -210,17 +210,17 @@ 
 	 * @param string $orderProductId Unique ID of the ordered subscription product
 	 * @return \Aimeos\MShop\Order\Item\Base\Iface Order with products added
 	 */
-	protected function addBasketProducts( \Aimeos\MShop\Context\Item\Iface $context,
-		\Aimeos\MShop\Order\Item\Base\Iface $newBasket, array $orderProducts, $orderProductId )
+	protected function addBasketProducts(\Aimeos\MShop\Context\Item\Iface $context,
+		\Aimeos\MShop\Order\Item\Base\Iface $newBasket, array $orderProducts, $orderProductId)
 	{
-		foreach( $orderProducts as $orderProduct )
+		foreach ($orderProducts as $orderProduct)
 		{
-			if( $orderProduct->getId() == $orderProductId )
+			if ($orderProduct->getId() == $orderProductId)
 			{
-				foreach( $orderProduct->getAttributeItems() as $attrItem ) {
-					$attrItem->setId( null );
+				foreach ($orderProduct->getAttributeItems() as $attrItem) {
+					$attrItem->setId(null);
 				}
-				$newBasket->addProduct( $orderProduct->setId( null ) );
+				$newBasket->addProduct($orderProduct->setId(null));
 			}
 		}
 
@@ -236,35 +236,35 @@ 
 	 * @param array $services Associative list of type as key and list of service objects implementing \Aimeos\MShop\Order\Item\Base\Service\Iface as values
 	 * @return \Aimeos\MShop\Order\Item\Base\Iface Order with delivery and payment service added
 	 */
-	protected function addBasketServices( \Aimeos\MShop\Context\Item\Iface $context,
-		\Aimeos\MShop\Order\Item\Base\Iface $newBasket, array $services )
+	protected function addBasketServices(\Aimeos\MShop\Context\Item\Iface $context,
+		\Aimeos\MShop\Order\Item\Base\Iface $newBasket, array $services)
 	{
 		$type = \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT;
 
-		if( isset( $services[$type] ) )
+		if (isset($services[$type]))
 		{
-			foreach( $services[$type] as $orderService ) {
-				$newBasket->addService( $orderService, $type );
+			foreach ($services[$type] as $orderService) {
+				$newBasket->addService($orderService, $type);
 			}
 		}
 
 		$type = \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_DELIVERY;
 
-		$serviceManager = \Aimeos\MShop::create( $context, 'service' );
-		$orderServiceManager = \Aimeos\MShop::create( $context, 'order/base/service' );
+		$serviceManager = \Aimeos\MShop::create($context, 'service');
+		$orderServiceManager = \Aimeos\MShop::create($context, 'order/base/service');
 
-		$search = $serviceManager->createSearch( true );
-		$search->setSortations( [$search->sort( '+', 'service.position' )] );
-		$search->setConditions( $search->compare( '==', 'service.type', $type ) );
+		$search = $serviceManager->createSearch(true);
+		$search->setSortations([$search->sort('+', 'service.position')]);
+		$search->setConditions($search->compare('==', 'service.type', $type));
 
-		foreach( $serviceManager->searchItems( $search, ['media', 'price', 'text'] ) as $item )
+		foreach ($serviceManager->searchItems($search, ['media', 'price', 'text']) as $item)
 		{
-			$provider = $serviceManager->getProvider( $item, $item->getType() );
+			$provider = $serviceManager->getProvider($item, $item->getType());
 
-			if( $provider->isAvailable( $newBasket ) === true )
+			if ($provider->isAvailable($newBasket) === true)
 			{
-				$orderServiceItem = $orderServiceManager->createItem()->copyFrom( $item );
-				return $newBasket->addService( $orderServiceItem, $type );
+				$orderServiceItem = $orderServiceManager->createItem()->copyFrom($item);
+				return $newBasket->addService($orderServiceItem, $type);
 			}
 		}
 
@@ -278,30 +278,30 @@ 
 	 * @param string $baseId Unique order base ID
 	 * @return \Aimeos\MShop\Context\Item\Iface New context object
 	 */
-	protected function createContext( $baseId )
+	protected function createContext($baseId)
 	{
 		$context = clone $this->getContext();
 
-		$manager = \Aimeos\MShop::create( $context, 'order/base' );
-		$baseItem = $manager->getItem( $baseId );
+		$manager = \Aimeos\MShop::create($context, 'order/base');
+		$baseItem = $manager->getItem($baseId);
 
 		$locale = $baseItem->getLocale();
 		$level = \Aimeos\MShop\Locale\Manager\Base::SITE_ALL;
 
-		$manager = \Aimeos\MShop::create( $context, 'locale' );
-		$locale = $manager->bootstrap( $baseItem->getSiteCode(), $locale->getLanguageId(), $locale->getCurrencyId(), false, $level );
+		$manager = \Aimeos\MShop::create($context, 'locale');
+		$locale = $manager->bootstrap($baseItem->getSiteCode(), $locale->getLanguageId(), $locale->getCurrencyId(), false, $level);
 
-		$context->setLocale( $locale );
+		$context->setLocale($locale);
 
 		try
 		{
-			$manager = \Aimeos\MShop::create( $context, 'customer' );
-			$customerItem = $manager->getItem( $baseItem->getCustomerId(), ['customer/group'] );
+			$manager = \Aimeos\MShop::create($context, 'customer');
+			$customerItem = $manager->getItem($baseItem->getCustomerId(), ['customer/group']);
 
-			$context->setUserId( $baseItem->getCustomerId() );
-			$context->setGroupIds( $customerItem->getGroups() );
+			$context->setUserId($baseItem->getCustomerId());
+			$context->setGroupIds($customerItem->getGroups());
 		}
-		catch( \Exception $e ) {} // Subscription without account
+		catch (\Exception $e) {} // Subscription without account
 
 		return $context;
 	}
@@ -314,19 +314,19 @@ 
 	 * @param \Aimeos\MShop\Subscription\Item\Iface $subscription Subscription item with order base ID and order product ID
 	 * @return \Aimeos\MShop\Order\Item\Base\Iface Complete order with product, addresses and services saved to the storage
 	 */
-	protected function createOrderBase( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Subscription\Item\Iface $subscription )
+	protected function createOrderBase(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Subscription\Item\Iface $subscription)
 	{
-		$manager = \Aimeos\MShop::create( $context, 'order/base' );
+		$manager = \Aimeos\MShop::create($context, 'order/base');
 
-		$basket = $manager->load( $subscription->getOrderBaseId() );
-		$newBasket = $manager->createItem()->setCustomerId( $basket->getCustomerId() );
+		$basket = $manager->load($subscription->getOrderBaseId());
+		$newBasket = $manager->createItem()->setCustomerId($basket->getCustomerId());
 
-		$newBasket = $this->addBasketProducts( $context, $newBasket, $basket->getProducts(), $subscription->getOrderProductId() );
-		$newBasket = $this->addBasketAddresses( $context, $newBasket, $basket->getAddresses() );
-		$newBasket = $this->addBasketServices( $context, $newBasket, $basket->getServices() );
-		$newBasket = $this->addBasketCoupons( $context, $newBasket, array_keys( $basket->getCoupons() ) );
+		$newBasket = $this->addBasketProducts($context, $newBasket, $basket->getProducts(), $subscription->getOrderProductId());
+		$newBasket = $this->addBasketAddresses($context, $newBasket, $basket->getAddresses());
+		$newBasket = $this->addBasketServices($context, $newBasket, $basket->getServices());
+		$newBasket = $this->addBasketCoupons($context, $newBasket, array_keys($basket->getCoupons()));
 
-		return $manager->store( $newBasket );
+		return $manager->store($newBasket);
 	}
 
 
@@ -337,15 +337,15 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Base\Iface $basket Complete order with product, addresses and services saved to the storage
 	 * @return \Aimeos\MShop\Order\Item\Iface New invoice item associated to the order saved to the storage
 	 */
-	protected function createOrderInvoice( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Order\Item\Base\Iface $basket )
+	protected function createOrderInvoice(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Order\Item\Base\Iface $basket)
 	{
-		$manager = \Aimeos\MShop::create( $context, 'order' );
+		$manager = \Aimeos\MShop::create($context, 'order');
 
 		$item = $manager->createItem();
-		$item->setBaseId( $basket->getId() );
-		$item->setType( 'subscription' );
+		$item->setBaseId($basket->getId());
+		$item->setType('subscription');
 
-		return $manager->saveItem( $item );
+		return $manager->saveItem($item);
 	}
 
 
@@ -356,17 +356,17 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Base\Iface $basket Complete order with product, addresses and services
 	 * @param \Aimeos\MShop\Order\Item\Iface New invoice item associated to the order
 	 */
-	protected function createPayment( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Order\Item\Base\Iface $basket,
-		\Aimeos\MShop\Order\Item\Iface $invoice )
+	protected function createPayment(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Order\Item\Base\Iface $basket,
+		\Aimeos\MShop\Order\Item\Iface $invoice)
 	{
-		$manager = \Aimeos\MShop::create( $context, 'service' );
+		$manager = \Aimeos\MShop::create($context, 'service');
 
-		foreach( $basket->getService( \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT ) as $service )
+		foreach ($basket->getService(\Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT) as $service)
 		{
-			$item = $manager->getItem( $service->getServiceId() );
-			$provider = $manager->getProvider( $item, 'payment' );
+			$item = $manager->getItem($service->getServiceId());
+			$provider = $manager->getProvider($item, 'payment');
 
-			$provider->repay( $invoice );
+			$provider->repay($invoice);
 		}
 	}
 }

controller/jobs/src/Controller/Jobs/Subscription/Process/Begin/Standard.php

Spacing +34 added lines, -34 removed lines

@@ -28,7 +28,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Subscription process start' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Subscription process start');
 	}
 
 
@@ -39,7 +39,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Process subscriptions initially' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Process subscriptions initially');
 	}
 
 
@@ -67,7 +67,7 @@ 
 		 * @see controller/common/subscription/process/payment-status
 		 * @see controller/common/subscription/process/payment-days
 		 */
-		$names = (array) $config->get( 'controller/common/subscription/process/processors', [] );
+		$names = (array) $config->get('controller/common/subscription/process/processors', []);
 
 		/** controller/common/subscription/process/payment-status
 		 * Minimum payment status that will activate the subscription
@@ -86,7 +86,7 @@ 
 		 * @see controller/common/subscription/process/payment-days
 		 */
 		$status = \Aimeos\MShop\Order\Item\Base::PAY_AUTHORIZED;
-		$status = $config->get( 'controller/common/subscription/process/payment-status', $status );
+		$status = $config->get('controller/common/subscription/process/payment-status', $status);
 
 		/** controller/common/subscription/process/payment-days
 		 * Number of days to wait for the payment until subscription is removed
@@ -104,74 +104,74 @@ 
 		 * @see controller/common/subscription/process/processors
 		 * @see controller/common/subscription/process/payment-status
 		 */
-		$days = (float) $config->get( 'controller/common/subscription/process/payment-days', 3 );
+		$days = (float) $config->get('controller/common/subscription/process/payment-days', 3);
 
 
-		$processors = $this->getProcessors( $names );
-		$orderManager = \Aimeos\MShop::create( $context, 'order' );
-		$manager = \Aimeos\MShop::create( $context, 'subscription' );
+		$processors = $this->getProcessors($names);
+		$orderManager = \Aimeos\MShop::create($context, 'order');
+		$manager = \Aimeos\MShop::create($context, 'subscription');
 
-		$search = $manager->createSearch( true );
+		$search = $manager->createSearch(true);
 		$expr = [
-			$search->compare( '==', 'subscription.datenext', null ),
+			$search->compare('==', 'subscription.datenext', null),
 			$search->getConditions(),
 		];
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSortations( [$search->sort( '+', 'subscription.id' )] );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSortations([$search->sort('+', 'subscription.id')]);
 
-		$date = date( 'Y-m-d H:i:s', time() - 86400 * $days );
+		$date = date('Y-m-d H:i:s', time() - 86400 * $days);
 		$start = 0;
 
 		do
 		{
 			$ordBaseIds = $payStatus = [];
 
-			$search->setSlice( $start, 100 );
-			$items = $manager->searchItems( $search );
+			$search->setSlice($start, 100);
+			$items = $manager->searchItems($search);
 
-			foreach( $items as $item ) {
+			foreach ($items as $item) {
 				$ordBaseIds[] = $item->getOrderBaseId();
 			}
 
-			$orderSearch = $orderManager->createSearch()->setSlice( 0, $search->getSliceSize() );
-			$orderSearch->setConditions( $orderSearch->compare( '==', 'order.base.id', $ordBaseIds ) );
-			$orderSearch->setSortations( [$orderSearch->sort( '+', 'order.id' )] );
+			$orderSearch = $orderManager->createSearch()->setSlice(0, $search->getSliceSize());
+			$orderSearch->setConditions($orderSearch->compare('==', 'order.base.id', $ordBaseIds));
+			$orderSearch->setSortations([$orderSearch->sort('+', 'order.id')]);
 
-			foreach( $orderManager->searchItems( $orderSearch ) as $orderItem ) {
+			foreach ($orderManager->searchItems($orderSearch) as $orderItem) {
 				$payStatus[$orderItem->getBaseId()] = $orderItem->getPaymentStatus();
 			}
 
-			foreach( $items as $item )
+			foreach ($items as $item)
 			{
 				try
 				{
-					if( isset( $payStatus[$item->getOrderBaseId()] ) && $payStatus[$item->getOrderBaseId()] >= $status )
+					if (isset($payStatus[$item->getOrderBaseId()]) && $payStatus[$item->getOrderBaseId()] >= $status)
 					{
-						foreach( $processors as $processor ) {
-							$processor->begin( $item );
+						foreach ($processors as $processor) {
+							$processor->begin($item);
 						}
 
-						$interval = new \DateInterval( $item->getInterval() );
-						$item->setDateNext( date_create( $item->getTimeCreated() )->add( $interval )->format( 'Y-m-d' ) );
+						$interval = new \DateInterval($item->getInterval());
+						$item->setDateNext(date_create($item->getTimeCreated())->add($interval)->format('Y-m-d'));
 					}
-					elseif( $item->getTimeCreated() < $date )
+					elseif ($item->getTimeCreated() < $date)
 					{
-						$item->setStatus( 0 );
+						$item->setStatus(0);
 					}
 
-					$manager->saveItem( $item );
+					$manager->saveItem($item);
 				}
-				catch( \Exception $e )
+				catch (\Exception $e)
 				{
 					$msg = 'Unable to process subscription with ID "%1$S": %2$s';
-					$logger->log( sprintf( $msg, $item->getId(), $e->getMessage() ) );
-					$logger->log( $e->getTraceAsString() );
+					$logger->log(sprintf($msg, $item->getId(), $e->getMessage()));
+					$logger->log($e->getTraceAsString());
 				}
 			}
 
-			$count = count( $items );
+			$count = count($items);
 			$start += $count;
 		}
-		while( $count === $search->getSliceSize() );
+		while ($count === $search->getSliceSize());
 	}
 }