Completed
Push — master ( 2e10c1...bb3077 )
by Aimeos
02:17
created
src/Controller/Common/Catalog/Import/Csv/Processor/Media/Standard.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -116,8 +116,7 @@  discard block
 block discarded – undo
116 116
 						$listItem = $listMap[$url][$type][$typecode];
117 117
 						$refItem = $listItem->getRefItem();
118 118
 						unset( $listItems[ $listItem->getId() ] );
119
-					}
120
-					else
119
+					} else
121 120
 					{
122 121
 						$listItem = $listManager->createItem();
123 122
 						$refItem = $manager->createItem();
@@ -150,8 +149,7 @@  discard block
 block discarded – undo
150 149
 			$data = $this->getObject()->process( $catalog, $data );
151 150
 
152 151
 			$manager->commit();
153
-		}
154
-		catch( \Exception $e )
152
+		} catch( \Exception $e )
155 153
 		{
156 154
 			$manager->rollback();
157 155
 			throw $e;
Please login to merge, or discard this patch.
common/src/Controller/Common/Catalog/Import/Csv/Processor/Text/Standard.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -110,8 +110,7 @@  discard block
 block discarded – undo
110 110
 					$listItem = $listMap[ $list['text.content'] ][$type][$typecode];
111 111
 					$refItem = $listItem->getRefItem();
112 112
 					unset( $listItems[ $listItem->getId() ] );
113
-				}
114
-				else
113
+				} else
115 114
 				{
116 115
 					$listItem = $listManager->createItem();
117 116
 					$refItem = $manager->createItem();
@@ -142,8 +141,7 @@  discard block
 block discarded – undo
142 141
 			$data = $this->getObject()->process( $catalog, $data );
143 142
 
144 143
 			$manager->commit();
145
-		}
146
-		catch( \Exception $e )
144
+		} catch( \Exception $e )
147 145
 		{
148 146
 			$manager->rollback();
149 147
 			throw $e;
Please login to merge, or discard this patch.
controller/jobs/src/Controller/Jobs/Catalog/Import/Csv/Standard.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -352,8 +352,7 @@  discard block
 block discarded – undo
352 352
 			}
353 353
 
354 354
 			$container->close();
355
-		}
356
-		catch( \Exception $e )
355
+		} catch( \Exception $e )
357 356
 		{
358 357
 			$logger->log( 'Catalog import error: ' . $e->getMessage() );
359 358
 			$logger->log( $e->getTraceAsString() );
@@ -583,8 +582,7 @@  discard block
 block discarded – undo
583 582
 					{
584 583
 		                $manager->moveItem( $catalogItem->getId(), $catalogItem->getParentId(), $parentid );
585 584
 						$catalogItem = $manager->saveItem( $catalogItem );
586
-					}
587
-					else
585
+					} else
588 586
 					{
589 587
 		                $catalogItem = $manager->insertItem( $catalogItem, $parentid );
590 588
 					}
@@ -594,8 +592,7 @@  discard block
 block discarded – undo
594 592
 				}
595 593
 
596 594
 				$manager->commit();
597
-			}
598
-			catch( \Exception $e )
595
+			} catch( \Exception $e )
599 596
 			{
600 597
 				$manager->rollback();
601 598
 
Please login to merge, or discard this patch.