@@ -164,7 +164,7 @@ |
||
164 | 164 | |
165 | 165 | try { |
166 | 166 | $localeManager->save( $item ); |
167 | - } catch( \Aimeos\Base\DB\Exception $e ) { ; } // if locale combination was already available |
|
167 | + } catch( \Aimeos\Base\DB\Exception $e ) {; } // if locale combination was already available |
|
168 | 168 | } |
169 | 169 | } |
170 | 170 | } |
@@ -52,9 +52,12 @@ discard block |
||
52 | 52 | $localeManager = \Aimeos\MShop::create( $this->context(), 'locale', 'Standard' ); |
53 | 53 | $siteManager = $localeManager->getSubManager( 'site' ); |
54 | 54 | |
55 | - try { |
|
55 | + try |
|
56 | + { |
|
56 | 57 | $siteItem = $siteManager->insert( $siteManager->create()->setLabel( $code )->setCode( $code ) ); |
57 | - } catch( \Aimeos\Base\DB\Exception $e ) { |
|
58 | + } |
|
59 | + catch( \Aimeos\Base\DB\Exception $e ) |
|
60 | + { |
|
58 | 61 | $siteItem = $siteManager->find( $code ); |
59 | 62 | } |
60 | 63 | |
@@ -68,7 +71,9 @@ discard block |
||
68 | 71 | |
69 | 72 | $localeManager->save( $localeItem, false ); |
70 | 73 | } |
71 | - catch( \Aimeos\Base\DB\Exception $e ) {} // already in the database |
|
74 | + catch( \Aimeos\Base\DB\Exception $e ) |
|
75 | + { |
|
76 | +} // already in the database |
|
72 | 77 | } |
73 | 78 | |
74 | 79 | |
@@ -167,9 +172,13 @@ discard block |
||
167 | 172 | $item = $localeManager->create()->fromArray( $dataset, true ) |
168 | 173 | ->setSiteId( $siteIds[$dataset['site']]['site'] ); |
169 | 174 | |
170 | - try { |
|
175 | + try |
|
176 | + { |
|
171 | 177 | $localeManager->save( $item ); |
172 | - } catch( \Aimeos\Base\DB\Exception $e ) { ; } // if locale combination was already available |
|
178 | + } |
|
179 | + catch( \Aimeos\Base\DB\Exception $e ) |
|
180 | + { |
|
181 | +; } // if locale combination was already available |
|
173 | 182 | } |
174 | 183 | } |
175 | 184 | } |
@@ -61,8 +61,7 @@ discard block |
||
61 | 61 | for( $i = 0; $i < $numCatPerLevel; $i++ ) { |
62 | 62 | $treeFcn( $parents, $catItem->getId(), $numCatPerLevel, $level - 1, $catLabel . '-' . ( $i + 1 ), $i ); |
63 | 63 | } |
64 | - } |
|
65 | - else |
|
64 | + } else |
|
66 | 65 | { |
67 | 66 | $fcn = function( array $parents, $catLabel ) { |
68 | 67 | |
@@ -120,9 +119,12 @@ discard block |
||
120 | 119 | |
121 | 120 | while( true ) |
122 | 121 | { |
123 | - try { |
|
122 | + try |
|
123 | + { |
|
124 | 124 | return $catalogManager->insert( $item, $parentId ); |
125 | - } catch( \Aimeos\Base\DB\Exception $e ) { |
|
125 | + } |
|
126 | + catch( \Aimeos\Base\DB\Exception $e ) |
|
127 | + { |
|
126 | 128 | if( $e->getCode() !== 40001 ) { throw $e; } // transaction deadlock |
127 | 129 | } |
128 | 130 | } |
@@ -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 | } |
@@ -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 | } |
@@ -140,8 +140,7 @@ |
||
140 | 140 | foreach( $cond->getExpressions() as $expr ) { |
141 | 141 | $list = array_merge( $list, $this->getProductIds( $expr ) ); |
142 | 142 | } |
143 | - } |
|
144 | - elseif( $cond instanceof \Aimeos\Base\Criteria\Expression\Compare\Iface ) |
|
143 | + } elseif( $cond instanceof \Aimeos\Base\Criteria\Expression\Compare\Iface ) |
|
145 | 144 | { |
146 | 145 | if( $cond->getName() === 'stock.productid' && $cond->getOperator() === '==' ) { |
147 | 146 | $list = array_merge( $list, (array) $cond->getValue() ); |
@@ -153,8 +153,8 @@ |
||
153 | 153 | { |
154 | 154 | $map = []; |
155 | 155 | |
156 | - $conn = $this->context()->db( 'db-locale' ); |
|
157 | - $tconn = $this->context()->db( 'db-locale', true ); |
|
156 | + $conn = $this->context()->db( 'db-locale' ); |
|
157 | + $tconn = $this->context()->db( 'db-locale', true ); |
|
158 | 158 | |
159 | 159 | $type = \Aimeos\Base\DB\Statement\Base::PARAM_INT; |
160 | 160 | $roots = $conn->create( 'SELECT id, nleft, nright FROM mshop_locale_site WHERE level = 0' )->execute(); |
@@ -39,9 +39,12 @@ |
||
39 | 39 | { |
40 | 40 | $db->for( 'mysql', 'CREATE FULLTEXT INDEX `idx_msindte_content` ON `mshop_index_text` (`content`)' ); |
41 | 41 | |
42 | - try { |
|
42 | + try |
|
43 | + { |
|
43 | 44 | $db->for( 'postgresql', 'CREATE INDEX "idx_msindte_content" ON "mshop_index_text" USING GIN (to_tsvector(\'english\', "content"))' ); |
44 | - } catch( \Exception $e ) { |
|
45 | + } |
|
46 | + catch( \Exception $e ) |
|
47 | + { |
|
45 | 48 | // Doctrine DBAL bug: https://github.com/doctrine/dbal/issues/5351 |
46 | 49 | } |
47 | 50 | } |