aimeos / ai-controller-jobs

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

Doc Comments +1 added lines, -1 removed lines

@@ -326,7 +326,7 @@
 	 *
 	 * @param string $name One of "domain", "max-items" or "max-query"
 	 * @param mixed $default Default value if name is unknown
-	 * @return mixed Configuration value
+	 * @return string Configuration value
 	 */
 	protected function getConfig( $name, $default = null )
 	{

Spacing +46 added lines, -46 removed lines

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

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

Doc Comments +3 added lines

@@ -248,6 +248,9 @@
 	}
 
 
+	/**
+	 * @param string $catcode
+	 */
 	protected function get( $catcode, array $domains = [] )
 	{
 		$manager = \Aimeos\MShop\Catalog\Manager\Factory::create( $this->context );

Spacing +66 added lines, -66 removed lines

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

controller/jobs/tests/Perf/Product/Import/Csv/StandardTest.php

Doc Comments +21 added lines

@@ -73,6 +73,9 @@ 
 	}
 
 
+	/**
+	 * @param integer $cnt
+	 */
 	protected function addAttribute( array $data, $cnt )
 	{
 		$data[] = 'length'; // type
@@ -86,6 +89,9 @@ 
 	}
 
 
+	/**
+	 * @param integer $cnt
+	 */
 	protected function addMedia( array $data, $cnt )
 	{
 		$data[] = "/path/to/image-$cnt.jpg"; // url
@@ -94,6 +100,9 @@ 
 	}
 
 
+	/**
+	 * @param integer $cnt
+	 */
 	protected function addPrice( array $data, $cnt )
 	{
 		$data[] = 1; // quantity
@@ -105,6 +114,9 @@ 
 	}
 
 
+	/**
+	 * @param integer $cnt
+	 */
 	protected function addProduct( array $data, $cnt )
 	{
 		$data[] = 'import-' . $cnt; // code
@@ -116,6 +128,9 @@ 
 	}
 
 
+	/**
+	 * @param integer $cnt
+	 */
 	protected function addProductRef( array $data, $cnt )
 	{
 		$data[] = 'import-' . ($cnt % 100); // code
@@ -125,6 +140,9 @@ 
 	}
 
 
+	/**
+	 * @param integer $cnt
+	 */
 	protected function addProperty( array $data, $cnt )
 	{
 		$data[] = 'package-weight'; // type
@@ -134,6 +152,9 @@ 
 	}
 
 
+	/**
+	 * @param integer $cnt
+	 */
 	protected function addText( array $data, $cnt )
 	{
 		$data[] = 'name'; // type

Spacing +76 added lines, -76 removed lines

@@ -17,31 +17,31 @@ 
 		$this->context = \TestHelperJobs::getContext('unitperf');
 
 		$config = $this->context->getConfig();
-		$config->set( 'controller/jobs/product/import/csv/location', 'tmp/product-import.zip' );
-		$config->set( 'controller/jobs/product/import/csv/container/type', 'Zip' );
-		$config->set( 'controller/jobs/product/import/csv/container/content', 'CSV' );
-		$config->set( 'controller/jobs/product/import/csv/mapping', $this->getMapping() );
+		$config->set('controller/jobs/product/import/csv/location', 'tmp/product-import.zip');
+		$config->set('controller/jobs/product/import/csv/container/type', 'Zip');
+		$config->set('controller/jobs/product/import/csv/container/content', 'CSV');
+		$config->set('controller/jobs/product/import/csv/mapping', $this->getMapping());
 
-		$container = \Aimeos\MW\Container\Factory::getContainer( 'tmp/product-import.zip', 'Zip', 'CSV', [] );
+		$container = \Aimeos\MW\Container\Factory::getContainer('tmp/product-import.zip', 'Zip', 'CSV', []);
 
-		$content = $container->create( 'product.csv' );
+		$content = $container->create('product.csv');
 
-		for( $i = 0; $i < 1000; $i++ )
+		for ($i = 0; $i < 1000; $i++)
 		{
 			$data = [];
 
-			$data = $this->addProduct( $data, $i );
-			$data = $this->addText( $data, $i );
-			$data = $this->addMedia( $data, $i );
-			$data = $this->addPrice( $data, $i );
-			$data = $this->addAttribute( $data, $i );
-			$data = $this->addProductRef( $data, $i );
-			$data = $this->addProperty( $data, $i );
+			$data = $this->addProduct($data, $i);
+			$data = $this->addText($data, $i);
+			$data = $this->addMedia($data, $i);
+			$data = $this->addPrice($data, $i);
+			$data = $this->addAttribute($data, $i);
+			$data = $this->addProductRef($data, $i);
+			$data = $this->addProperty($data, $i);
 
-			$content->add( $data );
+			$content->add($data);
 		}
 
-		$container->add( $content );
+		$container->add($content);
 
 		$container->close();
 	}
@@ -55,25 +55,25 @@ 
 		$this->cleanupPrice();
 		$this->cleanupProduct();
 
-		unlink( 'tmp/product-import.zip' );
+		unlink('tmp/product-import.zip');
 	}
 
 
 	public function testImport()
 	{
 		$aimeos = \TestHelperJobs::getAimeos();
-		$cntl = \Aimeos\Controller\Jobs\Product\Import\Csv\Factory::createController( $this->context, $aimeos, 'Standard' );
+		$cntl = \Aimeos\Controller\Jobs\Product\Import\Csv\Factory::createController($this->context, $aimeos, 'Standard');
 
-		$start = microtime( true );
+		$start = microtime(true);
 
 		$cntl->run();
 
-		$stop = microtime( true );
-		echo "\n    product import CSV: " . ( ( $stop - $start ) ) . " sec\n";
+		$stop = microtime(true);
+		echo "\n    product import CSV: " . (($stop - $start)) . " sec\n";
 	}
 
 
-	protected function addAttribute( array $data, $cnt )
+	protected function addAttribute(array $data, $cnt)
 	{
 		$data[] = 'length'; // type
 		$data[] = 'import-' . ($cnt % 30); // code
@@ -86,7 +86,7 @@ 
 	}
 
 
-	protected function addMedia( array $data, $cnt )
+	protected function addMedia(array $data, $cnt)
 	{
 		$data[] = "/path/to/image-$cnt.jpg"; // url
 
@@ -94,7 +94,7 @@ 
 	}
 
 
-	protected function addPrice( array $data, $cnt )
+	protected function addPrice(array $data, $cnt)
 	{
 		$data[] = 1; // quantity
 		$data[] = 'import-' . $cnt; // label
@@ -105,7 +105,7 @@ 
 	}
 
 
-	protected function addProduct( array $data, $cnt )
+	protected function addProduct(array $data, $cnt)
 	{
 		$data[] = 'import-' . $cnt; // code
 		$data[] = 'import-' . $cnt; // label
@@ -116,7 +116,7 @@ 
 	}
 
 
-	protected function addProductRef( array $data, $cnt )
+	protected function addProductRef(array $data, $cnt)
 	{
 		$data[] = 'import-' . ($cnt % 100); // code
 		$data[] = 'suggestion'; // type
@@ -125,7 +125,7 @@ 
 	}
 
 
-	protected function addProperty( array $data, $cnt )
+	protected function addProperty(array $data, $cnt)
 	{
 		$data[] = 'package-weight'; // type
 		$data[] = '0.5'; // value
@@ -134,7 +134,7 @@ 
 	}
 
 
-	protected function addText( array $data, $cnt )
+	protected function addText(array $data, $cnt)
 	{
 		$data[] = 'name'; // type
 		$data[] = 'import-name-' . $cnt; //content
@@ -149,132 +149,132 @@ 
 
 	protected function cleanupAttribute()
 	{
-		$manager = \Aimeos\MShop\Attribute\Manager\Factory::create( $this->context );
+		$manager = \Aimeos\MShop\Attribute\Manager\Factory::create($this->context);
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'attribute.domain', 'product' ),
-			$search->compare( '==', 'attribute.label', 'import-%' ),
+			$search->compare('==', 'attribute.domain', 'product'),
+			$search->compare('==', 'attribute.label', 'import-%'),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSortations( array( $search->sort( '+', 'attribute.id' ) ) );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSortations(array($search->sort('+', 'attribute.id')));
 
 		$start = 0;
 
 		do
 		{
-			$result = $manager->searchItems( $search );
-			$manager->deleteItems( array_keys( $result ) );
+			$result = $manager->searchItems($search);
+			$manager->deleteItems(array_keys($result));
 
-			$count = count( $result );
+			$count = count($result);
 			$start += $count;
-			$search->setSlice( $start );
+			$search->setSlice($start);
 		}
-		while( $count == $search->getSliceSize() );
+		while ($count == $search->getSliceSize());
 	}
 
 
 	protected function cleanupMedia()
 	{
-		$manager = \Aimeos\MShop\Media\Manager\Factory::create( $this->context );
+		$manager = \Aimeos\MShop\Media\Manager\Factory::create($this->context);
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'media.domain', 'product' ),
-			$search->compare( '==', 'media.label', 'import-%' ),
+			$search->compare('==', 'media.domain', 'product'),
+			$search->compare('==', 'media.label', 'import-%'),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSortations( array( $search->sort( '+', 'media.id' ) ) );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSortations(array($search->sort('+', 'media.id')));
 
 		$start = 0;
 
 		do
 		{
-			$result = $manager->searchItems( $search );
-			$manager->deleteItems( array_keys( $result ) );
+			$result = $manager->searchItems($search);
+			$manager->deleteItems(array_keys($result));
 
-			$count = count( $result );
+			$count = count($result);
 			$start += $count;
-			$search->setSlice( $start );
+			$search->setSlice($start);
 		}
-		while( $count == $search->getSliceSize() );
+		while ($count == $search->getSliceSize());
 	}
 
 
 	protected function cleanupPrice()
 	{
-		$manager = \Aimeos\MShop\Price\Manager\Factory::create( $this->context );
+		$manager = \Aimeos\MShop\Price\Manager\Factory::create($this->context);
 
 		$search = $manager->createSearch();
 		$expr = array(
-				$search->compare( '==', 'price.domain', 'product' ),
-				$search->compare( '==', 'price.label', 'import-%' ),
+				$search->compare('==', 'price.domain', 'product'),
+				$search->compare('==', 'price.label', 'import-%'),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSortations( array( $search->sort( '+', 'price.id' ) ) );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSortations(array($search->sort('+', 'price.id')));
 
 		$start = 0;
 
 		do
 		{
-			$result = $manager->searchItems( $search );
-			$manager->deleteItems( array_keys( $result ) );
+			$result = $manager->searchItems($search);
+			$manager->deleteItems(array_keys($result));
 
-			$count = count( $result );
+			$count = count($result);
 			$start += $count;
-			$search->setSlice( $start );
+			$search->setSlice($start);
 		}
-		while( $count == $search->getSliceSize() );
+		while ($count == $search->getSliceSize());
 	}
 
 
 	protected function cleanupProduct()
 	{
-		$manager = \Aimeos\MShop\Product\Manager\Factory::create( $this->context );
+		$manager = \Aimeos\MShop\Product\Manager\Factory::create($this->context);
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', 'import-%' ) );
-		$search->setSortations( array( $search->sort( '+', 'product.id' ) ) );
+		$search->setConditions($search->compare('==', 'product.code', 'import-%'));
+		$search->setSortations(array($search->sort('+', 'product.id')));
 
 		$start = 0;
 
 		do
 		{
-			$result = $manager->searchItems( $search );
-			$manager->deleteItems( array_keys( $result ) );
+			$result = $manager->searchItems($search);
+			$manager->deleteItems(array_keys($result));
 
-			$count = count( $result );
+			$count = count($result);
 			$start += $count;
-			$search->setSlice( $start );
+			$search->setSlice($start);
 		}
-		while( $count == $search->getSliceSize() );
+		while ($count == $search->getSliceSize());
 	}
 
 
 	protected function cleanupText()
 	{
-		$manager = \Aimeos\MShop\Text\Manager\Factory::create( $this->context );
+		$manager = \Aimeos\MShop\Text\Manager\Factory::create($this->context);
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'text.domain', 'product' ),
-			$search->compare( '==', 'text.label', 'import-%' ),
+			$search->compare('==', 'text.domain', 'product'),
+			$search->compare('==', 'text.label', 'import-%'),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSortations( array( $search->sort( '+', 'text.id' ) ) );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSortations(array($search->sort('+', 'text.id')));
 
 		$start = 0;
 
 		do
 		{
-			$result = $manager->searchItems( $search );
-			$manager->deleteItems( array_keys( $result ) );
+			$result = $manager->searchItems($search);
+			$manager->deleteItems(array_keys($result));
 
-			$count = count( $result );
+			$count = count($result);
 			$start += $count;
-			$search->setSlice( $start );
+			$search->setSlice($start);
 		}
-		while( $count == $search->getSliceSize() );
+		while ($count == $search->getSliceSize());
 	}
 
 

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

Spacing +8 added lines, -8 removed lines

@@ -42,20 +42,20 @@ 
 	 * @param string|null $type Attribute type
 	 * @return string|null Product ID or null if not found
 	 */
-	public function get( $code, $type = null )
+	public function get($code, $type = null)
 	{
-		if( isset( $this->prodmap[$code] ) ) {
+		if (isset($this->prodmap[$code])) {
 			return $this->prodmap[$code];
 		}
 
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'product' );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'product');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.code', $code ) );
+		$search->setConditions($search->compare('==', 'product.code', $code));
 
-		$result = $manager->searchItems( $search );
+		$result = $manager->searchItems($search);
 
-		if( ( $item = reset( $result ) ) !== false )
+		if (($item = reset($result)) !== false)
 		{
 			$this->prodmap[$code] = $item->getId();
 			return $this->prodmap[$code];
@@ -68,8 +68,8 @@ 
 	 *
 	 * @param \Aimeos\MShop\Common\Item\Iface $item Product object
 	 */
-	public function set( \Aimeos\MShop\Common\Item\Iface $item )
+	public function set(\Aimeos\MShop\Common\Item\Iface $item)
 	{
-		$this->prodmap[ $item->getCode() ] = $item->getId();
+		$this->prodmap[$item->getCode()] = $item->getId();
 	}
 }
\ No newline at end of file

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

Spacing +14 added lines, -14 removed lines

@@ -40,15 +40,15 @@ 
 	 *
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		parent::__construct( $context );
+		parent::__construct($context);
 
-		$manager = \Aimeos\MShop::create( $context, 'catalog' );
-		$result = $manager->searchItems( $manager->createSearch() );
+		$manager = \Aimeos\MShop::create($context, 'catalog');
+		$result = $manager->searchItems($manager->createSearch());
 
-		foreach( $result as $id => $item ) {
-			$this->categories[ $item->getCode() ] = $id;
+		foreach ($result as $id => $item) {
+			$this->categories[$item->getCode()] = $id;
 		}
 	}
 
@@ -60,20 +60,20 @@ 
 	 * @param string|null $type Not used
 	 * @return string|null Catalog ID or null if not found
 	 */
-	public function get( $code, $type = null )
+	public function get($code, $type = null)
 	{
-		if( isset( $this->categories[$code] ) ) {
+		if (isset($this->categories[$code])) {
 			return $this->categories[$code];
 		}
 
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'catalog' );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'catalog');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'catalog.code', $code ) );
+		$search->setConditions($search->compare('==', 'catalog.code', $code));
 
-		$result = $manager->searchItems( $search );
+		$result = $manager->searchItems($search);
 
-		if( ( $item = reset( $result ) ) !== false )
+		if (($item = reset($result)) !== false)
 		{
 			$this->categories[$code] = $item->getId();
 			return $item->getId();
@@ -86,8 +86,8 @@ 
 	 *
 	 * @param \Aimeos\MShop\Common\Item\Iface $item Catalog object
 	 */
-	public function set( \Aimeos\MShop\Common\Item\Iface $item )
+	public function set(\Aimeos\MShop\Common\Item\Iface $item)
 	{
-		$this->categories[ $item->getCode() ] = $item->getId();
+		$this->categories[$item->getCode()] = $item->getId();
 	}
 }
\ No newline at end of file

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

Spacing +17 added lines, -17 removed lines

@@ -40,15 +40,15 @@ 
 	 *
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context)
 	{
-		parent::__construct( $context );
+		parent::__construct($context);
 
-		$manager = \Aimeos\MShop::create( $context, 'attribute' );
-		$result = $manager->searchItems( $manager->createSearch() );
+		$manager = \Aimeos\MShop::create($context, 'attribute');
+		$result = $manager->searchItems($manager->createSearch());
 
-		foreach( $result as $id => $item ) {
-			$this->attributes[ $item->getCode() ][ $item->getType() ] = $item;
+		foreach ($result as $id => $item) {
+			$this->attributes[$item->getCode()][$item->getType()] = $item;
 		}
 	}
 
@@ -60,24 +60,24 @@ 
 	 * @param string|null $type Attribute type
 	 * @return \Aimeos\MShop\Attribute\Item\Iface|null Attribute object or null if not found
 	 */
-	public function get( $code, $type = null )
+	public function get($code, $type = null)
 	{
-		if( isset( $this->attributes[$code] ) && isset( $this->attributes[$code][$type] ) ) {
+		if (isset($this->attributes[$code]) && isset($this->attributes[$code][$type])) {
 			return $this->attributes[$code][$type];
 		}
 
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'attribute' );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'attribute');
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'attribute.code', $code ),
-			$search->compare( '==', 'attribute.type', $type ),
+			$search->compare('==', 'attribute.code', $code),
+			$search->compare('==', 'attribute.type', $type),
 		);
-		$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)
 		{
 			$this->attributes[$code][$type] = $item;
 			return $item;
@@ -90,14 +90,14 @@ 
 	 *
 	 * @param \Aimeos\MShop\Common\Item\Iface $item Attribute object
 	 */
-	public function set( \Aimeos\MShop\Common\Item\Iface $item )
+	public function set(\Aimeos\MShop\Common\Item\Iface $item)
 	{
 		$code = $item->getCode();
 
-		if( !isset( $this->attributes[$code] ) || !is_array( $this->attributes[$code] ) ) {
+		if (!isset($this->attributes[$code]) || !is_array($this->attributes[$code])) {
 			$this->attributes[$code] = [];
 		}
 
-		$this->attributes[$code][ $item->getType() ] = $item;
+		$this->attributes[$code][$item->getType()] = $item;
 	}
 }
\ No newline at end of file

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

Spacing +35 added lines, -35 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::create( $context, 'product/lists/type' );
+			$manager = \Aimeos\MShop::create($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,47 +104,47 @@ 
 	 * @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::create( $context, 'product/lists' );
-		$separator = $context->getConfig()->get( 'controller/common/product/import/csv/separator', "\n" );
+		$manager = \Aimeos\MShop::create($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 = $listItem->fromArray( $list )->setRefId( $prodid );
-				$product->addListItem( 'product', $listItem );
+				$listItem = $listItem->fromArray($list)->setRefId($prodid);
+				$product->addListItem('product', $listItem);
 			}
 		}
 
-		$product->deleteListItems( $listItems );
+		$product->deleteListItems($listItems);
 
-		return $this->getObject()->process( $product, $data );
+		return $this->getObject()->process($product, $data);
 	}
 
 
@@ -154,16 +154,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;

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

Spacing +23 added lines, -23 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::create( $context, 'product/property/type' );
-		$search = $manager->createSearch()->setSlice( 0, 0x7fffffff );
+		$manager = \Aimeos\MShop::create($context, 'product/property/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,45 +63,45 @@ 
 	 * @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::create( $this->getContext(), 'product/property' );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'product/property');
 
 		$propMap = [];
-		$items = $product->getPropertyItems( null, false );
-		$map = $this->getMappedChunk( $data, $this->getMapping() );
+		$items = $product->getPropertyItems(null, false);
+		$map = $this->getMappedChunk($data, $this->getMapping());
 
-		foreach( $items as $item ) {
-			$propMap[ $item->getValue() ][ $item->getType() ] = $item;
+		foreach ($items as $item) {
+			$propMap[$item->getValue()][$item->getType()] = $item;
 		}
 
-		foreach( $map as $list )
+		foreach ($map as $list)
 		{
-			if( ( $value = $this->getValue( $list, 'product.property.value' ) ) === null ) {
+			if (($value = $this->getValue($list, 'product.property.value')) === null) {
 				continue;
 			}
 
-			if( ( $type = $this->getValue( $list, 'product.property.type' ) ) && !isset( $this->types[$type] ) )
+			if (($type = $this->getValue($list, 'product.property.type')) && !isset($this->types[$type]))
 			{
-				$msg = sprintf( 'Invalid type "%1$s" (%2$s)', $type, 'product property' );
-				throw new \Aimeos\Controller\Common\Exception( $msg );
+				$msg = sprintf('Invalid type "%1$s" (%2$s)', $type, 'product property');
+				throw new \Aimeos\Controller\Common\Exception($msg);
 			}
 
-			if( isset( $propMap[$value][$type] ) )
+			if (isset($propMap[$value][$type]))
 			{
 				$item = $propMap[$value][$type];
-				unset( $items[ $item->getId() ] );
+				unset($items[$item->getId()]);
 			}
 			else
 			{
-				$item = $manager->createItem()->setType( $type );
+				$item = $manager->createItem()->setType($type);
 			}
 
-			$product->addPropertyItem( $item->fromArray( $list ) );
+			$product->addPropertyItem($item->fromArray($list));
 		}
 
-		$product->deletePropertyItems( $items );
+		$product->deletePropertyItems($items);
 
-		return $this->getObject()->process( $product, $data );
+		return $this->getObject()->process($product, $data);
 	}
 }

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

Spacing +53 added lines, -53 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/catalog/listtypes
 		 * Names of the catalog list types that are updated or removed
@@ -68,26 +68,26 @@ 
 		 * @see controller/common/product/import/csv/processor/text/listtypes
 		 */
 		$key = 'controller/common/product/import/csv/processor/catalog/listtypes';
-		$this->listTypes = $context->getConfig()->get( $key );
+		$this->listTypes = $context->getConfig()->get($key);
 
-		if( $this->listTypes === null )
+		if ($this->listTypes === null)
 		{
 			$this->listTypes = [];
-			$manager = \Aimeos\MShop::create( $context, 'catalog/lists/type' );
+			$manager = \Aimeos\MShop::create($context, 'catalog/lists/type');
 
-			$search = $manager->createSearch()->setSlice( 0, 0x7fffffff );
-			$search->setConditions( $search->compare( '==', 'catalog.lists.type.domain', 'product' ) );
+			$search = $manager->createSearch()->setSlice(0, 0x7fffffff);
+			$search->setConditions($search->compare('==', 'catalog.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( 'catalog' );
+		$this->cache = $this->getCache('catalog');
 	}
 
 
@@ -98,11 +98,11 @@ 
 	 * @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)
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop::create( $context, 'catalog' );
-		$listManager = \Aimeos\MShop::create( $context, 'catalog/lists' );
+		$manager = \Aimeos\MShop::create($context, 'catalog');
+		$listManager = \Aimeos\MShop::create($context, 'catalog/lists');
 
 		/** controller/common/product/import/csv/separator
 		 * Single separator character for multiple entries in one field of the import file
@@ -122,7 +122,7 @@ 
 		 * @category Developer
 		 * @see controller/common/product/import/csv/domains
 		 */
-		$separator = $context->getConfig()->get( 'controller/common/product/import/csv/separator', "\n" );
+		$separator = $context->getConfig()->get('controller/common/product/import/csv/separator', "\n");
 
 		$manager->begin();
 
@@ -130,57 +130,57 @@ 
 		{
 			$listMap = [];
 			$prodid = $product->getId();
-			$map = $this->getMappedChunk( $data, $this->getMapping() );
-			$listItems = $this->getListItems( $prodid, $this->listTypes );
+			$map = $this->getMappedChunk($data, $this->getMapping());
+			$listItems = $this->getListItems($prodid, $this->listTypes);
 
-			foreach( $listItems as $listItem ) {
-				$listMap[ $listItem->getParentId() ][ $listItem->getType() ] = $listItem;
+			foreach ($listItems as $listItem) {
+				$listMap[$listItem->getParentId()][$listItem->getType()] = $listItem;
 			}
 
-			foreach( $map as $pos => $list )
+			foreach ($map as $pos => $list)
 			{
-				if( $this->checkEntry( $list ) === false ) {
+				if ($this->checkEntry($list) === false) {
 					continue;
 				}
 
-				$codes = explode( $separator, $this->getValue( $list, 'catalog.code', '' ) );
-				$listtype = $this->getValue( $list, 'catalog.lists.type', 'default' );
+				$codes = explode($separator, $this->getValue($list, 'catalog.code', ''));
+				$listtype = $this->getValue($list, 'catalog.lists.type', 'default');
 
-				foreach( $codes as $code )
+				foreach ($codes as $code)
 				{
-					$code = trim( $code );
+					$code = trim($code);
 
-					if( ( $catid = $this->cache->get( $code ) ) === null )
+					if (($catid = $this->cache->get($code)) === null)
 					{
 						$msg = 'No category 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()));
 					}
 
 					$list['catalog.lists.parentid'] = $catid;
 					$list['catalog.lists.refid'] = $prodid;
 					$list['catalog.lists.domain'] = 'product';
 
-					if( isset( $listMap[$catid][$listtype] ) )
+					if (isset($listMap[$catid][$listtype]))
 					{
 						$listItem = $listMap[$catid][$listtype];
-						unset( $listItems[ $listItem->getId() ] );
+						unset($listItems[$listItem->getId()]);
 					}
 					else
 					{
-						$listItem = $listManager->createItem()->setType( $listtype );
+						$listItem = $listManager->createItem()->setType($listtype);
 					}
 
-					$listItem = $listItem->setPosition( $pos++ )->fromArray( $list );
-					$listManager->saveItem( $listItem, false );
+					$listItem = $listItem->setPosition($pos++)->fromArray($list);
+					$listManager->saveItem($listItem, false);
 				}
 			}
 
-			$listManager->deleteItems( array_keys( $listItems ) );
-			$data = $this->getObject()->process( $product, $data );
+			$listManager->deleteItems(array_keys($listItems));
+			$data = $this->getObject()->process($product, $data);
 
 			$manager->commit();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$manager->rollback();
 			throw $e;
@@ -197,13 +197,13 @@ 
 	 * @param integer $pos Computed position of the list item in the associated list of items
 	 * @return array Given associative list enriched by default values if they were not already set
 	 */
-	protected function addListItemDefaults( array $list, $pos )
+	protected function addListItemDefaults(array $list, $pos)
 	{
-		if( !isset( $list['catalog.lists.position'] ) ) {
+		if (!isset($list['catalog.lists.position'])) {
 			$list['catalog.lists.position'] = $pos;
 		}
 
-		if( !isset( $list['catalog.lists.status'] ) ) {
+		if (!isset($list['catalog.lists.status'])) {
 			$list['catalog.lists.status'] = 1;
 		}
 
@@ -217,16 +217,16 @@ 
 	 * @param array $list Associative list of key/value pairs from the mapped data
 	 * @return boolean True if the entry is valid, false if not
 	 */
-	protected function checkEntry( array $list )
+	protected function checkEntry(array $list)
 	{
-		if( $this->getValue( $list, 'catalog.code' ) === null ) {
+		if ($this->getValue($list, 'catalog.code') === null) {
 			return false;
 		}
 
-		if( ( $type = $this->getValue( $list, 'catalog.lists.type' ) ) && !isset( $this->listTypes[$type] ) )
+		if (($type = $this->getValue($list, 'catalog.lists.type')) && !isset($this->listTypes[$type]))
 		{
-			$msg = sprintf( 'Invalid type "%1$s" (%2$s)', $type, 'catalog list' );
-			throw new \Aimeos\Controller\Common\Exception( $msg );
+			$msg = sprintf('Invalid type "%1$s" (%2$s)', $type, 'catalog list');
+			throw new \Aimeos\Controller\Common\Exception($msg);
 		}
 
 		return true;
@@ -240,24 +240,24 @@ 
 	 * @param array|null $types List of catalog list types
 	 * @return array List of catalog list items
 	 */
-	protected function getListItems( $prodid, $types )
+	protected function getListItems($prodid, $types)
 	{
-		$manager = \Aimeos\MShop::create( $this->getContext(), 'catalog/lists' );
+		$manager = \Aimeos\MShop::create($this->getContext(), 'catalog/lists');
 		$search = $manager->createSearch();
 
 		$expr = array(
-			$search->compare( '==', 'catalog.lists.domain', 'product' ),
-			$search->compare( '==', 'catalog.lists.refid', $prodid ),
+			$search->compare('==', 'catalog.lists.domain', 'product'),
+			$search->compare('==', 'catalog.lists.refid', $prodid),
 		);
 
-		if( $types !== null ) {
-			$expr[] = $search->compare( '==', 'catalog.lists.type', $types );
+		if ($types !== null) {
+			$expr[] = $search->compare('==', 'catalog.lists.type', $types);
 		}
 
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSortations( array( $search->sort( '+', 'catalog.lists.position' ) ) );
-		$search->setSlice( 0, 0x7FFFFFFF );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSortations(array($search->sort('+', 'catalog.lists.position')));
+		$search->setSlice(0, 0x7FFFFFFF);
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 }