@@ -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 | |
@@ -465,9 +465,13 @@ |
||
| 465 | 465 | $stmt->bind( 5, $date ); //mtime |
| 466 | 466 | $stmt->bind( 6, $siteid ); |
| 467 | 467 | |
| 468 | - try { |
|
| 468 | + try |
|
| 469 | + { |
|
| 469 | 470 | $stmt->execute()->finish(); |
| 470 | - } catch( \Aimeos\Base\DB\Exception $e ) { ; } // Ignore duplicates |
|
| 471 | + } |
|
| 472 | + catch( \Aimeos\Base\DB\Exception $e ) |
|
| 473 | + { |
|
| 474 | +; } // Ignore duplicates |
|
| 471 | 475 | } |
| 472 | 476 | } |
| 473 | 477 | |
@@ -819,9 +819,12 @@ discard block |
||
| 819 | 819 | |
| 820 | 820 | foreach( $sitePath as $siteId ) |
| 821 | 821 | { |
| 822 | - try { |
|
| 822 | + try |
|
| 823 | + { |
|
| 823 | 824 | $path = $this->createTreeManager( $siteId )->getPath( $id ); |
| 824 | - } catch( \Exception $e ) { |
|
| 825 | + } |
|
| 826 | + catch( \Exception $e ) |
|
| 827 | + { |
|
| 825 | 828 | continue; |
| 826 | 829 | } |
| 827 | 830 | |
@@ -865,9 +868,12 @@ discard block |
||
| 865 | 868 | |
| 866 | 869 | foreach( $sitePath as $siteId ) |
| 867 | 870 | { |
| 868 | - try { |
|
| 871 | + try |
|
| 872 | + { |
|
| 869 | 873 | $node = $this->createTreeManager( $siteId )->getNode( $id, $level, $criteria ); |
| 870 | - } catch( \Aimeos\MW\Tree\Exception $e ) { |
|
| 874 | + } |
|
| 875 | + catch( \Aimeos\MW\Tree\Exception $e ) |
|
| 876 | + { |
|
| 871 | 877 | continue; |
| 872 | 878 | } |
| 873 | 879 | |
@@ -949,8 +955,7 @@ discard block |
||
| 949 | 955 | if( $child->getParentId() !== $item->getId() ) { |
| 950 | 956 | $this->move( $child->getId(), $item->getParentId(), $child->getParentId() ); |
| 951 | 957 | } |
| 952 | - } |
|
| 953 | - else |
|
| 958 | + } else |
|
| 954 | 959 | { |
| 955 | 960 | $this->insert( $child, $item->getId() ); |
| 956 | 961 | } |
@@ -1095,8 +1100,7 @@ discard block |
||
| 1095 | 1100 | * @see mshop/catalog/manager/insert-usage/ansi |
| 1096 | 1101 | */ |
| 1097 | 1102 | $path = 'mshop/catalog/manager/update-usage'; |
| 1098 | - } |
|
| 1099 | - else |
|
| 1103 | + } else |
|
| 1100 | 1104 | { |
| 1101 | 1105 | /** mshop/catalog/manager/insert-usage/mysql |
| 1102 | 1106 | * Updates the config, editor, ctime and mtime value of an inserted record |
@@ -1160,8 +1164,7 @@ discard block |
||
| 1160 | 1164 | { |
| 1161 | 1165 | $stmt->bind( $idx++, $siteid ); |
| 1162 | 1166 | $stmt->bind( $idx++, $id, \Aimeos\Base\DB\Statement\Base::PARAM_INT ); |
| 1163 | - } |
|
| 1164 | - else |
|
| 1167 | + } else |
|
| 1165 | 1168 | { |
| 1166 | 1169 | $stmt->bind( $idx++, $date ); // ctime |
| 1167 | 1170 | $stmt->bind( $idx++, $siteid ); |
@@ -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 | |
@@ -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 |