@@ -181,7 +181,8 @@ |
||
| 181 | 181 | $data = $this->getObject()->process( $product, $data ); |
| 182 | 182 | |
| 183 | 183 | $manager->commit(); |
| 184 | - } catch( \Exception $e ) |
|
| 184 | + } |
|
| 185 | + catch( \Exception $e ) |
|
| 185 | 186 | { |
| 186 | 187 | $manager->rollback(); |
| 187 | 188 | throw $e; |
@@ -356,7 +356,8 @@ discard block |
||
| 356 | 356 | } |
| 357 | 357 | |
| 358 | 358 | $container->close(); |
| 359 | - } catch( \Exception $e ) |
|
| 359 | + } |
|
| 360 | + catch( \Exception $e ) |
|
| 360 | 361 | { |
| 361 | 362 | $logger->log( 'Supplier import error: ' . $e->getMessage() . "\n" . $e->getTraceAsString() ); |
| 362 | 363 | $this->mail( 'Supplier CSV import error', $e->getMessage() . "\n" . $e->getTraceAsString() ); |
@@ -576,7 +577,8 @@ discard block |
||
| 576 | 577 | } |
| 577 | 578 | |
| 578 | 579 | $manager->commit(); |
| 579 | - } catch( \Exception $e ) |
|
| 580 | + } |
|
| 581 | + catch( \Exception $e ) |
|
| 580 | 582 | { |
| 581 | 583 | $manager->rollback(); |
| 582 | 584 | |
@@ -207,9 +207,12 @@ discard block |
||
| 207 | 207 | { |
| 208 | 208 | foreach( $codes as $code ) |
| 209 | 209 | { |
| 210 | - try { |
|
| 210 | + try |
|
| 211 | + { |
|
| 211 | 212 | $basket->addCoupon( $code ); |
| 212 | - } catch( \Aimeos\MShop\Plugin\Provider\Exception | \Aimeos\MShop\Coupon\Exception $e ) { |
|
| 213 | + } |
|
| 214 | + catch( \Aimeos\MShop\Plugin\Provider\Exception | \Aimeos\MShop\Coupon\Exception $e ) |
|
| 215 | + { |
|
| 213 | 216 | $basket->deleteCoupon( $code ); |
| 214 | 217 | } |
| 215 | 218 | } |
@@ -328,7 +331,9 @@ discard block |
||
| 328 | 331 | $context->setUserId( $baseItem->getCustomerId() ); |
| 329 | 332 | $context->setGroupIds( $customerItem->getGroups() ); |
| 330 | 333 | } |
| 331 | - catch( \Exception $e ) {} // Subscription without account |
|
| 334 | + catch( \Exception $e ) |
|
| 335 | + { |
|
| 336 | +} // Subscription without account |
|
| 332 | 337 | |
| 333 | 338 | return $context; |
| 334 | 339 | } |
@@ -81,8 +81,7 @@ |
||
| 81 | 81 | foreach( $manager->search( $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 | } |
@@ -81,8 +81,7 @@ |
||
| 81 | 81 | foreach( $manager->search( $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 | } |
@@ -96,8 +96,7 @@ |
||
| 96 | 96 | $files[] = $entry->getPathname(); |
| 97 | 97 | } |
| 98 | 98 | } |
| 99 | - } |
|
| 100 | - else |
|
| 99 | + } else |
|
| 101 | 100 | { |
| 102 | 101 | $files[] = $location; |
| 103 | 102 | } |
@@ -95,8 +95,7 @@ discard block |
||
| 95 | 95 | $files[] = $entry->getPathname(); |
| 96 | 96 | } |
| 97 | 97 | } |
| 98 | - } |
|
| 99 | - else |
|
| 98 | + } else |
|
| 100 | 99 | { |
| 101 | 100 | $files[] = $location; |
| 102 | 101 | } |
@@ -240,7 +239,9 @@ discard block |
||
| 240 | 239 | |
| 241 | 240 | return $currentid; |
| 242 | 241 | } |
| 243 | - catch( \Aimeos\MShop\Exception $e ) {} // not found, create new |
|
| 242 | + catch( \Aimeos\MShop\Exception $e ) |
|
| 243 | + { |
|
| 244 | +} // not found, create new |
|
| 244 | 245 | } |
| 245 | 246 | |
| 246 | 247 | $item = $this->process( $manager->create(), $node ); |
@@ -278,13 +279,11 @@ discard block |
||
| 278 | 279 | |
| 279 | 280 | $currentid = $this->importNode( $node, $domains, $parentid, $childMap ); |
| 280 | 281 | $total++; |
| 281 | - } |
|
| 282 | - elseif( $xml->nodeType === \XMLReader::ELEMENT && $xml->name === 'catalog' ) |
|
| 282 | + } elseif( $xml->nodeType === \XMLReader::ELEMENT && $xml->name === 'catalog' ) |
|
| 283 | 283 | { |
| 284 | 284 | $this->importTree( $xml, $domains, $currentid, $childMap ); |
| 285 | 285 | $childMap = []; |
| 286 | - } |
|
| 287 | - elseif( $xml->nodeType === \XMLReader::END_ELEMENT && $xml->name === 'catalog' ) |
|
| 286 | + } elseif( $xml->nodeType === \XMLReader::END_ELEMENT && $xml->name === 'catalog' ) |
|
| 288 | 287 | { |
| 289 | 288 | \Aimeos\MShop::create( $this->getContext(), 'catalog' )->deleteItems( $map ); |
| 290 | 289 | break; |
@@ -81,8 +81,7 @@ discard block |
||
| 81 | 81 | foreach( $manager->search( $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 | } |
@@ -159,8 +158,7 @@ discard block |
||
| 159 | 158 | $listItem = $listMap[$url][$type][$listtype]; |
| 160 | 159 | $refItem = $listItem->getRefItem(); |
| 161 | 160 | unset( $listItems[$listItem->getId()] ); |
| 162 | - } |
|
| 163 | - else |
|
| 161 | + } else |
|
| 164 | 162 | { |
| 165 | 163 | $listItem = $listManager->create()->setType( $listtype ); |
| 166 | 164 | $refItem = $manager->create()->setType( $type ); |
@@ -81,8 +81,7 @@ discard block |
||
| 81 | 81 | foreach( $manager->search( $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 |
||
| 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->create()->setType( $listtype ); |
| 144 | 142 | $refItem = $manager->create()->setType( $type ); |