Completed
Pull Request — master (#25)
by
unknown
04:29
created
src/Controller/Common/Product/Import/Csv/Processor/Supplier/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
 		}
@@ -164,8 +163,7 @@  discard block
 block discarded – undo
164 163
 					{
165 164
 						$listItem = $listMap[$catid][$listtype];
166 165
 						unset( $listItems[$listItem->getId()] );
167
-					}
168
-					else
166
+					} else
169 167
 					{
170 168
 						$listItem = $listManager->createItem()->setType( $listtype );
171 169
 					}
Please login to merge, or discard this patch.
controller/jobs/src/Controller/Jobs/Supplier/Import/Csv/Standard.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -313,7 +313,8 @@  discard block
 block discarded – undo
313 313
 			throw new \Aimeos\Controller\Jobs\Exception( $msg );
314 314
 		}
315 315
 
316
-		try {
316
+		try
317
+		{
317 318
 			$procMappings = $mappings;
318 319
 			unset( $procMappings['item'] );
319 320
 
@@ -350,7 +351,9 @@  discard block
 block discarded – undo
350 351
 			}
351 352
 
352 353
 			$container->close();
353
-		} catch ( \Exception $e ) {
354
+		}
355
+		catch ( \Exception $e )
356
+		{
354 357
 			$logger->log( 'Supplier import error: ' . $e->getMessage() . "\n" . $e->getTraceAsString() );
355 358
 			$this->mail( 'Supplier CSV import error', $e->getMessage() . "\n" . $e->getTraceAsString() );
356 359
 			throw new \Aimeos\Controller\Jobs\Exception( $e->getMessage() );
@@ -536,7 +539,8 @@  discard block
 block discarded – undo
536 539
 		foreach( $data as $code => $list ) {
537 540
 			$manager->begin();
538 541
 
539
-			try {
542
+			try
543
+			{
540 544
 				$code = trim( $code );
541 545
 
542 546
 				if( isset( $supplierMap[$code] ) ) {
@@ -558,7 +562,9 @@  discard block
 block discarded – undo
558 562
 				}
559 563
 
560 564
 				$manager->commit();
561
-			} catch ( \Exception $e ) {
565
+			}
566
+			catch ( \Exception $e )
567
+			{
562 568
 				$manager->rollback();
563 569
 
564 570
 				$msg = sprintf( 'Unable to import supplier with code "%1$s": %2$s', $code, $e->getMessage() );
Please login to merge, or discard this patch.
Controller/Common/Product/Import/Csv/Processor/Supplier/StandardTest.php 1 patch
Braces   +9 added lines, -6 removed lines patch added patch discarded remove patch
@@ -50,8 +50,9 @@  discard block
 block discarded – undo
50 50
 
51 51
 	protected function tearDown(): void
52 52
 	{
53
-		if( self::$supplier != null )
54
-			$this->delete( self::$supplier );
53
+		if( self::$supplier != null ) {
54
+					$this->delete( self::$supplier );
55
+		}
55 56
 
56 57
 		\Aimeos\MShop::cache( false );
57 58
 	}
@@ -75,8 +76,9 @@  discard block
 block discarded – undo
75 76
 
76 77
 		$suppliersCodes = ['job_csv_test', 'job_csv_test2'];
77 78
 
78
-		foreach( $suppliersCodes as $code )
79
-			$this->create( $code );
79
+		foreach( $suppliersCodes as $code ) {
80
+					$this->create( $code );
81
+		}
80 82
 
81 83
 		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Supplier\Standard( $this->context, $mapping, $this->endpoint );
82 84
 		$object->process( self::$product, $data );
@@ -109,8 +111,9 @@  discard block
 block discarded – undo
109 111
 
110 112
 		$suppliersCodes = ['job_csv_test', 'job_csv_test2'];
111 113
 
112
-		foreach( $suppliersCodes as $code )
113
-			$this->create( $code );
114
+		foreach( $suppliersCodes as $code ) {
115
+					$this->create( $code );
116
+		}
114 117
 
115 118
 		$object = new \Aimeos\Controller\Common\Product\Import\Csv\Processor\Supplier\Standard( $this->context, $mapping, $this->endpoint );
116 119
 		$object->process( self::$product, $data );
Please login to merge, or discard this patch.
src/Controller/Common/Supplier/Import/Csv/Processor/Media/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
 		}
@@ -143,8 +142,7 @@  discard block
 block discarded – undo
143 142
 					$listItem = $listMap[$url][$type][$listtype];
144 143
 					$refItem = $listItem->getRefItem();
145 144
 					unset( $listItems[$listItem->getId()] );
146
-				}
147
-				else
145
+				} else
148 146
 				{
149 147
 					$listItem = $listManager->createItem()->setType( $listtype );
150 148
 					$refItem = $manager->createItem()->setType( $type );
Please login to merge, or discard this patch.
src/Controller/Common/Supplier/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
 		}
@@ -137,8 +136,7 @@  discard block
 block discarded – undo
137 136
 				$listItem = $listMap[$content][$type][$listtype];
138 137
 				$refItem = $listItem->getRefItem();
139 138
 				unset( $listItems[$listItem->getId()] );
140
-			}
141
-			else
139
+			} else
142 140
 			{
143 141
 				$listItem = $listManager->createItem()->setType( $listtype );
144 142
 				$refItem = $manager->createItem()->setType( $type );
Please login to merge, or discard this patch.
src/Controller/Common/Supplier/Import/Csv/Processor/Address/Standard.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -62,7 +62,8 @@  discard block
 block discarded – undo
62 62
 		$manager = \Aimeos\MShop::create( $this->getContext(), 'supplier/address' );
63 63
 		$manager->begin();
64 64
 
65
-		try {
65
+		try
66
+		{
66 67
 			$map = $this->getMappedChunk( $data, $this->getMapping() );
67 68
 			$items = $this->getAddressItems( $supplier->getId() );
68 69
 
@@ -86,7 +87,9 @@  discard block
 block discarded – undo
86 87
 
87 88
 			$manager->commit();
88 89
 
89
-		} catch ( \Exception $e ) {
90
+		}
91
+		catch ( \Exception $e )
92
+		{
90 93
 			$manager->rollback();
91 94
 			throw $e;
92 95
 		}
Please login to merge, or discard this patch.