aimeos / ai-controller-jobs

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

Braces +3 added lines, -6 removed lines

@@ -349,8 +349,7 @@ 
 			}
 
 			$container->close();
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$logger->log( 'Catalog import error: ' . $e->getMessage() );
 			$logger->log( $e->getTraceAsString() );
@@ -590,8 +589,7 @@ 
 					{
 						$manager->moveItem( $item->getId(), $item->getParentId(), $parentid );
 						$item = $manager->saveItem( $item );
-					}
-					else
+					} else
 					{
 						$item = $manager->insertItem( $item, $parentid );
 					}
@@ -603,8 +601,7 @@ 
 				}
 
 				$manager->commit();
-			}
-			catch( \Exception $e )
+			} catch( \Exception $e )
 			{
 				$manager->rollback();
 

Spacing +87 added lines, -87 removed lines

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

controller/common/tests/Controller/Common/Product/Import/Csv/BaseTest.php

Spacing +23 added lines, -23 removed lines

@@ -16,77 +16,77 @@ 
 
 	protected function setUp()
 	{
-		\Aimeos\MShop::cache( true );
+		\Aimeos\MShop::cache(true);
 
 		$context = \TestHelperCntl::getContext();
 		$aimeos = \TestHelperCntl::getAimeos();
 
-		$this->object = new TestAbstract( $context, $aimeos );
+		$this->object = new TestAbstract($context, $aimeos);
 	}
 
 
 	protected function tearDown()
 	{
-		\Aimeos\MShop::cache( false );
+		\Aimeos\MShop::cache(false);
 		\Aimeos\MShop::clear();
 	}
 
 
 	public function testGetCache()
 	{
-		$cache = $this->object->getCachePublic( 'attribute' );
+		$cache = $this->object->getCachePublic('attribute');
 
-		$this->assertInstanceOf( '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Cache\\Iface', $cache );
+		$this->assertInstanceOf('\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Cache\\Iface', $cache);
 	}
 
 
 	public function testGetCacheInvalidType()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		$this->object->getCachePublic( '$' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		$this->object->getCachePublic('$');
 	}
 
 
 	public function testGetCacheInvalidClass()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		$this->object->getCachePublic( 'unknown' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		$this->object->getCachePublic('unknown');
 	}
 
 
 	public function testGetCacheInvalidInterface()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		$this->object->getCachePublic( 'attribute', 'unknown' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		$this->object->getCachePublic('attribute', 'unknown');
 	}
 
 
 	public function testGetProcessors()
 	{
-		$processor = $this->object->getProcessorsPublic( array( 'attribute' => [] ) );
+		$processor = $this->object->getProcessorsPublic(array('attribute' => []));
 
-		$this->assertInstanceOf( '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Processor\\Iface', $processor );
+		$this->assertInstanceOf('\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Processor\\Iface', $processor);
 	}
 
 
 	public function testGetProcessorsInvalidType()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		$this->object->getProcessorsPublic( array( '$' => [] ) );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		$this->object->getProcessorsPublic(array('$' => []));
 	}
 
 
 	public function testGetProcessorsInvalidClass()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		$this->object->getProcessorsPublic( array( 'unknown' => [] ) );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		$this->object->getProcessorsPublic(array('unknown' => []));
 	}
 
 
 	public function testGetProcessorsInvalidInterface()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		$this->object->getProcessorsPublic( array( 'unknown' => [] ) );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		$this->object->getProcessorsPublic(array('unknown' => []));
 	}
 }
 
@@ -99,15 +99,15 @@ 
 		return \TestHelperCntl::getContext();
 	}
 
-	public function getCachePublic( $type, $name = null )
+	public function getCachePublic($type, $name = null)
 	{
-		return $this->getCache( $type, $name );
+		return $this->getCache($type, $name);
 	}
 
 
-	public function getProcessorsPublic( array $mappings )
+	public function getProcessorsPublic(array $mappings)
 	{
-		return $this->getProcessors( $mappings );
+		return $this->getProcessors($mappings);
 	}
 }
 

controller/common/tests/Controller/Common/Product/Import/Csv/Cache/Attribute/StandardTest.php

Spacing +16 added lines, -16 removed lines

@@ -16,49 +16,49 @@
 
 	protected function setUp()
 	{
-		\Aimeos\MShop::cache( true );
+		\Aimeos\MShop::cache(true);
 
 		$context = \TestHelperCntl::getContext();
-		$this->object = new \Aimeos\Controller\Common\Product\Import\Csv\Cache\Attribute\Standard( $context );
+		$this->object = new \Aimeos\Controller\Common\Product\Import\Csv\Cache\Attribute\Standard($context);
 	}
 
 
 	protected function tearDown()
 	{
-		\Aimeos\MShop::cache( false );
+		\Aimeos\MShop::cache(false);
 		\Aimeos\MShop::clear();
 	}
 
 
 	public function testGet()
 	{
-		$item = $this->object->get( 'black', 'color' );
+		$item = $this->object->get('black', 'color');
 
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Attribute\\Item\\Iface', $item );
-		$this->assertEquals( 'black', $item->getCode() );
-		$this->assertEquals( 'color', $item->getType() );
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Attribute\\Item\\Iface', $item);
+		$this->assertEquals('black', $item->getCode());
+		$this->assertEquals('color', $item->getType());
 	}
 
 
 	public function testGetUnknown()
 	{
-		$this->assertEquals( null, $this->object->get( 'cache-test', 'color' ) );
+		$this->assertEquals(null, $this->object->get('cache-test', 'color'));
 	}
 
 
 	public function testSet()
 	{
-		$item = $this->object->get( 'black', 'color' );
+		$item = $this->object->get('black', 'color');
 
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Attribute\\Item\\Iface', $item );
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Attribute\\Item\\Iface', $item);
 
-		$item->setCode( 'cache-test' );
+		$item->setCode('cache-test');
 
-		$this->object->set( $item );
-		$item = $this->object->get( 'cache-test', 'color' );
+		$this->object->set($item);
+		$item = $this->object->get('cache-test', 'color');
 
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Attribute\\Item\\Iface', $item );
-		$this->assertEquals( 'cache-test', $item->getCode() );
-		$this->assertEquals( 'color', $item->getType() );
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Attribute\\Item\\Iface', $item);
+		$this->assertEquals('cache-test', $item->getCode());
+		$this->assertEquals('color', $item->getType());
 	}
 }
\ No newline at end of file

controller/common/tests/Controller/Common/Catalog/Import/Csv/BaseTest.php

Spacing +19 added lines, -19 removed lines

@@ -16,62 +16,62 @@ 
 
 	protected function setUp()
 	{
-		\Aimeos\MShop::cache( true );
+		\Aimeos\MShop::cache(true);
 
 		$context = \TestHelperCntl::getContext();
 		$aimeos = \TestHelperCntl::getAimeos();
 
-		$this->object = new TestAbstract( $context, $aimeos );
+		$this->object = new TestAbstract($context, $aimeos);
 	}
 
 
 	protected function tearDown()
 	{
-		\Aimeos\MShop::cache( false );
+		\Aimeos\MShop::cache(false);
 		\Aimeos\MShop::clear();
 	}
 
 
 	public function testGetCacheInvalidType()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		$this->object->getCachePublic( '$' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		$this->object->getCachePublic('$');
 	}
 
 
 	public function testGetCacheInvalidClass()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		$this->object->getCachePublic( 'unknown' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		$this->object->getCachePublic('unknown');
 	}
 
 
 	public function testGetProcessors()
 	{
-		$processor = $this->object->getProcessorsPublic( array( 'media' => [] ) );
+		$processor = $this->object->getProcessorsPublic(array('media' => []));
 
-		$this->assertInstanceOf( '\\Aimeos\\Controller\\Common\\Catalog\\Import\\Csv\\Processor\\Iface', $processor );
+		$this->assertInstanceOf('\\Aimeos\\Controller\\Common\\Catalog\\Import\\Csv\\Processor\\Iface', $processor);
 	}
 
 
 	public function testGetProcessorsInvalidType()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		$this->object->getProcessorsPublic( array( '$' => [] ) );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		$this->object->getProcessorsPublic(array('$' => []));
 	}
 
 
 	public function testGetProcessorsInvalidClass()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		$this->object->getProcessorsPublic( array( 'unknown' => [] ) );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		$this->object->getProcessorsPublic(array('unknown' => []));
 	}
 
 
 	public function testGetProcessorsInvalidInterface()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		$this->object->getProcessorsPublic( array( 'unknown' => [] ) );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		$this->object->getProcessorsPublic(array('unknown' => []));
 	}
 }
 
@@ -79,15 +79,15 @@ 
 class TestAbstract
 	extends \Aimeos\Controller\Common\Catalog\Import\Csv\Base
 {
-	public function getCachePublic( $type, $name = null )
+	public function getCachePublic($type, $name = null)
 	{
-		return $this->getCache( $type, $name );
+		return $this->getCache($type, $name);
 	}
 
 
-	public function getProcessorsPublic( array $mappings )
+	public function getProcessorsPublic(array $mappings)
 	{
-		return $this->getProcessors( $mappings );
+		return $this->getProcessors($mappings);
 	}
 }
 

controller/jobs/tests/Controller/Jobs/Product/Export/StandardTest.php

Spacing +14 added lines, -14 removed lines

@@ -18,18 +18,18 @@ 
 
 	protected function setUp()
 	{
-		\Aimeos\MShop::cache( true );
+		\Aimeos\MShop::cache(true);
 
 		$this->context = \TestHelperJobs::getContext();
 		$this->aimeos = \TestHelperJobs::getAimeos();
 
-		$this->object = new \Aimeos\Controller\Jobs\Product\Export\Standard( $this->context, $this->aimeos );
+		$this->object = new \Aimeos\Controller\Jobs\Product\Export\Standard($this->context, $this->aimeos);
 	}
 
 
 	protected function tearDown()
 	{
-		\Aimeos\MShop::cache( false );
+		\Aimeos\MShop::cache(false);
 		\Aimeos\MShop::clear();
 
 		$this->object = null;
@@ -38,34 +38,34 @@ 
 
 	public function testGetName()
 	{
-		$this->assertEquals( 'Product export', $this->object->getName() );
+		$this->assertEquals('Product export', $this->object->getName());
 	}
 
 
 	public function testGetDescription()
 	{
 		$text = 'Exports all available products';
-		$this->assertEquals( $text, $this->object->getDescription() );
+		$this->assertEquals($text, $this->object->getDescription());
 	}
 
 
 	public function testRun()
 	{
-		$this->context->getConfig()->set( 'controller/jobs/product/export/filename', 'aimeos-products-%1$d.xml' );
+		$this->context->getConfig()->set('controller/jobs/product/export/filename', 'aimeos-products-%1$d.xml');
 
 		$this->object->run();
 
 		$ds = DIRECTORY_SEPARATOR;
-		$this->assertFileExists( 'tmp' . $ds . 'aimeos-products-1.xml' );
-		$this->assertFileExists( 'tmp' . $ds . 'aimeos-products-2.xml' );
+		$this->assertFileExists('tmp' . $ds . 'aimeos-products-1.xml');
+		$this->assertFileExists('tmp' . $ds . 'aimeos-products-2.xml');
 
-		$file1 = file_get_contents( 'tmp' . $ds . 'aimeos-products-1.xml' );
-		$file2 = file_get_contents( 'tmp' . $ds . 'aimeos-products-2.xml' );
+		$file1 = file_get_contents('tmp' . $ds . 'aimeos-products-1.xml');
+		$file2 = file_get_contents('tmp' . $ds . 'aimeos-products-2.xml');
 
-		unlink( 'tmp' . $ds . 'aimeos-products-1.xml' );
-		unlink( 'tmp' . $ds . 'aimeos-products-2.xml' );
+		unlink('tmp' . $ds . 'aimeos-products-1.xml');
+		unlink('tmp' . $ds . 'aimeos-products-2.xml');
 
-		$this->assertContains( 'CNE', $file2 );
-		$this->assertContains( 'U:BUNDLE', $file2 );
+		$this->assertContains('CNE', $file2);
+		$this->assertContains('U:BUNDLE', $file2);
 	}
 }
\ No newline at end of file

controller/jobs/tests/Controller/Jobs/Product/Export/Sitemap/StandardTest.php

Spacing +19 added lines, -19 removed lines

@@ -18,18 +18,18 @@ 
 
 	protected function setUp()
 	{
-		\Aimeos\MShop::cache( true );
+		\Aimeos\MShop::cache(true);
 
 		$this->context = \TestHelperJobs::getContext();
 		$this->aimeos = \TestHelperJobs::getAimeos();
 
-		$this->object = new \Aimeos\Controller\Jobs\Product\Export\Sitemap\Standard( $this->context, $this->aimeos );
+		$this->object = new \Aimeos\Controller\Jobs\Product\Export\Sitemap\Standard($this->context, $this->aimeos);
 	}
 
 
 	protected function tearDown()
 	{
-		\Aimeos\MShop::cache( false );
+		\Aimeos\MShop::cache(false);
 		\Aimeos\MShop::clear();
 
 		$this->object = null;
@@ -38,40 +38,40 @@ 
 
 	public function testGetName()
 	{
-		$this->assertEquals( 'Product site map', $this->object->getName() );
+		$this->assertEquals('Product site map', $this->object->getName());
 	}
 
 
 	public function testGetDescription()
 	{
 		$text = 'Creates a product site map for search engines';
-		$this->assertEquals( $text, $this->object->getDescription() );
+		$this->assertEquals($text, $this->object->getDescription());
 	}
 
 
 	public function testRun()
 	{
-		$this->context->getConfig()->set( 'controller/jobs/product/export/sitemap/max-items', 5 );
+		$this->context->getConfig()->set('controller/jobs/product/export/sitemap/max-items', 5);
 
 		$this->object->run();
 
 		$ds = DIRECTORY_SEPARATOR;
-		$this->assertFileExists( 'tmp' . $ds . 'aimeos-sitemap-1.xml.gz' );
-		$this->assertFileExists( 'tmp' . $ds . 'aimeos-sitemap-2.xml.gz' );
-		$this->assertFileExists( 'tmp' . $ds . 'aimeos-sitemap-index.xml.gz' );
+		$this->assertFileExists('tmp' . $ds . 'aimeos-sitemap-1.xml.gz');
+		$this->assertFileExists('tmp' . $ds . 'aimeos-sitemap-2.xml.gz');
+		$this->assertFileExists('tmp' . $ds . 'aimeos-sitemap-index.xml.gz');
 
-		$file1 = gzread( gzopen( 'tmp' . $ds . 'aimeos-sitemap-1.xml.gz', 'rb' ), 0x1000 );
-		$file2 = gzread( gzopen( 'tmp' . $ds . 'aimeos-sitemap-2.xml.gz', 'rb' ), 0x1000 );
-		$index = gzread( gzopen( 'tmp' . $ds . 'aimeos-sitemap-index.xml.gz', 'rb' ), 0x1000 );
+		$file1 = gzread(gzopen('tmp' . $ds . 'aimeos-sitemap-1.xml.gz', 'rb'), 0x1000);
+		$file2 = gzread(gzopen('tmp' . $ds . 'aimeos-sitemap-2.xml.gz', 'rb'), 0x1000);
+		$index = gzread(gzopen('tmp' . $ds . 'aimeos-sitemap-index.xml.gz', 'rb'), 0x1000);
 
-		unlink( 'tmp' . $ds . 'aimeos-sitemap-1.xml.gz' );
-		unlink( 'tmp' . $ds . 'aimeos-sitemap-2.xml.gz' );
-		unlink( 'tmp' . $ds . 'aimeos-sitemap-index.xml.gz' );
+		unlink('tmp' . $ds . 'aimeos-sitemap-1.xml.gz');
+		unlink('tmp' . $ds . 'aimeos-sitemap-2.xml.gz');
+		unlink('tmp' . $ds . 'aimeos-sitemap-index.xml.gz');
 
-		$this->assertContains( 'Cafe_Noire_Expresso', $file2 );
-		$this->assertContains( 'Unittest%3A_Bundle', $file2 );
+		$this->assertContains('Cafe_Noire_Expresso', $file2);
+		$this->assertContains('Unittest%3A_Bundle', $file2);
 
-		$this->assertContains( 'aimeos-sitemap-1.xml.gz', $index );
-		$this->assertContains( 'aimeos-sitemap-2.xml.gz', $index );
+		$this->assertContains('aimeos-sitemap-1.xml.gz', $index);
+		$this->assertContains('aimeos-sitemap-2.xml.gz', $index);
 	}
 }
\ No newline at end of file

controller/jobs/tests/Controller/Jobs/Product/Bought/StandardTest.php

Spacing +11 added lines, -11 removed lines

@@ -19,18 +19,18 @@ 
 
 	protected function setUp()
 	{
-		\Aimeos\MShop::cache( true );
+		\Aimeos\MShop::cache(true);
 
 		$this->context = \TestHelperJobs::getContext();
 		$this->aimeos = \TestHelperJobs::getAimeos();
 
-		$this->object = new \Aimeos\Controller\Jobs\Product\Bought\Standard( $this->context, $this->aimeos );
+		$this->object = new \Aimeos\Controller\Jobs\Product\Bought\Standard($this->context, $this->aimeos);
 	}
 
 
 	protected function tearDown()
 	{
-		\Aimeos\MShop::cache( false );
+		\Aimeos\MShop::cache(false);
 		\Aimeos\MShop::clear();
 
 		$this->object = null;
@@ -39,28 +39,28 @@ 
 
 	public function testGetName()
 	{
-		$this->assertEquals( 'Products bought together', $this->object->getName() );
+		$this->assertEquals('Products bought together', $this->object->getName());
 	}
 
 
 	public function testGetDescription()
 	{
 		$text = 'Creates bought together product suggestions';
-		$this->assertEquals( $text, $this->object->getDescription() );
+		$this->assertEquals($text, $this->object->getDescription());
 	}
 
 
 	public function testRun()
 	{
-		$stub = $this->getMockBuilder( '\\Aimeos\\MShop\\Product\\Manager\\Lists\\Standard' )
-			->setConstructorArgs( array( $this->context ) )
-			->setMethods( array( 'deleteItems', 'saveItem' ) )
+		$stub = $this->getMockBuilder('\\Aimeos\\MShop\\Product\\Manager\\Lists\\Standard')
+			->setConstructorArgs(array($this->context))
+			->setMethods(array('deleteItems', 'saveItem'))
 			->getMock();
 
-		\Aimeos\MShop::inject( $this->context, 'product/lists', $stub );
+		\Aimeos\MShop::inject($this->context, 'product/lists', $stub);
 
-		$stub->expects( $this->atLeastOnce() )->method( 'deleteItems' );
-		$stub->expects( $this->atLeastOnce() )->method( 'saveItem' );
+		$stub->expects($this->atLeastOnce())->method('deleteItems');
+		$stub->expects($this->atLeastOnce())->method('saveItem');
 
 		$this->object->run();
 	}

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