@@ -32,9 +32,12 @@ discard block |
||
32 | 32 | { |
33 | 33 | parent::__construct( $config ); |
34 | 34 | |
35 | - try { |
|
35 | + try |
|
36 | + { |
|
36 | 37 | $this->conn = $this->createConnection(); |
37 | - } catch( \Aimeos\Base\DB\Exception $e ) { |
|
38 | + } |
|
39 | + catch( \Aimeos\Base\DB\Exception $e ) |
|
40 | + { |
|
38 | 41 | throw new \Aimeos\MW\MQueue\Exception( $e->getMessage() ); |
39 | 42 | } |
40 | 43 | } |
@@ -110,14 +113,12 @@ discard block |
||
110 | 113 | { |
111 | 114 | $dsn .= 'Database=' . $dbase; |
112 | 115 | $dsn .= isset( $host ) ? ';Server=' . $host . ( isset( $port ) ? ',' . $port : '' ) : ''; |
113 | - } |
|
114 | - elseif( $sock == null ) |
|
116 | + } elseif( $sock == null ) |
|
115 | 117 | { |
116 | 118 | $dsn .= 'dbname=' . $dbase; |
117 | 119 | $dsn .= isset( $host ) ? ';host=' . $host : ''; |
118 | 120 | $dsn .= isset( $port ) ? ';port=' . $port : ''; |
119 | - } |
|
120 | - else |
|
121 | + } else |
|
121 | 122 | { |
122 | 123 | $dsn .= 'dbname=' . $dbase . ';unix_socket=' . $sock; |
123 | 124 | } |
@@ -718,9 +718,12 @@ discard block |
||
718 | 718 | |
719 | 719 | foreach( $sitePath as $siteId ) |
720 | 720 | { |
721 | - try { |
|
721 | + try |
|
722 | + { |
|
722 | 723 | $path = $this->createTreeManager( $siteId )->getPath( $id ); |
723 | - } catch( \Exception $e ) { |
|
724 | + } |
|
725 | + catch( \Exception $e ) |
|
726 | + { |
|
724 | 727 | continue; |
725 | 728 | } |
726 | 729 | |
@@ -757,9 +760,12 @@ discard block |
||
757 | 760 | |
758 | 761 | foreach( $sitePath as $siteId ) |
759 | 762 | { |
760 | - try { |
|
763 | + try |
|
764 | + { |
|
761 | 765 | $node = $this->createTreeManager( $siteId )->getNode( $id, $level, $criteria ); |
762 | - } catch( \Aimeos\MW\Tree\Exception $e ) { |
|
766 | + } |
|
767 | + catch( \Aimeos\MW\Tree\Exception $e ) |
|
768 | + { |
|
763 | 769 | continue; |
764 | 770 | } |
765 | 771 | |
@@ -841,8 +847,7 @@ discard block |
||
841 | 847 | if( $child->getParentId() !== $item->getParentId() ) { |
842 | 848 | $this->move( $child->getId(), $item->getParentId(), $child->getParentId() ); |
843 | 849 | } |
844 | - } |
|
845 | - else |
|
850 | + } else |
|
846 | 851 | { |
847 | 852 | $this->insert( $child, $item->getId() ); |
848 | 853 | } |
@@ -1001,8 +1006,7 @@ discard block |
||
1001 | 1006 | */ |
1002 | 1007 | $path = 'mshop/catalog/manager/update-usage'; |
1003 | 1008 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ), false ); |
1004 | - } |
|
1005 | - else |
|
1009 | + } else |
|
1006 | 1010 | { |
1007 | 1011 | /** mshop/catalog/manager/insert-usage/mysql |
1008 | 1012 | * Updates the config, editor, ctime and mtime value of an inserted record |
@@ -1066,8 +1070,7 @@ discard block |
||
1066 | 1070 | { |
1067 | 1071 | $stmt->bind( $idx++, $siteid ); |
1068 | 1072 | $stmt->bind( $idx++, $id, \Aimeos\Base\DB\Statement\Base::PARAM_INT ); |
1069 | - } |
|
1070 | - else |
|
1073 | + } else |
|
1071 | 1074 | { |
1072 | 1075 | $stmt->bind( $idx++, $date ); // ctime |
1073 | 1076 | $stmt->bind( $idx++, $siteid ); |
@@ -701,7 +701,7 @@ |
||
701 | 701 | |
702 | 702 | try { |
703 | 703 | $stmt->execute()->finish(); |
704 | - } catch( \Aimeos\Base\DB\Exception $e ) { ; } // Ignore duplicates |
|
704 | + } catch( \Aimeos\Base\DB\Exception $e ) {; } // Ignore duplicates |
|
705 | 705 | } |
706 | 706 | } |
707 | 707 | } |
@@ -699,9 +699,13 @@ |
||
699 | 699 | $stmt->bind( 7, $date ); // mtime |
700 | 700 | $stmt->bind( 8, $siteid ); |
701 | 701 | |
702 | - try { |
|
702 | + try |
|
703 | + { |
|
703 | 704 | $stmt->execute()->finish(); |
704 | - } catch( \Aimeos\Base\DB\Exception $e ) { ; } // Ignore duplicates |
|
705 | + } |
|
706 | + catch( \Aimeos\Base\DB\Exception $e ) |
|
707 | + { |
|
708 | +; } // Ignore duplicates |
|
705 | 709 | } |
706 | 710 | } |
707 | 711 | } |
@@ -504,7 +504,7 @@ |
||
504 | 504 | |
505 | 505 | try { |
506 | 506 | $stmt->execute()->finish(); |
507 | - } catch( \Aimeos\Base\DB\Exception $e ) { ; } // Ignore duplicates |
|
507 | + } catch( \Aimeos\Base\DB\Exception $e ) {; } // Ignore duplicates |
|
508 | 508 | } |
509 | 509 | } |
510 | 510 | } |
@@ -502,9 +502,13 @@ |
||
502 | 502 | $stmt->bind( 7, $date ); //mtime |
503 | 503 | $stmt->bind( 8, $siteid ); |
504 | 504 | |
505 | - try { |
|
505 | + try |
|
506 | + { |
|
506 | 507 | $stmt->execute()->finish(); |
507 | - } catch( \Aimeos\Base\DB\Exception $e ) { ; } // Ignore duplicates |
|
508 | + } |
|
509 | + catch( \Aimeos\Base\DB\Exception $e ) |
|
510 | + { |
|
511 | +; } // Ignore duplicates |
|
508 | 512 | } |
509 | 513 | } |
510 | 514 | } |
@@ -472,7 +472,7 @@ |
||
472 | 472 | |
473 | 473 | try { |
474 | 474 | $stmt->execute()->finish(); |
475 | - } catch( \Aimeos\Base\DB\Exception $e ) { ; } // Ignore duplicates |
|
475 | + } catch( \Aimeos\Base\DB\Exception $e ) {; } // Ignore duplicates |
|
476 | 476 | } |
477 | 477 | } |
478 | 478 |
@@ -470,9 +470,13 @@ |
||
470 | 470 | $stmt->bind( 5, $date ); //mtime |
471 | 471 | $stmt->bind( 6, $siteid ); |
472 | 472 | |
473 | - try { |
|
473 | + try |
|
474 | + { |
|
474 | 475 | $stmt->execute()->finish(); |
475 | - } catch( \Aimeos\Base\DB\Exception $e ) { ; } // Ignore duplicates |
|
476 | + } |
|
477 | + catch( \Aimeos\Base\DB\Exception $e ) |
|
478 | + { |
|
479 | +; } // Ignore duplicates |
|
476 | 480 | } |
477 | 481 | } |
478 | 482 |
@@ -830,7 +830,7 @@ |
||
830 | 830 | |
831 | 831 | try { |
832 | 832 | $stmt->execute()->finish(); |
833 | - } catch( \Aimeos\Base\DB\Exception $e ) { ; } // Ignore duplicates |
|
833 | + } catch( \Aimeos\Base\DB\Exception $e ) {; } // Ignore duplicates |
|
834 | 834 | } |
835 | 835 | |
836 | 836 |
@@ -828,9 +828,13 @@ |
||
828 | 828 | $stmt->bind( 6, $date ); //mtime |
829 | 829 | $stmt->bind( 7, $siteid ); |
830 | 830 | |
831 | - try { |
|
831 | + try |
|
832 | + { |
|
832 | 833 | $stmt->execute()->finish(); |
833 | - } catch( \Aimeos\Base\DB\Exception $e ) { ; } // Ignore duplicates |
|
834 | + } |
|
835 | + catch( \Aimeos\Base\DB\Exception $e ) |
|
836 | + { |
|
837 | +; } // Ignore duplicates |
|
834 | 838 | } |
835 | 839 | |
836 | 840 |
@@ -706,7 +706,7 @@ |
||
706 | 706 | |
707 | 707 | try { |
708 | 708 | $stmt->execute()->finish(); |
709 | - } catch( \Aimeos\Base\DB\Exception $e ) { ; } // Ignore duplicates |
|
709 | + } catch( \Aimeos\Base\DB\Exception $e ) {; } // Ignore duplicates |
|
710 | 710 | } |
711 | 711 | } |
712 | 712 | } |
@@ -704,9 +704,13 @@ |
||
704 | 704 | $stmt->bind( 4, $date ); // mtime |
705 | 705 | $stmt->bind( 5, $siteid ); |
706 | 706 | |
707 | - try { |
|
707 | + try |
|
708 | + { |
|
708 | 709 | $stmt->execute()->finish(); |
709 | - } catch( \Aimeos\Base\DB\Exception $e ) { ; } // Ignore duplicates |
|
710 | + } |
|
711 | + catch( \Aimeos\Base\DB\Exception $e ) |
|
712 | + { |
|
713 | +; } // Ignore duplicates |
|
710 | 714 | } |
711 | 715 | } |
712 | 716 | } |