Completed
Pull Request — master (#25)
by
unknown
02:53
created
src/Controller/Common/Supplier/Import/Csv/Processor/Address/Standard.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@
 block discarded – undo
67 67
 					continue;
68 68
 				}
69 69
 
70
-				if( ($item = $items->pop()) === null ) {
70
+				if( ( $item = $items->pop() ) === null ) {
71 71
 					$item = $manager->createItem();
72 72
 				}
73 73
 
Please login to merge, or discard this patch.
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -58,7 +58,8 @@  discard block
 block discarded – undo
58 58
 		$manager = \Aimeos\MShop::create( $this->getContext(), 'supplier/address' );
59 59
 		$manager->begin();
60 60
 
61
-		try {
61
+		try
62
+		{
62 63
 			$map = $this->getMappedChunk( $data, $this->getMapping() );
63 64
 			$items = $supplier->getAddressItems();
64 65
 
@@ -78,7 +79,9 @@  discard block
 block discarded – undo
78 79
 			$data = $this->getObject()->process( $supplier, $data );
79 80
 
80 81
 			$manager->commit();
81
-		} catch( \Exception $e ) {
82
+		}
83
+		catch( \Exception $e )
84
+		{
82 85
 			$manager->rollback();
83 86
 			throw $e;
84 87
 		}
Please login to merge, or discard this patch.