aimeos / ai-controller-jobs

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

Spacing +13 added lines, -13 removed lines

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

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

Spacing +94 added lines, -94 removed lines

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

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\Factory::createManager( $context, 'subscription' );
+		$date = date('Y-m-d');
+		$processors = $this->getProcessors($names);
+		$manager = \Aimeos\MShop\Factory::createManager($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\Factory::createManager( $context, 'coupon' );
-			$codeManager = \Aimeos\MShop\Factory::createManager( $context, 'coupon/code' );
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'coupon');
+			$codeManager = \Aimeos\MShop\Factory::createManager($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\Factory::createManager( $context, 'service' );
-		$orderServiceManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base/service' );
+		$serviceManager = \Aimeos\MShop\Factory::createManager($context, 'service');
+		$orderServiceManager = \Aimeos\MShop\Factory::createManager($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\Factory::createManager( $context, 'order/base' );
-		$baseItem = $manager->getItem( $baseId );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'order/base');
+		$baseItem = $manager->getItem($baseId);
 
 		$locale = $baseItem->getLocale();
 		$level = \Aimeos\MShop\Locale\Manager\Base::SITE_ALL;
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
-		$locale = $manager->bootstrap( $baseItem->getSiteCode(), $locale->getLanguageId(), $locale->getCurrencyId(), false, $level );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'locale');
+		$locale = $manager->bootstrap($baseItem->getSiteCode(), $locale->getLanguageId(), $locale->getCurrencyId(), false, $level);
 
-		$context->setLocale( $locale );
+		$context->setLocale($locale);
 
 		try
 		{
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );
-			$customerItem = $manager->getItem( $baseItem->getCustomerId(), ['customer/group'] );
+			$manager = \Aimeos\MShop\Factory::createManager($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\Factory::createManager( $context, 'order/base' );
+		$manager = \Aimeos\MShop\Factory::createManager($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\Factory::createManager( $context, 'order' );
+		$manager = \Aimeos\MShop\Factory::createManager($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\Factory::createManager( $context, 'service' );
+		$manager = \Aimeos\MShop\Factory::createManager($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/Order/Service/Payment/Standard.php

Spacing +35 added lines, -35 removed lines

@@ -29,7 +29,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Capture authorized payments' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Capture authorized payments');
 	}
 
 
@@ -40,7 +40,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Authorized payments of orders will be captured after dispatching or after a configurable amount of time' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Authorized payments of orders will be captured after dispatching or after a configurable amount of time');
 	}
 
 
@@ -68,8 +68,8 @@ 
 		 * @category User
 		 * @category Developer
 		 */
-		$days = $config->get( 'controller/jobs/order/service/payment/limit-days', 90 );
-		$date = date( 'Y-m-d 00:00:00', time() - 86400 * $days );
+		$days = $config->get('controller/jobs/order/service/payment/limit-days', 90);
+		$date = date('Y-m-d 00:00:00', time() - 86400 * $days);
 
 		/** controller/jobs/order/service/payment/capture-days
 		 * Automatically capture payments after the configured amount of days
@@ -84,90 +84,90 @@ 
 		 * @category User
 		 * @category Developer
 		 */
-		$capDays = $config->get( 'controller/jobs/order/service/payment/capture-days', null );
+		$capDays = $config->get('controller/jobs/order/service/payment/capture-days', null);
 
 
-		$serviceManager = \Aimeos\MShop\Factory::createManager( $context, 'service' );
+		$serviceManager = \Aimeos\MShop\Factory::createManager($context, 'service');
 		$serviceSearch = $serviceManager->createSearch();
-		$serviceSearch->setConditions( $serviceSearch->compare( '==', 'service.type', 'payment' ) );
+		$serviceSearch->setConditions($serviceSearch->compare('==', 'service.type', 'payment'));
 
-		$orderManager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
+		$orderManager = \Aimeos\MShop\Factory::createManager($context, 'order');
 		$orderSearch = $orderManager->createSearch();
 
-		$status = array( \Aimeos\MShop\Order\Item\Base::STAT_DISPATCHED, \Aimeos\MShop\Order\Item\Base::STAT_DELIVERED );
+		$status = array(\Aimeos\MShop\Order\Item\Base::STAT_DISPATCHED, \Aimeos\MShop\Order\Item\Base::STAT_DELIVERED);
 		$start = 0;
 
 		do
 		{
-			$serviceItems = $serviceManager->searchItems( $serviceSearch );
+			$serviceItems = $serviceManager->searchItems($serviceSearch);
 
-			foreach( $serviceItems as $serviceItem )
+			foreach ($serviceItems as $serviceItem)
 			{
 				try
 				{
-					$serviceProvider = $serviceManager->getProvider( $serviceItem, $serviceItem->getType() );
+					$serviceProvider = $serviceManager->getProvider($serviceItem, $serviceItem->getType());
 
-					if( !$serviceProvider->isImplemented( \Aimeos\MShop\Service\Provider\Payment\Base::FEAT_CAPTURE ) ) {
+					if (!$serviceProvider->isImplemented(\Aimeos\MShop\Service\Provider\Payment\Base::FEAT_CAPTURE)) {
 						continue;
 					}
 
 
 					$expr = [];
-					$expr[] = $orderSearch->compare( '>', 'order.datepayment', $date );
+					$expr[] = $orderSearch->compare('>', 'order.datepayment', $date);
 
-					if( $capDays !== null )
+					if ($capDays !== null)
 					{
-						$capdate = date( 'Y-m-d 00:00:00', time() - 86400 * $capDays );
-						$expr[] = $orderSearch->compare( '<=', 'order.datepayment', $capdate );
+						$capdate = date('Y-m-d 00:00:00', time() - 86400 * $capDays);
+						$expr[] = $orderSearch->compare('<=', 'order.datepayment', $capdate);
 					}
 					else
 					{
-						$expr[] = $orderSearch->compare( '==', 'order.statusdelivery', $status );
+						$expr[] = $orderSearch->compare('==', 'order.statusdelivery', $status);
 					}
 
-					$expr[] = $orderSearch->compare( '==', 'order.statuspayment', \Aimeos\MShop\Order\Item\Base::PAY_AUTHORIZED );
-					$expr[] = $orderSearch->compare( '==', 'order.base.service.code', $serviceItem->getCode() );
-					$expr[] = $orderSearch->compare( '==', 'order.base.service.type', 'payment' );
+					$expr[] = $orderSearch->compare('==', 'order.statuspayment', \Aimeos\MShop\Order\Item\Base::PAY_AUTHORIZED);
+					$expr[] = $orderSearch->compare('==', 'order.base.service.code', $serviceItem->getCode());
+					$expr[] = $orderSearch->compare('==', 'order.base.service.type', 'payment');
 
-					$orderSearch->setConditions( $orderSearch->combine( '&&', $expr ) );
+					$orderSearch->setConditions($orderSearch->combine('&&', $expr));
 
 
 					$orderStart = 0;
 
 					do
 					{
-						$orderItems = $orderManager->searchItems( $orderSearch );
+						$orderItems = $orderManager->searchItems($orderSearch);
 
-						foreach( $orderItems as $orderItem )
+						foreach ($orderItems as $orderItem)
 						{
 							try
 							{
-								$serviceProvider->capture( $orderItem );
+								$serviceProvider->capture($orderItem);
 							}
-							catch( \Exception $e )
+							catch (\Exception $e)
 							{
 								$str = 'Error while capturing payment for order with ID "%1$s": %2$s';
-								$context->getLogger()->log( sprintf( $str, $orderItem->getId(), $e->getMessage() ) );
+								$context->getLogger()->log(sprintf($str, $orderItem->getId(), $e->getMessage()));
 							}
 						}
 
-						$orderCount = count( $orderItems );
+						$orderCount = count($orderItems);
 						$orderStart += $orderCount;
-						$orderSearch->setSlice( $orderStart );
+						$orderSearch->setSlice($orderStart);
 					}
-					while( $orderCount >= $orderSearch->getSliceSize() );
+					while ($orderCount >= $orderSearch->getSliceSize());
 				}
-				catch( \Exception $e )
+				catch (\Exception $e)
 				{
 					$str = 'Error while capturing payments for service with ID "%1$s": %2$s';
-					$context->getLogger()->log( sprintf( $str, $serviceItem->getId(), $e->getMessage() ) );
+					$context->getLogger()->log(sprintf($str, $serviceItem->getId(), $e->getMessage()));
 				}
 			}
 
-			$count = count( $serviceItems );
+			$count = count($serviceItems);
 			$start += $count;
-			$serviceSearch->setSlice( $start );
+			$serviceSearch->setSlice($start);
 		}
-		while( $count >= $serviceSearch->getSliceSize() );
+		while ($count >= $serviceSearch->getSliceSize());
 	}
 }

controller/jobs/src/Controller/Jobs/Order/Service/Delivery/Standard.php

Spacing +30 added lines, -30 removed lines

@@ -29,7 +29,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Process order delivery services' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Process order delivery services');
 	}
 
 
@@ -40,7 +40,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Sends paid orders to the ERP system or logistic partner' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Sends paid orders to the ERP system or logistic partner');
 	}
 
 
@@ -69,8 +69,8 @@ 
 		 * @see controller/jobs/order/email/delivery/standard/limit-days
 		 * @see controller/jobs/order/service/delivery/batch-max
 		 */
-		$days = $context->getConfig()->get( 'controller/jobs/order/service/delivery/limit-days', 90 );
-		$date = date( 'Y-m-d 00:00:00', time() - 86400 * $days );
+		$days = $context->getConfig()->get('controller/jobs/order/service/delivery/limit-days', 90);
+		$date = date('Y-m-d 00:00:00', time() - 86400 * $days);
 
 		/** controller/jobs/order/service/delivery/batch-max
 		 * Maximum number of orders processed at once by the delivery service provider
@@ -85,71 +85,71 @@ 
 		 * @category Developer
 		 * @see controller/jobs/order/service/delivery/limit-days
 		 */
-		$maxItems = $context->getConfig()->get( 'controller/jobs/order/service/delivery/batch-max', 100 );
+		$maxItems = $context->getConfig()->get('controller/jobs/order/service/delivery/batch-max', 100);
 
 
-		$serviceManager = \Aimeos\MShop\Service\Manager\Factory::createManager( $context );
+		$serviceManager = \Aimeos\MShop\Service\Manager\Factory::createManager($context);
 		$serviceSearch = $serviceManager->createSearch();
-		$serviceSearch->setConditions( $serviceSearch->compare( '==', 'service.type', 'delivery' ) );
+		$serviceSearch->setConditions($serviceSearch->compare('==', 'service.type', 'delivery'));
 
-		$orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager( $context );
+		$orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager($context);
 		$orderSearch = $orderManager->createSearch();
 
 		$start = 0;
 
 		do
 		{
-			$serviceItems = $serviceManager->searchItems( $serviceSearch );
+			$serviceItems = $serviceManager->searchItems($serviceSearch);
 
-			foreach( $serviceItems as $serviceItem )
+			foreach ($serviceItems as $serviceItem)
 			{
 				try
 				{
-					$serviceProvider = $serviceManager->getProvider( $serviceItem, $serviceItem->getType() );
+					$serviceProvider = $serviceManager->getProvider($serviceItem, $serviceItem->getType());
 
 					$expr = array(
-						$orderSearch->compare( '>', 'order.datepayment', $date ),
-						$orderSearch->compare( '>', 'order.statuspayment', \Aimeos\MShop\Order\Item\Base::PAY_PENDING ),
-						$orderSearch->compare( '==', 'order.statusdelivery', \Aimeos\MShop\Order\Item\Base::STAT_UNFINISHED ),
-						$orderSearch->compare( '==', 'order.base.service.code', $serviceItem->getCode() ),
-						$orderSearch->compare( '==', 'order.base.service.type', 'delivery' ),
+						$orderSearch->compare('>', 'order.datepayment', $date),
+						$orderSearch->compare('>', 'order.statuspayment', \Aimeos\MShop\Order\Item\Base::PAY_PENDING),
+						$orderSearch->compare('==', 'order.statusdelivery', \Aimeos\MShop\Order\Item\Base::STAT_UNFINISHED),
+						$orderSearch->compare('==', 'order.base.service.code', $serviceItem->getCode()),
+						$orderSearch->compare('==', 'order.base.service.type', 'delivery'),
 					);
-					$orderSearch->setConditions( $orderSearch->combine( '&&', $expr ) );
+					$orderSearch->setConditions($orderSearch->combine('&&', $expr));
 
 					$orderStart = 0;
 
 					do
 					{
-						$orderSearch->setSlice( $orderStart, $maxItems );
-						$orderItems = $orderManager->searchItems( $orderSearch );
+						$orderSearch->setSlice($orderStart, $maxItems);
+						$orderItems = $orderManager->searchItems($orderSearch);
 
 						try
 						{
-							$serviceProvider->processBatch( $orderItems );
-							$orderManager->saveItems( $orderItems );
+							$serviceProvider->processBatch($orderItems);
+							$orderManager->saveItems($orderItems);
 						}
-						catch( \Exception $e )
+						catch (\Exception $e)
 						{
 							$str = 'Error while processing orders by delivery service "%1$s": %2$s';
-							$context->getLogger()->log( sprintf( $str, $serviceItem->getLabel(), $e->getMessage() ) );
+							$context->getLogger()->log(sprintf($str, $serviceItem->getLabel(), $e->getMessage()));
 						}
 
-						$orderCount = count( $orderItems );
+						$orderCount = count($orderItems);
 						$orderStart += $orderCount;
 					}
-					while( $orderCount >= $orderSearch->getSliceSize() );
+					while ($orderCount >= $orderSearch->getSliceSize());
 				}
-				catch( \Exception $e )
+				catch (\Exception $e)
 				{
 					$str = 'Error while processing service with ID "%1$s": %2$s';
-					$context->getLogger()->log( sprintf( $str, $serviceItem->getId(), $e->getMessage() ) );
+					$context->getLogger()->log(sprintf($str, $serviceItem->getId(), $e->getMessage()));
 				}
 			}
 
-			$count = count( $serviceItems );
+			$count = count($serviceItems);
 			$start += $count;
-			$serviceSearch->setSlice( $start );
+			$serviceSearch->setSlice($start);
 		}
-		while( $count >= $serviceSearch->getSliceSize() );
+		while ($count >= $serviceSearch->getSliceSize());
 	}
 }

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\Factory::createManager( $context, 'order/base' );
+		$baseManager = \Aimeos\MShop\Factory::createManager($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\Factory::createManager( $context, 'order/base/product' );
+		$baseProductManager = \Aimeos\MShop\Factory::createManager($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\Factory::createManager( $context, 'catalog/lists' );
-		$baseProductManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base/product' );
+		$catalogListManager = \Aimeos\MShop\Factory::createManager($context, 'catalog/lists');
+		$baseProductManager = \Aimeos\MShop\Factory::createManager($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\Factory::createManager( $this->getContext(), 'product/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($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\Factory::createManager( $this->getContext(), 'product/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($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/common/src/Controller/Common/Product/Import/Csv/Processor/Stock/Standard.php

Spacing +28 added lines, -28 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,48 +63,48 @@ 
 	 * @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();
 				}
 
-				$item->fromArray( $list );
-				$manager->saveItem( $item, false );
+				$item->fromArray($list);
+				$manager->saveItem($item, 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;
@@ -120,13 +120,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);
 	}
 }

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

Spacing +83 added lines, -83 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,69 +530,69 @@ 
 	 * @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->fromArray( $this->addItemDefaults( $map ) );
-					$product = $manager->saveItem( $product );
+					$product->fromArray($this->addItemDefaults($map));
+					$product = $manager->saveItem($product);
 
-					$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;
 	}
@@ -604,9 +604,9 @@ 
 	 * @param array $list Associative list of domain item keys and their values, e.g. "product.status" => 1
 	 * @return array Given associative list enriched by default values if they were not already set
 	 */
-	protected function addItemDefaults( array $list )
+	protected function addItemDefaults(array $list)
 	{
-		if( !isset( $list['product.status'] ) ) {
+		if (!isset($list['product.status'])) {
 			$list['product.status'] = 1;
 		}
 

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

Spacing +36 added lines, -36 removed lines

@@ -43,10 +43,10 @@ 
 	 * @param array $mapping Associative list of field position in CSV as key and domain item key as value
 	 * @param \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object Decorated processor
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
-		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
+		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null)
 	{
-		parent::__construct( $context, $mapping, $object );
+		parent::__construct($context, $mapping, $object);
 
 		/** controller/common/product/import/csv/processor/product/listtypes
 		 * Names of the product list types that are updated or removed
@@ -74,26 +74,26 @@ 
 		 * @see controller/common/product/import/csv/processor/text/listtypes
 		 */
 		$key = 'controller/common/product/import/csv/processor/product/listtypes';
-		$this->listTypes = $context->getConfig()->get( $key, ['default', 'suggestion'] );
+		$this->listTypes = $context->getConfig()->get($key, ['default', 'suggestion']);
 
-		if( $this->listTypes === null )
+		if ($this->listTypes === null)
 		{
 			$this->listTypes = [];
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists/type' );
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'product/lists/type');
 
-			$search = $manager->createSearch()->setSlice( 0, 0x7fffffff );
-			$search->setConditions( $search->compare( '==', 'product.lists.type.domain', 'product' ) );
+			$search = $manager->createSearch()->setSlice(0, 0x7fffffff);
+			$search->setConditions($search->compare('==', 'product.lists.type.domain', 'product'));
 
-			foreach( $manager->searchItems( $search ) as $item ) {
+			foreach ($manager->searchItems($search) as $item) {
 				$this->listTypes[$item->getCode()] = $item->getCode();
 			}
 		}
 		else
 		{
-			$this->listTypes = array_flip( $this->listTypes );
+			$this->listTypes = array_flip($this->listTypes);
 		}
 
-		$this->cache = $this->getCache( 'product' );
+		$this->cache = $this->getCache('product');
 	}
 
 
@@ -104,49 +104,49 @@ 
 	 * @param array $data List of CSV fields with position as key and data as value
 	 * @return array List of data which has not been imported
 	 */
-	public function process( \Aimeos\MShop\Product\Item\Iface $product, array $data )
+	public function process(\Aimeos\MShop\Product\Item\Iface $product, array $data)
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists' );
-		$separator = $context->getConfig()->get( 'controller/common/product/import/csv/separator', "\n" );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product/lists');
+		$separator = $context->getConfig()->get('controller/common/product/import/csv/separator', "\n");
 
-		$listItems = $product->getListItems( 'product', null, null, false );
-		$this->cache->set( $product );
+		$listItems = $product->getListItems('product', null, null, false);
+		$this->cache->set($product);
 
-		foreach( $this->getMappedChunk( $data, $this->getMapping() ) as $list )
+		foreach ($this->getMappedChunk($data, $this->getMapping()) as $list)
 		{
-			if( $this->checkEntry( $list ) === false ) {
+			if ($this->checkEntry($list) === false) {
 				continue;
 			}
 
-			$listtype = $this->getValue( $list, 'product.lists.type', 'default' );
+			$listtype = $this->getValue($list, 'product.lists.type', 'default');
 
-			foreach( explode( $separator, $this->getValue( $list, 'product.code', '' ) ) as $code )
+			foreach (explode($separator, $this->getValue($list, 'product.code', '')) as $code)
 			{
-				$code = trim( $code );
+				$code = trim($code);
 
-				if( ( $prodid = $this->cache->get( $code ) ) === null )
+				if (($prodid = $this->cache->get($code)) === null)
 				{
 					$msg = 'No product for code "%1$s" available when importing product with code "%2$s"';
-					throw new \Aimeos\Controller\Jobs\Exception( sprintf( $msg, $code, $product->getCode() ) );
+					throw new \Aimeos\Controller\Jobs\Exception(sprintf($msg, $code, $product->getCode()));
 				}
 
-				if( ( $listItem = $product->getListItem( 'product', $listtype, $prodid ) ) === null ) {
-					$listItem = $manager->createItem()->setType( $listtype );
+				if (($listItem = $product->getListItem('product', $listtype, $prodid)) === null) {
+					$listItem = $manager->createItem()->setType($listtype);
 				} else {
-					unset( $listItems[$listItem->getId()] );
+					unset($listItems[$listItem->getId()]);
 				}
 
-				$listItem->fromArray( $list );
-				$listItem->setRefId( $prodid );
+				$listItem->fromArray($list);
+				$listItem->setRefId($prodid);
 
-				$product->addListItem( 'product', $listItem );
+				$product->addListItem('product', $listItem);
 			}
 		}
 
-		$product->deleteListItems( $listItems );
+		$product->deleteListItems($listItems);
 
-		return $this->getObject()->process( $product, $data );
+		return $this->getObject()->process($product, $data);
 	}
 
 
@@ -156,16 +156,16 @@ 
 	 * @param array $list Associative list of key/value pairs from the mapping
 	 * @return boolean True if valid, false if not
 	 */
-	protected function checkEntry( array $list )
+	protected function checkEntry(array $list)
 	{
-		if( $this->getValue( $list, 'product.code' ) === null ) {
+		if ($this->getValue($list, 'product.code') === null) {
 			return false;
 		}
 
-		if( ( $type = $this->getValue( $list, 'product.lists.type' ) ) && !isset( $this->listTypes[$type] ) )
+		if (($type = $this->getValue($list, 'product.lists.type')) && !isset($this->listTypes[$type]))
 		{
-			$msg = sprintf( 'Invalid type "%1$s" (%2$s)', $type, 'product list' );
-			throw new \Aimeos\Controller\Common\Exception( $msg );
+			$msg = sprintf('Invalid type "%1$s" (%2$s)', $type, 'product list');
+			throw new \Aimeos\Controller\Common\Exception($msg);
 		}
 
 		return true;