aimeos / ai-controller-jobs

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

Spacing +35 added lines, -35 removed lines

@@ -35,51 +35,51 @@
 		);
 
 
-		$object = new \Aimeos\Controller\Common\Subscription\Export\Csv\Processor\Product\Standard( $context, $mapping );
-
-		$subscription = $this->getSubscription( $context );
-		$order = \Aimeos\MShop\Factory::createManager( $context, 'order/base' )->load( $subscription->getOrderBaseId() );
-
-		$data = $object->process( $subscription, $order );
-
-
-		$this->assertEquals( 1, count( $data ) );
-
-		$this->assertEquals( 18, count( $data[0] ) );
-		$this->assertEquals( 'default', $data[0][0] );
-		$this->assertEquals( 'unit_type1', $data[0][1] );
-		$this->assertEquals( 'unitsupplier', $data[0][2] );
-		$this->assertEquals( 'CNE', $data[0][3] );
-		$this->assertGreaterThan( 0, $data[0][4] );
-		$this->assertEquals( '9', $data[0][5] );
-		$this->assertEquals( 'Cafe Noire Expresso', $data[0][6] );
-		$this->assertEquals( 'somewhere/thump1.jpg', $data[0][7] );
-		$this->assertEquals( '4.50', $data[0][8] );
-		$this->assertEquals( '0.00', $data[0][9] );
-		$this->assertEquals( '0.00', $data[0][10] );
-		$this->assertEquals( '0.0000', $data[0][11] );
-		$this->assertEquals( '1', $data[0][12] );
-		$this->assertEquals( '1', $data[0][13] );
-		$this->assertEquals( "default\ndefault\nconfig", $data[0][14] );
-		$this->assertEquals( "width\nlength\ninterval", $data[0][15] );
-		$this->assertEquals( "33\n36\nP0Y1M0W0D", $data[0][16] );
-		$this->assertEquals( "33\n36\nP0Y1M0W0D", $data[0][17] );
+		$object = new \Aimeos\Controller\Common\Subscription\Export\Csv\Processor\Product\Standard($context, $mapping);
+
+		$subscription = $this->getSubscription($context);
+		$order = \Aimeos\MShop\Factory::createManager($context, 'order/base')->load($subscription->getOrderBaseId());
+
+		$data = $object->process($subscription, $order);
+
+
+		$this->assertEquals(1, count($data));
+
+		$this->assertEquals(18, count($data[0]));
+		$this->assertEquals('default', $data[0][0]);
+		$this->assertEquals('unit_type1', $data[0][1]);
+		$this->assertEquals('unitsupplier', $data[0][2]);
+		$this->assertEquals('CNE', $data[0][3]);
+		$this->assertGreaterThan(0, $data[0][4]);
+		$this->assertEquals('9', $data[0][5]);
+		$this->assertEquals('Cafe Noire Expresso', $data[0][6]);
+		$this->assertEquals('somewhere/thump1.jpg', $data[0][7]);
+		$this->assertEquals('4.50', $data[0][8]);
+		$this->assertEquals('0.00', $data[0][9]);
+		$this->assertEquals('0.00', $data[0][10]);
+		$this->assertEquals('0.0000', $data[0][11]);
+		$this->assertEquals('1', $data[0][12]);
+		$this->assertEquals('1', $data[0][13]);
+		$this->assertEquals("default\ndefault\nconfig", $data[0][14]);
+		$this->assertEquals("width\nlength\ninterval", $data[0][15]);
+		$this->assertEquals("33\n36\nP0Y1M0W0D", $data[0][16]);
+		$this->assertEquals("33\n36\nP0Y1M0W0D", $data[0][17]);
 	}
 
 
-	protected function getSubscription( $context )
+	protected function getSubscription($context)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'subscription' );
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'subscription');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'subscription.dateend', '2010-01-01' ) );
+		$search->setConditions($search->compare('==', 'subscription.dateend', '2010-01-01'));
 
-		$items = $manager->searchItems( $search );
+		$items = $manager->searchItems($search);
 
-		if( ( $item = reset( $items ) ) !== false ) {
+		if (($item = reset($items)) !== false) {
 			return $item;
 		}
 
-		throw new \Exception( 'No subscription item found' );
+		throw new \Exception('No subscription item found');
 	}
 }

controller/jobs/src/Controller/Jobs/Media/Scale/Standard.php

Spacing +18 added lines, -18 removed lines

@@ -28,7 +28,7 @@ 
 	 */
 	public function getName()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Rescale product images' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Rescale product images');
 	}
 
 
@@ -39,7 +39,7 @@ 
 	 */
 	public function getDescription()
 	{
-		return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Rescales product images to the new sizes' );
+		return $this->getContext()->getI18n()->dt('controller/jobs', 'Rescales product images to the new sizes');
 	}
 
 
@@ -51,41 +51,41 @@ 
 	public function run()
 	{
 		$context = $this->getContext();
-		$cntl = \Aimeos\Controller\Common\Media\Factory::createController( $context );
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'media' );
+		$cntl = \Aimeos\Controller\Common\Media\Factory::createController($context);
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'media');
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'media.domain', 'product' ),
-			$search->compare( '=~', 'media.mimetype', 'image/' ),
+			$search->compare('==', 'media.domain', 'product'),
+			$search->compare('=~', 'media.mimetype', 'image/'),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSortations( array( $search->sort( '+', 'media.id' ) ) );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSortations(array($search->sort('+', 'media.id')));
 
 		$start = 0;
 
 		do
 		{
-			$search->setSlice( $start );
-			$items = $manager->searchItems( $search );
+			$search->setSlice($start);
+			$items = $manager->searchItems($search);
 
-			foreach( $items as $item )
+			foreach ($items as $item)
 			{
 				try
 				{
-					$cntl->scale( $item, 'fs-media' );
-					$manager->saveItem( $item );
+					$cntl->scale($item, 'fs-media');
+					$manager->saveItem($item);
 				}
-				catch( \Exception $e )
+				catch (\Exception $e)
 				{
-					$msg = sprintf( 'Scaling media item "%1$s" failed: %2$s', $item->getId(), $e->getMessage() );
-					$context->getLogger()->log( $msg );
+					$msg = sprintf('Scaling media item "%1$s" failed: %2$s', $item->getId(), $e->getMessage());
+					$context->getLogger()->log($msg);
 				}
 			}
 
-			$count = count( $items );
+			$count = count($items);
 			$start += $count;
 		}
-		while( $count === $search->getSliceSize() );
+		while ($count === $search->getSliceSize());
 	}
 }

Braces +1 added lines, -2 removed lines

@@ -75,8 +75,7 @@
 				{
 					$cntl->scale( $item, 'fs-media' );
 					$manager->saveItem( $item );
-				}
-				catch( \Exception $e )
+				} catch( \Exception $e )
 				{
 					$msg = sprintf( 'Scaling media item "%1$s" failed: %2$s', $item->getId(), $e->getMessage() );
 					$context->getLogger()->log( $msg );

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

Spacing +38 added lines, -38 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,40 +77,40 @@ 
 	 * @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');
 		$manager->begin();
 
 		try
 		{
 			$delete = $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
 				{
@@ -118,33 +118,33 @@ 
 					$refItem = $manager->createItem();
 				}
 
-				$list['text.typeid'] = $this->getTypeId( 'text/type', 'catalog', $type );
+				$list['text.typeid'] = $this->getTypeId('text/type', 'catalog', $type);
 				$list['text.domain'] = 'catalog';
 
-				$refItem->fromArray( $this->addItemDefaults( $list ) );
-				$refItem = $manager->saveItem( $refItem );
+				$refItem->fromArray($this->addItemDefaults($list));
+				$refItem = $manager->saveItem($refItem);
 
-				$list['catalog.lists.typeid'] = $this->getTypeId( 'catalog/lists/type', 'text', $typecode );
+				$list['catalog.lists.typeid'] = $this->getTypeId('catalog/lists/type', 'text', $typecode);
 				$list['catalog.lists.parentid'] = $catalog->getId();
 				$list['catalog.lists.refid'] = $refItem->getId();
 				$list['catalog.lists.domain'] = 'text';
 
-				$listItem->fromArray( $this->addListItemDefaults( $list, $pos ) );
-				$listManager->saveItem( $listItem, false );
+				$listItem->fromArray($this->addListItemDefaults($list, $pos));
+				$listManager->saveItem($listItem, false);
 			}
 
-			foreach( $listItems as $listItem ) {
+			foreach ($listItems as $listItem) {
 				$delete[] = $listItem->getRefId();
 			}
 
-			$manager->deleteItems( $delete );
-			$listManager->deleteItems( array_keys( $listItems ) );
+			$manager->deleteItems($delete);
+			$listManager->deleteItems(array_keys($listItems));
 
-			$data = $this->getObject()->process( $catalog, $data );
+			$data = $this->getObject()->process($catalog, $data);
 
 			$manager->commit();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$manager->rollback();
 			throw $e;
@@ -160,17 +160,17 @@ 
 	 * @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.languageid'] ) ) {
+		if (!isset($list['text.languageid'])) {
 			$list['text.languageid'] = $this->getContext()->getLocale()->getLanguageId();
 		}
 
-		if( !isset( $list['text.status'] ) ) {
+		if (!isset($list['text.status'])) {
 			$list['text.status'] = 1;
 		}
 
@@ -184,10 +184,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;
 		}

Braces +2 added lines, -4 removed lines

@@ -111,8 +111,7 @@ 
 					$listItem = $listMap[$content][$type][$typecode];
 					$refItem = $listItem->getRefItem();
 					unset( $listItems[ $listItem->getId() ] );
-				}
-				else
+				} else
 				{
 					$listItem = $listManager->createItem();
 					$refItem = $manager->createItem();
@@ -143,8 +142,7 @@ 
 			$data = $this->getObject()->process( $catalog, $data );
 
 			$manager->commit();
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$manager->rollback();
 			throw $e;

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

Spacing +38 added lines, -38 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\Product\Import\Csv\Processor\Iface $object Decorated processor
 	 */
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
-			\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null )
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
+			\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null)
 	{
-		parent::__construct( $context, $mapping, $object );
+		parent::__construct($context, $mapping, $object);
 
 		/** controller/common/product/import/csv/processor/text/listtypes
 		 * Names of the product list types for texts that are updated or removed
@@ -66,7 +66,7 @@ 
 		 * @see controller/common/product/import/csv/processor/price/listtypes
 		 * @see controller/common/product/import/csv/processor/product/listtypes
 		 */
-		$this->listTypes = $context->getConfig()->get( 'controller/common/product/import/csv/processor/text/listtypes' );
+		$this->listTypes = $context->getConfig()->get('controller/common/product/import/csv/processor/text/listtypes');
 	}
 
 
@@ -77,40 +77,40 @@ 
 	 * @param array $data List of CSV fields with position as key and data as value
 	 * @return array List of data which hasn't been imported
 	 */
-	public function process( \Aimeos\MShop\Product\Item\Iface $product, array $data )
+	public function process(\Aimeos\MShop\Product\Item\Iface $product, array $data)
 	{
-		$listManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/lists' );
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'text' );
+		$listManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/lists');
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'text');
 		$manager->begin();
 
 		try
 		{
 			$delete = $listMap = [];
-			$map = $this->getMappedChunk( $data, $this->getMapping() );
-			$listItems = $product->getListItems( 'text', $this->listTypes );
+			$map = $this->getMappedChunk($data, $this->getMapping());
+			$listItems = $product->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['product.lists.type'] ) ? $list['product.lists.type'] : 'default' );
+				$content = trim($list['text.content']);
+				$type = trim(isset($list['text.type']) ? $list['text.type'] : 'name');
+				$typecode = trim(isset($list['product.lists.type']) ? $list['product.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
 				{
@@ -118,33 +118,33 @@ 
 					$refItem = $manager->createItem();
 				}
 
-				$list['text.typeid'] = $this->getTypeId( 'text/type', 'product', $type );
+				$list['text.typeid'] = $this->getTypeId('text/type', 'product', $type);
 				$list['text.domain'] = 'product';
 
-				$refItem->fromArray( $this->addItemDefaults( $list ) );
-				$refItem = $manager->saveItem( $refItem );
+				$refItem->fromArray($this->addItemDefaults($list));
+				$refItem = $manager->saveItem($refItem);
 
-				$list['product.lists.typeid'] = $this->getTypeId( 'product/lists/type', 'text', $typecode );
+				$list['product.lists.typeid'] = $this->getTypeId('product/lists/type', 'text', $typecode);
 				$list['product.lists.parentid'] = $product->getId();
 				$list['product.lists.refid'] = $refItem->getId();
 				$list['product.lists.domain'] = 'text';
 
-				$listItem->fromArray( $this->addListItemDefaults( $list, $pos ) );
-				$listManager->saveItem( $listItem, false );
+				$listItem->fromArray($this->addListItemDefaults($list, $pos));
+				$listManager->saveItem($listItem, false);
 			}
 
-			foreach( $listItems as $listItem ) {
+			foreach ($listItems as $listItem) {
 				$delete[] = $listItem->getRefId();
 			}
 
-			$manager->deleteItems( $delete );
-			$listManager->deleteItems( array_keys( $listItems ) );
+			$manager->deleteItems($delete);
+			$listManager->deleteItems(array_keys($listItems));
 
-			$data = $this->getObject()->process( $product, $data );
+			$data = $this->getObject()->process($product, $data);
 
 			$manager->commit();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$manager->rollback();
 			throw $e;
@@ -160,17 +160,17 @@ 
 	 * @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.languageid'] ) ) {
+		if (!isset($list['text.languageid'])) {
 			$list['text.languageid'] = $this->getContext()->getLocale()->getLanguageId();
 		}
 
-		if( !isset( $list['text.status'] ) ) {
+		if (!isset($list['text.status'])) {
 			$list['text.status'] = 1;
 		}
 
@@ -184,10 +184,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['product.lists.type'] )
-			&& $this->listTypes !== null && !in_array( trim( $list['product.lists.type'] ), (array) $this->listTypes )
+		if (!isset($list['text.content']) || trim($list['text.content']) === '' || isset($list['product.lists.type'])
+			&& $this->listTypes !== null && !in_array(trim($list['product.lists.type']), (array) $this->listTypes)
 		) {
 			return false;
 		}

Braces +2 added lines, -4 removed lines

@@ -111,8 +111,7 @@ 
 					$listItem = $listMap[$content][$type][$typecode];
 					$refItem = $listItem->getRefItem();
 					unset( $listItems[ $listItem->getId() ] );
-				}
-				else
+				} else
 				{
 					$listItem = $listManager->createItem();
 					$refItem = $manager->createItem();
@@ -143,8 +142,7 @@ 
 			$data = $this->getObject()->process( $product, $data );
 
 			$manager->commit();
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$manager->rollback();
 			throw $e;

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

Spacing +22 added lines, -22 removed lines

@@ -40,54 +40,54 @@ 
 	 * @param array $data List of CSV fields with position as key and data as value
 	 * @return array List of data which hasn't been imported
 	 */
-	public function process( \Aimeos\MShop\Product\Item\Iface $product, array $data )
+	public function process(\Aimeos\MShop\Product\Item\Iface $product, array $data)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/property' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/property');
 		$manager->begin();
 
 		try
 		{
 			$propMap = [];
-			$map = $this->getMappedChunk( $data, $this->getMapping() );
-			$items = $this->getPropertyItems( $product->getId() );
+			$map = $this->getMappedChunk($data, $this->getMapping());
+			$items = $this->getPropertyItems($product->getId());
 
-			foreach( $items as $item ) {
-				$propMap[ $item->getValue() ][ $item->getType() ] = $item;
+			foreach ($items as $item) {
+				$propMap[$item->getValue()][$item->getType()] = $item;
 			}
 
-			foreach( $map as $list )
+			foreach ($map as $list)
 			{
-				$typecode = trim( $list['product.property.type'] );
-				$value = trim( $list['product.property.value'] );
+				$typecode = trim($list['product.property.type']);
+				$value = trim($list['product.property.value']);
 
-				if( $typecode == '' || $value == '' ) {
+				if ($typecode == '' || $value == '') {
 					continue;
 				}
 
-				$list['product.property.typeid'] = $this->getTypeId( 'product/property/type', 'product', $typecode );
+				$list['product.property.typeid'] = $this->getTypeId('product/property/type', 'product', $typecode);
 				$list['product.property.parentid'] = $product->getId();
 
-				if( isset( $propMap[$value][$typecode] ) )
+				if (isset($propMap[$value][$typecode]))
 				{
 					$item = $propMap[$value][$typecode];
-					unset( $items[ $item->getId() ] );
+					unset($items[$item->getId()]);
 				}
 				else
 				{
 					$item = $manager->createItem();
 				}
 
-				$item->fromArray( $list );
-				$manager->saveItem( $item, false );
+				$item->fromArray($list);
+				$manager->saveItem($item, false);
 			}
 
-			$manager->deleteItems( array_keys( $items ) );
+			$manager->deleteItems(array_keys($items));
 
-			$data = $this->getObject()->process( $product, $data );
+			$data = $this->getObject()->process($product, $data);
 
 			$manager->commit();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
 			$manager->rollback();
 			throw $e;
@@ -103,13 +103,13 @@ 
 	 * @param string $prodid Unique product ID
 	 * @return array Associative list of product property items
 	 */
-	protected function getPropertyItems( $prodid )
+	protected function getPropertyItems($prodid)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/property' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/property');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'product.property.parentid', $prodid ) );
+		$search->setConditions($search->compare('==', 'product.property.parentid', $prodid));
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 }

Braces +2 added lines, -4 removed lines

@@ -71,8 +71,7 @@ 
 				{
 					$item = $propMap[$value][$typecode];
 					unset( $items[ $item->getId() ] );
-				}
-				else
+				} else
 				{
 					$item = $manager->createItem();
 				}
@@ -86,8 +85,7 @@ 
 			$data = $this->getObject()->process( $product, $data );
 
 			$manager->commit();
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$manager->rollback();
 			throw $e;

controller/common/src/Controller/Common/Coupon/Import/Csv/Processor/Code/Standard.php

Spacing +8 added lines, -8 removed lines

@@ -40,21 +40,21 @@
 	 * @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\Coupon\Item\Code\Iface $item, array $data )
+	public function process(\Aimeos\MShop\Coupon\Item\Code\Iface $item, array $data)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'coupon/code' );
-		$map = $this->getMappedChunk( $data, $this->getMapping() );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'coupon/code');
+		$map = $this->getMappedChunk($data, $this->getMapping());
 
-		foreach( $map as $list )
+		foreach ($map as $list)
 		{
-			if( trim( $list['coupon.code.code'] ) == '' ) {
+			if (trim($list['coupon.code.code']) == '') {
 				continue;
 			}
 
-			$item->fromArray( $list );
-			$manager->saveItem( $item );
+			$item->fromArray($list);
+			$manager->saveItem($item);
 		}
 
-		return $this->getObject()->process( $item, $data );
+		return $this->getObject()->process($item, $data);
 	}
 }