@@ -82,8 +82,7 @@ discard block |
||
82 | 82 | foreach( $manager->search( $search ) as $item ) { |
83 | 83 | $this->listTypes[$item->getCode()] = $item->getCode(); |
84 | 84 | } |
85 | - } |
|
86 | - else |
|
85 | + } else |
|
87 | 86 | { |
88 | 87 | $this->listTypes = array_flip( $this->listTypes ); |
89 | 88 | } |
@@ -147,8 +146,7 @@ discard block |
||
147 | 146 | { |
148 | 147 | $listItem = $listMap[$code][$attrType][$listtype]; |
149 | 148 | unset( $listItems[$listItem->getId()] ); |
150 | - } |
|
151 | - else |
|
149 | + } else |
|
152 | 150 | { |
153 | 151 | $listItem = $listManager->create()->setType( $listtype ); |
154 | 152 | } |
@@ -124,9 +124,11 @@ discard block |
||
124 | 124 | } |
125 | 125 | catch( \Exception $e ) |
126 | 126 | { |
127 | - if( $e->getCode() < 1 ) // not a soft error |
|
127 | + if( $e->getCode() < 1 ) { |
|
128 | + // not a soft error |
|
128 | 129 | { |
129 | 130 | $item->setReason( \Aimeos\MShop\Subscription\Item\Iface::REASON_PAYMENT ); |
131 | + } |
|
130 | 132 | |
131 | 133 | if( $end ) { |
132 | 134 | $item->setDateEnd( date_create()->format( 'Y-m-d' ) ); |
@@ -228,9 +230,12 @@ discard block |
||
228 | 230 | { |
229 | 231 | foreach( $codes as $code ) |
230 | 232 | { |
231 | - try { |
|
233 | + try |
|
234 | + { |
|
232 | 235 | $basket->addCoupon( $code ); |
233 | - } catch( \Aimeos\MShop\Plugin\Provider\Exception | \Aimeos\MShop\Coupon\Exception $e ) { |
|
236 | + } |
|
237 | + catch( \Aimeos\MShop\Plugin\Provider\Exception | \Aimeos\MShop\Coupon\Exception $e ) |
|
238 | + { |
|
234 | 239 | $basket->deleteCoupon( $code ); |
235 | 240 | } |
236 | 241 | } |
@@ -349,7 +354,9 @@ discard block |
||
349 | 354 | $context->setUserId( $baseItem->getCustomerId() ); |
350 | 355 | $context->setGroupIds( $customerItem->getGroups() ); |
351 | 356 | } |
352 | - catch( \Exception $e ) {} // Subscription without account |
|
357 | + catch( \Exception $e ) |
|
358 | + { |
|
359 | +} // Subscription without account |
|
353 | 360 | |
354 | 361 | return $context; |
355 | 362 | } |
@@ -562,9 +562,11 @@ |
||
562 | 562 | |
563 | 563 | $map = $this->getMappedChunk( $list, $mapping ); |
564 | 564 | |
565 | - if( isset( $map[0] ) ) // there can only be one chunk for the base product data |
|
565 | + if( isset( $map[0] ) ) { |
|
566 | + // there can only be one chunk for the base product data |
|
566 | 567 | { |
567 | 568 | $type = $this->checkType( $this->getValue( $map[0], 'product.type', $product->getType() ) ); |
569 | + } |
|
568 | 570 | $map[0]['product.config'] = json_decode( $map[0]['product.config'] ?? '[]', true ) ?: []; |
569 | 571 | |
570 | 572 | $product = $product->fromArray( $map[0], true ); |
@@ -592,8 +592,7 @@ |
||
592 | 592 | { |
593 | 593 | $manager->move( $item->getId(), $item->getParentId(), $parentid ); |
594 | 594 | $item = $manager->save( $item ); |
595 | - } |
|
596 | - else |
|
595 | + } else |
|
597 | 596 | { |
598 | 597 | $item = $manager->insert( $item, $parentid ); |
599 | 598 | } |
@@ -113,9 +113,12 @@ |
||
113 | 113 | |
114 | 114 | foreach( $items as $item ) |
115 | 115 | { |
116 | - try { |
|
116 | + try |
|
117 | + { |
|
117 | 118 | $manager->save( $cntl->scale( $item, 'fs-media', $force ) ); |
118 | - } catch( \Exception $e ) { |
|
119 | + } |
|
120 | + catch( \Exception $e ) |
|
121 | + { |
|
119 | 122 | $logger->log( sprintf( 'Scaling media item "%1$s" failed: %2$s', $item->getId(), $e->getMessage() ) ); |
120 | 123 | } |
121 | 124 | } |
@@ -84,8 +84,7 @@ discard block |
||
84 | 84 | foreach( $manager->search( $search ) as $item ) { |
85 | 85 | $this->listTypes[$item->getCode()] = $item->getCode(); |
86 | 86 | } |
87 | - } |
|
88 | - else |
|
87 | + } else |
|
89 | 88 | { |
90 | 89 | $this->listTypes = array_flip( $this->listTypes ); |
91 | 90 | } |
@@ -155,8 +154,7 @@ discard block |
||
155 | 154 | $listItem = $listMap[$url][$type][$langId][$listtype]; |
156 | 155 | $refItem = $listItem->getRefItem(); |
157 | 156 | unset( $listItems[$listItem->getId()] ); |
158 | - } |
|
159 | - else |
|
157 | + } else |
|
160 | 158 | { |
161 | 159 | $listItem = $listManager->create()->setType( $listtype ); |
162 | 160 | $refItem = $manager->create()->setType( $type ); |