Completed
Pull Request — master (#26)
by
unknown
03:03
created
controller/jobs/src/Controller/Jobs/Supplier/Import/Xml/Standard.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -96,8 +96,7 @@
 block discarded – undo
96 96
 						$files[] = $entry->getPathname();
97 97
 					}
98 98
 				}
99
-			}
100
-			else
99
+			} else
101 100
 			{
102 101
 				$files[] = $location;
103 102
 			}
Please login to merge, or discard this patch.
controller/jobs/src/Controller/Jobs/Product/Import/Xml/Standard.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -96,8 +96,7 @@
 block discarded – undo
96 96
 						$files[] = $entry->getPathname();
97 97
 					}
98 98
 				}
99
-			}
100
-			else
99
+			} else
101 100
 			{
102 101
 				$files[] = $location;
103 102
 			}
Please login to merge, or discard this patch.
common/src/Controller/Common/Product/Import/Csv/Processor/Text/Standard.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -81,8 +81,7 @@  discard block
 block discarded – undo
81 81
 			foreach( $manager->searchItems( $search ) as $item ) {
82 82
 				$this->listTypes[$item->getCode()] = $item->getCode();
83 83
 			}
84
-		}
85
-		else
84
+		} else
86 85
 		{
87 86
 			$this->listTypes = array_flip( $this->listTypes );
88 87
 		}
@@ -138,8 +137,7 @@  discard block
 block discarded – undo
138 137
 				$listItem = $listMap[$content][$language][$type][$listtype];
139 138
 				$refItem = $listItem->getRefItem();
140 139
 				unset( $listItems[$listItem->getId()] );
141
-			}
142
-			else
140
+			} else
143 141
 			{
144 142
 				$listItem = $listManager->createItem()->setType( $listtype );
145 143
 				$refItem = $manager->createItem()->setType( $type );
Please login to merge, or discard this patch.
controller/jobs/src/Controller/Jobs/Stock/Import/Csv/Standard.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -96,8 +96,7 @@
 block discarded – undo
96 96
 						$files[] = $entry->getPathname();
97 97
 					}
98 98
 				}
99
-			}
100
-			else
99
+			} else
101 100
 			{
102 101
 				$files[] = $location;
103 102
 			}
Please login to merge, or discard this patch.
controller/jobs/src/Controller/Jobs/Catalog/Import/Xml/Standard.php 1 patch
Braces   +6 added lines, -7 removed lines patch added patch discarded remove patch
@@ -95,8 +95,7 @@  discard block
 block discarded – undo
95 95
 						$files[] = $entry->getPathname();
96 96
 					}
97 97
 				}
98
-			}
99
-			else
98
+			} else
100 99
 			{
101 100
 				$files[] = $location;
102 101
 			}
@@ -235,7 +234,9 @@  discard block
 block discarded – undo
235 234
 
236 235
 				return $currentid;
237 236
 			}
238
-			catch( \Aimeos\MShop\Exception $e ) {} // not found, create new
237
+			catch( \Aimeos\MShop\Exception $e )
238
+			{
239
+} // not found, create new
239 240
 		}
240 241
 
241 242
 		$item = $this->process( $manager->createItem(), $node );
@@ -273,13 +274,11 @@  discard block
 block discarded – undo
273 274
 
274 275
 				$currentid = $this->importNode( $node, $domains, $parentid, $childMap );
275 276
 				$total++;
276
-			}
277
-			elseif( $xml->nodeType === \XMLReader::ELEMENT && $xml->name === 'catalog' )
277
+			} elseif( $xml->nodeType === \XMLReader::ELEMENT && $xml->name === 'catalog' )
278 278
 			{
279 279
 				$this->importTree( $xml, $domains, $currentid, $childMap );
280 280
 				$childMap = [];
281
-			}
282
-			elseif( $xml->nodeType === \XMLReader::END_ELEMENT && $xml->name === 'catalog' )
281
+			} elseif( $xml->nodeType === \XMLReader::END_ELEMENT && $xml->name === 'catalog' )
283 282
 			{
284 283
 				\Aimeos\MShop::create( $this->getContext(), 'catalog' )->deleteItems( $map );
285 284
 				break;
Please login to merge, or discard this patch.
src/Controller/Common/Common/Import/Xml/Processor/Catalog/Standard.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -86,8 +86,7 @@
 block discarded – undo
86 86
 				$listItem = $map[$parentid][$type];
87 87
 				unset( $listItems[$map[$parentid][$type]->getId()] );
88 88
 				unset( $map[$parentid][$type] );
89
-			}
90
-			else
89
+			} else
91 90
 			{
92 91
 				$listItem = $listManager->createItem();
93 92
 			}
Please login to merge, or discard this patch.
src/Controller/Common/Product/Import/Csv/Processor/Price/Standard.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -87,8 +87,7 @@
 block discarded – undo
87 87
 			foreach( $manager->searchItems( $search ) as $item ) {
88 88
 				$this->listTypes[$item->getCode()] = $item->getCode();
89 89
 			}
90
-		}
91
-		else
90
+		} else
92 91
 		{
93 92
 			$this->listTypes = array_flip( $this->listTypes );
94 93
 		}
Please login to merge, or discard this patch.
controller/jobs/src/Controller/Jobs/Product/Import/Csv/Standard.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -575,9 +575,11 @@
 block discarded – undo
575 575
 
576 576
 				$map = $this->getMappedChunk( $list, $mapping );
577 577
 
578
-				if( isset( $map[0] ) ) // there can only be one chunk for the base product data
578
+				if( isset( $map[0] ) ) {
579
+					// there can only be one chunk for the base product data
579 580
 				{
580 581
 					$type = $this->checkType( $this->getValue( $map[0], 'product.type', $product->getType() ) );
582
+				}
581 583
 
582 584
 					$product = $product->fromArray( $map[0], true );
583 585
 					$product = $manager->saveItem( $product->setType( $type ) );
Please login to merge, or discard this patch.
controller/jobs/src/Controller/Jobs/Subscription/Process/Renew/Standard.php 1 patch
Braces   +11 added lines, -4 removed lines patch added patch discarded remove patch
@@ -180,11 +180,16 @@  discard block
 block discarded – undo
180 180
 		{
181 181
 			foreach( $codes as $code )
182 182
 			{
183
-				try {
183
+				try
184
+				{
184 185
 					$basket->addCoupon( $code );
185
-				} catch( \Aimeos\MShop\Plugin\Provider\Exception $e ) {
186
+				}
187
+				catch( \Aimeos\MShop\Plugin\Provider\Exception $e )
188
+				{
186 189
 					$basket->deleteCoupon( $code );
187
-				} catch( \Aimeos\MShop\Coupon\Exception $e ) {
190
+				}
191
+				catch( \Aimeos\MShop\Coupon\Exception $e )
192
+				{
188 193
 					$basket->deleteCoupon( $code );
189 194
 				}
190 195
 			}
@@ -301,7 +306,9 @@  discard block
 block discarded – undo
301 306
 			$context->setUserId( $baseItem->getCustomerId() );
302 307
 			$context->setGroupIds( $customerItem->getGroups() );
303 308
 		}
304
-		catch( \Exception $e ) {} // Subscription without account
309
+		catch( \Exception $e )
310
+		{
311
+} // Subscription without account
305 312
 
306 313
 		return $context;
307 314
 	}
Please login to merge, or discard this patch.