@@ -270,9 +270,13 @@ discard block |
||
270 | 270 | */ |
271 | 271 | public function create( array $values = [] ) : \Aimeos\MShop\Common\Item\Iface |
272 | 272 | { |
273 | - try { |
|
273 | + try |
|
274 | + { |
|
274 | 275 | $values['log.siteid'] = $values['log.siteid'] ?? $this->context()->locale()->getSiteId(); |
275 | - } catch( \Exception $e ) {} // if no locale item is available |
|
276 | + } |
|
277 | + catch( \Exception $e ) |
|
278 | + { |
|
279 | +} // if no locale item is available |
|
276 | 280 | |
277 | 281 | return $this->createItemBase( $values ); |
278 | 282 | } |
@@ -449,9 +453,12 @@ discard block |
||
449 | 453 | return $item; |
450 | 454 | } |
451 | 455 | |
452 | - try { |
|
456 | + try |
|
457 | + { |
|
453 | 458 | $siteid = $this->context()->locale()->getSiteId(); |
454 | - } catch( \Exception $e ) { |
|
459 | + } |
|
460 | + catch( \Exception $e ) |
|
461 | + { |
|
455 | 462 | $siteid = ''; |
456 | 463 | } |
457 | 464 | |
@@ -498,8 +505,7 @@ discard block |
||
498 | 505 | */ |
499 | 506 | $path = 'madmin/log/manager/insert'; |
500 | 507 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
501 | - } |
|
502 | - else |
|
508 | + } else |
|
503 | 509 | { |
504 | 510 | /** madmin/log/manager/update/mysql |
505 | 511 | * Updates an existing log record in the database |
@@ -815,7 +815,7 @@ discard block |
||
815 | 815 | |
816 | 816 | foreach( $price->getTaxrates() as $name => $taxrate ) |
817 | 817 | { |
818 | - $price = (clone $price)->setTaxRate( $taxrate ); |
|
818 | + $price = ( clone $price )->setTaxRate( $taxrate ); |
|
819 | 819 | |
820 | 820 | if( isset( $taxes[$name][$taxrate] ) ) { |
821 | 821 | $taxes[$name][$taxrate]->addItem( $price, $product->getQuantity() ); |
@@ -833,7 +833,7 @@ discard block |
||
833 | 833 | |
834 | 834 | foreach( $price->getTaxrates() as $name => $taxrate ) |
835 | 835 | { |
836 | - $price = (clone $price)->setTaxRate( $taxrate ); |
|
836 | + $price = ( clone $price )->setTaxRate( $taxrate ); |
|
837 | 837 | |
838 | 838 | if( isset( $taxes[$name][$taxrate] ) ) { |
839 | 839 | $taxes[$name][$taxrate]->addItem( $price ); |
@@ -182,8 +182,7 @@ |
||
182 | 182 | $search->compare( '==', $prefix . '.lists.domain', $key ), |
183 | 183 | $search->compare( '==', $prefix . '.lists.type', $domain ), |
184 | 184 | ] ); |
185 | - } |
|
186 | - else |
|
185 | + } else |
|
187 | 186 | { |
188 | 187 | $domain = !strncmp( $domain, $prefix . '/', $len + 1 ) ? [$domain, substr( $domain, $len + 1 )] : $domain; // remove prefix |
189 | 188 | $list[] = $search->compare( '==', $prefix . '.lists.domain', $domain ); |
@@ -102,16 +102,19 @@ |
||
102 | 102 | |
103 | 103 | if( $siteId ) |
104 | 104 | { |
105 | - if( in_array( $siteId, $siteIds ) ) // if product is inherited, inherit price too |
|
105 | + if( in_array( $siteId, $siteIds ) ) { |
|
106 | + // if product is inherited, inherit price too |
|
106 | 107 | { |
107 | 108 | if( !in_array( $priceItem->getSiteId(), $siteIds ) ) { |
108 | 109 | continue; |
109 | - } |
|
110 | 110 | } |
111 | - elseif( $priceItem->getSiteId() !== $siteId ) // Use price from specific site originally passed as parameter |
|
111 | + } |
|
112 | + } elseif( $priceItem->getSiteId() !== $siteId ) { |
|
113 | + // Use price from specific site originally passed as parameter |
|
112 | 114 | { |
113 | 115 | continue; |
114 | 116 | } |
117 | + } |
|
115 | 118 | } |
116 | 119 | |
117 | 120 | $qty = (string) $priceItem->getQuantity(); |
@@ -44,9 +44,12 @@ |
||
44 | 44 | |
45 | 45 | foreach( $data as $entry ) |
46 | 46 | { |
47 | - try { |
|
47 | + try |
|
48 | + { |
|
48 | 49 | $manager->find( $entry['catalog.code'] ); |
49 | - } catch( \Exception $e ) { |
|
50 | + } |
|
51 | + catch( \Exception $e ) |
|
52 | + { |
|
50 | 53 | $manager->insert( $manager->create()->fromArray( $entry ) ); |
51 | 54 | } |
52 | 55 | } |
@@ -467,7 +467,7 @@ |
||
467 | 467 | |
468 | 468 | try { |
469 | 469 | $stmt->execute()->finish(); |
470 | - } catch( \Aimeos\Base\DB\Exception $e ) { ; } // Ignore duplicates |
|
470 | + } catch( \Aimeos\Base\DB\Exception $e ) {; } // Ignore duplicates |
|
471 | 471 | } |
472 | 472 | } |
473 | 473 |
@@ -459,9 +459,13 @@ |
||
459 | 459 | $stmt->bind( 5, $context->datetime() ); //mtime |
460 | 460 | $stmt->bind( 6, $siteid ); |
461 | 461 | |
462 | - try { |
|
462 | + try |
|
463 | + { |
|
463 | 464 | $stmt->execute()->finish(); |
464 | - } catch( \Aimeos\Base\DB\Exception $e ) { ; } // Ignore duplicates |
|
465 | + } |
|
466 | + catch( \Aimeos\Base\DB\Exception $e ) |
|
467 | + { |
|
468 | +; } // Ignore duplicates |
|
465 | 469 | } |
466 | 470 | } |
467 | 471 |
@@ -294,8 +294,7 @@ |
||
294 | 294 | $map[$item->getParentId()][$item->getPosition()] = $item; |
295 | 295 | |
296 | 296 | $subProducts = []; |
297 | - } |
|
298 | - else |
|
297 | + } else |
|
299 | 298 | { // in case it's a sub-product |
300 | 299 | $subProducts[$item->getPosition()] = $item; |
301 | 300 | } |
@@ -296,8 +296,7 @@ |
||
296 | 296 | } ); |
297 | 297 | |
298 | 298 | $service->setId( null )->setAttributeItems( $attrItems->setId( null ) ); |
299 | - } |
|
300 | - else |
|
299 | + } else |
|
301 | 300 | { |
302 | 301 | unset( $map[$type][$key] ); |
303 | 302 | } |
@@ -15,7 +15,7 @@ |
||
15 | 15 | { |
16 | 16 | $this->info( 'Creating test schema', 'vv' ); |
17 | 17 | |
18 | - $this->db( 'db-test' )->table( 'mshop_test', function( \Aimeos\Upscheme\Schema\Table $table ) { |
|
18 | + $this->db( 'db-test' )->table( 'mshop_test', function( \Aimeos\Upscheme\Schema\Table $table ) { |
|
19 | 19 | |
20 | 20 | $table->engine = 'InnoDB'; |
21 | 21 |