aimeos / ai-controller-jobs

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

Braces +2 added lines, -4 removed lines

@@ -351,8 +351,7 @@ 
 			}
 
 			$container->close();
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$logger->log( 'Product import error: ' . $e->getMessage() );
 			$logger->log( $e->getTraceAsString() );
@@ -540,8 +539,7 @@ 
 				}
 
 				$manager->commit();
-			}
-			catch( \Exception $e )
+			} catch( \Exception $e )
 			{
 				$manager->rollback();
 

Spacing +83 added lines, -83 removed lines

@@ -30,14 +30,14 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context MShop context object
 	 * @param \Aimeos\Bootstrap $aimeos \Aimeos\Bootstrap main object
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\Bootstrap $aimeos )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\Bootstrap $aimeos)
 	{
-		parent::__construct( $context, $aimeos );
+		parent::__construct($context, $aimeos);
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product/type' );
-		$search = $manager->createSearch()->setSlice( 0, 0x7fffffff );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product/type');
+		$search = $manager->createSearch()->setSlice(0, 0x7fffffff);
 
-		foreach( $manager->searchItems( $search ) as $item ) {
+		foreach ($manager->searchItems($search) as $item) {
 			$this->types[$item->getCode()] = $item->getCode();
 		}
 	}
@@ -50,7 +50,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Product import CSV' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Product import CSV');
 	}
 
 
@@ -61,7 +61,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Imports new and updates existing products from CSV files' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Imports new and updates existing products from CSV files');
 	}
 
 
@@ -76,7 +76,7 @@ 
 		$context = $this->getContext();
 		$config = $context->getConfig();
 		$logger = $context->getLogger();
-		$domains = array( 'attribute', 'media', 'price', 'product', 'product/property', 'text' );
+		$domains = array('attribute', 'media', 'price', 'product', 'product/property', 'text');
 		$mappings = $this->getDefaultMapping();
 
 
@@ -96,7 +96,7 @@ 
 		 * @see controller/common/product/import/csv/converter
 		 * @see controller/common/product/import/csv/max-size
 		 */
-		$domains = $config->get( 'controller/common/product/import/csv/domains', $domains );
+		$domains = $config->get('controller/common/product/import/csv/domains', $domains);
 
 		/** controller/jobs/product/import/csv/domains
 		 * List of item domain names that should be retrieved along with the product items
@@ -116,7 +116,7 @@ 
 		 * @see controller/jobs/product/import/csv/backup
 		 * @see controller/common/product/import/csv/max-size
 		 */
-		$domains = $config->get( 'controller/jobs/product/import/csv/domains', $domains );
+		$domains = $config->get('controller/jobs/product/import/csv/domains', $domains);
 
 
 		/** controller/common/product/import/csv/mapping
@@ -141,7 +141,7 @@ 
 		 * @see controller/common/product/import/csv/converter
 		 * @see controller/common/product/import/csv/max-size
 		 */
-		$mappings = $config->get( 'controller/common/product/import/csv/mapping', $mappings );
+		$mappings = $config->get('controller/common/product/import/csv/mapping', $mappings);
 
 		/** controller/jobs/product/import/csv/mapping
 		 * List of mappings between the position in the CSV file and item keys
@@ -161,7 +161,7 @@ 
 		 * @see controller/jobs/product/import/csv/backup
 		 * @see controller/common/product/import/csv/max-size
 		 */
-		$mappings = $config->get( 'controller/jobs/product/import/csv/mapping', $mappings );
+		$mappings = $config->get('controller/jobs/product/import/csv/mapping', $mappings);
 
 
 		/** controller/common/product/import/csv/converter
@@ -203,7 +203,7 @@ 
 		 * @see controller/common/product/import/csv/mapping
 		 * @see controller/common/product/import/csv/max-size
 		 */
-		$converters = $config->get( 'controller/common/product/import/csv/converter', [] );
+		$converters = $config->get('controller/common/product/import/csv/converter', []);
 
 		/** controller/jobs/product/import/csv/converter
 		 * List of converter names for the values at the position in the CSV file
@@ -223,7 +223,7 @@ 
 		 * @see controller/jobs/product/import/csv/backup
 		 * @see controller/common/product/import/csv/max-size
 		 */
-		$converters = $config->get( 'controller/jobs/product/import/csv/converter', $converters );
+		$converters = $config->get('controller/jobs/product/import/csv/converter', $converters);
 
 
 		/** controller/common/product/import/csv/max-size
@@ -243,7 +243,7 @@ 
 		 * @see controller/common/product/import/csv/mapping
 		 * @see controller/common/product/import/csv/converter
 		 */
-		$maxcnt = (int) $config->get( 'controller/common/product/import/csv/max-size', 1000 );
+		$maxcnt = (int) $config->get('controller/common/product/import/csv/max-size', 1000);
 
 
 		/** controller/jobs/product/import/csv/skip-lines
@@ -265,7 +265,7 @@ 
 		 * @see controller/jobs/product/import/csv/backup
 		 * @see controller/common/product/import/csv/max-size
 		 */
-		$skiplines = (int) $config->get( 'controller/jobs/product/import/csv/skip-lines', 0 );
+		$skiplines = (int) $config->get('controller/jobs/product/import/csv/skip-lines', 0);
 
 
 		/** controller/jobs/product/import/csv/strict
@@ -289,7 +289,7 @@ 
 		 * @see controller/jobs/product/import/csv/backup
 		 * @see controller/common/product/import/csv/max-size
 		 */
-		$strict = (bool) $config->get( 'controller/jobs/product/import/csv/strict', true );
+		$strict = (bool) $config->get('controller/jobs/product/import/csv/strict', true);
 
 
 		/** controller/jobs/product/import/csv/backup
@@ -322,74 +322,74 @@ 
 		 * @see controller/jobs/product/import/csv/strict
 		 * @see controller/common/product/import/csv/max-size
 		 */
-		$backup = $config->get( 'controller/jobs/product/import/csv/backup' );
+		$backup = $config->get('controller/jobs/product/import/csv/backup');
 
 
-		if( !isset( $mappings['item'] ) || !is_array( $mappings['item'] ) )
+		if (!isset($mappings['item']) || !is_array($mappings['item']))
 		{
-			$msg = sprintf( 'Required mapping key "%1$s" is missing or contains no array', 'item' );
-			throw new \Aimeos\Controller\Jobs\Exception( $msg );
+			$msg = sprintf('Required mapping key "%1$s" is missing or contains no array', 'item');
+			throw new \Aimeos\Controller\Jobs\Exception($msg);
 		}
 
 		try
 		{
 			$procMappings = $mappings;
-			unset( $procMappings['item'] );
+			unset($procMappings['item']);
 
-			$codePos = $this->getCodePosition( $mappings['item'] );
-			$convlist = $this->getConverterList( $converters );
-			$processor = $this->getProcessors( $procMappings );
+			$codePos = $this->getCodePosition($mappings['item']);
+			$convlist = $this->getConverterList($converters);
+			$processor = $this->getProcessors($procMappings);
 			$container = $this->getContainer();
 			$path = $container->getName();
 
-			$msg = sprintf( 'Started product import from "%1$s" (%2$s)', $path, __CLASS__ );
-			$logger->log( $msg, \Aimeos\MW\Logger\Base::NOTICE );
+			$msg = sprintf('Started product import from "%1$s" (%2$s)', $path, __CLASS__);
+			$logger->log($msg, \Aimeos\MW\Logger\Base::NOTICE);
 
-			foreach( $container as $content )
+			foreach ($container as $content)
 			{
 				$name = $content->getName();
 
-				for( $i = 0; $i < $skiplines; $i++ ) {
+				for ($i = 0; $i < $skiplines; $i++) {
 					$content->next();
 				}
 
-				while( ( $data = $this->getData( $content, $maxcnt, $codePos ) ) !== [] )
+				while (($data = $this->getData($content, $maxcnt, $codePos)) !== [])
 				{
-					$data = $this->convertData( $convlist, $data );
-					$products = $this->getProducts( array_keys( $data ), $domains );
-					$errcnt = $this->import( $products, $data, $mappings['item'], $processor, $strict );
-					$chunkcnt = count( $data );
+					$data = $this->convertData($convlist, $data);
+					$products = $this->getProducts(array_keys($data), $domains);
+					$errcnt = $this->import($products, $data, $mappings['item'], $processor, $strict);
+					$chunkcnt = count($data);
 
 					$msg = 'Imported product lines from "%1$s": %2$d/%3$d (%4$s)';
-					$logger->log( sprintf( $msg, $name, $chunkcnt - $errcnt, $chunkcnt, __CLASS__ ), \Aimeos\MW\Logger\Base::NOTICE );
+					$logger->log(sprintf($msg, $name, $chunkcnt - $errcnt, $chunkcnt, __CLASS__), \Aimeos\MW\Logger\Base::NOTICE);
 
 					$errors += $errcnt;
 					$total += $chunkcnt;
-					unset( $products, $data );
+					unset($products, $data);
 				}
 			}
 
 			$container->close();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$logger->log( 'Product import error: ' . $e->getMessage() );
-			$logger->log( $e->getTraceAsString() );
+			$logger->log('Product import error: ' . $e->getMessage());
+			$logger->log($e->getTraceAsString());
 
-			throw new \Aimeos\Controller\Jobs\Exception( $e->getMessage() );
+			throw new \Aimeos\Controller\Jobs\Exception($e->getMessage());
 		}
 
 		$msg = 'Finished product import from "%1$s": %2$d successful, %3$s errors, %4$s total (%5$s)';
-		$logger->log( sprintf( $msg, $path, $total - $errors, $errors, $total, __CLASS__ ), \Aimeos\MW\Logger\Base::NOTICE );
+		$logger->log(sprintf($msg, $path, $total - $errors, $errors, $total, __CLASS__), \Aimeos\MW\Logger\Base::NOTICE);
 
-		if( $errors > 0 )
+		if ($errors > 0)
 		{
-			$msg = sprintf( 'Invalid product lines in "%1$s": %2$d/%3$d', $path, $errors, $total );
-			throw new \Aimeos\Controller\Jobs\Exception( $msg );
+			$msg = sprintf('Invalid product lines in "%1$s": %2$d/%3$d', $path, $errors, $total);
+			throw new \Aimeos\Controller\Jobs\Exception($msg);
 		}
 
-		if( !empty( $backup ) && @rename( $path, strftime( $backup ) ) === false ) {
-			throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Unable to move imported file' ) );
+		if (!empty($backup) && @rename($path, strftime($backup)) === false) {
+			throw new \Aimeos\Controller\Jobs\Exception(sprintf('Unable to move imported file'));
 		}
 	}
 
@@ -401,16 +401,16 @@ 
 	 * @return integer Position of the "product.code" column
 	 * @throws \Aimeos\Controller\Jobs\Exception If no mapping for "product.code" is found
 	 */
-	protected function getCodePosition( array $mapping )
+	protected function getCodePosition(array $mapping)
 	{
-		foreach( $mapping as $pos => $key )
+		foreach ($mapping as $pos => $key)
 		{
-			if( $key === 'product.code' ) {
+			if ($key === 'product.code') {
 				return $pos;
 			}
 		}
 
-		throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'No "product.code" column in CSV mapping found' ) );
+		throw new \Aimeos\Controller\Jobs\Exception(sprintf('No "product.code" column in CSV mapping found'));
 	}
 
 
@@ -445,7 +445,7 @@ 
 		 * @see controller/jobs/product/import/csv/container/content
 		 * @see controller/jobs/product/import/csv/container/options
 		 */
-		$location = $config->get( 'controller/jobs/product/import/csv/location' );
+		$location = $config->get('controller/jobs/product/import/csv/location');
 
 		/** controller/jobs/product/import/csv/container/type
 		 * Nave of the container type to read the data from
@@ -468,7 +468,7 @@ 
 		 * @see controller/jobs/product/import/csv/container/content
 		 * @see controller/jobs/product/import/csv/container/options
 		 */
-		$container = $config->get( 'controller/jobs/product/import/csv/container/type', 'Directory' );
+		$container = $config->get('controller/jobs/product/import/csv/container/type', 'Directory');
 
 		/** controller/jobs/product/import/csv/container/content
 		 * Name of the content type inside the container to read the data from
@@ -489,7 +489,7 @@ 
 		 * @see controller/jobs/product/import/csv/container/type
 		 * @see controller/jobs/product/import/csv/container/options
 		 */
-		$content = $config->get( 'controller/jobs/product/import/csv/container/content', 'CSV' );
+		$content = $config->get('controller/jobs/product/import/csv/container/content', 'CSV');
 
 		/** controller/jobs/product/import/csv/container/options
 		 * List of file container options for the product import files
@@ -507,15 +507,15 @@ 
 		 * @see controller/jobs/product/import/csv/container/content
 		 * @see controller/jobs/product/import/csv/container/type
 		 */
-		$options = $config->get( 'controller/jobs/product/import/csv/container/options', [] );
+		$options = $config->get('controller/jobs/product/import/csv/container/options', []);
 
-		if( $location === null )
+		if ($location === null)
 		{
-			$msg = sprintf( 'Required configuration for "%1$s" is missing', 'controller/jobs/product/import/csv/location' );
-			throw new \Aimeos\Controller\Jobs\Exception( $msg );
+			$msg = sprintf('Required configuration for "%1$s" is missing', 'controller/jobs/product/import/csv/location');
+			throw new \Aimeos\Controller\Jobs\Exception($msg);
 		}
 
-		return \Aimeos\MW\Container\Factory::getContainer( $location, $container, $content, $options );
+		return \Aimeos\MW\Container\Factory::getContainer($location, $container, $content, $options);
 	}
 
 
@@ -530,69 +530,69 @@ 
 	 * @return integer Number of products that couldn't be imported
 	 * @throws \Aimeos\Controller\Jobs\Exception
 	 */
-	protected function import( array $products, array $data, array $mapping,
-		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $processor, $strict )
+	protected function import(array $products, array $data, array $mapping,
+		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $processor, $strict)
 	{
 		$items = [];
 		$errors = 0;
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
-		$indexManager = \Aimeos\MShop\Factory::createManager( $context, 'index' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'product');
+		$indexManager = \Aimeos\MShop\Factory::createManager($context, 'index');
 
-		foreach( $data as $code => $list )
+		foreach ($data as $code => $list)
 		{
 			$manager->begin();
 
 			try
 			{
-				$code = trim( $code );
+				$code = trim($code);
 
-				if( isset( $products[$code] ) ) {
+				if (isset($products[$code])) {
 					$product = $products[$code];
 				} else {
 					$product = $manager->createItem();
 				}
 
-				$map = $this->getMappedChunk( $list, $mapping );
+				$map = $this->getMappedChunk($list, $mapping);
 
-				if( isset( $map[0] ) )
+				if (isset($map[0]))
 				{
 					$map = $map[0]; // there can only be one chunk for the base product data
-					$map['product.type'] = $this->getValue( $map, 'product.type', 'default' );
+					$map['product.type'] = $this->getValue($map, 'product.type', 'default');
 
-					if( !in_array( $map['product.type'], $this->types ) )
+					if (!in_array($map['product.type'], $this->types))
 					{
-						$msg = sprintf( 'Invalid product type "%1$s"', $map['product.type'] );
-						throw new \Aimeos\Controller\Jobs\Exception( $msg );
+						$msg = sprintf('Invalid product type "%1$s"', $map['product.type']);
+						throw new \Aimeos\Controller\Jobs\Exception($msg);
 					}
 
-					$product->fromArray( $this->addItemDefaults( $map ) );
-					$product = $manager->saveItem( $product );
+					$product->fromArray($this->addItemDefaults($map));
+					$product = $manager->saveItem($product);
 
-					$list = $processor->process( $product, $list );
+					$list = $processor->process($product, $list);
 
-					$product = $manager->saveItem( $product );
+					$product = $manager->saveItem($product);
 					$items[$product->getId()] = $product;
 				}
 
 				$manager->commit();
 			}
-			catch( \Exception $e )
+			catch (\Exception $e)
 			{
 				$manager->rollback();
 
-				$msg = sprintf( 'Unable to import product with code "%1$s": %2$s', $code, $e->getMessage() );
-				$context->getLogger()->log( $msg );
+				$msg = sprintf('Unable to import product with code "%1$s": %2$s', $code, $e->getMessage());
+				$context->getLogger()->log($msg);
 
 				$errors++;
 			}
 
-			if( $strict && !empty( $list ) ) {
-				$context->getLogger()->log( 'Not imported: ' . print_r( $list, true ) );
+			if ($strict && !empty($list)) {
+				$context->getLogger()->log('Not imported: ' . print_r($list, true));
 			}
 		}
 
-		$indexManager->rebuildIndex( $items );
+		$indexManager->rebuildIndex($items);
 
 		return $errors;
 	}
@@ -604,9 +604,9 @@ 
 	 * @param array $list Associative list of domain item keys and their values, e.g. "product.status" => 1
 	 * @return array Given associative list enriched by default values if they were not already set
 	 */
-	protected function addItemDefaults( array $list )
+	protected function addItemDefaults(array $list)
 	{
-		if( !isset( $list['product.status'] ) ) {
+		if (!isset($list['product.status'])) {
 			$list['product.status'] = 1;
 		}
 

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

Braces +1 added lines, -2 removed lines

@@ -131,8 +131,7 @@
 			$data = $this->getObject()->process( $product, $data );
 
 			$manager->commit();
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$manager->rollback();
 			throw $e;

Spacing +28 added lines, -28 removed lines

@@ -42,15 +42,15 @@ 
 	 * @param array $mapping Associative list of field position in CSV as key and domain item key as value
 	 * @param \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object Decorated processor
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
-		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
+		\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null)
 	{
-		parent::__construct( $context, $mapping, $object );
+		parent::__construct($context, $mapping, $object);
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'stock/type' );
-		$search = $manager->createSearch()->setSlice( 0, 0x7fffffff );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'stock/type');
+		$search = $manager->createSearch()->setSlice(0, 0x7fffffff);
 
-		foreach( $manager->searchItems( $search ) as $item ) {
+		foreach ($manager->searchItems($search) as $item) {
 			$this->types[$item->getCode()] = $item->getCode();
 		}
 	}
@@ -63,48 +63,48 @@ 
 	 * @param array $data List of CSV fields with position as key and data as value
 	 * @return array List of data which hasn't been imported
 	 */
-	public function process( \Aimeos\MShop\Product\Item\Iface $product, array $data )
+	public function process(\Aimeos\MShop\Product\Item\Iface $product, array $data)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'stock' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'stock');
 		$manager->begin();
 
 		try
 		{
-			$map = $this->getMappedChunk( $data, $this->getMapping() );
-			$items = $this->getStockItems( $product->getCode() );
+			$map = $this->getMappedChunk($data, $this->getMapping());
+			$items = $this->getStockItems($product->getCode());
 
-			foreach( $map as $pos => $list )
+			foreach ($map as $pos => $list)
 			{
-				if( !array_key_exists( 'stock.stocklevel', $list ) ) {
+				if (!array_key_exists('stock.stocklevel', $list)) {
 					continue;
 				}
 
 				$list['stock.productcode'] = $product->getCode();
-				$list['stock.dateback'] = $this->getValue( $list, 'stock.dateback' );
-				$list['stock.stocklevel'] = $this->getValue( $list, 'stock.stocklevel' );
-				$list['stock.type'] = $this->getValue( $list, 'stock.type', 'default' );
+				$list['stock.dateback'] = $this->getValue($list, 'stock.dateback');
+				$list['stock.stocklevel'] = $this->getValue($list, 'stock.stocklevel');
+				$list['stock.type'] = $this->getValue($list, 'stock.type', 'default');
 
-				if( !in_array( $list['stock.type'], $this->types ) )
+				if (!in_array($list['stock.type'], $this->types))
 				{
-					$msg = sprintf( 'Invalid type "%1$s" (%2$s)', $list['stock.type'], 'stock' );
-					throw new \Aimeos\Controller\Common\Exception( $msg );
+					$msg = sprintf('Invalid type "%1$s" (%2$s)', $list['stock.type'], 'stock');
+					throw new \Aimeos\Controller\Common\Exception($msg);
 				}
 
-				if( ( $item = array_pop( $items ) ) === null ) {
+				if (($item = array_pop($items)) === null) {
 					$item = $manager->createItem();
 				}
 
-				$item->fromArray( $list );
-				$manager->saveItem( $item, false );
+				$item->fromArray($list);
+				$manager->saveItem($item, false);
 			}
 
-			$manager->deleteItems( array_keys( $items ) );
+			$manager->deleteItems(array_keys($items));
 
-			$data = $this->getObject()->process( $product, $data );
+			$data = $this->getObject()->process($product, $data);
 
 			$manager->commit();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$manager->rollback();
 			throw $e;
@@ -120,13 +120,13 @@ 
 	 * @param string $code Unique product code
 	 * @return \Aimeos\MShop\Stock\Item\Iface[] Associative list of stock items
 	 */
-	protected function getStockItems( $code )
+	protected function getStockItems($code)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'stock' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'stock');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'stock.productcode', $code ) );
+		$search->setConditions($search->compare('==', 'stock.productcode', $code));
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 }

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

Spacing +76 added lines, -76 removed lines

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

controller/jobs/tests/Controller/Jobs/Admin/Log/StandardTest.php

Spacing +20 added lines, -20 removed lines

@@ -25,7 +25,7 @@ 
 		$this->context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$this->object = new \Aimeos\Controller\Jobs\Admin\Log\Standard( $this->context, $aimeos );
+		$this->object = new \Aimeos\Controller\Jobs\Admin\Log\Standard($this->context, $aimeos);
 	}
 
 
@@ -44,14 +44,14 @@ 
 
 	public function testGetName()
 	{
-		$this->assertEquals( 'Log cleanup', $this->object->getName() );
+		$this->assertEquals('Log cleanup', $this->object->getName());
 	}
 
 
 	public function testGetDescription()
 	{
 		$text = 'Removes the old log entries from the database and archives them (optional)';
-		$this->assertEquals( $text, $this->object->getDescription() );
+		$this->assertEquals($text, $this->object->getDescription());
 	}
 
 
@@ -59,38 +59,38 @@ 
 	{
 		$config = $this->context->getConfig();
 
-		$mock = $this->getMockBuilder( '\\Aimeos\\MAdmin\\Log\\Manager\\Standard' )
-			->setMethods( array( 'deleteItems' ) )
-			->setConstructorArgs( array( $this->context ) )
+		$mock = $this->getMockBuilder('\\Aimeos\\MAdmin\\Log\\Manager\\Standard')
+			->setMethods(array('deleteItems'))
+			->setConstructorArgs(array($this->context))
 			->getMock();
 
-		$mock->expects( $this->atLeastOnce() )->method( 'deleteItems' );
+		$mock->expects($this->atLeastOnce())->method('deleteItems');
 
-		$tmppath = dirname( dirname( dirname( dirname( __DIR__ ) ) ) ) . DIRECTORY_SEPARATOR . 'tmp';
+		$tmppath = dirname(dirname(dirname(dirname(__DIR__)))) . DIRECTORY_SEPARATOR . 'tmp';
 		$name = 'ControllerJobsAdminLogDefaultRun';
-		$config->set( 'madmin/log/manager/name', $name );
-		$config->set( 'controller/jobs/admin/log/standard/limit-days', 0 );
-		$config->set( 'controller/jobs/admin/log/standard/path', $tmppath );
+		$config->set('madmin/log/manager/name', $name);
+		$config->set('controller/jobs/admin/log/standard/limit-days', 0);
+		$config->set('controller/jobs/admin/log/standard/path', $tmppath);
 
-		\Aimeos\MAdmin\Log\Manager\Factory::injectManager( '\\Aimeos\\MAdmin\\Log\\Manager\\' . $name, $mock );
+		\Aimeos\MAdmin\Log\Manager\Factory::injectManager('\\Aimeos\\MAdmin\\Log\\Manager\\' . $name, $mock);
 
-		if( !is_dir( $tmppath ) && mkdir( $tmppath ) === false ) {
-			throw new \RuntimeException( sprintf( 'Unable to create temporary path "%1$s"', $tmppath ) );
+		if (!is_dir($tmppath) && mkdir($tmppath) === false) {
+			throw new \RuntimeException(sprintf('Unable to create temporary path "%1$s"', $tmppath));
 		}
 
 		$this->object->run();
 
-		foreach( new \DirectoryIterator( $tmppath ) as $file )
+		foreach (new \DirectoryIterator($tmppath) as $file)
 		{
-			if( $file->isFile() && $file->getExtension() === 'zip' )
+			if ($file->isFile() && $file->getExtension() === 'zip')
 			{
-				$container = \Aimeos\MW\Container\Factory::getContainer( $file->getPathName(), 'Zip', 'CSV', [] );
-				$container->get( 'unittest facility.csv' );
-				unlink( $file->getPathName() );
+				$container = \Aimeos\MW\Container\Factory::getContainer($file->getPathName(), 'Zip', 'CSV', []);
+				$container->get('unittest facility.csv');
+				unlink($file->getPathName());
 				return;
 			}
 		}
 
-		$this->fail( 'Log archive file not found' );
+		$this->fail('Log archive file not found');
 	}
 }

controller/jobs/tests/Controller/Jobs/Order/Service/Payment/StandardTest.php

Spacing +67 added lines, -67 removed lines

@@ -24,7 +24,7 @@ 
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$this->object = new \Aimeos\Controller\Jobs\Order\Service\Payment\Standard( $context, $aimeos );
+		$this->object = new \Aimeos\Controller\Jobs\Order\Service\Payment\Standard($context, $aimeos);
 	}
 
 
@@ -42,14 +42,14 @@ 
 
 	public function testGetName()
 	{
-		$this->assertEquals( 'Capture authorized payments', $this->object->getName() );
+		$this->assertEquals('Capture authorized payments', $this->object->getName());
 	}
 
 
 	public function testGetDescription()
 	{
 		$text = 'Authorized payments of orders will be captured after dispatching or after a configurable amount of time';
-		$this->assertEquals( $text, $this->object->getDescription() );
+		$this->assertEquals($text, $this->object->getDescription());
 	}
 
 
@@ -60,49 +60,49 @@ 
 
 
 		$name = 'ControllerJobsServicePaymentProcessDefaultRun';
-		$context->getConfig()->set( 'mshop/service/manager/name', $name );
-		$context->getConfig()->set( 'mshop/order/manager/name', $name );
+		$context->getConfig()->set('mshop/service/manager/name', $name);
+		$context->getConfig()->set('mshop/order/manager/name', $name);
 
 
-		$serviceManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Manager\\Standard' )
-			->setMethods( array( 'getProvider', 'searchItems' ) )
-			->setConstructorArgs( array( $context ) )
+		$serviceManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Manager\\Standard')
+			->setMethods(array('getProvider', 'searchItems'))
+			->setConstructorArgs(array($context))
 			->getMock();
 
-		$orderManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Order\\Manager\\Standard' )
-			->setMethods( array( 'saveItem', 'searchItems' ) )
-			->setConstructorArgs( array( $context ) )
+		$orderManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Order\\Manager\\Standard')
+			->setMethods(array('saveItem', 'searchItems'))
+			->setConstructorArgs(array($context))
 			->getMock();
 
-		\Aimeos\MShop\Service\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub );
-		\Aimeos\MShop\Order\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub );
+		\Aimeos\MShop\Service\Manager\Factory::injectManager('\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub);
+		\Aimeos\MShop\Order\Manager\Factory::injectManager('\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub);
 
 
 		$serviceItem = $serviceManagerStub->createItem();
 		$orderItem = $orderManagerStub->createItem();
 
-		$serviceProviderStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Provider\\Payment\\PrePay' )
-			->setMethods( array( 'isImplemented', 'capture' ) )
-			->setConstructorArgs( array( $context, $serviceItem ) )
+		$serviceProviderStub = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Provider\\Payment\\PrePay')
+			->setMethods(array('isImplemented', 'capture'))
+			->setConstructorArgs(array($context, $serviceItem))
 			->getMock();
 
 
-		$serviceManagerStub->expects( $this->once() )->method( 'searchItems' )
-			->will( $this->onConsecutiveCalls( array( $serviceItem ), [] ) );
+		$serviceManagerStub->expects($this->once())->method('searchItems')
+			->will($this->onConsecutiveCalls(array($serviceItem), []));
 
-		$serviceManagerStub->expects( $this->once() )->method( 'getProvider' )
-			->will( $this->returnValue( $serviceProviderStub ) );
+		$serviceManagerStub->expects($this->once())->method('getProvider')
+			->will($this->returnValue($serviceProviderStub));
 
-		$orderManagerStub->expects( $this->once() )->method( 'searchItems' )
-			->will( $this->onConsecutiveCalls( array( $orderItem ), [] ) );
+		$orderManagerStub->expects($this->once())->method('searchItems')
+			->will($this->onConsecutiveCalls(array($orderItem), []));
 
-		$serviceProviderStub->expects( $this->once() )->method( 'isImplemented' )
-			->will( $this->returnValue( true ) );
+		$serviceProviderStub->expects($this->once())->method('isImplemented')
+			->will($this->returnValue(true));
 
-		$serviceProviderStub->expects( $this->once() )->method( 'capture' );
+		$serviceProviderStub->expects($this->once())->method('capture');
 
 
-		$object = new \Aimeos\Controller\Jobs\Order\Service\Payment\Standard( $context, $aimeos );
+		$object = new \Aimeos\Controller\Jobs\Order\Service\Payment\Standard($context, $aimeos);
 		$object->run();
 	}
 
@@ -114,52 +114,52 @@ 
 
 
 		$name = 'ControllerJobsServicePaymentProcessDefaultRun';
-		$context->getConfig()->set( 'mshop/service/manager/name', $name );
-		$context->getConfig()->set( 'mshop/order/manager/name', $name );
+		$context->getConfig()->set('mshop/service/manager/name', $name);
+		$context->getConfig()->set('mshop/order/manager/name', $name);
 
 
-		$orderManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Order\\Manager\\Standard' )
-			->setMethods( array( 'saveItem', 'searchItems' ) )
-			->setConstructorArgs( array( $context ) )
+		$orderManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Order\\Manager\\Standard')
+			->setMethods(array('saveItem', 'searchItems'))
+			->setConstructorArgs(array($context))
 			->getMock();
 
-		$serviceManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Manager\\Standard' )
-			->setMethods( array( 'getProvider', 'searchItems' ) )
-			->setConstructorArgs( array( $context ) )
+		$serviceManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Manager\\Standard')
+			->setMethods(array('getProvider', 'searchItems'))
+			->setConstructorArgs(array($context))
 			->getMock();
 
-		\Aimeos\MShop\Service\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub );
-		\Aimeos\MShop\Order\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub );
+		\Aimeos\MShop\Service\Manager\Factory::injectManager('\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub);
+		\Aimeos\MShop\Order\Manager\Factory::injectManager('\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub);
 
 
 		$serviceItem = $serviceManagerStub->createItem();
 		$orderItem = $orderManagerStub->createItem();
 
-		$serviceProviderStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Provider\\Payment\\PrePay' )
-			->setMethods( array( 'isImplemented', 'capture' ) )
-			->setConstructorArgs( array( $context, $serviceItem ) )
+		$serviceProviderStub = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Provider\\Payment\\PrePay')
+			->setMethods(array('isImplemented', 'capture'))
+			->setConstructorArgs(array($context, $serviceItem))
 			->getMock();
 
 
-		$serviceManagerStub->expects( $this->once() )->method( 'searchItems' )
-			->will( $this->onConsecutiveCalls( array( $serviceItem ), [] ) );
+		$serviceManagerStub->expects($this->once())->method('searchItems')
+			->will($this->onConsecutiveCalls(array($serviceItem), []));
 
-		$serviceManagerStub->expects( $this->once() )->method( 'getProvider' )
-			->will( $this->returnValue( $serviceProviderStub ) );
+		$serviceManagerStub->expects($this->once())->method('getProvider')
+			->will($this->returnValue($serviceProviderStub));
 
-		$orderManagerStub->expects( $this->once() )->method( 'searchItems' )
-			->will( $this->onConsecutiveCalls( array( $orderItem ), [] ) );
+		$orderManagerStub->expects($this->once())->method('searchItems')
+			->will($this->onConsecutiveCalls(array($orderItem), []));
 
-		$serviceProviderStub->expects( $this->once() )->method( 'isImplemented' )
-			->will( $this->returnValue( true ) );
+		$serviceProviderStub->expects($this->once())->method('isImplemented')
+			->will($this->returnValue(true));
 
-		$serviceProviderStub->expects( $this->once() )->method( 'capture' )
-			->will( $this->throwException( new \Aimeos\MShop\Service\Exception( 'test oder service payment: capture' ) ) );
+		$serviceProviderStub->expects($this->once())->method('capture')
+			->will($this->throwException(new \Aimeos\MShop\Service\Exception('test oder service payment: capture')));
 
-		$orderManagerStub->expects( $this->never() )->method( 'saveItem' );
+		$orderManagerStub->expects($this->never())->method('saveItem');
 
 
-		$object = new \Aimeos\Controller\Jobs\Order\Service\Payment\Standard( $context, $aimeos );
+		$object = new \Aimeos\Controller\Jobs\Order\Service\Payment\Standard($context, $aimeos);
 		$object->run();
 	}
 
@@ -171,36 +171,36 @@ 
 
 
 		$name = 'ControllerJobsServicePaymentProcessDefaultRun';
-		$context->getConfig()->set( 'mshop/service/manager/name', $name );
-		$context->getConfig()->set( 'mshop/order/manager/name', $name );
+		$context->getConfig()->set('mshop/service/manager/name', $name);
+		$context->getConfig()->set('mshop/order/manager/name', $name);
 
 
-		$orderManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Order\\Manager\\Standard' )
-			->setMethods( array( 'saveItem', 'searchItems' ) )
-			->setConstructorArgs( array( $context ) )
+		$orderManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Order\\Manager\\Standard')
+			->setMethods(array('saveItem', 'searchItems'))
+			->setConstructorArgs(array($context))
 			->getMock();
 
-		$serviceManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Service\\Manager\\Standard' )
-			->setMethods( array( 'getProvider', 'searchItems' ) )
-			->setConstructorArgs( array( $context ) )
+		$serviceManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Service\\Manager\\Standard')
+			->setMethods(array('getProvider', 'searchItems'))
+			->setConstructorArgs(array($context))
 			->getMock();
 
-		\Aimeos\MShop\Service\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub );
-		\Aimeos\MShop\Order\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub );
+		\Aimeos\MShop\Service\Manager\Factory::injectManager('\\Aimeos\\MShop\\Service\\Manager\\' . $name, $serviceManagerStub);
+		\Aimeos\MShop\Order\Manager\Factory::injectManager('\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub);
 
 
 		$serviceItem = $serviceManagerStub->createItem();
 
-		$serviceManagerStub->expects( $this->once() )->method( 'searchItems' )
-			->will( $this->onConsecutiveCalls( array( $serviceItem ), [] ) );
+		$serviceManagerStub->expects($this->once())->method('searchItems')
+			->will($this->onConsecutiveCalls(array($serviceItem), []));
 
-		$serviceManagerStub->expects( $this->once() )->method( 'getProvider' )
-			->will( $this->throwException( new \Aimeos\MShop\Service\Exception( 'test service delivery process: getProvider' ) ) );
+		$serviceManagerStub->expects($this->once())->method('getProvider')
+			->will($this->throwException(new \Aimeos\MShop\Service\Exception('test service delivery process: getProvider')));
 
-		$orderManagerStub->expects( $this->never() )->method( 'searchItems' );
+		$orderManagerStub->expects($this->never())->method('searchItems');
 
 
-		$object = new \Aimeos\Controller\Jobs\Order\Service\Payment\Standard( $context, $aimeos );
+		$object = new \Aimeos\Controller\Jobs\Order\Service\Payment\Standard($context, $aimeos);
 		$object->run();
 	}
 }

controller/jobs/src/Controller/Jobs/Admin/Log/Standard.php

Spacing +26 added lines, -26 removed lines

@@ -29,7 +29,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Log cleanup' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Log cleanup');
 	}
 
 
@@ -40,7 +40,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Removes the old log entries from the database and archives them (optional)' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Removes the old log entries from the database and archives them (optional)');
 	}
 
 
@@ -71,8 +71,8 @@ 
 		 * @see controller/jobs/admin/log/standard/container/format
 		 * @see controller/jobs/admin/log/standard/container/options
 		 */
-		$limit = $config->get( 'controller/jobs/admin/log/standard/limit-days', 30 );
-		$limitDate = date( 'Y-m-d H:i:s', time() - $limit * 86400 );
+		$limit = $config->get('controller/jobs/admin/log/standard/limit-days', 30);
+		$limitDate = date('Y-m-d H:i:s', time() - $limit * 86400);
 
 		/** controller/jobs/admin/log/standard/path
 		 * Path to a writable directory where the log archive files should be stored
@@ -101,7 +101,7 @@ 
 		 * @see controller/jobs/admin/log/standard/container/options
 		 * @see controller/jobs/admin/log/standard/limit-days
 		 */
-		if( ( $path = $config->get( 'controller/jobs/admin/log/standard/path', null ) ) !== null )
+		if (($path = $config->get('controller/jobs/admin/log/standard/path', null)) !== null)
 		{
 			/** controller/jobs/admin/log/standard/container/type
 			 * Container file type storing all coupon code files to import
@@ -175,19 +175,19 @@ 
 			 * @see controller/jobs/admin/log/standard/limit-days
 			 */
 
-			$type = $config->get( 'controller/jobs/admin/log/standard/container/type', 'Zip' );
-			$format = $config->get( 'controller/jobs/admin/log/standard/container/format', 'CSV' );
-			$options = $config->get( 'controller/jobs/admin/log/standard/container/options', [] );
+			$type = $config->get('controller/jobs/admin/log/standard/container/type', 'Zip');
+			$format = $config->get('controller/jobs/admin/log/standard/container/format', 'CSV');
+			$options = $config->get('controller/jobs/admin/log/standard/container/options', []);
 
-			$path .= DIRECTORY_SEPARATOR . str_replace( ' ', '_', $limitDate );
-			$container = \Aimeos\MW\Container\Factory::getContainer( $path, $type, $format, $options );
+			$path .= DIRECTORY_SEPARATOR . str_replace(' ', '_', $limitDate);
+			$container = \Aimeos\MW\Container\Factory::getContainer($path, $type, $format, $options);
 		}
 
-		$manager = \Aimeos\MAdmin\Factory::createManager( $context, 'log' );
+		$manager = \Aimeos\MAdmin\Factory::createManager($context, 'log');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '<=', 'log.timestamp', $limitDate ) );
-		$search->setSortations( array( $search->sort( '+', 'log.timestamp' ) ) );
+		$search->setConditions($search->compare('<=', 'log.timestamp', $limitDate));
+		$search->setSortations(array($search->sort('+', 'log.timestamp')));
 
 		$start = 0;
 		$contents = [];
@@ -195,37 +195,37 @@ 
 		do
 		{
 			$ids = [];
-			$items = $manager->searchItems( $search );
+			$items = $manager->searchItems($search);
 
-			foreach( $items as $id => $item )
+			foreach ($items as $id => $item)
 			{
-				if( $container !== null )
+				if ($container !== null)
 				{
 					$facility = $item->getFacility();
 
-					if( !isset( $contents[$facility] ) ) {
-						$contents[$facility] = $container->create( $facility );
+					if (!isset($contents[$facility])) {
+						$contents[$facility] = $container->create($facility);
 					}
 
-					$contents[$facility]->add( $item->toArray() );
+					$contents[$facility]->add($item->toArray());
 				}
 
 				$ids[] = $id;
 			}
 
-			$manager->deleteItems( $ids );
+			$manager->deleteItems($ids);
 
-			$count = count( $items );
+			$count = count($items);
 			$start += $count;
-			$search->setSlice( $start );
+			$search->setSlice($start);
 		}
-		while( $count >= $search->getSliceSize() );
+		while ($count >= $search->getSliceSize());
 
 
-		if( $container !== null && !empty( $contents ) )
+		if ($container !== null && !empty($contents))
 		{
-			foreach( $contents as $content ) {
-				$container->add( $content );
+			foreach ($contents as $content) {
+				$container->add($content);
 			}
 
 			$container->close();

controller/jobs/src/Controller/Jobs/Order/Cleanup/Unpaid/Standard.php

Spacing +17 added lines, -17 removed lines

@@ -29,7 +29,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Removes unpaid orders' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Removes unpaid orders');
 	}
 
 
@@ -40,7 +40,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Deletes unpaid orders to keep the database clean' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Deletes unpaid orders to keep the database clean');
 	}
 
 
@@ -52,9 +52,9 @@ 
 	public function run()
 	{
 		$context = $this->getContext();
-		$controller = \Aimeos\Controller\Common\Order\Factory::createController( $context );
-		$baseManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' );
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
+		$controller = \Aimeos\Controller\Common\Order\Factory::createController($context);
+		$baseManager = \Aimeos\MShop\Factory::createManager($context, 'order/base');
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'order');
 
 		/** controller/jobs/order/cleanup/unpaid/keep-days
 		 * Removes all orders from the database that are unpaid
@@ -71,35 +71,35 @@ 
 		 * @since 2014.07
 		 * @category User
 		 */
-		$days = $context->getConfig()->get( 'controller/jobs/order/cleanup/unpaid/keep-days', 3 );
-		$limit = date( 'Y-m-d H:i:s', time() - 86400 * $days );
+		$days = $context->getConfig()->get('controller/jobs/order/cleanup/unpaid/keep-days', 3);
+		$limit = date('Y-m-d H:i:s', time() - 86400 * $days);
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '<', 'order.mtime', $limit ),
-			$search->compare( '<', 'order.statuspayment', \Aimeos\MShop\Order\Item\Base::PAY_REFUND ),
+			$search->compare('<', 'order.mtime', $limit),
+			$search->compare('<', 'order.statuspayment', \Aimeos\MShop\Order\Item\Base::PAY_REFUND),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
 		$start = 0;
 
 		do
 		{
 			$baseIds = [];
-			$items = $manager->searchItems( $search );
+			$items = $manager->searchItems($search);
 
-			foreach( $items as $item )
+			foreach ($items as $item)
 			{
-				$controller->unblock( $item );
+				$controller->unblock($item);
 				$baseIds[] = $item->getBaseId();
 			}
 
-			$baseManager->deleteItems( $baseIds );
+			$baseManager->deleteItems($baseIds);
 
-			$count = count( $items );
+			$count = count($items);
 			$start += $count;
-			$search->setSlice( $start );
+			$search->setSlice($start);
 		}
-		while( $count >= $search->getSliceSize() );
+		while ($count >= $search->getSliceSize());
 	}
 }

controller/jobs/src/Controller/Jobs/Order/Cleanup/Unfinished/Standard.php

Spacing +17 added lines, -17 removed lines

@@ -29,7 +29,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Removes unfinished orders' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Removes unfinished orders');
 	}
 
 
@@ -40,7 +40,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Deletes unfinished orders an makes their products and coupon codes available again' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Deletes unfinished orders an makes their products and coupon codes available again');
 	}
 
 
@@ -52,9 +52,9 @@ 
 	public function run()
 	{
 		$context = $this->getContext();
-		$controller = \Aimeos\Controller\Common\Order\Factory::createController( $context );
-		$baseManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' );
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
+		$controller = \Aimeos\Controller\Common\Order\Factory::createController($context);
+		$baseManager = \Aimeos\MShop\Factory::createManager($context, 'order/base');
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'order');
 
 		/** controller/jobs/order/cleanup/unfinished/keep-hours
 		 * Release the ordered products after the configured time if no payment was confirmed
@@ -74,35 +74,35 @@ 
 		 * @since 2014.07
 		 * @category User
 		 */
-		$hours = $context->getConfig()->get( 'controller/jobs/order/cleanup/unfinished/keep-hours', 24 );
-		$limit = date( 'Y-m-d H:i:s', time() - 3600 * $hours );
+		$hours = $context->getConfig()->get('controller/jobs/order/cleanup/unfinished/keep-hours', 24);
+		$limit = date('Y-m-d H:i:s', time() - 3600 * $hours);
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '<', 'order.mtime', $limit ),
-			$search->compare( '==', 'order.statuspayment', \Aimeos\MShop\Order\Item\Base::PAY_UNFINISHED ),
+			$search->compare('<', 'order.mtime', $limit),
+			$search->compare('==', 'order.statuspayment', \Aimeos\MShop\Order\Item\Base::PAY_UNFINISHED),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
 		$start = 0;
 
 		do
 		{
 			$baseIds = [];
-			$items = $manager->searchItems( $search );
+			$items = $manager->searchItems($search);
 
-			foreach( $items as $item )
+			foreach ($items as $item)
 			{
-				$controller->unblock( $item );
+				$controller->unblock($item);
 				$baseIds[] = $item->getBaseId();
 			}
 
-			$baseManager->deleteItems( $baseIds );
+			$baseManager->deleteItems($baseIds);
 
-			$count = count( $items );
+			$count = count($items);
 			$start += $count;
-			$search->setSlice( $start );
+			$search->setSlice($start);
 		}
-		while( $count >= $search->getSliceSize() );
+		while ($count >= $search->getSliceSize());
 	}
 }

controller/jobs/tests/Controller/Jobs/Order/Export/Csv/FactoryTest.php

Spacing +8 added lines, -8 removed lines

@@ -16,8 +16,8 @@ 
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$obj = \Aimeos\Controller\Jobs\Order\Export\Csv\Factory::createController( $context, $aimeos );
-		$this->assertInstanceOf( '\\Aimeos\\Controller\\Jobs\\Iface', $obj );
+		$obj = \Aimeos\Controller\Jobs\Order\Export\Csv\Factory::createController($context, $aimeos);
+		$this->assertInstanceOf('\\Aimeos\\Controller\\Jobs\\Iface', $obj);
 	}
 
 
@@ -26,8 +26,8 @@ 
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		\Aimeos\Controller\Jobs\Order\Export\Csv\Factory::createController( $context, $aimeos, 'Wrong$$$Name' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		\Aimeos\Controller\Jobs\Order\Export\Csv\Factory::createController($context, $aimeos, 'Wrong$$$Name');
 	}
 
 
@@ -36,8 +36,8 @@ 
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		\Aimeos\Controller\Jobs\Order\Export\Csv\Factory::createController( $context, $aimeos, 'WrongClass' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		\Aimeos\Controller\Jobs\Order\Export\Csv\Factory::createController($context, $aimeos, 'WrongClass');
 	}
 
 
@@ -46,8 +46,8 @@ 
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		\Aimeos\Controller\Jobs\Order\Export\Csv\Factory::createController( $context, $aimeos, 'Factory' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		\Aimeos\Controller\Jobs\Order\Export\Csv\Factory::createController($context, $aimeos, 'Factory');
 	}
 
 }