@@ -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 ); |
@@ -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 |
@@ -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 |
@@ -55,9 +55,12 @@ |
||
55 | 55 | |
56 | 56 | foreach( $testdata['group'] as $entry ) |
57 | 57 | { |
58 | - try { |
|
58 | + try |
|
59 | + { |
|
59 | 60 | $manager->save( $manager->find( $entry['group.code'] )->fromArray( $entry ) ); |
60 | - } catch( \Exception $e ) { |
|
61 | + } |
|
62 | + catch( \Exception $e ) |
|
63 | + { |
|
61 | 64 | $manager->save( $manager->create()->fromArray( $entry ), false ); |
62 | 65 | } |
63 | 66 | } |
@@ -344,7 +344,8 @@ |
||
344 | 344 | { |
345 | 345 | $stockManager->decrease( [$item->getProductId() => -1 * $how * $item->getQuantity()], $item->getStockType() ); |
346 | 346 | |
347 | - switch( $item->getType() ) { |
|
347 | + switch( $item->getType() ) |
|
348 | + { |
|
348 | 349 | case 'default': |
349 | 350 | $this->updateStockBundle( $item->getParentProductId(), $item->getStockType() ); break; |
350 | 351 | case 'select': |
@@ -137,8 +137,7 @@ |
||
137 | 137 | $msg = $this->context()->translate( 'mshop', 'Unable to open file "%1$s"' ); |
138 | 138 | throw new \RuntimeException( sprintf( $msg, $file ) ); |
139 | 139 | } |
140 | - } |
|
141 | - else |
|
140 | + } else |
|
142 | 141 | { |
143 | 142 | $fh = $this->context()->fs( $fsname )->reads( $file ); |
144 | 143 | } |
@@ -56,9 +56,9 @@ |
||
56 | 56 | if( $this->call( 'filterPreviews', $image, $maxwidth, $maxheight, $force ) ) |
57 | 57 | { |
58 | 58 | $file = match( $force ) { |
59 | - 0 => (clone $image)->scaleDown( $maxwidth, $maxheight ), |
|
60 | - 1 => (clone $image)->pad( $maxwidth, $maxheight, $bg, 'center' ), |
|
61 | - 2 => (clone $image)->cover( $maxwidth, $maxheight ) |
|
59 | + 0 => ( clone $image )->scaleDown( $maxwidth, $maxheight ), |
|
60 | + 1 => ( clone $image )->pad( $maxwidth, $maxheight, $bg, 'center' ), |
|
61 | + 2 => ( clone $image )->cover( $maxwidth, $maxheight ) |
|
62 | 62 | }; |
63 | 63 | |
64 | 64 | $list[$file->width()] = $file; |