@@ -133,7 +133,7 @@ |
||
| 133 | 133 | * |
| 134 | 134 | * @param array $list Associative list of key/value pairs |
| 135 | 135 | * @param string $key Key for the value to retrieve |
| 136 | - * @param mixed $default Default value if key isn't found |
|
| 136 | + * @param string $default Default value if key isn't found |
|
| 137 | 137 | * @param mixed Value for the key in the list of the default value |
| 138 | 138 | */ |
| 139 | 139 | protected function getValue( array $list, $key, $default ) |
@@ -248,6 +248,9 @@ |
||
| 248 | 248 | } |
| 249 | 249 | |
| 250 | 250 | |
| 251 | + /** |
|
| 252 | + * @param string $catcode |
|
| 253 | + */ |
|
| 251 | 254 | protected function get( $catcode, array $domains = [] ) |
| 252 | 255 | { |
| 253 | 256 | $manager = \Aimeos\MShop\Catalog\Manager\Factory::createManager( $this->context ); |
@@ -116,8 +116,7 @@ discard block |
||
| 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 |
||
| 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; |
@@ -110,8 +110,7 @@ discard block |
||
| 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 |
||
| 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; |
@@ -352,8 +352,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 | |