aimeos / ai-controller-jobs

controller/jobs/src/Controller/Jobs/Coupon/Import/Csv/Code/Standard.php

Braces +2 added lines, -4 removed lines

@@ -160,8 +160,7 @@ 
 				$msg = 'Finished coupon import: %1$d successful, %2$s errors, %3$s total (%4$s)';
 				$logger->log( sprintf( $msg, $total - $errors, $errors, $total, __CLASS__ ), \Aimeos\MW\Logger\Base::NOTICE );
 			}
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$logger->log( 'Coupon import error: ' . $e->getMessage() );
 			$logger->log( $e->getTraceAsString() );
@@ -309,8 +308,7 @@ 
 				$list = $processor->process( $item, $list );
 
 				$manager->commit();
-			}
-			catch( \Exception $e )
+			} catch( \Exception $e )
 			{
 				$manager->rollback();
 

Spacing +47 added lines, -47 removed lines

@@ -28,7 +28,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Coupon code import CSV' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Coupon code import CSV');
 	}
 
 
@@ -39,7 +39,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Imports new and updates existing coupon code from CSV files' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Imports new and updates existing coupon code from CSV files');
 	}
 
 
@@ -71,7 +71,7 @@ 
 		 * @see controller/jobs/coupon/import/csv/code/skip-lines
 		 * @see controller/jobs/coupon/import/csv/code/max-size
 		 */
-		$mappings = $config->get( 'controller/jobs/coupon/import/csv/code/mapping', $mappings );
+		$mappings = $config->get('controller/jobs/coupon/import/csv/code/mapping', $mappings);
 
 
 		/** controller/jobs/coupon/import/csv/code/max-size
@@ -90,7 +90,7 @@ 
 		 * @see controller/jobs/coupon/import/csv/code/skip-lines
 		 * @see controller/jobs/coupon/import/csv/code/mapping
 		 */
-		$maxcnt = (int) $config->get( 'controller/jobs/coupon/import/csv/code/max-size', 1000 );
+		$maxcnt = (int) $config->get('controller/jobs/coupon/import/csv/code/max-size', 1000);
 
 
 		/** controller/jobs/coupon/import/csv/code/skip-lines
@@ -108,64 +108,64 @@ 
 		 * @see controller/jobs/coupon/import/csv/code/mapping
 		 * @see controller/jobs/coupon/import/csv/code/max-size
 		 */
-		$skiplines = (int) $config->get( 'controller/jobs/coupon/import/csv/code/skip-lines', 0 );
+		$skiplines = (int) $config->get('controller/jobs/coupon/import/csv/code/skip-lines', 0);
 
 
 		try
 		{
-			$processor = $this->getProcessors( $mappings );
-			$codePos = $this->getCodePosition( $mappings['code'] );
-			$fs = $context->getFileSystemManager()->get( 'fs-import' );
+			$processor = $this->getProcessors($mappings);
+			$codePos = $this->getCodePosition($mappings['code']);
+			$fs = $context->getFileSystemManager()->get('fs-import');
 			$dir = 'couponcode/' . $context->getLocale()->getSite()->getCode();
 
-			if( $fs->isDir( $dir ) === false ) {
+			if ($fs->isDir($dir) === false) {
 				return;
 			}
 
-			foreach( $fs->scan( $dir ) as $filename )
+			foreach ($fs->scan($dir) as $filename)
 			{
-				if( $filename == '.' || $filename == '..' ) {
+				if ($filename == '.' || $filename == '..') {
 					continue;
 				}
 
-				list( $couponId, ) = explode( '.', $filename );
-				$container = $this->getContainer( $fs->readf( $dir . '/' . $filename ) );
+				list($couponId,) = explode('.', $filename);
+				$container = $this->getContainer($fs->readf($dir . '/' . $filename));
 
-				$msg = sprintf( 'Started coupon import from "%1$s" (%2$s)', $filename, __CLASS__ );
-				$logger->log( $msg, \Aimeos\MW\Logger\Base::NOTICE );
+				$msg = sprintf('Started coupon import from "%1$s" (%2$s)', $filename, __CLASS__);
+				$logger->log($msg, \Aimeos\MW\Logger\Base::NOTICE);
 
-				foreach( $container as $content )
+				foreach ($container as $content)
 				{
-					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)) !== [])
 					{
-						$items = $this->getCouponCodeItems( array_keys( $data ) );
-						$errcnt = $this->import( $items, $data, $couponId, $processor );
-						$chunkcnt = count( $data );
+						$items = $this->getCouponCodeItems(array_keys($data));
+						$errcnt = $this->import($items, $data, $couponId, $processor);
+						$chunkcnt = count($data);
 
 						$msg = 'Imported coupon lines from "%1$s": %2$d/%3$d (%4$s)';
-						$logger->log( sprintf( $msg, $filename, $chunkcnt - $errcnt, $chunkcnt, __CLASS__ ), \Aimeos\MW\Logger\Base::NOTICE );
+						$logger->log(sprintf($msg, $filename, $chunkcnt - $errcnt, $chunkcnt, __CLASS__), \Aimeos\MW\Logger\Base::NOTICE);
 
 						$errors += $errcnt;
 						$total += $chunkcnt;
-						unset( $items, $data );
+						unset($items, $data);
 					}
 				}
 
 				$container->close();
-				$fs->rm( $dir . '/' . $filename );
+				$fs->rm($dir . '/' . $filename);
 
 				$msg = 'Finished coupon import: %1$d successful, %2$s errors, %3$s total (%4$s)';
-				$logger->log( sprintf( $msg, $total - $errors, $errors, $total, __CLASS__ ), \Aimeos\MW\Logger\Base::NOTICE );
+				$logger->log(sprintf($msg, $total - $errors, $errors, $total, __CLASS__), \Aimeos\MW\Logger\Base::NOTICE);
 			}
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$logger->log( 'Coupon import error: ' . $e->getMessage() );
-			$logger->log( $e->getTraceAsString() );
+			$logger->log('Coupon import error: ' . $e->getMessage());
+			$logger->log($e->getTraceAsString());
 
 			throw $e;
 		}
@@ -179,16 +179,16 @@ 
 	 * @return integer Position of the "coupon.code" column
 	 * @throws \Aimeos\Controller\Jobs\Exception If no mapping for "coupon.code.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 === 'coupon.code.code' ) {
+			if ($key === 'coupon.code.code') {
 				return $pos;
 			}
 		}
 
-		throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'No "coupon.code.code" column in CSV mapping found' ) );
+		throw new \Aimeos\Controller\Jobs\Exception(sprintf('No "coupon.code.code" column in CSV mapping found'));
 	}
 
 
@@ -198,7 +198,7 @@ 
 	 * @param string $filepath Path to the container file
 	 * @return \Aimeos\MW\Container\Iface Container object
 	 */
-	protected function getContainer( $filepath )
+	protected function getContainer($filepath)
 	{
 		$config = $this->getContext()->getConfig();
 
@@ -222,7 +222,7 @@ 
 		 * @see controller/jobs/coupon/import/csv/code/container/content
 		 * @see controller/jobs/coupon/import/csv/code/container/options
 		 */
-		$container = $config->get( 'controller/jobs/coupon/import/csv/code/container/type', 'File' );
+		$container = $config->get('controller/jobs/coupon/import/csv/code/container/type', 'File');
 
 		/** controller/jobs/coupon/import/csv/code/container/content
 		 * Name of the content type inside the container to read the data from
@@ -242,7 +242,7 @@ 
 		 * @see controller/jobs/coupon/import/csv/code/container/type
 		 * @see controller/jobs/coupon/import/csv/code/container/options
 		 */
-		$content = $config->get( 'controller/jobs/coupon/import/csv/code/container/content', 'CSV' );
+		$content = $config->get('controller/jobs/coupon/import/csv/code/container/content', 'CSV');
 
 		/** controller/jobs/coupon/import/csv/code/container/options
 		 * List of file container options for the coupon import files
@@ -259,9 +259,9 @@ 
 		 * @see controller/jobs/coupon/import/csv/code/container/content
 		 * @see controller/jobs/coupon/import/csv/code/container/type
 		 */
-		$options = $config->get( 'controller/jobs/coupon/import/csv/code/container/options', [] );
+		$options = $config->get('controller/jobs/coupon/import/csv/code/container/options', []);
 
-		return \Aimeos\MW\Container\Factory::getContainer( $filepath, $container, $content, $options );
+		return \Aimeos\MW\Container\Factory::getContainer($filepath, $container, $content, $options);
 	}
 
 
@@ -275,36 +275,36 @@ 
 	 * @return integer Number of coupons that couldn't be imported
 	 * @throws \Aimeos\Controller\Jobs\Exception
 	 */
-	protected function import( array $items, array $data, $couponId,
-		\Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Iface $processor )
+	protected function import(array $items, array $data, $couponId,
+		\Aimeos\Controller\Common\Coupon\Import\Csv\Processor\Iface $processor)
 	{
 		$errors = 0;
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'coupon/code' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'coupon/code');
 
-		foreach( $data as $code => $list )
+		foreach ($data as $code => $list)
 		{
 			$manager->begin();
 
 			try
 			{
-				if( isset( $items[$code] ) ) {
+				if (isset($items[$code])) {
 					$item = $items[$code];
 				} else {
 					$item = $manager->createItem();
 				}
 
-				$item->setParentId( $couponId );
-				$list = $processor->process( $item, $list );
+				$item->setParentId($couponId);
+				$list = $processor->process($item, $list);
 
 				$manager->commit();
 			}
-			catch( \Exception $e )
+			catch (\Exception $e)
 			{
 				$manager->rollback();
 
-				$msg = sprintf( 'Unable to import coupon with code "%1$s": %2$s', $code, $e->getMessage() );
-				$context->getLogger()->log( $msg );
+				$msg = sprintf('Unable to import coupon with code "%1$s": %2$s', $code, $e->getMessage());
+				$context->getLogger()->log($msg);
 
 				$errors++;
 			}

controller/jobs/src/Controller/Jobs/Coupon/Import/Csv/Code/Factory.php

Spacing +6 added lines, -6 removed lines

@@ -29,7 +29,7 @@ 
 	 * @param string|null $name Name of the controller or "Standard" if null
 	 * @return \Aimeos\Controller\Jobs\Iface New controller object
 	 */
-	public static function createController( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\Bootstrap $aimeos, $name = null )
+	public static function createController(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\Bootstrap $aimeos, $name = null)
 	{
 		/** controller/jobs/coupon/import/csv/code/name
 		 * Class name of the used coupon code import job controller implementation
@@ -64,20 +64,20 @@ 
 		 * @since 2017.10
 		 * @category Developer
 		 */
-		if ( $name === null ) {
+		if ($name === null) {
 			$name = $context->getConfig()->get('controller/jobs/coupon/import/csv/code/name', 'Standard');
 		}
 
-		if ( ctype_alnum($name) === false )
+		if (ctype_alnum($name) === false)
 		{
 			$classname = is_string($name) ? '\\Aimeos\\Controller\\Jobs\\Coupon\\Import\\Csv\\Code\\' . $name : '<not a string>';
-			throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+			throw new \Aimeos\Controller\Jobs\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 		}
 
 		$iface = '\\Aimeos\\Controller\\Jobs\\Iface';
 		$classname = '\\Aimeos\\Controller\\Jobs\\Coupon\\Import\\Csv\\Code\\' . $name;
 
-		$controller = self::createControllerBase( $context, $aimeos, $classname, $iface );
+		$controller = self::createControllerBase($context, $aimeos, $classname, $iface);
 
 		/** controller/jobs/coupon/import/csv/code/decorators/excludes
 		 * Excludes decorators added by the "common" option from the coupon code import CSV job controller
@@ -154,6 +154,6 @@ 
 		 * @see controller/jobs/coupon/import/csv/code/decorators/excludes
 		 * @see controller/jobs/coupon/import/csv/code/decorators/global
 		 */
-		return self::addControllerDecorators( $context, $aimeos, $controller, 'coupon/import/csv/code' );
+		return self::addControllerDecorators($context, $aimeos, $controller, 'coupon/import/csv/code');
 	}
 }
\ No newline at end of file

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

Spacing +94 added lines, -94 removed lines

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

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

Spacing +11 added lines, -11 removed lines

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

controller/jobs/tests/Controller/Jobs/Coupon/Import/Csv/Code/FactoryTest.php

Spacing +8 added lines, -8 removed lines

@@ -16,8 +16,8 @@ 
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$obj = \Aimeos\Controller\Jobs\Coupon\Import\Csv\Code\Factory::createController( $context, $aimeos );
-		$this->assertInstanceOf( '\\Aimeos\\Controller\\Jobs\\Iface', $obj);
+		$obj = \Aimeos\Controller\Jobs\Coupon\Import\Csv\Code\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\Coupon\Import\Csv\Code\Factory::createController( $context, $aimeos, 'Wrong$$$Name' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		\Aimeos\Controller\Jobs\Coupon\Import\Csv\Code\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\Coupon\Import\Csv\Code\Factory::createController( $context, $aimeos, 'WrongClass' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		\Aimeos\Controller\Jobs\Coupon\Import\Csv\Code\Factory::createController($context, $aimeos, 'WrongClass');
 	}
 
 
@@ -46,7 +46,7 @@ 
 		$context = \TestHelperJobs::getContext();
 		$aimeos = \TestHelperJobs::getAimeos();
 
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		\Aimeos\Controller\Jobs\Coupon\Import\Csv\Code\Factory::createController( $context, $aimeos, 'Factory' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		\Aimeos\Controller\Jobs\Coupon\Import\Csv\Code\Factory::createController($context, $aimeos, 'Factory');
 	}
 }
\ No newline at end of file

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

Spacing +8 added lines, -8 removed lines

@@ -40,20 +40,20 @@ 
 	 * @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\Order\Item\Iface $invoice, \Aimeos\MShop\Order\Item\Base\Iface $order )
+	public function process(\Aimeos\MShop\Order\Item\Iface $invoice, \Aimeos\MShop\Order\Item\Base\Iface $order)
 	{
 		$result = [];
 
-		foreach( $order->getProducts() as $item )
+		foreach ($order->getProducts() as $item)
 		{
 			$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;
@@ -61,16 +61,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/tests/Controller/Common/Order/Export/Csv/Processor/Service/StandardTest.php

Spacing +43 added lines, -43 removed lines

@@ -29,59 +29,59 @@
 		);
 
 
-		$object = new \Aimeos\Controller\Common\Order\Export\Csv\Processor\Service\Standard( $context, $mapping );
-
-		$invoice = $this->getInvoice( $context );
-		$order = \Aimeos\MShop\Factory::createManager( $context, 'order/base' )->load( $invoice->getBaseId() );
-
-		$data = $object->process( $invoice, $order );
-
-
-		$this->assertEquals( 2, count( $data ) );
-
-		$this->assertEquals( 12, count( $data[0] ) );
-		$this->assertEquals( 'payment', $data[0][0] );
-		$this->assertEquals( 'OGONE', $data[0][1] );
-		$this->assertEquals( 'ogone', $data[0][2] );
-		$this->assertEquals( 'somewhere/thump1.jpg', $data[0][3] );
-		$this->assertEquals( '0.00', $data[0][4] );
-		$this->assertEquals( '0.00', $data[0][5] );
-		$this->assertEquals( '0.00', $data[0][6] );
-		$this->assertEquals( '0.0000', $data[0][7] );
-		$this->assertEquals( "payment\npayment\npayment\npayment\npayment\npayment\npayment\npayment\npayment", $data[0][8] );
-		$this->assertEquals( "ACOWNER\nACSTRING\nNAME\nOgone-alias-name\nOgone-alias-value\nREFID\nTXDATE\nX-ACCOUNT\nX-STATUS", $data[0][9] );
-		$this->assertEquals( "account owner\naccount number\npayment method\nogone alias name\nogone alias value\nreference id\ntransaction date\ntransaction account\ntransaction status", $data[0][10] );
-		$this->assertEquals( "test user\n9876543\nCreditCard\naliasName\naliasValue\n12345678\n2009-08-18\nKraft02\n9", $data[0][11] );
-
-		$this->assertEquals( 12, count( $data[1] ) );
-		$this->assertEquals( 'delivery', $data[1][0] );
-		$this->assertEquals( '73', $data[1][1] );
-		$this->assertEquals( 'solucia', $data[1][2] );
-		$this->assertEquals( 'somewhere/thump1.jpg', $data[1][3] );
-		$this->assertEquals( '0.00', $data[1][4] );
-		$this->assertEquals( '5.00', $data[1][5] );
-		$this->assertEquals( '0.00', $data[1][6] );
-		$this->assertEquals( '0.0000', $data[1][7] );
-		$this->assertEquals( '', $data[1][8] );
-		$this->assertEquals( '', $data[1][9] );
-		$this->assertEquals( '', $data[1][10] );
-		$this->assertEquals( '', $data[1][11] );
+		$object = new \Aimeos\Controller\Common\Order\Export\Csv\Processor\Service\Standard($context, $mapping);
+
+		$invoice = $this->getInvoice($context);
+		$order = \Aimeos\MShop\Factory::createManager($context, 'order/base')->load($invoice->getBaseId());
+
+		$data = $object->process($invoice, $order);
+
+
+		$this->assertEquals(2, count($data));
+
+		$this->assertEquals(12, count($data[0]));
+		$this->assertEquals('payment', $data[0][0]);
+		$this->assertEquals('OGONE', $data[0][1]);
+		$this->assertEquals('ogone', $data[0][2]);
+		$this->assertEquals('somewhere/thump1.jpg', $data[0][3]);
+		$this->assertEquals('0.00', $data[0][4]);
+		$this->assertEquals('0.00', $data[0][5]);
+		$this->assertEquals('0.00', $data[0][6]);
+		$this->assertEquals('0.0000', $data[0][7]);
+		$this->assertEquals("payment\npayment\npayment\npayment\npayment\npayment\npayment\npayment\npayment", $data[0][8]);
+		$this->assertEquals("ACOWNER\nACSTRING\nNAME\nOgone-alias-name\nOgone-alias-value\nREFID\nTXDATE\nX-ACCOUNT\nX-STATUS", $data[0][9]);
+		$this->assertEquals("account owner\naccount number\npayment method\nogone alias name\nogone alias value\nreference id\ntransaction date\ntransaction account\ntransaction status", $data[0][10]);
+		$this->assertEquals("test user\n9876543\nCreditCard\naliasName\naliasValue\n12345678\n2009-08-18\nKraft02\n9", $data[0][11]);
+
+		$this->assertEquals(12, count($data[1]));
+		$this->assertEquals('delivery', $data[1][0]);
+		$this->assertEquals('73', $data[1][1]);
+		$this->assertEquals('solucia', $data[1][2]);
+		$this->assertEquals('somewhere/thump1.jpg', $data[1][3]);
+		$this->assertEquals('0.00', $data[1][4]);
+		$this->assertEquals('5.00', $data[1][5]);
+		$this->assertEquals('0.00', $data[1][6]);
+		$this->assertEquals('0.0000', $data[1][7]);
+		$this->assertEquals('', $data[1][8]);
+		$this->assertEquals('', $data[1][9]);
+		$this->assertEquals('', $data[1][10]);
+		$this->assertEquals('', $data[1][11]);
 	}
 
 
-	protected function getInvoice( $context )
+	protected function getInvoice($context)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'order');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'order.datepayment', '2008-02-15 12:34:56' ) );
+		$search->setConditions($search->compare('==', 'order.datepayment', '2008-02-15 12:34:56'));
 
-		$items = $manager->searchItems( $search );
+		$items = $manager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) !== false ) {
+		if (($item = reset($items)) !== false) {
 			return $item;
 		}
 
-		throw new \Exception( 'No order item found' );
+		throw new \Exception('No order item found');
 	}
 }

controller/jobs/tests/Controller/Jobs/Coupon/Import/Csv/Code/StandardTest.php

Spacing +28 added lines, -28 removed lines

@@ -18,95 +18,95 @@
 
 	protected function setUp()
 	{
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 
 		$this->context = \TestHelperJobs::getContext();
 		$this->aimeos = \TestHelperJobs::getAimeos();
 		$config = $this->context->getConfig();
 
-		$config->set( 'controller/jobs/product/import/csv/skip-lines', 1 );
+		$config->set('controller/jobs/product/import/csv/skip-lines', 1);
 
-		$this->object = new \Aimeos\Controller\Jobs\Coupon\Import\Csv\Code\Standard( $this->context, $this->aimeos );
+		$this->object = new \Aimeos\Controller\Jobs\Coupon\Import\Csv\Code\Standard($this->context, $this->aimeos);
 	}
 
 
 	protected function tearDown()
 	{
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 
-		unset( $this->object );
+		unset($this->object);
 	}
 
 
 	public function testGetName()
 	{
-		$this->assertEquals( 'Coupon code import CSV', $this->object->getName() );
+		$this->assertEquals('Coupon code import CSV', $this->object->getName());
 	}
 
 
 	public function testGetDescription()
 	{
 		$text = 'Imports new and updates existing coupon code from CSV files';
-		$this->assertEquals( $text, $this->object->getDescription() );
+		$this->assertEquals($text, $this->object->getDescription());
 	}
 
 
 	public function testRun()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'coupon' );
-		$coupon = $manager->saveItem( $manager->createItem()->setProvider( 'Example' ) );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'coupon');
+		$coupon = $manager->saveItem($manager->createItem()->setProvider('Example'));
 
 		$dir = 'tmp/import/couponcode/unittest';
 		$filepath = $dir . '/' . $coupon->getId() . '.csv';
 
-		if( !is_dir( $dir ) && mkdir( 'tmp/import/couponcode/unittest', 0775, true ) === false ) {
-			throw new \Exception( sprintf( 'Unable to create directory "%1$s"', $dir ) );
+		if (!is_dir($dir) && mkdir('tmp/import/couponcode/unittest', 0775, true) === false) {
+			throw new \Exception(sprintf('Unable to create directory "%1$s"', $dir));
 		}
 
 		$content = 'code,count,start,end
 jobccimport1,3,2000-01-01 00:00:00,
 jobccimport2,5,,';
 
-		if( file_put_contents( $filepath, $content ) === false ) {
-			throw new \Exception( sprintf( 'Unable to create file "%1$s"', $file ) );
+		if (file_put_contents($filepath, $content) === false) {
+			throw new \Exception(sprintf('Unable to create file "%1$s"', $file));
 		}
 
 		$this->object->run();
 
 
-		$codeManager = \Aimeos\MShop\Factory::createManager( $this->context, 'coupon/code' );
-		$code1 = $codeManager->findItem( 'jobccimport1' );
-		$code2 = $codeManager->findItem( 'jobccimport2' );
+		$codeManager = \Aimeos\MShop\Factory::createManager($this->context, 'coupon/code');
+		$code1 = $codeManager->findItem('jobccimport1');
+		$code2 = $codeManager->findItem('jobccimport2');
 
-		$manager->deleteItem( $coupon->getId() );
+		$manager->deleteItem($coupon->getId());
 
-		$this->assertEquals( 3, $code1->getCount() );
-		$this->assertEquals( '2000-01-01 00:00:00', $code1->getDateStart() );
-		$this->assertEquals( null, $code1->getDateEnd() );
+		$this->assertEquals(3, $code1->getCount());
+		$this->assertEquals('2000-01-01 00:00:00', $code1->getDateStart());
+		$this->assertEquals(null, $code1->getDateEnd());
 
-		$this->assertEquals( 5, $code2->getCount() );
-		$this->assertEquals( null, $code2->getDateStart() );
-		$this->assertEquals( null, $code2->getDateEnd() );
+		$this->assertEquals(5, $code2->getCount());
+		$this->assertEquals(null, $code2->getDateStart());
+		$this->assertEquals(null, $code2->getDateEnd());
 	}
 
 
 	public function testRunException()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'coupon' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'coupon');
 
 		$dir = 'tmp/import/couponcode/unittest';
 		$filepath = $dir . '/0.csv';
 
-		if( !is_dir( $dir ) && mkdir( 'tmp/import/couponcode/unittest', 0775, true ) === false ) {
-			throw new \Exception( sprintf( 'Unable to create directory "%1$s"', $dir ) );
+		if (!is_dir($dir) && mkdir('tmp/import/couponcode/unittest', 0775, true) === false) {
+			throw new \Exception(sprintf('Unable to create directory "%1$s"', $dir));
 		}
 
 		$content = 'code,count,start,end
 jobccimport1,,,';
 
-		if( file_put_contents( $filepath, $content ) === false ) {
-			throw new \Exception( sprintf( 'Unable to create file "%1$s"', $file ) );
+		if (file_put_contents($filepath, $content) === false) {
+			throw new \Exception(sprintf('Unable to create file "%1$s"', $file));
 		}
 
 		$this->object->run();

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

Spacing +10 added lines, -10 removed lines

@@ -40,25 +40,25 @@ 
 	 * @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\Order\Item\Iface $invoice, \Aimeos\MShop\Order\Item\Base\Iface $order )
+	public function process(\Aimeos\MShop\Order\Item\Iface $invoice, \Aimeos\MShop\Order\Item\Base\Iface $order)
 	{
 		$result = [];
 		$services = $order->getServices();
 
-		krsort( $services );
+		krsort($services);
 
-		foreach( $services as $list )
+		foreach ($services as $list)
 		{
-			foreach( $list as $item )
+			foreach ($list as $item)
 			{
 				$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;
@@ -66,16 +66,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;
 			}
 		}