aimeos / ai-controller-jobs

controller/jobs/src/Controller/Jobs/Subscription/Process/Renew/Standard.php

Braces +3 added lines, -6 removed lines

@@ -93,8 +93,7 @@ 
 
 						$interval = new \DateInterval( $item->getInterval() );
 						$item->setDateNext( date_create()->add( $interval )->format( 'Y-m-d' ) );
-					}
-					catch( \Exception $e )
+					} catch( \Exception $e )
 					{
 						$item->setReason( \Aimeos\MShop\Subscription\Item\Iface::REASON_PAYMENT );
 						$item->setDateEnd( date_create()->format( 'Y-m-d' ) );
@@ -108,8 +107,7 @@ 
 					foreach( $processors as $processor ) {
 						$processor->renew( $item, $newInvoice );
 					}
-				}
-				catch( \Exception $e )
+				} catch( \Exception $e )
 				{
 					$msg = 'Unable to process subscription with ID "%1$s": %2$s';
 					$logger->log( sprintf( $msg, $item->getId(), $e->getMessage() ) );
@@ -152,8 +150,7 @@ 
 
 			$context->setUserId( $baseItem->getCustomerId() );
 			$context->setGroupIds( $customerItem->getGroups() );
-		}
-		catch( \Exception $e ) {} // Subscription without account
+		} catch( \Exception $e ) {} // Subscription without account
 
 		return $context;
 	}

Spacing +84 added lines, -84 removed lines

@@ -28,7 +28,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Subscription process renew' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Subscription process renew');
 	}
 
 
@@ -39,7 +39,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Renews subscriptions at next date' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Renews subscriptions at next date');
 	}
 
 
@@ -54,73 +54,73 @@ 
 		$config = $context->getConfig();
 		$logger = $context->getLogger();
 
-		$names = (array) $config->get( 'controller/common/subscription/process/processors', [] );
+		$names = (array) $config->get('controller/common/subscription/process/processors', []);
 
-		$date = date( 'Y-m-d' );
-		$processors = $this->getProcessors( $names );
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'subscription' );
+		$date = date('Y-m-d');
+		$processors = $this->getProcessors($names);
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'subscription');
 
-		$search = $manager->createSearch( true );
+		$search = $manager->createSearch(true);
 		$expr = [
-			$search->compare( '<=', 'subscription.datenext', $date ),
-			$search->combine( '||', [
-				$search->compare( '==', 'subscription.dateend', null ),
-				$search->compare( '>', 'subscription.dateend', $date ),
-			] ),
+			$search->compare('<=', 'subscription.datenext', $date),
+			$search->combine('||', [
+				$search->compare('==', 'subscription.dateend', null),
+				$search->compare('>', 'subscription.dateend', $date),
+			]),
 			$search->getConditions(),
 		];
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSortations( [$search->sort( '+', 'subscription.id' )] );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSortations([$search->sort('+', 'subscription.id')]);
 
 		$start = 0;
 
 		do
 		{
-			$search->setSlice( $start, 100 );
-			$items = $manager->searchItems( $search );
+			$search->setSlice($start, 100);
+			$items = $manager->searchItems($search);
 
-			foreach( $items as $item )
+			foreach ($items as $item)
 			{
 				try
 				{
-					$context = $this->createContext( $item->getOrderBaseId() );
-					$newOrder = $this->createOrderBase( $context, $item );
-					$newInvoice = $this->createOrderInvoice( $context, $newOrder );
+					$context = $this->createContext($item->getOrderBaseId());
+					$newOrder = $this->createOrderBase($context, $item);
+					$newInvoice = $this->createOrderInvoice($context, $newOrder);
 
 					try
 					{
-						$this->createPayment( $context, $newOrder, $newInvoice );
+						$this->createPayment($context, $newOrder, $newInvoice);
 
-						$interval = new \DateInterval( $item->getInterval() );
-						$item->setDateNext( date_create()->add( $interval )->format( 'Y-m-d' ) );
+						$interval = new \DateInterval($item->getInterval());
+						$item->setDateNext(date_create()->add($interval)->format('Y-m-d'));
 					}
-					catch( \Exception $e )
+					catch (\Exception $e)
 					{
-						$item->setReason( \Aimeos\MShop\Subscription\Item\Iface::REASON_PAYMENT );
-						$item->setDateEnd( date_create()->format( 'Y-m-d' ) );
-						$manager->saveItem( $item );
+						$item->setReason(\Aimeos\MShop\Subscription\Item\Iface::REASON_PAYMENT);
+						$item->setDateEnd(date_create()->format('Y-m-d'));
+						$manager->saveItem($item);
 
 						throw $e;
 					}
 
-					$manager->saveItem( $item );
+					$manager->saveItem($item);
 
-					foreach( $processors as $processor ) {
-						$processor->renew( $item, $newInvoice );
+					foreach ($processors as $processor) {
+						$processor->renew($item, $newInvoice);
 					}
 				}
-				catch( \Exception $e )
+				catch (\Exception $e)
 				{
 					$msg = 'Unable to process subscription with ID "%1$s": %2$s';
-					$logger->log( sprintf( $msg, $item->getId(), $e->getMessage() ) );
-					$logger->log( $e->getTraceAsString() );
+					$logger->log(sprintf($msg, $item->getId(), $e->getMessage()));
+					$logger->log($e->getTraceAsString());
 				}
 			}
 
-			$count = count( $items );
+			$count = count($items);
 			$start += $count;
 		}
-		while( $count === $search->getSliceSize() );
+		while ($count === $search->getSliceSize());
 	}
 
 
@@ -131,25 +131,25 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Base\Iface $basket Order including product and addresses
 	 * @return \Aimeos\MShop\Order\Item\Base\Iface Order with delivery service added
 	 */
-	protected function addDeliveryService( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Order\Item\Base\Iface $basket )
+	protected function addDeliveryService(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Order\Item\Base\Iface $basket)
 	{
 		$type = \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_DELIVERY;
 
-		$serviceManager = \Aimeos\MShop\Factory::createManager( $context, 'service' );
-		$orderServiceManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base/service' );
+		$serviceManager = \Aimeos\MShop\Factory::createManager($context, 'service');
+		$orderServiceManager = \Aimeos\MShop\Factory::createManager($context, 'order/base/service');
 
-		$search = $serviceManager->createSearch( true );
-		$search->setSortations( [$search->sort( '+', 'service.position' )] );
-		$search->setConditions( $search->compare( '==', 'service.type.code', $type ) );
+		$search = $serviceManager->createSearch(true);
+		$search->setSortations([$search->sort('+', 'service.position')]);
+		$search->setConditions($search->compare('==', 'service.type.code', $type));
 
-		foreach( $serviceManager->searchItems( $search, ['media', 'price', 'text'] ) as $item )
+		foreach ($serviceManager->searchItems($search, ['media', 'price', 'text']) as $item)
 		{
-			$provider = $serviceManager->getProvider( $item, $item->getType() );
+			$provider = $serviceManager->getProvider($item, $item->getType());
 
-			if( $provider->isAvailable( $basket ) === true )
+			if ($provider->isAvailable($basket) === true)
 			{
-				$orderServiceItem = $orderServiceManager->createItem()->copyFrom( $item );
-				$basket->addService( $orderServiceItem, $type );
+				$orderServiceItem = $orderServiceManager->createItem()->copyFrom($item);
+				$basket->addService($orderServiceItem, $type);
 
 				return $basket;
 			}
@@ -165,30 +165,30 @@ 
 	 * @param string $baseId Unique order base ID
 	 * @return \Aimeos\MShop\Context\Item\Iface New context object
 	 */
-	protected function createContext( $baseId )
+	protected function createContext($baseId)
 	{
 		$context = clone $this->getContext();
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' );
-		$baseItem = $manager->getItem( $baseId );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'order/base');
+		$baseItem = $manager->getItem($baseId);
 
 		$locale = $baseItem->getLocale();
 		$level = \Aimeos\MShop\Locale\Manager\Base::SITE_ALL;
 
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
-		$locale = $manager->bootstrap( $baseItem->getSiteCode(), $locale->getLanguageId(), $locale->getCurrencyId(), false, $level );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'locale');
+		$locale = $manager->bootstrap($baseItem->getSiteCode(), $locale->getLanguageId(), $locale->getCurrencyId(), false, $level);
 
-		$context->setLocale( $locale );
+		$context->setLocale($locale);
 
 		try
 		{
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' );
-			$customerItem = $manager->getItem( $baseItem->getCustomerId(), ['customer/group'] );
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'customer');
+			$customerItem = $manager->getItem($baseItem->getCustomerId(), ['customer/group']);
 
-			$context->setUserId( $baseItem->getCustomerId() );
-			$context->setGroupIds( $customerItem->getGroups() );
+			$context->setUserId($baseItem->getCustomerId());
+			$context->setGroupIds($customerItem->getGroups());
 		}
-		catch( \Exception $e ) {} // Subscription without account
+		catch (\Exception $e) {} // Subscription without account
 
 		return $context;
 	}
@@ -201,39 +201,39 @@ 
 	 * @param \Aimeos\MShop\Subscription\Item\Iface $subscription Subscription item with order base ID and order product ID
 	 * @return \Aimeos\MShop\Order\Item\Base\Iface Complete order with product, addresses and services saved to the storage
 	 */
-	protected function createOrderBase( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Subscription\Item\Iface $subscription )
+	protected function createOrderBase(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Subscription\Item\Iface $subscription)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'order/base');
 
-		$basket = $manager->load( $subscription->getOrderBaseId() );
+		$basket = $manager->load($subscription->getOrderBaseId());
 
 		$newBasket = $manager->createItem();
-		$newBasket->setCustomerId( $basket->getCustomerId() );
+		$newBasket->setCustomerId($basket->getCustomerId());
 
-		foreach( $basket->getProducts() as $orderProduct )
+		foreach ($basket->getProducts() as $orderProduct)
 		{
-			if( $orderProduct->getId() === $subscription->getOrderProductId() )
+			if ($orderProduct->getId() === $subscription->getOrderProductId())
 			{
-				foreach( $orderProduct->getAttributeItems() as $attrItem ) {
-					$attrItem->setId( null );
+				foreach ($orderProduct->getAttributeItems() as $attrItem) {
+					$attrItem->setId(null);
 				}
-				$newBasket->addProduct( $orderProduct->setId( null ) );
+				$newBasket->addProduct($orderProduct->setId(null));
 			}
 		}
 
-		foreach( $basket->getAddresses() as $type => $orderAddress ) {
-			$newBasket->setAddress( $orderAddress, $type );
+		foreach ($basket->getAddresses() as $type => $orderAddress) {
+			$newBasket->setAddress($orderAddress, $type);
 		}
 
 		$type = \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT;
 
-		foreach( $basket->getService( $type ) as $orderService ) {
-			$newBasket->addService( $orderService, $type );
+		foreach ($basket->getService($type) as $orderService) {
+			$newBasket->addService($orderService, $type);
 		}
 
-		$newBasket = $this->addDeliveryService( $context, $newBasket );
+		$newBasket = $this->addDeliveryService($context, $newBasket);
 
-		return $manager->store( $newBasket );
+		return $manager->store($newBasket);
 	}
 
 
@@ -244,15 +244,15 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Base\Iface $basket Complete order with product, addresses and services saved to the storage
 	 * @return \Aimeos\MShop\Order\Item\Iface New invoice item associated to the order saved to the storage
 	 */
-	protected function createOrderInvoice( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Order\Item\Base\Iface $basket )
+	protected function createOrderInvoice(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Order\Item\Base\Iface $basket)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'order');
 
 		$item = $manager->createItem();
-		$item->setBaseId( $basket->getId() );
-		$item->setType( 'subscription' );
+		$item->setBaseId($basket->getId());
+		$item->setType('subscription');
 
-		return $manager->saveItem( $item );
+		return $manager->saveItem($item);
 	}
 
 
@@ -263,17 +263,17 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Base\Iface $basket Complete order with product, addresses and services
 	 * @param \Aimeos\MShop\Order\Item\Iface New invoice item associated to the order
 	 */
-	protected function createPayment( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Order\Item\Base\Iface $basket,
-		\Aimeos\MShop\Order\Item\Iface $invoice )
+	protected function createPayment(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MShop\Order\Item\Base\Iface $basket,
+		\Aimeos\MShop\Order\Item\Iface $invoice)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'service' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'service');
 
-		foreach( $basket->getService( \Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT ) as $service )
+		foreach ($basket->getService(\Aimeos\MShop\Order\Item\Base\Service\Base::TYPE_PAYMENT) as $service)
 		{
-			$item = $manager->getItem( $service->getServiceId() );
-			$provider = $manager->getProvider( $item, 'payment' );
+			$item = $manager->getItem($service->getServiceId());
+			$provider = $manager->getProvider($item, 'payment');
 
-			$provider->repay( $invoice );
+			$provider->repay($invoice);
 		}
 	}
 }

controller/jobs/tests/Controller/Jobs/Subscription/Process/Begin/StanardTest.php

Spacing +29 added lines, -29 removed lines

@@ -20,49 +20,49 @@ 
 		$aimeos = \TestHelperJobs::getAimeos();
 		$this->context = \TestHelperJobs::getContext();
 
-		$this->object = new \Aimeos\Controller\Jobs\Subscription\Process\Begin\Standard( $this->context, $aimeos );
+		$this->object = new \Aimeos\Controller\Jobs\Subscription\Process\Begin\Standard($this->context, $aimeos);
 
-		\Aimeos\MShop\Factory::setCache( true );
+		\Aimeos\MShop\Factory::setCache(true);
 	}
 
 
 	protected function tearDown()
 	{
-		\Aimeos\MShop\Factory::setCache( false );
+		\Aimeos\MShop\Factory::setCache(false);
 		\Aimeos\MShop\Factory::clear();
 
-		unset( $this->object, $this->context );
+		unset($this->object, $this->context);
 	}
 
 
 	public function testGetName()
 	{
-		$this->assertEquals( 'Subscription process start', $this->object->getName() );
+		$this->assertEquals('Subscription process start', $this->object->getName());
 	}
 
 
 	public function testGetDescription()
 	{
-		$this->assertEquals( 'Process subscriptions initially', $this->object->getDescription() );
+		$this->assertEquals('Process subscriptions initially', $this->object->getDescription());
 	}
 
 
 	public function testRun()
 	{
-		$this->context->getConfig()->set( 'controller/common/subscription/process/processors', ['cgroup'] );
+		$this->context->getConfig()->set('controller/common/subscription/process/processors', ['cgroup']);
 		$item = $this->getSubscription();
 
-		$managerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Subscription\\Manager\\Standard' )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( ['searchItems', 'saveItem'] )
+		$managerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Subscription\\Manager\\Standard')
+			->setConstructorArgs([$this->context])
+			->setMethods(['searchItems', 'saveItem'])
 			->getMock();
 
-		\Aimeos\MShop\Factory::injectManager( $this->context, 'subscription', $managerStub );
+		\Aimeos\MShop\Factory::injectManager($this->context, 'subscription', $managerStub);
 
-		$managerStub->expects( $this->once() )->method( 'searchItems' )
-			->will( $this->returnValue( [$item] ) );
+		$managerStub->expects($this->once())->method('searchItems')
+			->will($this->returnValue([$item]));
 
-		$managerStub->expects( $this->once() )->method( 'saveItem' );
+		$managerStub->expects($this->once())->method('saveItem');
 
 		$this->object->run();
 	}
@@ -70,21 +70,21 @@ 
 
 	public function testRunException()
 	{
-		$this->context->getConfig()->set( 'controller/common/subscription/process/processors', ['cgroup'] );
-		$this->context->getConfig()->set( 'controller/common/subscription/process/processor/cgroup/groupids', ['1'] );
+		$this->context->getConfig()->set('controller/common/subscription/process/processors', ['cgroup']);
+		$this->context->getConfig()->set('controller/common/subscription/process/processor/cgroup/groupids', ['1']);
 
-		$managerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Subscription\\Manager\\Standard' )
-			->setConstructorArgs( [$this->context] )
-			->setMethods( ['searchItems', 'saveItem'] )
+		$managerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Subscription\\Manager\\Standard')
+			->setConstructorArgs([$this->context])
+			->setMethods(['searchItems', 'saveItem'])
 			->getMock();
 
-		\Aimeos\MShop\Factory::injectManager( $this->context, 'subscription', $managerStub );
+		\Aimeos\MShop\Factory::injectManager($this->context, 'subscription', $managerStub);
 
-		$managerStub->expects( $this->once() )->method( 'searchItems' )
-			->will( $this->returnValue( [$managerStub->createItem()] ) );
+		$managerStub->expects($this->once())->method('searchItems')
+			->will($this->returnValue([$managerStub->createItem()]));
 
-		$managerStub->expects( $this->once() )->method( 'saveItem' )
-			->will( $this->throwException( new \Exception() ) );
+		$managerStub->expects($this->once())->method('saveItem')
+			->will($this->throwException(new \Exception()));
 
 		$this->object->run();
 	}
@@ -92,17 +92,17 @@ 
 
 	protected function getSubscription()
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'subscription' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'subscription');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'subscription.dateend', '2010-01-01' ) );
+		$search->setConditions($search->compare('==', 'subscription.dateend', '2010-01-01'));
 
-		$items = $manager->searchItems( $search );
+		$items = $manager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) !== false ) {
+		if (($item = reset($items)) !== false) {
 			return $item;
 		}
 
-		throw new \Exception( 'No subscription item found' );
+		throw new \Exception('No subscription item found');
 	}
 }

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

Braces +1 added lines, -2 removed lines

@@ -108,8 +108,7 @@
 				$listItem = $listMap[$content][$type][$typecode];
 				$refItem = $listItem->getRefItem();
 				unset( $listItems[ $listItem->getId() ] );
-			}
-			else
+			} else
 			{
 				$listItem = $listManager->createItem( $typecode, 'text' );
 				$refItem = $manager->createItem( $type, 'catalog' );

Spacing +33 added lines, -33 removed lines

@@ -42,10 +42,10 @@ 
 	 * @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 $object Decorated processor
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
-			\Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Iface $object = null )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
+			\Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Iface $object = null)
 	{
-		parent::__construct( $context, $mapping, $object );
+		parent::__construct($context, $mapping, $object);
 
 		/** controller/common/catalog/import/csv/processor/text/listtypes
 		 * Names of the catalog list types for texts that are updated or removed
@@ -66,7 +66,7 @@ 
 		 * @see controller/common/catalog/import/csv/processor/price/listtypes
 		 * @see controller/common/catalog/import/csv/processor/catalog/listtypes
 		 */
-		$this->listTypes = $context->getConfig()->get( 'controller/common/catalog/import/csv/processor/text/listtypes' );
+		$this->listTypes = $context->getConfig()->get('controller/common/catalog/import/csv/processor/text/listtypes');
 	}
 
 
@@ -77,53 +77,53 @@ 
 	 * @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)
 	{
-		$listManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog/lists' );
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'text' );
+		$listManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog/lists');
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'text');
 
 		$listMap = [];
-		$map = $this->getMappedChunk( $data, $this->getMapping() );
-		$listItems = $catalog->getListItems( 'text', $this->listTypes );
+		$map = $this->getMappedChunk($data, $this->getMapping());
+		$listItems = $catalog->getListItems('text', $this->listTypes);
 
-		foreach( $listItems as $listItem )
+		foreach ($listItems as $listItem)
 		{
-			if( ( $refItem = $listItem->getRefItem() ) !== null ) {
-				$listMap[ $refItem->getContent() ][ $refItem->getType() ][ $listItem->getType() ] = $listItem;
+			if (($refItem = $listItem->getRefItem()) !== null) {
+				$listMap[$refItem->getContent()][$refItem->getType()][$listItem->getType()] = $listItem;
 			}
 		}
 
-		foreach( $map as $pos => $list )
+		foreach ($map as $pos => $list)
 		{
-			if( $this->checkEntry( $list ) === false ) {
+			if ($this->checkEntry($list) === false) {
 				continue;
 			}
 
-			$content = trim( $list['text.content'] );
-			$type = trim( isset( $list['text.type'] ) ? $list['text.type'] : 'name' );
-			$typecode = trim( isset( $list['catalog.lists.type'] ) ? $list['catalog.lists.type'] : 'default' );
+			$content = trim($list['text.content']);
+			$type = trim(isset($list['text.type']) ? $list['text.type'] : 'name');
+			$typecode = trim(isset($list['catalog.lists.type']) ? $list['catalog.lists.type'] : 'default');
 
-			if( isset( $listMap[$content][$type][$typecode] ) )
+			if (isset($listMap[$content][$type][$typecode]))
 			{
 				$listItem = $listMap[$content][$type][$typecode];
 				$refItem = $listItem->getRefItem();
-				unset( $listItems[ $listItem->getId() ] );
+				unset($listItems[$listItem->getId()]);
 			}
 			else
 			{
-				$listItem = $listManager->createItem( $typecode, 'text' );
-				$refItem = $manager->createItem( $type, 'catalog' );
+				$listItem = $listManager->createItem($typecode, 'text');
+				$refItem = $manager->createItem($type, 'catalog');
 			}
 
-			$refItem->fromArray( $this->addItemDefaults( $list ) );
-			$listItem->fromArray( $this->addListItemDefaults( $list, $pos ) );
+			$refItem->fromArray($this->addItemDefaults($list));
+			$listItem->fromArray($this->addListItemDefaults($list, $pos));
 
-			$catalog->addListItem( 'text', $listItem, $refItem );
+			$catalog->addListItem('text', $listItem, $refItem);
 		}
 
-		$catalog->deleteListItems( $listItems, true );
+		$catalog->deleteListItems($listItems, true);
 
-		return $this->getObject()->process( $catalog, $data );
+		return $this->getObject()->process($catalog, $data);
 	}
 
 
@@ -133,13 +133,13 @@ 
 	 * @param array $list Associative list of domain item keys and their values, e.g. "text.status" => 1
 	 * @return array Given associative list enriched by default values if they were not already set
 	 */
-	protected function addItemDefaults( array $list )
+	protected function addItemDefaults(array $list)
 	{
-		if( !isset( $list['text.label'] ) ) {
-			$list['text.label'] = mb_strcut( trim( $list['text.content'] ), 0, 255 );
+		if (!isset($list['text.label'])) {
+			$list['text.label'] = mb_strcut(trim($list['text.content']), 0, 255);
 		}
 
-		if( !isset( $list['text.status'] ) ) {
+		if (!isset($list['text.status'])) {
 			$list['text.status'] = 1;
 		}
 
@@ -153,10 +153,10 @@ 
 	 * @param array $list Associative list of key/value pairs from the mapping
 	 * @return boolean True if valid, false if not
 	 */
-	protected function checkEntry( array $list )
+	protected function checkEntry(array $list)
 	{
-		if( !isset( $list['text.content'] ) || trim( $list['text.content'] ) === '' || isset( $list['catalog.lists.type'] )
-			&& $this->listTypes !== null && !in_array( trim( $list['catalog.lists.type'] ), (array) $this->listTypes )
+		if (!isset($list['text.content']) || trim($list['text.content']) === '' || isset($list['catalog.lists.type'])
+			&& $this->listTypes !== null && !in_array(trim($list['catalog.lists.type']), (array) $this->listTypes)
 		) {
 			return false;
 		}

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

Braces +1 added lines, -2 removed lines

@@ -112,8 +112,7 @@
 					$listItem = $listMap[$url][$type][$typecode];
 					$refItem = $listItem->getRefItem();
 					unset( $listItems[ $listItem->getId() ] );
-				}
-				else
+				} else
 				{
 					$listItem = $listManager->createItem( $typecode, 'media' );
 					$refItem = $manager->createItem( $type, 'catalog' );

Spacing +35 added lines, -35 removed lines

@@ -42,10 +42,10 @@ 
 	 * @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 $object Decorated processor
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
-			\Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Iface $object = null )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
+			\Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Iface $object = null)
 	{
-		parent::__construct( $context, $mapping, $object );
+		parent::__construct($context, $mapping, $object);
 
 		/** controller/common/catalog/import/csv/processor/media/listtypes
 		 * Names of the catalog list types for media that are updated or removed
@@ -66,7 +66,7 @@ 
 		 * @see controller/common/catalog/import/csv/processor/price/listtypes
 		 * @see controller/common/catalog/import/csv/processor/text/listtypes
 		 */
-		$this->listTypes = $context->getConfig()->get( 'controller/common/catalog/import/csv/processor/media/listtypes' );
+		$this->listTypes = $context->getConfig()->get('controller/common/catalog/import/csv/processor/media/listtypes');
 	}
 
 
@@ -77,60 +77,60 @@ 
 	 * @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)
 	{
 		$context = $this->getContext();
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'media' );
-		$listManager = \Aimeos\MShop\Factory::createManager( $context, 'catalog/lists' );
-		$separator = $context->getConfig()->get( 'controller/common/catalog/import/csv/separator', "\n" );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'media');
+		$listManager = \Aimeos\MShop\Factory::createManager($context, 'catalog/lists');
+		$separator = $context->getConfig()->get('controller/common/catalog/import/csv/separator', "\n");
 
 		$listMap = [];
-		$map = $this->getMappedChunk( $data, $this->getMapping() );
-		$listItems = $catalog->getListItems( 'media', $this->listTypes );
+		$map = $this->getMappedChunk($data, $this->getMapping());
+		$listItems = $catalog->getListItems('media', $this->listTypes);
 
-		foreach( $listItems as $listItem )
+		foreach ($listItems as $listItem)
 		{
-			if( ( $refItem = $listItem->getRefItem() ) !== null ) {
-				$listMap[ $refItem->getUrl() ][ $refItem->getType() ][ $listItem->getType() ] = $listItem;
+			if (($refItem = $listItem->getRefItem()) !== null) {
+				$listMap[$refItem->getUrl()][$refItem->getType()][$listItem->getType()] = $listItem;
 			}
 		}
 
-		foreach( $map as $pos => $list )
+		foreach ($map as $pos => $list)
 		{
-			if( $this->checkEntry( $list ) === false ) {
+			if ($this->checkEntry($list) === false) {
 				continue;
 			}
 
-			$urls = explode( $separator, trim( $list['media.url'] ) );
-			$type = trim( $this->getValue( $list, 'media.type', 'default' ) );
-			$typecode = trim( $this->getValue( $list, 'catalog.lists.type', 'default' ) );
+			$urls = explode($separator, trim($list['media.url']));
+			$type = trim($this->getValue($list, 'media.type', 'default'));
+			$typecode = trim($this->getValue($list, 'catalog.lists.type', 'default'));
 
-			foreach( $urls as $url )
+			foreach ($urls as $url)
 			{
-				if( isset( $listMap[$url][$type][$typecode] ) )
+				if (isset($listMap[$url][$type][$typecode]))
 				{
 					$listItem = $listMap[$url][$type][$typecode];
 					$refItem = $listItem->getRefItem();
-					unset( $listItems[ $listItem->getId() ] );
+					unset($listItems[$listItem->getId()]);
 				}
 				else
 				{
-					$listItem = $listManager->createItem( $typecode, 'media' );
-					$refItem = $manager->createItem( $type, 'catalog' );
+					$listItem = $listManager->createItem($typecode, 'media');
+					$refItem = $manager->createItem($type, 'catalog');
 				}
 
 				$list['media.url'] = $url;
 
-				$list = $refItem->fromArray( $this->addItemDefaults( $list ) );
-				$list = $listItem->fromArray( $this->addListItemDefaults( $list, $pos++ ) );
+				$list = $refItem->fromArray($this->addItemDefaults($list));
+				$list = $listItem->fromArray($this->addListItemDefaults($list, $pos++));
 
-				$catalog->addListItem( 'media', $listItem, $refItem );
+				$catalog->addListItem('media', $listItem, $refItem);
 			}
 		}
 
-		$catalog->deleteListItems( $listItems, true );
+		$catalog->deleteListItems($listItems, true);
 
-		return $this->getObject()->process( $catalog, $data );
+		return $this->getObject()->process($catalog, $data);
 	}
 
 
@@ -140,17 +140,17 @@ 
 	 * @param array $list Associative list of domain item keys and their values, e.g. "media.status" => 1
 	 * @return array Given associative list enriched by default values if they were not already set
 	 */
-	protected function addItemDefaults( array $list )
+	protected function addItemDefaults(array $list)
 	{
-		if( !isset( $list['media.label'] ) ) {
+		if (!isset($list['media.label'])) {
 			$list['media.label'] = $list['media.url'];
 		}
 
-		if( !isset( $list['media.preview'] ) ) {
+		if (!isset($list['media.preview'])) {
 			$list['media.preview'] = $list['media.url'];
 		}
 
-		if( !isset( $list['media.status'] ) ) {
+		if (!isset($list['media.status'])) {
 			$list['media.status'] = 1;
 		}
 
@@ -164,10 +164,10 @@ 
 	 * @param array $list Associative list of key/value pairs from the mapping
 	 * @return boolean True if valid, false if not
 	 */
-	protected function checkEntry( array $list )
+	protected function checkEntry(array $list)
 	{
-		if( !isset( $list['media.url'] ) || trim( $list['media.url'] ) === '' || isset( $list['catalog.lists.type'] )
-				&& $this->listTypes !== null && !in_array( trim( $list['catalog.lists.type'] ), (array) $this->listTypes )
+		if (!isset($list['media.url']) || trim($list['media.url']) === '' || isset($list['catalog.lists.type'])
+				&& $this->listTypes !== null && !in_array(trim($list['catalog.lists.type']), (array) $this->listTypes)
 		) {
 			return false;
 		}

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

Spacing +62 added lines, -62 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,31 +49,31 @@ 
 			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);
 
 
 		$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( '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('test text', $refItem->getLabel());
+		$this->assertEquals('Job CSV test', $refItem->getContent());
+		$this->assertEquals('de', $refItem->getLanguageId());
+		$this->assertEquals(1, $refItem->getStatus());
 	}
 
 
@@ -101,27 +101,27 @@ 
 			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);
 
 
 		$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++;
 		}
 	}
@@ -144,21 +144,21 @@ 
 			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->process( $catalog, $dataUpdate );
+		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Text\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($catalog, $data);
+		$object->process($catalog, $dataUpdate);
 
 
 		$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());
 	}
 
 
@@ -174,18 +174,18 @@ 
 			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);
 
-		$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, []);
 
 
 		$listItems = $catalog->getListItems();
 
-		$this->assertEquals( 0, count( $listItems ) );
+		$this->assertEquals(0, count($listItems));
 	}
 
 
@@ -205,15 +205,15 @@ 
 			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);
 
 
 		$listItems = $catalog->getListItems();
 
-		$this->assertEquals( 1, count( $listItems ) );
+		$this->assertEquals(1, count($listItems));
 	}
 
 
@@ -237,35 +237,35 @@ 
 			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);
 
 
 		$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 $item;
 	}

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

Spacing +64 added lines, -64 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,32 +51,32 @@ 
 			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);
 
 
 		$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( '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('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());
 	}
 
 
@@ -90,21 +90,21 @@ 
 			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);
 
 
 		$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++;
 		}
 	}
@@ -126,20 +126,20 @@ 
 			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);
 
 
 		$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++;
 		}
 	}
@@ -162,21 +162,21 @@ 
 			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->process( $catalog, $dataUpdate );
+		$object = new \Aimeos\Controller\Common\Catalog\Import\Csv\Processor\Media\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($catalog, $data);
+		$object->process($catalog, $dataUpdate);
 
 
 		$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());
 	}
 
 
@@ -190,18 +190,18 @@ 
 			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);
 
-		$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, []);
 
 
 		$listItems = $catalog->getListItems();
 
-		$this->assertEquals( 0, count( $listItems ) );
+		$this->assertEquals(0, count($listItems));
 	}
 
 
@@ -217,15 +217,15 @@ 
 			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);
 
 
 		$listItems = $catalog->getListItems();
 
-		$this->assertEquals( 1, count( $listItems ) );
+		$this->assertEquals(1, count($listItems));
 	}
 
 
@@ -245,34 +245,34 @@ 
 			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);
 
 
 		$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 $item;
 	}

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

Spacing +19 added lines, -19 removed lines

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

controller/jobs/src/Controller/Jobs/Product/Export/Sitemap/Standard.php

Spacing +50 added lines, -50 removed lines

@@ -28,7 +28,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Product site map' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Product site map');
 	}
 
 
@@ -39,7 +39,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Creates a product site map for search engines' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Creates a product site map for search engines');
 	}
 
 
@@ -52,8 +52,8 @@ 
 	{
 		$container = $this->createContainer();
 
-		$files = $this->export( $container );
-		$this->createSitemapIndex( $container, $files );
+		$files = $this->export($container);
+		$this->createSitemapIndex($container, $files);
 
 		$container->close();
 	}
@@ -65,7 +65,7 @@ 
 	 * @param \Aimeos\MW\Container\Content\Iface $content File content object
 	 * @param \Aimeos\MShop\Product\Item\Iface[] $items List of product items
 	 */
-	protected function addItems( \Aimeos\MW\Container\Content\Iface $content, array $items )
+	protected function addItems(\Aimeos\MW\Container\Content\Iface $content, array $items)
 	{
 		$config = $this->getContext()->getConfig();
 
@@ -96,7 +96,7 @@ 
 		 * @see controller/jobs/product/export/sitemap/max-items
 		 * @see controller/jobs/product/export/sitemap/max-query
 		 */
-		$changefreq = $config->get( 'controller/jobs/product/export/sitemap/changefreq', 'daily' );
+		$changefreq = $config->get('controller/jobs/product/export/sitemap/changefreq', 'daily');
 
 		/** controller/jobs/product/export/sitemap/standard/template-items
 		 * Relative path to the XML items template of the product site map job controller.
@@ -129,7 +129,7 @@ 
 		$view->siteItems = $items;
 		$view->siteFreq = $changefreq;
 
-		$content->add( $view->render( $context->getConfig()->get( $tplconf, $default ) ) );
+		$content->add($view->render($context->getConfig()->get($tplconf, $default)));
 	}
 
 
@@ -175,7 +175,7 @@ 
 		 * @see controller/jobs/product/export/sitemap/max-query
 		 * @see controller/jobs/product/export/sitemap/changefreq
 		 */
-		$location = $config->get( 'controller/jobs/product/export/sitemap/location' );
+		$location = $config->get('controller/jobs/product/export/sitemap/location');
 
 		/** controller/jobs/product/export/sitemap/container/options
 		 * List of file container options for the site map files
@@ -196,16 +196,16 @@ 
 		 * @see controller/jobs/product/export/sitemap/max-query
 		 * @see controller/jobs/product/export/sitemap/changefreq
 		 */
-		$default = array( 'gzip-mode' => 'wb' );
-		$options = $config->get( 'controller/jobs/product/export/sitemap/container/options', $default );
+		$default = array('gzip-mode' => 'wb');
+		$options = $config->get('controller/jobs/product/export/sitemap/container/options', $default);
 
-		if( $location === null )
+		if ($location === null)
 		{
-			$msg = sprintf( 'Required configuration for "%1$s" is missing', 'controller/jobs/product/export/sitemap/location' );
-			throw new \Aimeos\Controller\Jobs\Exception( $msg );
+			$msg = sprintf('Required configuration for "%1$s" is missing', 'controller/jobs/product/export/sitemap/location');
+			throw new \Aimeos\Controller\Jobs\Exception($msg);
 		}
 
-		return \Aimeos\MW\Container\Factory::getContainer( $location, 'Directory', 'Gzip', $options );
+		return \Aimeos\MW\Container\Factory::getContainer($location, 'Directory', 'Gzip', $options);
 	}
 
 
@@ -216,7 +216,7 @@ 
 	 * @param integer $filenum New file number
 	 * @return \Aimeos\MW\Container\Content\Iface New content object
 	 */
-	protected function createContent( \Aimeos\MW\Container\Iface $container, $filenum )
+	protected function createContent(\Aimeos\MW\Container\Iface $container, $filenum)
 	{
 		/** controller/jobs/product/export/sitemap/standard/template-header
 		 * Relative path to the XML site map header template of the product site map job controller.
@@ -246,9 +246,9 @@ 
 		$context = $this->getContext();
 		$view = $context->getView();
 
-		$content = $container->create( $this->getFilename( $filenum ) );
-		$content->add( $view->render( $context->getConfig()->get( $tplconf, $default ) ) );
-		$container->add( $content );
+		$content = $container->create($this->getFilename($filenum));
+		$content->add($view->render($context->getConfig()->get($tplconf, $default)));
+		$container->add($content);
 
 		return $content;
 	}
@@ -259,7 +259,7 @@ 
 	 *
 	 * @param \Aimeos\MW\Container\Content\Iface $content
 	 */
-	protected function closeContent( \Aimeos\MW\Container\Content\Iface $content )
+	protected function closeContent(\Aimeos\MW\Container\Content\Iface $content)
 	{
 		/** controller/jobs/product/export/sitemap/standard/template-footer
 		 * Relative path to the XML site map footer template of the product site map job controller.
@@ -289,7 +289,7 @@ 
 		$context = $this->getContext();
 		$view = $context->getView();
 
-		$content->add( $view->render( $context->getConfig()->get( $tplconf, $default ) ) );
+		$content->add($view->render($context->getConfig()->get($tplconf, $default)));
 	}
 
 
@@ -299,7 +299,7 @@ 
 	 * @param \Aimeos\MW\Container\Iface $container File container object
 	 * @param array $files List of generated site map file names
 	 */
-	protected function createSitemapIndex( \Aimeos\MW\Container\Iface $container, array $files )
+	protected function createSitemapIndex(\Aimeos\MW\Container\Iface $container, array $files)
 	{
 		/** controller/jobs/product/export/sitemap/standard/template-index
 		 * Relative path to the XML site map index template of the product site map job controller.
@@ -331,9 +331,9 @@ 
 
 		$view->siteFiles = $files;
 
-		$content = $container->create( 'aimeos-sitemap-index.xml' );
-		$content->add( $view->render( $context->getConfig()->get( $tplconf, $default ) ) );
-		$container->add( $content );
+		$content = $container->create('aimeos-sitemap-index.xml');
+		$content->add($view->render($context->getConfig()->get($tplconf, $default)));
+		$container->add($content);
 	}
 
 
@@ -344,44 +344,44 @@ 
 	 * @param boolean $default True to filter exported products by default criteria
 	 * @return array List of content (file) names
 	 */
-	protected function export( \Aimeos\MW\Container\Iface $container, $default = true )
+	protected function export(\Aimeos\MW\Container\Iface $container, $default = true)
 	{
-		$domains = $this->getConfig( 'domains', [] );
-		$maxItems = $this->getConfig( 'max-items', 10000 );
-		$maxQuery = $this->getConfig( 'max-query', 1000 );
+		$domains = $this->getConfig('domains', []);
+		$maxItems = $this->getConfig('max-items', 10000);
+		$maxQuery = $this->getConfig('max-query', 1000);
 
 		$start = 0; $filenum = 1;
 		$names = [];
 
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'index' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'index');
 
-		$search = $manager->createSearch( $default );
-		$search->setConditions( $search->compare( '!=', 'index.catalog.id', null ) );
-		$search->setSortations( array( $search->sort( '+', 'product.id' ) ) );
-		$search->setSlice( 0, $maxQuery );
+		$search = $manager->createSearch($default);
+		$search->setConditions($search->compare('!=', 'index.catalog.id', null));
+		$search->setSortations(array($search->sort('+', 'product.id')));
+		$search->setSlice(0, $maxQuery);
 
-		$content = $this->createContent( $container, $filenum );
+		$content = $this->createContent($container, $filenum);
 		$names[] = $content->getResource();
 
 		do
 		{
-			$items = $manager->searchItems( $search, $domains );
-			$this->addItems( $content, $items );
+			$items = $manager->searchItems($search, $domains);
+			$this->addItems($content, $items);
 
-			$count = count( $items );
+			$count = count($items);
 			$start += $count;
-			$search->setSlice( $start, $maxQuery );
+			$search->setSlice($start, $maxQuery);
 
-			if( $start + $maxQuery > $maxItems * $filenum )
+			if ($start + $maxQuery > $maxItems * $filenum)
 			{
-				$this->closeContent( $content );
-				$content = $this->createContent( $container, ++$filenum );
+				$this->closeContent($content);
+				$content = $this->createContent($container, ++$filenum);
 				$names[] = $content->getResource();
 			}
 		}
-		while( $count >= $search->getSliceSize() );
+		while ($count >= $search->getSliceSize());
 
-		$this->closeContent( $content );
+		$this->closeContent($content);
 
 		return $names;
 	}
@@ -394,11 +394,11 @@ 
 	 * @param mixed $default Default value if name is unknown
 	 * @return mixed Configuration value
 	 */
-	protected function getConfig( $name, $default = null )
+	protected function getConfig($name, $default = null)
 	{
 		$config = $this->getContext()->getConfig();
 
-		switch( $name )
+		switch ($name)
 		{
 			case 'domain':
 				/** controller/jobs/product/export/sitemap/domains
@@ -419,7 +419,7 @@ 
 				 * @see controller/jobs/product/export/sitemap/max-query
 				 * @see controller/jobs/product/export/sitemap/changefreq
 				 */
-				return $config->get( 'controller/jobs/product/export/sitemap/domains', $default );
+				return $config->get('controller/jobs/product/export/sitemap/domains', $default);
 
 			case 'max-items':
 				/** controller/jobs/product/export/sitemap/max-items
@@ -444,7 +444,7 @@ 
 				 * @see controller/jobs/product/export/sitemap/changefreq
 				 * @see controller/jobs/product/export/sitemap/domains
 				 */
-				return $config->get( 'controller/jobs/product/export/sitemap/max-items', 50000 );
+				return $config->get('controller/jobs/product/export/sitemap/max-items', 50000);
 
 			case 'max-query':
 				/** controller/jobs/product/export/sitemap/max-query
@@ -465,7 +465,7 @@ 
 				 * @see controller/jobs/product/export/sitemap/changefreq
 				 * @see controller/jobs/product/export/sitemap/domains
 				 */
-				return $config->get( 'controller/jobs/product/export/sitemap/max-query', 1000 );
+				return $config->get('controller/jobs/product/export/sitemap/max-query', 1000);
 		}
 
 		return $default;
@@ -478,8 +478,8 @@ 
 	 * @param integer $number Current file number
 	 * @return string New file name
 	 */
-	protected function getFilename( $number )
+	protected function getFilename($number)
 	{
-		return sprintf( 'aimeos-sitemap-%d.xml', $number );
+		return sprintf('aimeos-sitemap-%d.xml', $number);
 	}
 }

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

Spacing +35 added lines, -35 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,26 +49,26 @@ 
 			4 => '50',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Property\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Property\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($product, $data);
 
 
 		$pos = 0;
 		$expected = array(
-			array( 'package-weight', '3.00', 'de' ),
-			array( 'package-width', '50', null ),
+			array('package-weight', '3.00', 'de'),
+			array('package-width', '50', null),
 		);
 
 		$items = $product->getPropertyItems();
-		$this->assertEquals( 2, count( $items ) );
+		$this->assertEquals(2, count($items));
 
-		foreach( $items as $item )
+		foreach ($items as $item)
 		{
-			$this->assertEquals( $expected[$pos][0], $item->getType() );
-			$this->assertEquals( $expected[$pos][1], $item->getValue() );
-			$this->assertEquals( $expected[$pos][2], $item->getLanguageId() );
+			$this->assertEquals($expected[$pos][0], $item->getType());
+			$this->assertEquals($expected[$pos][1], $item->getValue());
+			$this->assertEquals($expected[$pos][2], $item->getLanguageId());
 			$pos++;
 		}
 	}
@@ -91,21 +91,21 @@ 
 			1 => '10',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Property\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
-		$object->process( $product, $dataUpdate );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Property\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($product, $data);
+		$object->process($product, $dataUpdate);
 
 
 		$items = $product->getPropertyItems();
-		$item = reset( $items );
+		$item = reset($items);
 
-		$this->assertEquals( 1, count( $items ) );
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Property\\Iface', $item );
+		$this->assertEquals(1, count($items));
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Property\\Iface', $item);
 
-		$this->assertEquals( 'package-height', $item->getType() );
-		$this->assertEquals( '10', $item->getValue() );
+		$this->assertEquals('package-height', $item->getType());
+		$this->assertEquals('10', $item->getValue());
 	}
 
 
@@ -121,18 +121,18 @@ 
 			1 => '3.00',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Property\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Property\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($product, $data);
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Property\Standard( $this->context, [], $this->endpoint );
-		$object->process( $product, [] );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Property\Standard($this->context, [], $this->endpoint);
+		$object->process($product, []);
 
 
 		$items = $product->getPropertyItems();
 
-		$this->assertEquals( 0, count( $items ) );
+		$this->assertEquals(0, count($items));
 	}
 
 
@@ -152,23 +152,23 @@ 
 			3 => '3.00',
 		);
 
-		$product = $this->create( 'job_csv_test' );
+		$product = $this->create('job_csv_test');
 
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Property\Standard( $this->context, $mapping, $this->endpoint );
-		$object->process( $product, $data );
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Property\Standard($this->context, $mapping, $this->endpoint);
+		$object->process($product, $data);
 
 		$items = $product->getPropertyItems();
 
-		$this->assertEquals( 1, count( $items ) );
+		$this->assertEquals(1, count($items));
 	}
 
 
 	/**
 	 * @param string $code
 	 */
-	protected function create( $code )
+	protected function create($code)
 	{
-		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager( $this->context );
-		return $manager->createItem()->setCode( $code );
+		$manager = \Aimeos\MShop\Product\Manager\Factory::createManager($this->context);
+		return $manager->createItem()->setCode($code);
 	}
 }
\ No newline at end of file