@@ -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 |
@@ -301,8 +301,7 @@ |
||
301 | 301 | */ |
302 | 302 | $path = 'mshop/group/manager/insert'; |
303 | 303 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
304 | - } |
|
305 | - else |
|
304 | + } else |
|
306 | 305 | { |
307 | 306 | /** mshop/group/manager/update/mysql |
308 | 307 | * Updates an existing group record in the database |
@@ -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 | } |
@@ -620,9 +620,13 @@ discard block |
||
620 | 620 | |
621 | 621 | if( empty( $item->getInvoiceNumber() ) && $item->getStatusPayment() >= \Aimeos\MShop\Order\Item\Base::PAY_PENDING ) |
622 | 622 | { |
623 | - try { |
|
623 | + try |
|
624 | + { |
|
624 | 625 | $item->setInvoiceNumber( $this->createInvoiceNumber( $item ) ); |
625 | - } catch( \Exception $e ) { // redo on transaction deadlock |
|
626 | + } |
|
627 | + catch( \Exception $e ) |
|
628 | + { |
|
629 | +// redo on transaction deadlock |
|
626 | 630 | $item->setInvoiceNumber( $this->createInvoiceNumber( $item ) ); |
627 | 631 | } |
628 | 632 | } |
@@ -673,8 +677,7 @@ discard block |
||
673 | 677 | */ |
674 | 678 | $path = 'mshop/order/manager/insert'; |
675 | 679 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
676 | - } |
|
677 | - else |
|
680 | + } else |
|
678 | 681 | { |
679 | 682 | /** mshop/order/manager/update/mysql |
680 | 683 | * Updates an existing order record in the database |
@@ -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': |
@@ -54,8 +54,7 @@ |
||
54 | 54 | $msg = $this->context()->translate( 'mshop', 'Unable to open file "%1$s"' ); |
55 | 55 | throw new \Aimeos\MShop\Media\Exception( sprintf( $msg, $file ) ); |
56 | 56 | } |
57 | - } |
|
58 | - else |
|
57 | + } else |
|
59 | 58 | { |
60 | 59 | $fh = $this->context()->fs( 'fs-media' )->reads( $file ); |
61 | 60 | } |
@@ -32,7 +32,7 @@ |
||
32 | 32 | abstract protected function context() : \Aimeos\MShop\ContextIface; |
33 | 33 | |
34 | 34 | |
35 | - /** |
|
35 | + /** |
|
36 | 36 | * Creates scaled images according to the configuration settings |
37 | 37 | * |
38 | 38 | * @param \Intervention\Image\Interfaces\ImageInterface $image Media object |