aimeos / ai-controller-jobs

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

Braces +3 added lines, -6 removed lines

@@ -352,8 +352,7 @@ 
 			}
 
 			$container->close();
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$logger->log( 'Catalog import error: ' . $e->getMessage() );
 			$logger->log( $e->getTraceAsString() );
@@ -583,8 +582,7 @@ 
 					{
 						$manager->moveItem( $catalogItem->getId(), $catalogItem->getParentId(), $parentid );
 						$catalogItem = $manager->saveItem( $catalogItem );
-					}
-					else
+					} else
 					{
 						$catalogItem = $manager->insertItem( $catalogItem, $parentid );
 					}
@@ -594,8 +592,7 @@ 
 				}
 
 				$manager->commit();
-			}
-			catch( \Exception $e )
+			} catch( \Exception $e )
 			{
 				$manager->rollback();
 

Spacing +89 added lines, -89 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
@@ -122,7 +122,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
@@ -142,7 +142,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
@@ -184,7 +184,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
@@ -204,7 +204,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
@@ -224,7 +224,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
@@ -246,7 +246,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
@@ -270,7 +270,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
@@ -303,75 +303,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'));
 		}
 	}
 
@@ -383,16 +383,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'));
 	}
 
 
@@ -427,7 +427,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
@@ -450,7 +450,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
@@ -471,7 +471,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
@@ -489,15 +489,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);
 	}
 
 
@@ -507,13 +507,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\Factory::createManager( $this->getContext(), 'catalog' );
-		$search = $manager->createSearch()->setSlice( 0, 0x7fffffff );
+		$manager = \Aimeos\MShop\Factory::createManager($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;
 		}
 
@@ -529,23 +529,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);
 	}
 
 
@@ -560,65 +560,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\Factory::createManager( $context, 'catalog' );
+		$manager = \Aimeos\MShop\Factory::createManager($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])) {
 					$catalogItem = $catalogMap[$code];
 				} else {
 					$catalogItem = $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 );
-					$catalogItem->fromArray( $this->addItemDefaults( $map ) );
+					$parentid = $this->getParentId($catalogMap, $map, $code);
+					$catalogItem->fromArray($this->addItemDefaults($map));
 
-					if( isset( $catalogMap[$code] ) )
+					if (isset($catalogMap[$code]))
 					{
-						$manager->moveItem( $catalogItem->getId(), $catalogItem->getParentId(), $parentid );
-						$catalogItem = $manager->saveItem( $catalogItem );
+						$manager->moveItem($catalogItem->getId(), $catalogItem->getParentId(), $parentid);
+						$catalogItem = $manager->saveItem($catalogItem);
 					}
 					else
 					{
-						$catalogItem = $manager->insertItem( $catalogItem, $parentid );
+						$catalogItem = $manager->insertItem($catalogItem, $parentid);
 					}
 
-					$list = $processor->process( $catalogItem, $list );
+					$list = $processor->process($catalogItem, $list);
 					$catalogMap[$code] = $catalogItem;
 
-					$manager->saveItem( $catalogItem );
+					$manager->saveItem($catalogItem);
 				}
 
 				$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));
 			}
 		}
 
@@ -632,9 +632,9 @@ 
 	 * @param array $list Associative list of domain item keys and their values, e.g. "catalog.status" => 1
 	 * @return array Given associative list enriched by default values if they were not already set
 	 */
-	protected function addItemDefaults( array $list )
+	protected function addItemDefaults(array $list)
 	{
-		if( !isset( $list['catalog.status'] ) ) {
+		if (!isset($list['catalog.status'])) {
 			$list['catalog.status'] = 1;
 		}
 

controller/common/src/Controller/Common/Subscription/Export/Csv/Processor/Address/Standard.php

Spacing +6 added lines, -6 removed lines

@@ -40,28 +40,28 @@
 	 * @param \Aimeos\MShop\Order\Item\Base\Iface $order Full subscription with associated items
 	 * @return array Two dimensional associative list of subscription data representing the lines in CSV
 	 */
-	public function process( \Aimeos\MShop\Subscription\Item\Iface $subscription, \Aimeos\MShop\Order\Item\Base\Iface $order )
+	public function process(\Aimeos\MShop\Subscription\Item\Iface $subscription, \Aimeos\MShop\Order\Item\Base\Iface $order)
 	{
 		$result = [];
 		$addresses = $order->getAddresses();
 
-		krsort( $addresses );
+		krsort($addresses);
 
-		foreach( $addresses as $item )
+		foreach ($addresses as $item)
 		{
 			$data = [];
 			$list = $item->toArray();
 
-			foreach( $this->getMapping() as $pos => $key )
+			foreach ($this->getMapping() as $pos => $key)
 			{
-				if( array_key_exists( $key, $list ) ) {
+				if (array_key_exists($key, $list)) {
 					$data[$pos] = $list[$key];
 				} else {
 					$data[$pos] = '';
 				}
 			}
 
-			ksort( $data );
+			ksort($data);
 			$result[] = $data;
 		}
 

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

Spacing +9 added lines, -9 removed lines

@@ -40,24 +40,24 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Base\Iface $order Full order with associated items
 	 * @return array Two dimensional associative list of order data representing the lines in CSV
 	 */
-	public function process( \Aimeos\MShop\Subscription\Item\Iface $subscription, \Aimeos\MShop\Order\Item\Base\Iface $order )
+	public function process(\Aimeos\MShop\Subscription\Item\Iface $subscription, \Aimeos\MShop\Order\Item\Base\Iface $order)
 	{
 		$result = [];
 
-		foreach( $order->getProducts() as $item )
+		foreach ($order->getProducts() as $item)
 		{
-			if( $subscription->getOrderProductId() != $item->getId() ) {
+			if ($subscription->getOrderProductId() != $item->getId()) {
 				continue;
 			}
 
 			$data = [];
 			$list = $item->toArray();
 
-			foreach( $item->getAttributes() as $attrItem )
+			foreach ($item->getAttributes() as $attrItem)
 			{
-				foreach( $attrItem->toArray() as $key => $value )
+				foreach ($attrItem->toArray() as $key => $value)
 				{
-					if( isset( $list[$key] ) ) {
+					if (isset($list[$key])) {
 						$list[$key] .= "\n" . $value;
 					} else {
 						$list[$key] = $value;
@@ -65,16 +65,16 @@ 
 				}
 			}
 
-			foreach( $this->getMapping() as $pos => $key )
+			foreach ($this->getMapping() as $pos => $key)
 			{
-				if( array_key_exists( $key, $list ) ) {
+				if (array_key_exists($key, $list)) {
 					$data[$pos] = $list[$key];
 				} else {
 					$data[$pos] = '';
 				}
 			}
 
-			ksort( $data );
+			ksort($data);
 			$result[] = $data;
 		}
 

controller/common/src/Controller/Common/Subscription/Export/Csv/Processor/Base.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @param array $mapping Associative list of field position in CSV as key and domain item key as value
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping)
 	{
 		$this->context = $context;
 		$this->mapping = $mapping;

controller/common/src/Controller/Common/Subscription/Export/Csv/Processor/Iface.php

Spacing +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @param array $mapping Associative list of field position in CSV as key and domain item key as value
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping );
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping);
 
 
 	/**
@@ -35,5 +35,5 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Base\Iface $order Full order with associated items
 	 * @return array Two dimensional associative list of order data representing the lines in CSV
 	 */
-	public function process( \Aimeos\MShop\Subscription\Item\Iface $subscription, \Aimeos\MShop\Order\Item\Base\Iface $order );
+	public function process(\Aimeos\MShop\Subscription\Item\Iface $subscription, \Aimeos\MShop\Order\Item\Base\Iface $order);
 }
\ No newline at end of file

controller/common/src/Controller/Common/Subscription/Export/Csv/Processor/Subscription/Standard.php

Spacing +4 added lines, -4 removed lines

@@ -40,21 +40,21 @@
 	 * @param \Aimeos\MShop\Order\Item\Base\Iface $order Full order with associated items
 	 * @return array Two dimensional associative list of subscription data representing the lines in CSV
 	 */
-	public function process( \Aimeos\MShop\Subscription\Item\Iface $subscription, \Aimeos\MShop\Order\Item\Base\Iface $order )
+	public function process(\Aimeos\MShop\Subscription\Item\Iface $subscription, \Aimeos\MShop\Order\Item\Base\Iface $order)
 	{
 		$result = [];
 		$list = $subscription->toArray() + $order->toArray();
 
-		foreach( $this->getMapping() as $pos => $key )
+		foreach ($this->getMapping() as $pos => $key)
 		{
-			if( array_key_exists( $key, $list ) ) {
+			if (array_key_exists($key, $list)) {
 				$result[$pos] = $list[$key];
 			} else {
 				$result[$pos] = '';
 			}
 		}
 
-		ksort( $result );
+		ksort($result);
 
 		return [$result];
 	}

controller/common/tests/Controller/Common/Subscription/Export/Csv/Processor/Address/StandardTest.php

Spacing +61 added lines, -61 removed lines

@@ -38,77 +38,77 @@
 		);
 
 
-		$object = new \Aimeos\Controller\Common\Subscription\Export\Csv\Processor\Address\Standard( $context, $mapping );
-
-		$subscription = $this->getSubscription( $context );
-		$order = \Aimeos\MShop\Factory::createManager( $context, 'order/base' )->load( $subscription->getOrderBaseId() );
-
-		$data = $object->process( $subscription, $order );
-
-
-		$this->assertEquals( 2, count( $data ) );
-
-		$this->assertEquals( 21, count( $data[0] ) );
-		$this->assertEquals( 'payment', $data[0][0] );
-		$this->assertEquals( 'mr', $data[0][1] );
-		$this->assertEquals( '', $data[0][2] );
-		$this->assertEquals( '', $data[0][3] );
-		$this->assertEquals( '', $data[0][4] );
-		$this->assertEquals( 'Our', $data[0][5] );
-		$this->assertEquals( 'Unittest', $data[0][6] );
-		$this->assertEquals( 'Durchschnitt', $data[0][7] );
-		$this->assertEquals( '1', $data[0][8] );
-		$this->assertEquals( '', $data[0][9] );
-		$this->assertEquals( '20146', $data[0][10] );
-		$this->assertEquals( 'Hamburg', $data[0][11] );
-		$this->assertEquals( 'Hamburg', $data[0][12] );
-		$this->assertEquals( 'DE', $data[0][13] );
-		$this->assertEquals( 'de', $data[0][14] );
-		$this->assertEquals( '055544332211', $data[0][15] );
-		$this->assertEquals( '055544332213', $data[0][16] );
-		$this->assertEquals( 'test@example.com', $data[0][17] );
-		$this->assertEquals( 'www.metaways.net', $data[0][18] );
-		$this->assertEquals( '11.000000', $data[0][19] );
-		$this->assertEquals( '52.000000', $data[0][20] );
-
-		$this->assertEquals( 21, count( $data[1] ) );
-		$this->assertEquals( 'delivery', $data[1][0] );
-		$this->assertEquals( 'mr', $data[1][1] );
-		$this->assertEquals( 'Example company', $data[1][2] );
-		$this->assertEquals( 'DE999999999', $data[1][3] );
-		$this->assertEquals( 'Dr.', $data[1][4] );
-		$this->assertEquals( 'Our', $data[1][5] );
-		$this->assertEquals( 'Unittest', $data[1][6] );
-		$this->assertEquals( 'Pickhuben', $data[1][7] );
-		$this->assertEquals( '2-4', $data[1][8] );
-		$this->assertEquals( '', $data[1][9] );
-		$this->assertEquals( '20457', $data[1][10] );
-		$this->assertEquals( 'Hamburg', $data[1][11] );
-		$this->assertEquals( 'Hamburg', $data[1][12] );
-		$this->assertEquals( 'DE', $data[1][13] );
-		$this->assertEquals( 'de', $data[1][14] );
-		$this->assertEquals( '055544332211', $data[1][15] );
-		$this->assertEquals( '055544332212', $data[1][16] );
-		$this->assertEquals( 'test@example.com', $data[1][17] );
-		$this->assertEquals( 'www.example.com', $data[1][18] );
-		$this->assertEquals( '10.000000', $data[1][19] );
-		$this->assertEquals( '50.000000', $data[1][20] );
+		$object = new \Aimeos\Controller\Common\Subscription\Export\Csv\Processor\Address\Standard($context, $mapping);
+
+		$subscription = $this->getSubscription($context);
+		$order = \Aimeos\MShop\Factory::createManager($context, 'order/base')->load($subscription->getOrderBaseId());
+
+		$data = $object->process($subscription, $order);
+
+
+		$this->assertEquals(2, count($data));
+
+		$this->assertEquals(21, count($data[0]));
+		$this->assertEquals('payment', $data[0][0]);
+		$this->assertEquals('mr', $data[0][1]);
+		$this->assertEquals('', $data[0][2]);
+		$this->assertEquals('', $data[0][3]);
+		$this->assertEquals('', $data[0][4]);
+		$this->assertEquals('Our', $data[0][5]);
+		$this->assertEquals('Unittest', $data[0][6]);
+		$this->assertEquals('Durchschnitt', $data[0][7]);
+		$this->assertEquals('1', $data[0][8]);
+		$this->assertEquals('', $data[0][9]);
+		$this->assertEquals('20146', $data[0][10]);
+		$this->assertEquals('Hamburg', $data[0][11]);
+		$this->assertEquals('Hamburg', $data[0][12]);
+		$this->assertEquals('DE', $data[0][13]);
+		$this->assertEquals('de', $data[0][14]);
+		$this->assertEquals('055544332211', $data[0][15]);
+		$this->assertEquals('055544332213', $data[0][16]);
+		$this->assertEquals('test@example.com', $data[0][17]);
+		$this->assertEquals('www.metaways.net', $data[0][18]);
+		$this->assertEquals('11.000000', $data[0][19]);
+		$this->assertEquals('52.000000', $data[0][20]);
+
+		$this->assertEquals(21, count($data[1]));
+		$this->assertEquals('delivery', $data[1][0]);
+		$this->assertEquals('mr', $data[1][1]);
+		$this->assertEquals('Example company', $data[1][2]);
+		$this->assertEquals('DE999999999', $data[1][3]);
+		$this->assertEquals('Dr.', $data[1][4]);
+		$this->assertEquals('Our', $data[1][5]);
+		$this->assertEquals('Unittest', $data[1][6]);
+		$this->assertEquals('Pickhuben', $data[1][7]);
+		$this->assertEquals('2-4', $data[1][8]);
+		$this->assertEquals('', $data[1][9]);
+		$this->assertEquals('20457', $data[1][10]);
+		$this->assertEquals('Hamburg', $data[1][11]);
+		$this->assertEquals('Hamburg', $data[1][12]);
+		$this->assertEquals('DE', $data[1][13]);
+		$this->assertEquals('de', $data[1][14]);
+		$this->assertEquals('055544332211', $data[1][15]);
+		$this->assertEquals('055544332212', $data[1][16]);
+		$this->assertEquals('test@example.com', $data[1][17]);
+		$this->assertEquals('www.example.com', $data[1][18]);
+		$this->assertEquals('10.000000', $data[1][19]);
+		$this->assertEquals('50.000000', $data[1][20]);
 	}
 
 
-	protected function getSubscription( $context )
+	protected function getSubscription($context)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'subscription' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'subscription');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'subscription.dateend', '2010-01-01' ) );
+		$search->setConditions($search->compare('==', 'subscription.dateend', '2010-01-01'));
 
-		$items = $manager->searchItems( $search );
+		$items = $manager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) !== false ) {
+		if (($item = reset($items)) !== false) {
 			return $item;
 		}
 
-		throw new \Exception( 'No subscription item found' );
+		throw new \Exception('No subscription item found');
 	}
 }

controller/common/tests/Controller/Common/Subscription/Export/Csv/Processor/Subscription/StandardTest.php

Spacing +15 added lines, -15 removed lines

@@ -20,36 +20,36 @@
 		);
 
 
-		$object = new \Aimeos\Controller\Common\Subscription\Export\Csv\Processor\Subscription\Standard( $context, $mapping );
+		$object = new \Aimeos\Controller\Common\Subscription\Export\Csv\Processor\Subscription\Standard($context, $mapping);
 
-		$subscription = $this->getSubscription( $context );
-		$order = \Aimeos\MShop\Factory::createManager( $context, 'order/base' )->load( $subscription->getOrderBaseId() );
+		$subscription = $this->getSubscription($context);
+		$order = \Aimeos\MShop\Factory::createManager($context, 'order/base')->load($subscription->getOrderBaseId());
 
-		$data = $object->process( $subscription, $order );
+		$data = $object->process($subscription, $order);
 
 
-		$this->assertEquals( 1, count( $data ) );
+		$this->assertEquals(1, count($data));
 
-		$this->assertEquals( 3, count( $data[0] ) );
-		$this->assertEquals( 'P0Y1M0W0D', $data[0][0] );
-		$this->assertEquals( '2000-01-01', $data[0][1] );
-		$this->assertEquals( '2010-01-01', $data[0][2] );
+		$this->assertEquals(3, count($data[0]));
+		$this->assertEquals('P0Y1M0W0D', $data[0][0]);
+		$this->assertEquals('2000-01-01', $data[0][1]);
+		$this->assertEquals('2010-01-01', $data[0][2]);
 	}
 
 
-	protected function getSubscription( $context )
+	protected function getSubscription($context)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'subscription' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'subscription');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'subscription.dateend', '2010-01-01' ) );
+		$search->setConditions($search->compare('==', 'subscription.dateend', '2010-01-01'));
 
-		$items = $manager->searchItems( $search );
+		$items = $manager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) !== false ) {
+		if (($item = reset($items)) !== false) {
 			return $item;
 		}
 
-		throw new \Exception( 'No subscription item found' );
+		throw new \Exception('No subscription item found');
 	}
 }

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

Braces +1 added lines, -2 removed lines

@@ -121,8 +121,7 @@
 				}
 
 				$this->export( $processors, $data, $maxcnt );
-			}
-			catch( \Exception $e )
+			} catch( \Exception $e )
 			{
 				$logger->log( 'Subscription export error: ' . $e->getMessage() );
 				$logger->log( $e->getTraceAsString() );

Spacing +60 added lines, -60 removed lines

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