Completed
Push — master ( 618dc8...d5c26d )
by Aimeos
02:29
created
src/Controller/Common/Product/Import/Csv/Processor/Property/Standard.php 2 patches
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -69,8 +69,7 @@  discard block
 block discarded – undo
69 69
 				{
70 70
 					$item = $propMap[ $list['product.property.value'] ][$typecode];
71 71
 					unset( $items[ $item->getId() ] );
72
-				}
73
-				else
72
+				} else
74 73
 				{
75 74
 					$item = $manager->createItem();
76 75
 				}
@@ -84,8 +83,7 @@  discard block
 block discarded – undo
84 83
 			$remaining = $this->getObject()->process( $product, $data );
85 84
 
86 85
 			$manager->commit();
87
-		}
88
-		catch( \Exception $e )
86
+		} catch( \Exception $e )
89 87
 		{
90 88
 			$manager->rollback();
91 89
 			throw $e;
Please login to merge, or discard this patch.
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -40,52 +40,52 @@  discard block
 block discarded – undo
40 40
 	 * @param array $data List of CSV fields with position as key and data as value
41 41
 	 * @return array List of data which hasn't been imported
42 42
 	 */
43
-	public function process( \Aimeos\MShop\Product\Item\Iface $product, array $data )
43
+	public function process(\Aimeos\MShop\Product\Item\Iface $product, array $data)
44 44
 	{
45
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/property' );
45
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/property');
46 46
 		$manager->begin();
47 47
 
48 48
 		try
49 49
 		{
50 50
 			$propMap = array();
51
-			$map = $this->getMappedChunk( $data, $this->getMapping() );
52
-			$items = $this->getPropertyItems( $product->getId() );
51
+			$map = $this->getMappedChunk($data, $this->getMapping());
52
+			$items = $this->getPropertyItems($product->getId());
53 53
 
54
-			foreach( $items as $item ) {
55
-				$propMap[ $item->getValue() ][ $item->getType() ] = $item;
54
+			foreach ($items as $item) {
55
+				$propMap[$item->getValue()][$item->getType()] = $item;
56 56
 			}
57 57
 
58
-			foreach( $map as $list )
58
+			foreach ($map as $list)
59 59
 			{
60
-				if( $list['product.property.type'] == '' || $list['product.property.value'] == '' ) {
60
+				if ($list['product.property.type'] == '' || $list['product.property.value'] == '') {
61 61
 					continue;
62 62
 				}
63 63
 
64 64
 				$typecode = $list['product.property.type'];
65
-				$list['product.property.typeid'] = $this->getTypeId( 'product/property/type', 'product', $typecode );
65
+				$list['product.property.typeid'] = $this->getTypeId('product/property/type', 'product', $typecode);
66 66
 				$list['product.property.parentid'] = $product->getId();
67 67
 
68
-				if( isset( $propMap[ $list['product.property.value'] ][$typecode] ) )
68
+				if (isset($propMap[$list['product.property.value']][$typecode]))
69 69
 				{
70
-					$item = $propMap[ $list['product.property.value'] ][$typecode];
71
-					unset( $items[ $item->getId() ] );
70
+					$item = $propMap[$list['product.property.value']][$typecode];
71
+					unset($items[$item->getId()]);
72 72
 				}
73 73
 				else
74 74
 				{
75 75
 					$item = $manager->createItem();
76 76
 				}
77 77
 
78
-				$item->fromArray( $list );
79
-				$manager->saveItem( $item );
78
+				$item->fromArray($list);
79
+				$manager->saveItem($item);
80 80
 			}
81 81
 
82
-			$manager->deleteItems( array_keys( $items ) );
82
+			$manager->deleteItems(array_keys($items));
83 83
 
84
-			$data = $this->getObject()->process( $product, $data );
84
+			$data = $this->getObject()->process($product, $data);
85 85
 
86 86
 			$manager->commit();
87 87
 		}
88
-		catch( \Exception $e )
88
+		catch (\Exception $e)
89 89
 		{
90 90
 			$manager->rollback();
91 91
 			throw $e;
@@ -101,13 +101,13 @@  discard block
 block discarded – undo
101 101
 	 * @param string $prodid Unique product ID
102 102
 	 * @return array Associative list of product property items
103 103
 	 */
104
-	protected function getPropertyItems( $prodid )
104
+	protected function getPropertyItems($prodid)
105 105
 	{
106
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/property' );
106
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/property');
107 107
 
108 108
 		$search = $manager->createSearch();
109
-		$search->setConditions( $search->compare( '==', 'product.property.parentid', $prodid ) );
109
+		$search->setConditions($search->compare('==', 'product.property.parentid', $prodid));
110 110
 
111
-		return $manager->searchItems( $search );
111
+		return $manager->searchItems($search);
112 112
 	}
113 113
 }
Please login to merge, or discard this patch.
common/src/Controller/Common/Product/Import/Csv/Processor/Text/Standard.php 2 patches
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -69,8 +69,7 @@  discard block
 block discarded – undo
69 69
 				{
70 70
 					$item = $propMap[ $list['product.property.value'] ][$typecode];
71 71
 					unset( $items[ $item->getId() ] );
72
-				}
73
-				else
72
+				} else
74 73
 				{
75 74
 					$item = $manager->createItem();
76 75
 				}
@@ -84,8 +83,7 @@  discard block
 block discarded – undo
84 83
 			$remaining = $this->getObject()->process( $product, $data );
85 84
 
86 85
 			$manager->commit();
87
-		}
88
-		catch( \Exception $e )
86
+		} catch( \Exception $e )
89 87
 		{
90 88
 			$manager->rollback();
91 89
 			throw $e;
Please login to merge, or discard this patch.
Spacing   +38 added lines, -38 removed lines patch added patch discarded remove patch
@@ -42,10 +42,10 @@  discard block
 block discarded – undo
42 42
 	 * @param array $mapping Associative list of field position in CSV as key and domain item key as value
43 43
 	 * @param \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object Decorated processor
44 44
 	 */
45
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
46
-			\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null )
45
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
46
+			\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null)
47 47
 	{
48
-		parent::__construct( $context, $mapping, $object );
48
+		parent::__construct($context, $mapping, $object);
49 49
 
50 50
 		/** controller/common/product/import/csv/processor/text/listtypes
51 51
 		 * Names of the product list types for texts that are updated or removed
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 		 * @see controller/common/product/import/csv/processor/price/listtypes
67 67
 		 * @see controller/common/product/import/csv/processor/product/listtypes
68 68
 		 */
69
-		$this->listTypes = $context->getConfig()->get( 'controller/common/product/import/csv/processor/text/listtypes' );
69
+		$this->listTypes = $context->getConfig()->get('controller/common/product/import/csv/processor/text/listtypes');
70 70
 	}
71 71
 
72 72
 
@@ -77,39 +77,39 @@  discard block
 block discarded – undo
77 77
 	 * @param array $data List of CSV fields with position as key and data as value
78 78
 	 * @return array List of data which hasn't been imported
79 79
 	 */
80
-	public function process( \Aimeos\MShop\Product\Item\Iface $product, array $data )
80
+	public function process(\Aimeos\MShop\Product\Item\Iface $product, array $data)
81 81
 	{
82
-		$listManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/lists' );
83
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'text' );
82
+		$listManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/lists');
83
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'text');
84 84
 		$manager->begin();
85 85
 
86 86
 		try
87 87
 		{
88 88
 			$delete = $listMap = array();
89
-			$map = $this->getMappedChunk( $data, $this->getMapping() );
90
-			$listItems = $product->getListItems( 'text', $this->listTypes );
89
+			$map = $this->getMappedChunk($data, $this->getMapping());
90
+			$listItems = $product->getListItems('text', $this->listTypes);
91 91
 
92
-			foreach( $listItems as $listItem )
92
+			foreach ($listItems as $listItem)
93 93
 			{
94
-				if( ( $refItem = $listItem->getRefItem() ) !== null ) {
95
-					$listMap[ $refItem->getContent() ][ $refItem->getType() ][ $listItem->getType() ] = $listItem;
94
+				if (($refItem = $listItem->getRefItem()) !== null) {
95
+					$listMap[$refItem->getContent()][$refItem->getType()][$listItem->getType()] = $listItem;
96 96
 				}
97 97
 			}
98 98
 
99
-			foreach( $map as $pos => $list )
99
+			foreach ($map as $pos => $list)
100 100
 			{
101
-				if( $this->checkEntry( $list ) === false ) {
101
+				if ($this->checkEntry($list) === false) {
102 102
 					continue;
103 103
 				}
104 104
 
105
-				$type = ( isset( $list['text.type'] ) ? $list['text.type'] : 'name' );
106
-				$typecode = ( isset( $list['product.lists.type'] ) ? $list['product.lists.type'] : 'default' );
105
+				$type = (isset($list['text.type']) ? $list['text.type'] : 'name');
106
+				$typecode = (isset($list['product.lists.type']) ? $list['product.lists.type'] : 'default');
107 107
 
108
-				if( isset( $listMap[ $list['text.content'] ][$type][$typecode] ) )
108
+				if (isset($listMap[$list['text.content']][$type][$typecode]))
109 109
 				{
110
-					$listItem = $listMap[ $list['text.content'] ][$type][$typecode];
110
+					$listItem = $listMap[$list['text.content']][$type][$typecode];
111 111
 					$refItem = $listItem->getRefItem();
112
-					unset( $listItems[ $listItem->getId() ] );
112
+					unset($listItems[$listItem->getId()]);
113 113
 				}
114 114
 				else
115 115
 				{
@@ -117,33 +117,33 @@  discard block
 block discarded – undo
117 117
 					$refItem = $manager->createItem();
118 118
 				}
119 119
 
120
-				$list['text.typeid'] = $this->getTypeId( 'text/type', 'product', $type );
120
+				$list['text.typeid'] = $this->getTypeId('text/type', 'product', $type);
121 121
 				$list['text.domain'] = 'product';
122 122
 
123
-				$refItem->fromArray( $this->addItemDefaults( $list ) );
124
-				$manager->saveItem( $refItem );
123
+				$refItem->fromArray($this->addItemDefaults($list));
124
+				$manager->saveItem($refItem);
125 125
 
126
-				$list['product.lists.typeid'] = $this->getTypeId( 'product/lists/type', 'text', $typecode );
126
+				$list['product.lists.typeid'] = $this->getTypeId('product/lists/type', 'text', $typecode);
127 127
 				$list['product.lists.parentid'] = $product->getId();
128 128
 				$list['product.lists.refid'] = $refItem->getId();
129 129
 				$list['product.lists.domain'] = 'text';
130 130
 
131
-				$listItem->fromArray( $this->addListItemDefaults( $list, $pos ) );
132
-				$listManager->saveItem( $listItem );
131
+				$listItem->fromArray($this->addListItemDefaults($list, $pos));
132
+				$listManager->saveItem($listItem);
133 133
 			}
134 134
 
135
-			foreach( $listItems as $listItem ) {
135
+			foreach ($listItems as $listItem) {
136 136
 				$delete[] = $listItem->getRefId();
137 137
 			}
138 138
 
139
-			$manager->deleteItems( $delete );
140
-			$listManager->deleteItems( array_keys( $listItems ) );
139
+			$manager->deleteItems($delete);
140
+			$listManager->deleteItems(array_keys($listItems));
141 141
 
142
-			$data = $this->getObject()->process( $product, $data );
142
+			$data = $this->getObject()->process($product, $data);
143 143
 
144 144
 			$manager->commit();
145 145
 		}
146
-		catch( \Exception $e )
146
+		catch (\Exception $e)
147 147
 		{
148 148
 			$manager->rollback();
149 149
 			throw $e;
@@ -159,17 +159,17 @@  discard block
 block discarded – undo
159 159
 	 * @param array $list Associative list of domain item keys and their values, e.g. "text.status" => 1
160 160
 	 * @return array Given associative list enriched by default values if they were not already set
161 161
 	 */
162
-	protected function addItemDefaults( array $list )
162
+	protected function addItemDefaults(array $list)
163 163
 	{
164
-		if( !isset( $list['text.label'] ) ) {
165
-			$list['text.label'] = mb_strcut( $list['text.content'], 0, 255 );
164
+		if (!isset($list['text.label'])) {
165
+			$list['text.label'] = mb_strcut($list['text.content'], 0, 255);
166 166
 		}
167 167
 
168
-		if( !isset( $list['text.languageid'] ) ) {
168
+		if (!isset($list['text.languageid'])) {
169 169
 			$list['text.languageid'] = $this->getContext()->getLocale()->getLanguageId();
170 170
 		}
171 171
 
172
-		if( !isset( $list['text.status'] ) ) {
172
+		if (!isset($list['text.status'])) {
173 173
 			$list['text.status'] = 1;
174 174
 		}
175 175
 
@@ -183,10 +183,10 @@  discard block
 block discarded – undo
183 183
 	 * @param array $list Associative list of key/value pairs from the mapping
184 184
 	 * @return boolean True if valid, false if not
185 185
 	 */
186
-	protected function checkEntry( array $list )
186
+	protected function checkEntry(array $list)
187 187
 	{
188
-		if( !isset( $list['text.content'] ) || $list['text.content'] === '' || isset( $list['product.lists.type'] )
189
-			&& $this->listTypes !== null && !in_array( $list['product.lists.type'], (array) $this->listTypes )
188
+		if (!isset($list['text.content']) || $list['text.content'] === '' || isset($list['product.lists.type'])
189
+			&& $this->listTypes !== null && !in_array($list['product.lists.type'], (array) $this->listTypes)
190 190
 		) {
191 191
 			return false;
192 192
 		}
Please login to merge, or discard this patch.
src/Controller/Common/Product/Import/Csv/Processor/Price/Standard.php 2 patches
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -69,8 +69,7 @@  discard block
 block discarded – undo
69 69
 				{
70 70
 					$item = $propMap[ $list['product.property.value'] ][$typecode];
71 71
 					unset( $items[ $item->getId() ] );
72
-				}
73
-				else
72
+				} else
74 73
 				{
75 74
 					$item = $manager->createItem();
76 75
 				}
@@ -84,8 +83,7 @@  discard block
 block discarded – undo
84 83
 			$remaining = $this->getObject()->process( $product, $data );
85 84
 
86 85
 			$manager->commit();
87
-		}
88
-		catch( \Exception $e )
86
+		} catch( \Exception $e )
89 87
 		{
90 88
 			$manager->rollback();
91 89
 			throw $e;
Please login to merge, or discard this patch.
Spacing   +37 added lines, -37 removed lines patch added patch discarded remove patch
@@ -42,10 +42,10 @@  discard block
 block discarded – undo
42 42
 	 * @param array $mapping Associative list of field position in CSV as key and domain item key as value
43 43
 	 * @param \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object Decorated processor
44 44
 	 */
45
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping,
46
-			\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null )
45
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping,
46
+			\Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null)
47 47
 	{
48
-		parent::__construct( $context, $mapping, $object );
48
+		parent::__construct($context, $mapping, $object);
49 49
 
50 50
 		/** controller/common/product/import/csv/processor/price/listtypes
51 51
 		 * Names of the product list types for prices that are updated or removed
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 		 * @see controller/common/product/import/csv/processor/product/listtypes
67 67
 		 * @see controller/common/product/import/csv/processor/text/listtypes
68 68
 		 */
69
-		$this->listTypes = $context->getConfig()->get( 'controller/common/product/import/csv/processor/price/listtypes' );
69
+		$this->listTypes = $context->getConfig()->get('controller/common/product/import/csv/processor/price/listtypes');
70 70
 	}
71 71
 
72 72
 
@@ -77,40 +77,40 @@  discard block
 block discarded – undo
77 77
 	 * @param array $data List of CSV fields with position as key and data as value
78 78
 	 * @return array List of data which hasn't been imported
79 79
 	 */
80
-	public function process( \Aimeos\MShop\Product\Item\Iface $product, array $data )
80
+	public function process(\Aimeos\MShop\Product\Item\Iface $product, array $data)
81 81
 	{
82
-		$listManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/lists' );
83
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'price' );
82
+		$listManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/lists');
83
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'price');
84 84
 		$manager->begin();
85 85
 
86 86
 		try
87 87
 		{
88 88
 			$delete = $listMap = array();
89
-			$map = $this->getMappedChunk( $data, $this->getMapping() );
90
-			$listItems = $product->getListItems( 'price', $this->listTypes );
89
+			$map = $this->getMappedChunk($data, $this->getMapping());
90
+			$listItems = $product->getListItems('price', $this->listTypes);
91 91
 
92
-			foreach( $listItems as $listItem )
92
+			foreach ($listItems as $listItem)
93 93
 			{
94
-				if( ( $refItem = $listItem->getRefItem() ) !== null ) {
95
-					$listMap[ $refItem->getValue() ][ $refItem->getType() ][ $listItem->getType() ] = $listItem;
94
+				if (($refItem = $listItem->getRefItem()) !== null) {
95
+					$listMap[$refItem->getValue()][$refItem->getType()][$listItem->getType()] = $listItem;
96 96
 				}
97 97
 			}
98 98
 
99
-			foreach( $map as $pos => $list )
99
+			foreach ($map as $pos => $list)
100 100
 			{
101
-				if( $this->checkEntry( $list ) === false ) {
101
+				if ($this->checkEntry($list) === false) {
102 102
 					continue;
103 103
 				}
104 104
 
105
-				$value = ( isset( $list['price.value'] ) ? $list['price.value'] : '0.00' );
106
-				$type = ( isset( $list['price.type'] ) ? $list['price.type'] : 'default' );
107
-				$typecode = ( isset( $list['product.lists.type'] ) ? $list['product.lists.type'] : 'default' );
105
+				$value = (isset($list['price.value']) ? $list['price.value'] : '0.00');
106
+				$type = (isset($list['price.type']) ? $list['price.type'] : 'default');
107
+				$typecode = (isset($list['product.lists.type']) ? $list['product.lists.type'] : 'default');
108 108
 
109
-				if( isset( $listMap[$value][$type][$typecode] ) )
109
+				if (isset($listMap[$value][$type][$typecode]))
110 110
 				{
111 111
 					$listItem = $listMap[$value][$type][$typecode];
112 112
 					$refItem = $listItem->getRefItem();
113
-					unset( $listItems[ $listItem->getId() ] );
113
+					unset($listItems[$listItem->getId()]);
114 114
 				}
115 115
 				else
116 116
 				{
@@ -118,33 +118,33 @@  discard block
 block discarded – undo
118 118
 					$refItem = $manager->createItem();
119 119
 				}
120 120
 
121
-				$list['price.typeid'] = $this->getTypeId( 'price/type', 'product', $type );
121
+				$list['price.typeid'] = $this->getTypeId('price/type', 'product', $type);
122 122
 				$list['price.domain'] = 'product';
123 123
 
124
-				$refItem->fromArray( $this->addItemDefaults( $list ) );
125
-				$manager->saveItem( $refItem );
124
+				$refItem->fromArray($this->addItemDefaults($list));
125
+				$manager->saveItem($refItem);
126 126
 
127
-				$list['product.lists.typeid'] = $this->getTypeId( 'product/lists/type', 'price', $typecode );
127
+				$list['product.lists.typeid'] = $this->getTypeId('product/lists/type', 'price', $typecode);
128 128
 				$list['product.lists.parentid'] = $product->getId();
129 129
 				$list['product.lists.refid'] = $refItem->getId();
130 130
 				$list['product.lists.domain'] = 'price';
131 131
 
132
-				$listItem->fromArray( $this->addListItemDefaults( $list, $pos ) );
133
-				$listManager->saveItem( $listItem );
132
+				$listItem->fromArray($this->addListItemDefaults($list, $pos));
133
+				$listManager->saveItem($listItem);
134 134
 			}
135 135
 
136
-			foreach( $listItems as $listItem ) {
136
+			foreach ($listItems as $listItem) {
137 137
 				$delete[] = $listItem->getRefId();
138 138
 			}
139 139
 
140
-			$manager->deleteItems( $delete );
141
-			$listManager->deleteItems( array_keys( $listItems ) );
140
+			$manager->deleteItems($delete);
141
+			$listManager->deleteItems(array_keys($listItems));
142 142
 
143
-			$data = $this->getObject()->process( $product, $data );
143
+			$data = $this->getObject()->process($product, $data);
144 144
 
145 145
 			$manager->commit();
146 146
 		}
147
-		catch( \Exception $e )
147
+		catch (\Exception $e)
148 148
 		{
149 149
 			$manager->rollback();
150 150
 			throw $e;
@@ -160,17 +160,17 @@  discard block
 block discarded – undo
160 160
 	 * @param array $list Associative list of domain item keys and their values, e.g. "price.status" => 1
161 161
 	 * @return array Given associative list enriched by default values if they were not already set
162 162
 	 */
163
-	protected function addItemDefaults( array $list )
163
+	protected function addItemDefaults(array $list)
164 164
 	{
165
-		if( !isset( $list['price.currencyid'] ) ) {
165
+		if (!isset($list['price.currencyid'])) {
166 166
 			$list['price.currencyid'] = $this->getContext()->getLocale()->getCurrencyId();
167 167
 		}
168 168
 
169
-		if( !isset( $list['price.label'] ) ) {
169
+		if (!isset($list['price.label'])) {
170 170
 			$list['price.label'] = $list['price.currencyid'] . ' ' . $list['price.value'];
171 171
 		}
172 172
 
173
-		if( !isset( $list['price.status'] ) ) {
173
+		if (!isset($list['price.status'])) {
174 174
 			$list['price.status'] = 1;
175 175
 		}
176 176
 
@@ -184,10 +184,10 @@  discard block
 block discarded – undo
184 184
 	 * @param array $list Associative list of key/value pairs from the mapping
185 185
 	 * @return boolean True if valid, false if not
186 186
 	 */
187
-	protected function checkEntry( array $list )
187
+	protected function checkEntry(array $list)
188 188
 	{
189
-		if( !isset( $list['price.value'] ) || $list['price.value'] === '' || isset( $list['product.lists.type'] )
190
-			&& $this->listTypes !== null && !in_array( $list['product.lists.type'], (array) $this->listTypes )
189
+		if (!isset($list['price.value']) || $list['price.value'] === '' || isset($list['product.lists.type'])
190
+			&& $this->listTypes !== null && !in_array($list['product.lists.type'], (array) $this->listTypes)
191 191
 		) {
192 192
 			return false;
193 193
 		}
Please login to merge, or discard this patch.
controller/common/src/Controller/Common/Product/Import/Csv/Base.php 1 patch
Spacing   +58 added lines, -58 removed lines patch added patch discarded remove patch
@@ -30,14 +30,14 @@  discard block
 block discarded – undo
30 30
 	 * @param array $data Associative list of product codes and lists of CSV field indexes and their data
31 31
 	 * @return array Associative list of CSV field indexes and their converted data
32 32
 	 */
33
-	protected function convertData( array $convlist, array $data )
33
+	protected function convertData(array $convlist, array $data)
34 34
 	{
35
-		foreach( $convlist as $idx => $converter )
35
+		foreach ($convlist as $idx => $converter)
36 36
 		{
37
-			foreach( $data as $code => $list )
37
+			foreach ($data as $code => $list)
38 38
 			{
39
-				if( isset( $list[$idx] ) ) {
40
-					$data[$code][$idx] = $converter->translate( $list[$idx] );
39
+				if (isset($list[$idx])) {
40
+					$data[$code][$idx] = $converter->translate($list[$idx]);
41 41
 				}
42 42
 			}
43 43
 		}
@@ -53,38 +53,38 @@  discard block
 block discarded – undo
53 53
 	 * @param string|null Name of the cache implementation
54 54
 	 * @return \Aimeos\Controller\Common\Product\Import\Csv\Cache\Iface Cache object
55 55
 	 */
56
-	protected function getCache( $type, $name = null )
56
+	protected function getCache($type, $name = null)
57 57
 	{
58 58
 		$context = $this->getContext();
59 59
 		$config = $context->getConfig();
60 60
 		$iface = '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Cache\\Iface';
61 61
 
62
-		if( ctype_alnum( $type ) === false )
62
+		if (ctype_alnum($type) === false)
63 63
 		{
64 64
 			$classname = is_string($name) ? '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Cache\\' . $type : '<not a string>';
65
-			throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
65
+			throw new \Aimeos\Controller\Jobs\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
66 66
 		}
67 67
 
68
-		if( $name === null ) {
69
-			$name = $config->get( 'controller/common/product/import/csv/cache/' . $type . '/name', 'Standard' );
68
+		if ($name === null) {
69
+			$name = $config->get('controller/common/product/import/csv/cache/' . $type . '/name', 'Standard');
70 70
 		}
71 71
 
72
-		if( ctype_alnum( $name ) === false )
72
+		if (ctype_alnum($name) === false)
73 73
 		{
74 74
 			$classname = is_string($name) ? '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Cache\\' . $type . '\\' . $name : '<not a string>';
75
-			throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
75
+			throw new \Aimeos\Controller\Jobs\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
76 76
 		}
77 77
 
78
-		$classname = '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Cache\\' . ucfirst( $type ) . '\\' . $name;
78
+		$classname = '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Cache\\' . ucfirst($type) . '\\' . $name;
79 79
 
80
-		if( class_exists( $classname ) === false ) {
81
-			throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Class "%1$s" not found', $classname ) );
80
+		if (class_exists($classname) === false) {
81
+			throw new \Aimeos\Controller\Jobs\Exception(sprintf('Class "%1$s" not found', $classname));
82 82
 		}
83 83
 
84
-		$object = new $classname( $context );
84
+		$object = new $classname($context);
85 85
 
86
-		if( !( $object instanceof $iface ) ) {
87
-			throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Class "%1$s" does not implement interface "%2$s"', $classname, $iface ) );
86
+		if (!($object instanceof $iface)) {
87
+			throw new \Aimeos\Controller\Jobs\Exception(sprintf('Class "%1$s" does not implement interface "%2$s"', $classname, $iface));
88 88
 		}
89 89
 
90 90
 		return $object;
@@ -97,12 +97,12 @@  discard block
 block discarded – undo
97 97
 	 * @param array $convmap List of converter names for the values at the position in the CSV file
98 98
 	 * @return array Associative list of positions and converter objects
99 99
 	 */
100
-	protected function getConverterList( array $convmap )
100
+	protected function getConverterList(array $convmap)
101 101
 	{
102 102
 		$convlist = array();
103 103
 
104
-		foreach( $convmap as $idx => $name ) {
105
-			$convlist[$idx] = \Aimeos\MW\Convert\Factory::createConverter( $name );
104
+		foreach ($convmap as $idx => $name) {
105
+			$convlist[$idx] = \Aimeos\MW\Convert\Factory::createConverter($name);
106 106
 		}
107 107
 
108 108
 		return $convlist;
@@ -117,15 +117,15 @@  discard block
 block discarded – undo
117 117
 	 * @param integer $codePos Column position which contains the unique product code (starting from 0)
118 118
 	 * @return array List of arrays with product codes as keys and list of values from the CSV file
119 119
 	 */
120
-	protected function getData( \Aimeos\MW\Container\Content\Iface $content, $maxcnt, $codePos )
120
+	protected function getData(\Aimeos\MW\Container\Content\Iface $content, $maxcnt, $codePos)
121 121
 	{
122 122
 		$count = 0;
123 123
 		$data = array();
124 124
 
125
-		while( $content->valid() && $count++ < $maxcnt )
125
+		while ($content->valid() && $count++ < $maxcnt)
126 126
 		{
127 127
 			$row = $content->current();
128
-			$data[ $row[$codePos] ] = $row;
128
+			$data[$row[$codePos]] = $row;
129 129
 			$content->next();
130 130
 		}
131 131
 
@@ -222,21 +222,21 @@  discard block
 block discarded – undo
222 222
 	 * @param array $mapping List of domain item keys with the CSV field position as key
223 223
 	 * @return array List of associative arrays containing the chunked properties
224 224
 	 */
225
-	protected function getMappedChunk( array &$data, array $mapping )
225
+	protected function getMappedChunk(array &$data, array $mapping)
226 226
 	{
227 227
 		$idx = 0;
228 228
 		$map = array();
229 229
 
230
-		foreach( $mapping as $pos => $key )
230
+		foreach ($mapping as $pos => $key)
231 231
 		{
232
-			if( isset( $map[$idx][$key] ) ) {
232
+			if (isset($map[$idx][$key])) {
233 233
 				$idx++;
234 234
 			}
235 235
 
236
-			if( isset( $data[$pos] ) )
236
+			if (isset($data[$pos]))
237 237
 			{
238 238
 				$map[$idx][$key] = $data[$pos];
239
-				unset( $data[$pos] );
239
+				unset($data[$pos]);
240 240
 			}
241 241
 		}
242 242
 
@@ -250,39 +250,39 @@  discard block
 block discarded – undo
250 250
 	 * @param array $mappings Associative list of processor types as keys and index/data mappings as values
251 251
 	 * @return \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface Processor object
252 252
 	 */
253
-	protected function getProcessors( array $mappings )
253
+	protected function getProcessors(array $mappings)
254 254
 	{
255 255
 		$context = $this->getContext();
256 256
 		$config = $context->getConfig();
257 257
 		$iface = '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Processor\\Iface';
258
-		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done( $context, array() );
258
+		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Done($context, array());
259 259
 
260
-		foreach( $mappings as $type => $mapping )
260
+		foreach ($mappings as $type => $mapping)
261 261
 		{
262
-			if( ctype_alnum( $type ) === false )
262
+			if (ctype_alnum($type) === false)
263 263
 			{
264 264
 				$classname = is_string($type) ? '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Processor\\' . $type : '<not a string>';
265
-				throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
265
+				throw new \Aimeos\Controller\Jobs\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
266 266
 			}
267 267
 
268
-			$name = $config->get( 'controller/common/product/import/csv/processor/' . $type . '/name', 'Standard' );
268
+			$name = $config->get('controller/common/product/import/csv/processor/' . $type . '/name', 'Standard');
269 269
 
270
-			if( ctype_alnum( $name ) === false )
270
+			if (ctype_alnum($name) === false)
271 271
 			{
272 272
 				$classname = is_string($name) ? '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Processor\\' . $type . '\\' . $name : '<not a string>';
273
-				throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
273
+				throw new \Aimeos\Controller\Jobs\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
274 274
 			}
275 275
 
276
-			$classname = '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Processor\\' . ucfirst( $type ) . '\\' . $name;
276
+			$classname = '\\Aimeos\\Controller\\Common\\Product\\Import\\Csv\\Processor\\' . ucfirst($type) . '\\' . $name;
277 277
 
278
-			if( class_exists( $classname ) === false ) {
279
-				throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Class "%1$s" not found', $classname ) );
278
+			if (class_exists($classname) === false) {
279
+				throw new \Aimeos\Controller\Jobs\Exception(sprintf('Class "%1$s" not found', $classname));
280 280
 			}
281 281
 
282
-			$object = new $classname( $context, $mapping, $object );
282
+			$object = new $classname($context, $mapping, $object);
283 283
 
284
-			if( !( $object instanceof $iface ) ) {
285
-				throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Class "%1$s" does not implement interface "%2$s"', $classname, $iface ) );
284
+			if (!($object instanceof $iface)) {
285
+				throw new \Aimeos\Controller\Jobs\Exception(sprintf('Class "%1$s" does not implement interface "%2$s"', $classname, $iface));
286 286
 			}
287 287
 		}
288 288
 
@@ -297,17 +297,17 @@  discard block
 block discarded – undo
297 297
 	 * @param array $domains List of domains whose items should be fetched too
298 298
 	 * @return array Associative list of product codes as key and product items as value
299 299
 	 */
300
-	protected function getProducts( array $codes, array $domains )
300
+	protected function getProducts(array $codes, array $domains)
301 301
 	{
302 302
 		$result = array();
303
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product' );
303
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product');
304 304
 
305 305
 		$search = $manager->createSearch();
306
-		$search->setConditions( $search->compare( '==', 'product.code', $codes ) );
307
-		$search->setSlice( 0, count( $codes ) );
306
+		$search->setConditions($search->compare('==', 'product.code', $codes));
307
+		$search->setSlice(0, count($codes));
308 308
 
309
-		foreach( $manager->searchItems( $search, $domains ) as $item ) {
310
-			$result[ $item->getCode() ] = $item;
309
+		foreach ($manager->searchItems($search, $domains) as $item) {
310
+			$result[$item->getCode()] = $item;
311 311
 		}
312 312
 
313 313
 		return $result;
@@ -322,23 +322,23 @@  discard block
 block discarded – undo
322 322
 	 * @param string $code Unique code of the type item
323 323
 	 * @return string Unique ID of the type item
324 324
 	 */
325
-	protected function getTypeId( $path, $domain, $code )
325
+	protected function getTypeId($path, $domain, $code)
326 326
 	{
327
-		if( !isset( self::$types[$path][$domain] ) )
327
+		if (!isset(self::$types[$path][$domain]))
328 328
 		{
329
-			$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $path );
330
-			$key = str_replace( '/', '.', $path );
329
+			$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $path);
330
+			$key = str_replace('/', '.', $path);
331 331
 
332 332
 			$search = $manager->createSearch();
333
-			$search->setConditions( $search->compare( '==', $key . '.domain', $domain ) );
333
+			$search->setConditions($search->compare('==', $key . '.domain', $domain));
334 334
 
335
-			foreach( $manager->searchItems( $search ) as $id => $item ) {
336
-				self::$types[$path][$domain][ $item->getCode() ] = $id;
335
+			foreach ($manager->searchItems($search) as $id => $item) {
336
+				self::$types[$path][$domain][$item->getCode()] = $id;
337 337
 			}
338 338
 		}
339 339
 
340
-		if( !isset( self::$types[$path][$domain][$code] ) ) {
341
-			throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'No type item for "%1$s/%2$s" in "%3$s" found', $domain, $code, $path ) );
340
+		if (!isset(self::$types[$path][$domain][$code])) {
341
+			throw new \Aimeos\Controller\Jobs\Exception(sprintf('No type item for "%1$s/%2$s" in "%3$s" found', $domain, $code, $path));
342 342
 		}
343 343
 
344 344
 		return self::$types[$path][$domain][$code];
Please login to merge, or discard this patch.