aimeos / ai-controller-jobs

controller/jobs/src/Controller/Jobs/Order/Service/Payment/Standard.php

Spacing +35 added lines, -35 removed lines

@@ -29,7 +29,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Capture authorized payments' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Capture authorized payments');
 	}
 
 
@@ -40,7 +40,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Authorized payments of orders will be captured after dispatching or after a configurable amount of time' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Authorized payments of orders will be captured after dispatching or after a configurable amount of time');
 	}
 
 
@@ -68,8 +68,8 @@ 
 		 * @category User
 		 * @category Developer
 		 */
-		$days = $config->get( 'controller/jobs/order/service/payment/limit-days', 90 );
-		$date = date( 'Y-m-d 00:00:00', time() - 86400 * $days );
+		$days = $config->get('controller/jobs/order/service/payment/limit-days', 90);
+		$date = date('Y-m-d 00:00:00', time() - 86400 * $days);
 
 		/** controller/jobs/order/service/payment/capture-days
 		 * Automatically capture payments after the configured amount of days
@@ -84,90 +84,90 @@ 
 		 * @category User
 		 * @category Developer
 		 */
-		$capDays = $config->get( 'controller/jobs/order/service/payment/capture-days', null );
+		$capDays = $config->get('controller/jobs/order/service/payment/capture-days', null);
 
 
-		$serviceManager = \Aimeos\MShop\Factory::createManager( $context, 'service' );
+		$serviceManager = \Aimeos\MShop\Factory::createManager($context, 'service');
 		$serviceSearch = $serviceManager->createSearch();
-		$serviceSearch->setConditions( $serviceSearch->compare( '==', 'service.type.code', 'payment' ) );
+		$serviceSearch->setConditions($serviceSearch->compare('==', 'service.type.code', 'payment'));
 
-		$orderManager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
+		$orderManager = \Aimeos\MShop\Factory::createManager($context, 'order');
 		$orderSearch = $orderManager->createSearch();
 
-		$status = array( \Aimeos\MShop\Order\Item\Base::STAT_DISPATCHED, \Aimeos\MShop\Order\Item\Base::STAT_DELIVERED );
+		$status = array(\Aimeos\MShop\Order\Item\Base::STAT_DISPATCHED, \Aimeos\MShop\Order\Item\Base::STAT_DELIVERED);
 		$start = 0;
 
 		do
 		{
-			$serviceItems = $serviceManager->searchItems( $serviceSearch );
+			$serviceItems = $serviceManager->searchItems($serviceSearch);
 
-			foreach( $serviceItems as $serviceItem )
+			foreach ($serviceItems as $serviceItem)
 			{
 				try
 				{
-					$serviceProvider = $serviceManager->getProvider( $serviceItem, $serviceItem->getType() );
+					$serviceProvider = $serviceManager->getProvider($serviceItem, $serviceItem->getType());
 
-					if( !$serviceProvider->isImplemented( \Aimeos\MShop\Service\Provider\Payment\Base::FEAT_CAPTURE ) ) {
+					if (!$serviceProvider->isImplemented(\Aimeos\MShop\Service\Provider\Payment\Base::FEAT_CAPTURE)) {
 						continue;
 					}
 
 
 					$expr = [];
-					$expr[] = $orderSearch->compare( '>', 'order.datepayment', $date );
+					$expr[] = $orderSearch->compare('>', 'order.datepayment', $date);
 
-					if( $capDays !== null )
+					if ($capDays !== null)
 					{
-						$capdate = date( 'Y-m-d 00:00:00', time() - 86400 * $capDays );
-						$expr[] = $orderSearch->compare( '<=', 'order.datepayment', $capdate );
+						$capdate = date('Y-m-d 00:00:00', time() - 86400 * $capDays);
+						$expr[] = $orderSearch->compare('<=', 'order.datepayment', $capdate);
 					}
 					else
 					{
-						$expr[] = $orderSearch->compare( '==', 'order.statusdelivery', $status );
+						$expr[] = $orderSearch->compare('==', 'order.statusdelivery', $status);
 					}
 
-					$expr[] = $orderSearch->compare( '==', 'order.statuspayment', \Aimeos\MShop\Order\Item\Base::PAY_AUTHORIZED );
-					$expr[] = $orderSearch->compare( '==', 'order.base.service.code', $serviceItem->getCode() );
-					$expr[] = $orderSearch->compare( '==', 'order.base.service.type', 'payment' );
+					$expr[] = $orderSearch->compare('==', 'order.statuspayment', \Aimeos\MShop\Order\Item\Base::PAY_AUTHORIZED);
+					$expr[] = $orderSearch->compare('==', 'order.base.service.code', $serviceItem->getCode());
+					$expr[] = $orderSearch->compare('==', 'order.base.service.type', 'payment');
 
-					$orderSearch->setConditions( $orderSearch->combine( '&&', $expr ) );
+					$orderSearch->setConditions($orderSearch->combine('&&', $expr));
 
 
 					$orderStart = 0;
 
 					do
 					{
-						$orderItems = $orderManager->searchItems( $orderSearch );
+						$orderItems = $orderManager->searchItems($orderSearch);
 
-						foreach( $orderItems as $orderItem )
+						foreach ($orderItems as $orderItem)
 						{
 							try
 							{
-								$serviceProvider->capture( $orderItem );
+								$serviceProvider->capture($orderItem);
 							}
-							catch( \Exception $e )
+							catch (\Exception $e)
 							{
 								$str = 'Error while capturing payment for order with ID "%1$s": %2$s';
-								$context->getLogger()->log( sprintf( $str, $orderItem->getId(), $e->getMessage() ) );
+								$context->getLogger()->log(sprintf($str, $orderItem->getId(), $e->getMessage()));
 							}
 						}
 
-						$orderCount = count( $orderItems );
+						$orderCount = count($orderItems);
 						$orderStart += $orderCount;
-						$orderSearch->setSlice( $orderStart );
+						$orderSearch->setSlice($orderStart);
 					}
-					while( $orderCount >= $orderSearch->getSliceSize() );
+					while ($orderCount >= $orderSearch->getSliceSize());
 				}
-				catch( \Exception $e )
+				catch (\Exception $e)
 				{
 					$str = 'Error while capturing payments for service with ID "%1$s": %2$s';
-					$context->getLogger()->log( sprintf( $str, $serviceItem->getId(), $e->getMessage() ) );
+					$context->getLogger()->log(sprintf($str, $serviceItem->getId(), $e->getMessage()));
 				}
 			}
 
-			$count = count( $serviceItems );
+			$count = count($serviceItems);
 			$start += $count;
-			$serviceSearch->setSlice( $start );
+			$serviceSearch->setSlice($start);
 		}
-		while( $count >= $serviceSearch->getSliceSize() );
+		while ($count >= $serviceSearch->getSliceSize());
 	}
 }

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

Spacing +25 added lines, -25 removed lines

@@ -16,77 +16,77 @@ 
 
 	protected function setUp()
 	{
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 
 		$context = \TestHelperCntl::getContext();
 		$aimeos = \TestHelperCntl::getAimeos();
 
-		$this->object = new TestAbstract( $context, $aimeos );
+		$this->object = new TestAbstract($context, $aimeos);
 	}
 
 
 	protected function tearDown()
 	{
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 	}
 
 
 	public function testGetCacheInvalidType()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		$this->object->getCachePublic( '$' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		$this->object->getCachePublic('$');
 	}
 
 
 	public function testGetCacheInvalidClass()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		$this->object->getCachePublic( 'unknown' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		$this->object->getCachePublic('unknown');
 	}
 
 
 	public function testGetProcessors()
 	{
-		$processor = $this->object->getProcessorsPublic( array( 'media' => [] ) );
+		$processor = $this->object->getProcessorsPublic(array('media' => []));
 
-		$this->assertInstanceOf( '\\Aimeos\\Controller\\Common\\Catalog\\Import\\Csv\\Processor\\Iface', $processor );
+		$this->assertInstanceOf('\\Aimeos\\Controller\\Common\\Catalog\\Import\\Csv\\Processor\\Iface', $processor);
 	}
 
 
 	public function testGetProcessorsInvalidType()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		$this->object->getProcessorsPublic( array( '$' => [] ) );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		$this->object->getProcessorsPublic(array('$' => []));
 	}
 
 
 	public function testGetProcessorsInvalidClass()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		$this->object->getProcessorsPublic( array( 'unknown' => [] ) );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		$this->object->getProcessorsPublic(array('unknown' => []));
 	}
 
 
 	public function testGetProcessorsInvalidInterface()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		$this->object->getProcessorsPublic( array( 'unknown' => [] ) );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		$this->object->getProcessorsPublic(array('unknown' => []));
 	}
 
 
 	public function testGetTypeId()
 	{
-		$typeid = $this->object->getTypeIdPublic( 'text/type', 'catalog', 'name' );
+		$typeid = $this->object->getTypeIdPublic('text/type', 'catalog', 'name');
 
-		$this->assertNotEquals( null, $typeid );
+		$this->assertNotEquals(null, $typeid);
 	}
 
 
 	public function testGetTypeIdUnknown()
 	{
-		$this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' );
-		$this->object->getTypeIdPublic( 'text/type', 'catalog', 'unknown' );
+		$this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception');
+		$this->object->getTypeIdPublic('text/type', 'catalog', 'unknown');
 	}
 }
 
@@ -94,21 +94,21 @@ 
 class TestAbstract
 	extends \Aimeos\Controller\Common\Catalog\Import\Csv\Base
 {
-	public function getCachePublic( $type, $name = null )
+	public function getCachePublic($type, $name = null)
 	{
-		return $this->getCache( $type, $name );
+		return $this->getCache($type, $name);
 	}
 
 
-	public function getProcessorsPublic( array $mappings )
+	public function getProcessorsPublic(array $mappings)
 	{
-		return $this->getProcessors( $mappings );
+		return $this->getProcessors($mappings);
 	}
 
 
-	public function getTypeIdPublic( $path, $domain, $code )
+	public function getTypeIdPublic($path, $domain, $code)
 	{
-		return $this->getTypeId( $path, $domain, $code );
+		return $this->getTypeId($path, $domain, $code);
 	}
 }
 

controller/common/tests/Controller/Common/Catalog/Import/Csv/Processor/Media/StandardTest.php

Spacing +93 added lines, -93 removed lines

@@ -17,16 +17,16 @@ 
 
 	protected function setUp()
 	{
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 
 		$this->context = \TestHelperCntl::getContext();
-		$this->endpoint = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Done( $this->context, [] );
+		$this->endpoint = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Done($this->context, []);
 	}
 
 
 	protected function tearDown()
 	{
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 	}
 
@@ -51,36 +51,36 @@ 
 			5 => 1,
 		);
 
-		$catalog = $this->create( 'job_csv_test' );
+		$catalog = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $catalog, $data );
+		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($catalog, $data);
 
-		$catalog = $this->get( 'job_csv_test' );
-		$this->delete( $catalog );
+		$catalog = $this->get('job_csv_test');
+		$this->delete($catalog);
 
 
 		$listItems = $catalog->getListItems();
-		$listItem = reset( $listItems );
+		$listItem = reset($listItems);
 
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem );
-		$this->assertEquals( 1, count( $listItems ) );
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem);
+		$this->assertEquals(1, count($listItems));
 
-		$this->assertEquals( 1, $listItem->getStatus() );
-		$this->assertEquals( 0, $listItem->getPosition() );
-		$this->assertEquals( 'media', $listItem->getDomain() );
-		$this->assertEquals( 'default', $listItem->getType() );
+		$this->assertEquals(1, $listItem->getStatus());
+		$this->assertEquals(0, $listItem->getPosition());
+		$this->assertEquals('media', $listItem->getDomain());
+		$this->assertEquals('default', $listItem->getType());
 
 		$refItem = $listItem->getRefItem();
 
-		$this->assertEquals( 1, $refItem->getStatus() );
-		$this->assertEquals( 'default', $refItem->getType() );
-		$this->assertEquals( 'catalog', $refItem->getDomain() );
-		$this->assertEquals( 'test image', $refItem->getLabel() );
-		$this->assertEquals( 'image/jpeg', $refItem->getMimetype() );
-		$this->assertEquals( 'path/to/preview', $refItem->getPreview() );
-		$this->assertEquals( 'path/to/file', $refItem->getUrl() );
-		$this->assertEquals( 'de', $refItem->getLanguageId() );
+		$this->assertEquals(1, $refItem->getStatus());
+		$this->assertEquals('default', $refItem->getType());
+		$this->assertEquals('catalog', $refItem->getDomain());
+		$this->assertEquals('test image', $refItem->getLabel());
+		$this->assertEquals('image/jpeg', $refItem->getMimetype());
+		$this->assertEquals('path/to/preview', $refItem->getPreview());
+		$this->assertEquals('path/to/file', $refItem->getUrl());
+		$this->assertEquals('de', $refItem->getLanguageId());
 	}
 
 
@@ -94,24 +94,24 @@ 
 			0 => "path/to/0\npath/to/1\npath/to/2\npath/to/3",
 		);
 
-		$catalog = $this->create( 'job_csv_test' );
+		$catalog = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $catalog, $data );
+		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($catalog, $data);
 
-		$catalog = $this->get( 'job_csv_test' );
-		$this->delete( $catalog );
+		$catalog = $this->get('job_csv_test');
+		$this->delete($catalog);
 
 
 		$pos = 0;
 		$listItems = $catalog->getListItems();
-		$expected = array( 'path/to/0', 'path/to/1', 'path/to/2', 'path/to/3' );
+		$expected = array('path/to/0', 'path/to/1', 'path/to/2', 'path/to/3');
 
-		$this->assertEquals( 4, count( $listItems ) );
+		$this->assertEquals(4, count($listItems));
 
-		foreach( $listItems as $listItem )
+		foreach ($listItems as $listItem)
 		{
-			$this->assertEquals( $expected[$pos], $listItem->getRefItem()->getUrl() );
+			$this->assertEquals($expected[$pos], $listItem->getRefItem()->getUrl());
 			$pos++;
 		}
 	}
@@ -133,23 +133,23 @@ 
 			3 => 'path/to/3',
 		);
 
-		$catalog = $this->create( 'job_csv_test' );
+		$catalog = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $catalog, $data );
+		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($catalog, $data);
 
-		$catalog = $this->get( 'job_csv_test' );
-		$this->delete( $catalog );
+		$catalog = $this->get('job_csv_test');
+		$this->delete($catalog);
 
 
 		$pos = 0;
 		$listItems = $catalog->getListItems();
 
-		$this->assertEquals( 4, count( $listItems ) );
+		$this->assertEquals(4, count($listItems));
 
-		foreach( $listItems as $listItem )
+		foreach ($listItems as $listItem)
 		{
-			$this->assertEquals( $data[$pos], $listItem->getRefItem()->getUrl() );
+			$this->assertEquals($data[$pos], $listItem->getRefItem()->getUrl());
 			$pos++;
 		}
 	}
@@ -172,27 +172,27 @@ 
 			1 => '',
 		);
 
-		$catalog = $this->create( 'job_csv_test' );
+		$catalog = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $catalog, $data );
+		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($catalog, $data);
 
-		$catalog = $this->get( 'job_csv_test' );
+		$catalog = $this->get('job_csv_test');
 
-		$object->process( $catalog, $dataUpdate );
+		$object->process($catalog, $dataUpdate);
 
-		$catalog = $this->get( 'job_csv_test' );
-		$this->delete( $catalog );
+		$catalog = $this->get('job_csv_test');
+		$this->delete($catalog);
 
 
 		$listItems = $catalog->getListItems();
-		$listItem = reset( $listItems );
+		$listItem = reset($listItems);
 
-		$this->assertEquals( 1, count( $listItems ) );
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem );
+		$this->assertEquals(1, count($listItems));
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem);
 
-		$this->assertEquals( 'path/to/new', $listItem->getRefItem()->getUrl() );
-		$this->assertEquals( null, $listItem->getRefItem()->getLanguageId() );
+		$this->assertEquals('path/to/new', $listItem->getRefItem()->getUrl());
+		$this->assertEquals(null, $listItem->getRefItem()->getLanguageId());
 	}
 
 
@@ -206,23 +206,23 @@ 
 			0 => '/path/to/file',
 		);
 
-		$catalog = $this->create( 'job_csv_test' );
+		$catalog = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $catalog, $data );
+		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($catalog, $data);
 
-		$catalog = $this->get( 'job_csv_test' );
+		$catalog = $this->get('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard( $this->context, [], $this->endpoint );
-		$object->process( $catalog, [] );
+		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard($this->context, [], $this->endpoint);
+		$object->process($catalog, []);
 
-		$catalog = $this->get( 'job_csv_test' );
-		$this->delete( $catalog );
+		$catalog = $this->get('job_csv_test');
+		$this->delete($catalog);
 
 
 		$listItems = $catalog->getListItems();
 
-		$this->assertEquals( 0, count( $listItems ) );
+		$this->assertEquals(0, count($listItems));
 	}
 
 
@@ -238,18 +238,18 @@ 
 			1 => '',
 		);
 
-		$catalog = $this->create( 'job_csv_test' );
+		$catalog = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $catalog, $data );
+		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($catalog, $data);
 
-		$catalog = $this->get( 'job_csv_test' );
-		$this->delete( $catalog );
+		$catalog = $this->get('job_csv_test');
+		$this->delete($catalog);
 
 
 		$listItems = $catalog->getListItems();
 
-		$this->assertEquals( 1, count( $listItems ) );
+		$this->assertEquals(1, count($listItems));
 	}
 
 
@@ -269,64 +269,64 @@ 
 			3 => 'default',
 		);
 
-		$this->context->getConfig()->set( 'controller/common/catalog/import/csv/processor/media/listtypes', array( 'default' ) );
+		$this->context->getConfig()->set('controller/common/catalog/import/csv/processor/media/listtypes', array('default'));
 
-		$catalog = $this->create( 'job_csv_test' );
+		$catalog = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $catalog, $data );
+		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($catalog, $data);
 
-		$catalog = $this->get( 'job_csv_test' );
-		$this->delete( $catalog );
+		$catalog = $this->get('job_csv_test');
+		$this->delete($catalog);
 
 
 		$listItems = $catalog->getListItems();
-		$listItem = reset( $listItems );
+		$listItem = reset($listItems);
 
-		$this->assertEquals( 1, count( $listItems ) );
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem );
+		$this->assertEquals(1, count($listItems));
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem);
 
-		$this->assertEquals( 'default', $listItem->getType() );
-		$this->assertEquals( 'path/to/file2', $listItem->getRefItem()->getUrl() );
+		$this->assertEquals('default', $listItem->getType());
+		$this->assertEquals('path/to/file2', $listItem->getRefItem()->getUrl());
 	}
 
 
 	/**
 	 * @param string $code
 	 */
-	protected function create( $code )
+	protected function create($code)
 	{
-		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager( $this->context );
+		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager($this->context);
 
 		$item = $manager->createItem();
-		$item->setCode( $code );
+		$item->setCode($code);
 
-		return $manager->insertItem( $item );
+		return $manager->insertItem($item);
 	}
 
 
-	protected function delete( \Aimeos\MShop\Catalog\Item\Iface $catalog )
+	protected function delete(\Aimeos\MShop\Catalog\Item\Iface $catalog)
 	{
-		$mediaManager = \Aimeos\MShop\Media\Manager\Factory::createManager( $this->context );
-		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager( $this->context );
-		$listManager = $manager->getSubManager( 'lists' );
+		$mediaManager = \Aimeos\MShop\Media\Manager\Factory::createManager($this->context);
+		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager($this->context);
+		$listManager = $manager->getSubManager('lists');
 
-		foreach( $catalog->getListItems('media') as $listItem )
+		foreach ($catalog->getListItems('media') as $listItem)
 		{
-			$mediaManager->deleteItem( $listItem->getRefItem()->getId() );
-			$listManager->deleteItem( $listItem->getId() );
+			$mediaManager->deleteItem($listItem->getRefItem()->getId());
+			$listManager->deleteItem($listItem->getId());
 		}
 
-		$manager->deleteItem( $catalog->getId() );
+		$manager->deleteItem($catalog->getId());
 	}
 
 
 	/**
 	 * @param string $code
 	 */
-	protected function get( $code )
+	protected function get($code)
 	{
-		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager( $this->context );
-		return $manager->findItem( $code, array('media') );
+		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager($this->context);
+		return $manager->findItem($code, array('media'));
 	}
 }
\ No newline at end of file

controller/common/tests/Controller/Common/Catalog/Import/Csv/Processor/Text/StandardTest.php

Spacing +89 added lines, -89 removed lines

@@ -17,16 +17,16 @@ 
 
 	protected function setUp()
 	{
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 
 		$this->context = \TestHelperCntl::getContext();
-		$this->endpoint = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Done( $this->context, [] );
+		$this->endpoint = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Done($this->context, []);
 	}
 
 
 	protected function tearDown()
 	{
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 	}
 
@@ -49,35 +49,35 @@ 
 			4 => 1,
 		);
 
-		$catalog = $this->create( 'job_csv_test' );
+		$catalog = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $catalog, $data );
+		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($catalog, $data);
 
-		$catalog = $this->get( 'job_csv_test' );
-		$this->delete( $catalog );
+		$catalog = $this->get('job_csv_test');
+		$this->delete($catalog);
 
 
 		$listItems = $catalog->getListItems();
-		$listItem = reset( $listItems );
+		$listItem = reset($listItems);
 
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem );
-		$this->assertEquals( 1, count( $listItems ) );
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem);
+		$this->assertEquals(1, count($listItems));
 
-		$this->assertEquals( 1, $listItem->getStatus() );
-		$this->assertEquals( 0, $listItem->getPosition() );
-		$this->assertEquals( 'text', $listItem->getDomain() );
-		$this->assertEquals( 'default', $listItem->getType() );
+		$this->assertEquals(1, $listItem->getStatus());
+		$this->assertEquals(0, $listItem->getPosition());
+		$this->assertEquals('text', $listItem->getDomain());
+		$this->assertEquals('default', $listItem->getType());
 
 		$refItem = $listItem->getRefItem();
 
-		$this->assertEquals( 1, $refItem->getStatus() );
-		$this->assertEquals( 'name', $refItem->getType() );
-		$this->assertEquals( 'catalog', $refItem->getDomain() );
-		$this->assertEquals( 'test text', $refItem->getLabel() );
-		$this->assertEquals( 'Job CSV test', $refItem->getContent() );
-		$this->assertEquals( 'de', $refItem->getLanguageId() );
-		$this->assertEquals( 1, $refItem->getStatus() );
+		$this->assertEquals(1, $refItem->getStatus());
+		$this->assertEquals('name', $refItem->getType());
+		$this->assertEquals('catalog', $refItem->getDomain());
+		$this->assertEquals('test text', $refItem->getLabel());
+		$this->assertEquals('Job CSV test', $refItem->getContent());
+		$this->assertEquals('de', $refItem->getLanguageId());
+		$this->assertEquals(1, $refItem->getStatus());
 	}
 
 
@@ -105,30 +105,30 @@ 
 			7 => 'Long: Job CSV test 2',
 		);
 
-		$catalog = $this->create( 'job_csv_test' );
+		$catalog = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $catalog, $data );
+		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($catalog, $data);
 
-		$catalog = $this->get( 'job_csv_test' );
-		$this->delete( $catalog );
+		$catalog = $this->get('job_csv_test');
+		$this->delete($catalog);
 
 
 		$pos = 0;
 		$listItems = $catalog->getListItems();
 		$expected = array(
-			0 => array( 'name', 'Job CSV test' ),
-			1 => array( 'short', 'Short: Job CSV test' ),
-			2 => array( 'long', 'Long: Job CSV test' ),
-			3 => array( 'long', 'Long: Job CSV test 2' ),
+			0 => array('name', 'Job CSV test'),
+			1 => array('short', 'Short: Job CSV test'),
+			2 => array('long', 'Long: Job CSV test'),
+			3 => array('long', 'Long: Job CSV test 2'),
 		);
 
-		$this->assertEquals( 4, count( $listItems ) );
+		$this->assertEquals(4, count($listItems));
 
-		foreach( $listItems as $listItem )
+		foreach ($listItems as $listItem)
 		{
-			$this->assertEquals( $expected[$pos][0], $listItem->getRefItem()->getType() );
-			$this->assertEquals( $expected[$pos][1], $listItem->getRefItem()->getContent() );
+			$this->assertEquals($expected[$pos][0], $listItem->getRefItem()->getType());
+			$this->assertEquals($expected[$pos][1], $listItem->getRefItem()->getContent());
 			$pos++;
 		}
 	}
@@ -151,27 +151,27 @@ 
 			1 => 'Short: Job CSV test',
 		);
 
-		$catalog = $this->create( 'job_csv_test' );
+		$catalog = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $catalog, $data );
+		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($catalog, $data);
 
-		$catalog = $this->get( 'job_csv_test' );
+		$catalog = $this->get('job_csv_test');
 
-		$object->process( $catalog, $dataUpdate );
+		$object->process($catalog, $dataUpdate);
 
-		$catalog = $this->get( 'job_csv_test' );
-		$this->delete( $catalog );
+		$catalog = $this->get('job_csv_test');
+		$this->delete($catalog);
 
 
 		$listItems = $catalog->getListItems();
-		$listItem = reset( $listItems );
+		$listItem = reset($listItems);
 
-		$this->assertEquals( 1, count( $listItems ) );
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem );
+		$this->assertEquals(1, count($listItems));
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem);
 
-		$this->assertEquals( 'short', $listItem->getRefItem()->getType() );
-		$this->assertEquals( 'Short: Job CSV test', $listItem->getRefItem()->getContent() );
+		$this->assertEquals('short', $listItem->getRefItem()->getType());
+		$this->assertEquals('Short: Job CSV test', $listItem->getRefItem()->getContent());
 	}
 
 
@@ -187,23 +187,23 @@ 
 			1 => 'Job CSV test',
 		);
 
-		$catalog = $this->create( 'job_csv_test' );
+		$catalog = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $catalog, $data );
+		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($catalog, $data);
 
-		$catalog = $this->get( 'job_csv_test' );
+		$catalog = $this->get('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard( $this->context, [], $this->endpoint );
-		$object->process( $catalog, [] );
+		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard($this->context, [], $this->endpoint);
+		$object->process($catalog, []);
 
-		$catalog = $this->get( 'job_csv_test' );
-		$this->delete( $catalog );
+		$catalog = $this->get('job_csv_test');
+		$this->delete($catalog);
 
 
 		$listItems = $catalog->getListItems();
 
-		$this->assertEquals( 0, count( $listItems ) );
+		$this->assertEquals(0, count($listItems));
 	}
 
 
@@ -223,18 +223,18 @@ 
 			3 => '',
 		);
 
-		$catalog = $this->create( 'job_csv_test' );
+		$catalog = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $catalog, $data );
+		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($catalog, $data);
 
-		$catalog = $this->get( 'job_csv_test' );
-		$this->delete( $catalog );
+		$catalog = $this->get('job_csv_test');
+		$this->delete($catalog);
 
 
 		$listItems = $catalog->getListItems();
 
-		$this->assertEquals( 1, count( $listItems ) );
+		$this->assertEquals(1, count($listItems));
 	}
 
 
@@ -258,65 +258,65 @@ 
 			5 => 'default',
 		);
 
-		$this->context->getConfig()->set( 'controller/common/catalog/import/csv/processor/text/listtypes', array( 'default' ) );
+		$this->context->getConfig()->set('controller/common/catalog/import/csv/processor/text/listtypes', array('default'));
 
-		$catalog = $this->create( 'job_csv_test' );
+		$catalog = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $catalog, $data );
+		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($catalog, $data);
 
-		$catalog = $this->get( 'job_csv_test' );
-		$this->delete( $catalog );
+		$catalog = $this->get('job_csv_test');
+		$this->delete($catalog);
 
 
 		$listItems = $catalog->getListItems();
-		$listItem = reset( $listItems );
+		$listItem = reset($listItems);
 
-		$this->assertEquals( 1, count( $listItems ) );
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem );
+		$this->assertEquals(1, count($listItems));
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem);
 
-		$this->assertEquals( 'default', $listItem->getType() );
-		$this->assertEquals( 'short', $listItem->getRefItem()->getType() );
-		$this->assertEquals( 'test short', $listItem->getRefItem()->getContent() );
+		$this->assertEquals('default', $listItem->getType());
+		$this->assertEquals('short', $listItem->getRefItem()->getType());
+		$this->assertEquals('test short', $listItem->getRefItem()->getContent());
 	}
 
 
 	/**
 	 * @param string $code
 	 */
-	protected function create( $code )
+	protected function create($code)
 	{
-		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager( $this->context );
+		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager($this->context);
 
 		$item = $manager->createItem();
-		$item->setCode( $code );
+		$item->setCode($code);
 
-		return $manager->insertItem( $item );
+		return $manager->insertItem($item);
 	}
 
 
-	protected function delete( \Aimeos\MShop\Catalog\Item\Iface $catalog )
+	protected function delete(\Aimeos\MShop\Catalog\Item\Iface $catalog)
 	{
-		$textManager = \Aimeos\MShop\Text\Manager\Factory::createManager( $this->context );
-		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager( $this->context );
-		$listManager = $manager->getSubManager( 'lists' );
+		$textManager = \Aimeos\MShop\Text\Manager\Factory::createManager($this->context);
+		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager($this->context);
+		$listManager = $manager->getSubManager('lists');
 
-		foreach( $catalog->getListItems('text') as $listItem )
+		foreach ($catalog->getListItems('text') as $listItem)
 		{
-			$textManager->deleteItem( $listItem->getRefItem()->getId() );
-			$listManager->deleteItem( $listItem->getId() );
+			$textManager->deleteItem($listItem->getRefItem()->getId());
+			$listManager->deleteItem($listItem->getId());
 		}
 
-		$manager->deleteItem( $catalog->getId() );
+		$manager->deleteItem($catalog->getId());
 	}
 
 
 	/**
 	 * @param string $code
 	 */
-	protected function get( $code )
+	protected function get($code)
 	{
-		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager( $this->context );
-		return $manager->findItem( $code, ['text'] );
+		$manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager($this->context);
+		return $manager->findItem($code, ['text']);
 	}
 }
\ No newline at end of file

controller/common/tests/Controller/Common/Product/Import/Csv/Processor/DoneTest.php

Spacing +6 added lines, -6 removed lines

@@ -17,16 +17,16 @@ 
 
 	protected function setUp()
 	{
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 
 		$this->context = \TestHelperCntl::getContext();
-		$this->object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done( $this->context, [] );
+		$this->object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done($this->context, []);
 	}
 
 
 	protected function tearDown()
 	{
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 
 		$this->object = null;
@@ -35,10 +35,10 @@ 
 
 	public function testProcess()
 	{
-		$product = \Aimeos\MShop\Factory::createManager( $this->context, 'product' )->createItem();
+		$product = \Aimeos\MShop\Factory::createManager($this->context, 'product')->createItem();
 
-		$result = $this->object->process( $product, array( 'test' ) );
+		$result = $this->object->process($product, array('test'));
 
-		$this->assertEquals( array( 'test' ), $result );
+		$this->assertEquals(array('test'), $result);
 	}
 }
\ No newline at end of file

controller/common/tests/Controller/Common/Product/Import/Csv/Processor/Media/StandardTest.php

Spacing +102 added lines, -102 removed lines

@@ -17,16 +17,16 @@ 
 
 	protected function setUp()
 	{
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 
 		$this->context = \TestHelperCntl::getContext();
-		$this->endpoint = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done( $this->context, [] );
+		$this->endpoint = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done($this->context, []);
 	}
 
 
 	protected function tearDown()
 	{
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 	}
 
@@ -51,36 +51,36 @@ 
 			5 => 1,
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Media\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Media\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$listItems = $product->getListItems();
-		$listItem = reset( $listItems );
+		$listItem = reset($listItems);
 
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem );
-		$this->assertEquals( 1, count( $listItems ) );
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem);
+		$this->assertEquals(1, count($listItems));
 
-		$this->assertEquals( 1, $listItem->getStatus() );
-		$this->assertEquals( 0, $listItem->getPosition() );
-		$this->assertEquals( 'media', $listItem->getDomain() );
-		$this->assertEquals( 'default', $listItem->getType() );
+		$this->assertEquals(1, $listItem->getStatus());
+		$this->assertEquals(0, $listItem->getPosition());
+		$this->assertEquals('media', $listItem->getDomain());
+		$this->assertEquals('default', $listItem->getType());
 
 		$refItem = $listItem->getRefItem();
 
-		$this->assertEquals( 1, $refItem->getStatus() );
-		$this->assertEquals( 'default', $refItem->getType() );
-		$this->assertEquals( 'product', $refItem->getDomain() );
-		$this->assertEquals( 'test image', $refItem->getLabel() );
-		$this->assertEquals( 'image/jpeg', $refItem->getMimetype() );
-		$this->assertEquals( 'path/to/preview', $refItem->getPreview() );
-		$this->assertEquals( 'path/to/file', $refItem->getUrl() );
-		$this->assertEquals( 'de', $refItem->getLanguageId() );
+		$this->assertEquals(1, $refItem->getStatus());
+		$this->assertEquals('default', $refItem->getType());
+		$this->assertEquals('product', $refItem->getDomain());
+		$this->assertEquals('test image', $refItem->getLabel());
+		$this->assertEquals('image/jpeg', $refItem->getMimetype());
+		$this->assertEquals('path/to/preview', $refItem->getPreview());
+		$this->assertEquals('path/to/file', $refItem->getUrl());
+		$this->assertEquals('de', $refItem->getLanguageId());
 	}
 
 
@@ -94,24 +94,24 @@ 
 			0 => "path/to/0\npath/to/1\npath/to/2\npath/to/3",
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Media\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Media\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$pos = 0;
 		$listItems = $product->getListItems();
-		$expected = array( 'path/to/0', 'path/to/1', 'path/to/2', 'path/to/3' );
+		$expected = array('path/to/0', 'path/to/1', 'path/to/2', 'path/to/3');
 
-		$this->assertEquals( 4, count( $listItems ) );
+		$this->assertEquals(4, count($listItems));
 
-		foreach( $listItems as $listItem )
+		foreach ($listItems as $listItem)
 		{
-			$this->assertEquals( $expected[$pos], $listItem->getRefItem()->getUrl() );
+			$this->assertEquals($expected[$pos], $listItem->getRefItem()->getUrl());
 			$pos++;
 		}
 	}
@@ -133,23 +133,23 @@ 
 			3 => 'path/to/3',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Media\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Media\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$pos = 0;
 		$listItems = $product->getListItems();
 
-		$this->assertEquals( 4, count( $listItems ) );
+		$this->assertEquals(4, count($listItems));
 
-		foreach( $listItems as $listItem )
+		foreach ($listItems as $listItem)
 		{
-			$this->assertEquals( $data[$pos], $listItem->getRefItem()->getUrl() );
+			$this->assertEquals($data[$pos], $listItem->getRefItem()->getUrl());
 			$pos++;
 		}
 	}
@@ -172,27 +172,27 @@ 
 			1 => '',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Media\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Media\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
+		$product = $this->get('job_csv_test');
 
-		$object->process( $product, $dataUpdate );
+		$object->process($product, $dataUpdate);
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$listItems = $product->getListItems();
-		$listItem = reset( $listItems );
+		$listItem = reset($listItems);
 
-		$this->assertEquals( 1, count( $listItems ) );
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem );
+		$this->assertEquals(1, count($listItems));
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem);
 
-		$this->assertEquals( 'path/to/new', $listItem->getRefItem()->getUrl() );
-		$this->assertEquals( null, $listItem->getRefItem()->getLanguageId() );
+		$this->assertEquals('path/to/new', $listItem->getRefItem()->getUrl());
+		$this->assertEquals(null, $listItem->getRefItem()->getLanguageId());
 	}
 
 
@@ -206,23 +206,23 @@ 
 			0 => '/path/to/file',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Media\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Media\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
+		$product = $this->get('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Media\Standard( $this->context, [], $this->endpoint );
-		$object->process( $product, [] );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Media\Standard($this->context, [], $this->endpoint);
+		$object->process($product, []);
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$listItems = $product->getListItems();
 
-		$this->assertEquals( 0, count( $listItems ) );
+		$this->assertEquals(0, count($listItems));
 	}
 
 
@@ -238,18 +238,18 @@ 
 			1 => '',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Media\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Media\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$listItems = $product->getListItems();
 
-		$this->assertEquals( 1, count( $listItems ) );
+		$this->assertEquals(1, count($listItems));
 	}
 
 
@@ -269,82 +269,82 @@ 
 			3 => 'default',
 		);
 
-		$this->context->getConfig()->set( 'controller/common/product/import/csv/processor/media/listtypes', array( 'default' ) );
+		$this->context->getConfig()->set('controller/common/product/import/csv/processor/media/listtypes', array('default'));
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Media\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Media\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$listItems = $product->getListItems();
-		$listItem = reset( $listItems );
+		$listItem = reset($listItems);
 
-		$this->assertEquals( 1, count( $listItems ) );
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem );
+		$this->assertEquals(1, count($listItems));
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem);
 
-		$this->assertEquals( 'default', $listItem->getType() );
-		$this->assertEquals( 'path/to/file2', $listItem->getRefItem()->getUrl() );
+		$this->assertEquals('default', $listItem->getType());
+		$this->assertEquals('path/to/file2', $listItem->getRefItem()->getUrl());
 	}
 
 
 	/**
 	 * @param string $code
 	 */
-	protected function create( $code )
+	protected function create($code)
 	{
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
-		$typeManager = $manager->getSubManager( 'type' );
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
+		$typeManager = $manager->getSubManager('type');
 
 		$typeSearch = $typeManager->createSearch();
-		$typeSearch->setConditions( $typeSearch->compare( '==', 'product.type.code', 'default' ) );
-		$typeResult = $typeManager->searchItems( $typeSearch );
+		$typeSearch->setConditions($typeSearch->compare('==', 'product.type.code', 'default'));
+		$typeResult = $typeManager->searchItems($typeSearch);
 
-		if( ( $typeItem = reset( $typeResult ) ) === false ) {
-			throw new \RuntimeException( 'No product type "default" found' );
+		if (($typeItem = reset($typeResult)) === false) {
+			throw new \RuntimeException('No product type "default" found');
 		}
 
 		$item = $manager->createItem();
-		$item->setTypeid( $typeItem->getId() );
-		$item->setCode( $code );
+		$item->setTypeid($typeItem->getId());
+		$item->setCode($code);
 
-		return $manager->saveItem( $item );
+		return $manager->saveItem($item);
 	}
 
 
-	protected function delete( \Aimeos\MShop\Product\Item\Iface $product )
+	protected function delete(\Aimeos\MShop\Product\Item\Iface $product)
 	{
-		$mediaManager = \Aimeos\MShop\Media\Manager\Factory::createManager( $this->context );
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
-		$listManager = $manager->getSubManager( 'lists' );
+		$mediaManager = \Aimeos\MShop\Media\Manager\Factory::createManager($this->context);
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
+		$listManager = $manager->getSubManager('lists');
 
-		foreach( $product->getListItems('media') as $listItem )
+		foreach ($product->getListItems('media') as $listItem)
 		{
-			$mediaManager->deleteItem( $listItem->getRefItem()->getId() );
-			$listManager->deleteItem( $listItem->getId() );
+			$mediaManager->deleteItem($listItem->getRefItem()->getId());
+			$listManager->deleteItem($listItem->getId());
 		}
 
-		$manager->deleteItem( $product->getId() );
+		$manager->deleteItem($product->getId());
 	}
 
 
 	/**
 	 * @param string $code
 	 */
-	protected function get( $code )
+	protected function get($code)
 	{
-		$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', $code ) );
+		$search->setConditions($search->compare('==', 'product.code', $code));
 
-		$result = $manager->searchItems( $search, array('media') );
+		$result = $manager->searchItems($search, array('media'));
 
-		if( ( $item = reset( $result ) ) === false ) {
-			throw new \RuntimeException( sprintf( 'No product item for code "%1$s"', $code ) );
+		if (($item = reset($result)) === false) {
+			throw new \RuntimeException(sprintf('No product item for code "%1$s"', $code));
 		}
 
 		return $item;

controller/common/tests/Controller/Common/Product/Import/Csv/Processor/Text/StandardTest.php

Spacing +98 added lines, -98 removed lines

@@ -17,16 +17,16 @@ 
 
 	protected function setUp()
 	{
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 
 		$this->context = \TestHelperCntl::getContext();
-		$this->endpoint = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done( $this->context, [] );
+		$this->endpoint = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done($this->context, []);
 	}
 
 
 	protected function tearDown()
 	{
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 	}
 
@@ -49,35 +49,35 @@ 
 			4 => 1,
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$listItems = $product->getListItems();
-		$listItem = reset( $listItems );
+		$listItem = reset($listItems);
 
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem );
-		$this->assertEquals( 1, count( $listItems ) );
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem);
+		$this->assertEquals(1, count($listItems));
 
-		$this->assertEquals( 1, $listItem->getStatus() );
-		$this->assertEquals( 0, $listItem->getPosition() );
-		$this->assertEquals( 'text', $listItem->getDomain() );
-		$this->assertEquals( 'default', $listItem->getType() );
+		$this->assertEquals(1, $listItem->getStatus());
+		$this->assertEquals(0, $listItem->getPosition());
+		$this->assertEquals('text', $listItem->getDomain());
+		$this->assertEquals('default', $listItem->getType());
 
 		$refItem = $listItem->getRefItem();
 
-		$this->assertEquals( 1, $refItem->getStatus() );
-		$this->assertEquals( 'name', $refItem->getType() );
-		$this->assertEquals( 'product', $refItem->getDomain() );
-		$this->assertEquals( 'test text', $refItem->getLabel() );
-		$this->assertEquals( 'Job CSV test', $refItem->getContent() );
-		$this->assertEquals( 'de', $refItem->getLanguageId() );
-		$this->assertEquals( 1, $refItem->getStatus() );
+		$this->assertEquals(1, $refItem->getStatus());
+		$this->assertEquals('name', $refItem->getType());
+		$this->assertEquals('product', $refItem->getDomain());
+		$this->assertEquals('test text', $refItem->getLabel());
+		$this->assertEquals('Job CSV test', $refItem->getContent());
+		$this->assertEquals('de', $refItem->getLanguageId());
+		$this->assertEquals(1, $refItem->getStatus());
 	}
 
 
@@ -105,30 +105,30 @@ 
 			7 => 'Long: Job CSV test 2',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$pos = 0;
 		$listItems = $product->getListItems();
 		$expected = array(
-			0 => array( 'name', 'Job CSV test' ),
-			1 => array( 'short', 'Short: Job CSV test' ),
-			2 => array( 'long', 'Long: Job CSV test' ),
-			3 => array( 'long', 'Long: Job CSV test 2' ),
+			0 => array('name', 'Job CSV test'),
+			1 => array('short', 'Short: Job CSV test'),
+			2 => array('long', 'Long: Job CSV test'),
+			3 => array('long', 'Long: Job CSV test 2'),
 		);
 
-		$this->assertEquals( 4, count( $listItems ) );
+		$this->assertEquals(4, count($listItems));
 
-		foreach( $listItems as $listItem )
+		foreach ($listItems as $listItem)
 		{
-			$this->assertEquals( $expected[$pos][0], $listItem->getRefItem()->getType() );
-			$this->assertEquals( $expected[$pos][1], $listItem->getRefItem()->getContent() );
+			$this->assertEquals($expected[$pos][0], $listItem->getRefItem()->getType());
+			$this->assertEquals($expected[$pos][1], $listItem->getRefItem()->getContent());
 			$pos++;
 		}
 	}
@@ -151,27 +151,27 @@ 
 			1 => 'Short: Job CSV test',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
+		$product = $this->get('job_csv_test');
 
-		$object->process( $product, $dataUpdate );
+		$object->process($product, $dataUpdate);
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$listItems = $product->getListItems();
-		$listItem = reset( $listItems );
+		$listItem = reset($listItems);
 
-		$this->assertEquals( 1, count( $listItems ) );
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem );
+		$this->assertEquals(1, count($listItems));
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem);
 
-		$this->assertEquals( 'short', $listItem->getRefItem()->getType() );
-		$this->assertEquals( 'Short: Job CSV test', $listItem->getRefItem()->getContent() );
+		$this->assertEquals('short', $listItem->getRefItem()->getType());
+		$this->assertEquals('Short: Job CSV test', $listItem->getRefItem()->getContent());
 	}
 
 
@@ -187,23 +187,23 @@ 
 			1 => 'Job CSV test',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
+		$product = $this->get('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard( $this->context, [], $this->endpoint );
-		$object->process( $product, [] );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard($this->context, [], $this->endpoint);
+		$object->process($product, []);
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$listItems = $product->getListItems();
 
-		$this->assertEquals( 0, count( $listItems ) );
+		$this->assertEquals(0, count($listItems));
 	}
 
 
@@ -223,18 +223,18 @@ 
 			3 => '',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$listItems = $product->getListItems();
 
-		$this->assertEquals( 1, count( $listItems ) );
+		$this->assertEquals(1, count($listItems));
 	}
 
 
@@ -258,83 +258,83 @@ 
 			5 => 'default',
 		);
 
-		$this->context->getConfig()->set( 'controller/common/product/import/csv/processor/text/listtypes', array( 'default' ) );
+		$this->context->getConfig()->set('controller/common/product/import/csv/processor/text/listtypes', array('default'));
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($product, $data);
 
-		$product = $this->get( 'job_csv_test' );
-		$this->delete( $product );
+		$product = $this->get('job_csv_test');
+		$this->delete($product);
 
 
 		$listItems = $product->getListItems();
-		$listItem = reset( $listItems );
+		$listItem = reset($listItems);
 
-		$this->assertEquals( 1, count( $listItems ) );
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem );
+		$this->assertEquals(1, count($listItems));
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $listItem);
 
-		$this->assertEquals( 'default', $listItem->getType() );
-		$this->assertEquals( 'short', $listItem->getRefItem()->getType() );
-		$this->assertEquals( 'test short', $listItem->getRefItem()->getContent() );
+		$this->assertEquals('default', $listItem->getType());
+		$this->assertEquals('short', $listItem->getRefItem()->getType());
+		$this->assertEquals('test short', $listItem->getRefItem()->getContent());
 	}
 
 
 	/**
 	 * @param string $code
 	 */
-	protected function create( $code )
+	protected function create($code)
 	{
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
-		$typeManager = $manager->getSubManager( 'type' );
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
+		$typeManager = $manager->getSubManager('type');
 
 		$typeSearch = $typeManager->createSearch();
-		$typeSearch->setConditions( $typeSearch->compare( '==', 'product.type.code', 'default' ) );
-		$typeResult = $typeManager->searchItems( $typeSearch );
+		$typeSearch->setConditions($typeSearch->compare('==', 'product.type.code', 'default'));
+		$typeResult = $typeManager->searchItems($typeSearch);
 
-		if( ( $typeItem = reset( $typeResult ) ) === false ) {
-			throw new \RuntimeException( 'No product type "default" found' );
+		if (($typeItem = reset($typeResult)) === false) {
+			throw new \RuntimeException('No product type "default" found');
 		}
 
 		$item = $manager->createItem();
-		$item->setTypeid( $typeItem->getId() );
-		$item->setCode( $code );
+		$item->setTypeid($typeItem->getId());
+		$item->setCode($code);
 
-		return $manager->saveItem( $item );
+		return $manager->saveItem($item);
 	}
 
 
-	protected function delete( \Aimeos\MShop\Product\Item\Iface $product )
+	protected function delete(\Aimeos\MShop\Product\Item\Iface $product)
 	{
-		$textManager = \Aimeos\MShop\Text\Manager\Factory::createManager( $this->context );
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
-		$listManager = $manager->getSubManager( 'lists' );
+		$textManager = \Aimeos\MShop\Text\Manager\Factory::createManager($this->context);
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
+		$listManager = $manager->getSubManager('lists');
 
-		foreach( $product->getListItems('text') as $listItem )
+		foreach ($product->getListItems('text') as $listItem)
 		{
-			$textManager->deleteItem( $listItem->getRefItem()->getId() );
-			$listManager->deleteItem( $listItem->getId() );
+			$textManager->deleteItem($listItem->getRefItem()->getId());
+			$listManager->deleteItem($listItem->getId());
 		}
 
-		$manager->deleteItem( $product->getId() );
+		$manager->deleteItem($product->getId());
 	}
 
 
 	/**
 	 * @param string $code
 	 */
-	protected function get( $code )
+	protected function get($code)
 	{
-		$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', $code ) );
+		$search->setConditions($search->compare('==', 'product.code', $code));
 
-		$result = $manager->searchItems( $search, array('text') );
+		$result = $manager->searchItems($search, array('text'));
 
-		if( ( $item = reset( $result ) ) === false ) {
-			throw new \RuntimeException( sprintf( 'No product item for code "%1$s"', $code ) );
+		if (($item = reset($result)) === false) {
+			throw new \RuntimeException(sprintf('No product item for code "%1$s"', $code));
 		}
 
 		return $item;

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

Spacing +3 added lines, -3 removed lines

@@ -27,8 +27,8 @@ 
 	 * @param array $mapping Associative list of field position in CSV as key and domain item key as value
 	 * @param \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Iface $processor Decorated processor
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
-		\Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Iface $processor = null )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
+		\Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Iface $processor = null)
 	{
 	}
 
@@ -40,7 +40,7 @@ 
 	 * @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\Catalog\Item\Iface $catalog, array $data )
+	public function process(\Aimeos\MShop\Catalog\Item\Iface $catalog, array $data)
 	{
 		return $data;
 	}

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

Spacing +3 added lines, -3 removed lines

@@ -26,8 +26,8 @@ 
 	 * @param array $mapping Associative list of field position in CSV as key and domain item key as value
 	 * @param \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Iface $processor Decorated processor
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
-		\Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Iface $processor = null );
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
+		\Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Iface $processor = null);
 
 
 	/**
@@ -37,5 +37,5 @@ 
 	 * @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\Catalog\Item\Iface $catalog, array $data );
+	public function process(\Aimeos\MShop\Catalog\Item\Iface $catalog, array $data);
 }
\ No newline at end of file