@@ -305,8 +305,7 @@ discard block |
||
305 | 305 | foreach( $columns as $name ) { |
306 | 306 | $names .= '"' . $name . '", '; $values .= '?, '; |
307 | 307 | } |
308 | - } |
|
309 | - else |
|
308 | + } else |
|
310 | 309 | { |
311 | 310 | foreach( $columns as $name ) { |
312 | 311 | $names .= '"' . $name . '" = ?, '; |
@@ -691,11 +690,9 @@ discard block |
||
691 | 690 | |
692 | 691 | if( isset( $attributes[$prefix] ) && $attributes[$prefix] instanceof $iface ) { |
693 | 692 | return $attributes[$prefix]->getInternalDeps(); |
694 | - } |
|
695 | - elseif( isset( $attributes[$name] ) && $attributes[$name] instanceof $iface ) { |
|
693 | + } elseif( isset( $attributes[$name] ) && $attributes[$name] instanceof $iface ) { |
|
696 | 694 | return $attributes[$name]->getInternalDeps(); |
697 | - } |
|
698 | - else if( isset( $attributes['id'] ) && $attributes['id'] instanceof $iface ) { |
|
695 | + } else if( isset( $attributes['id'] ) && $attributes['id'] instanceof $iface ) { |
|
699 | 696 | return $attributes['id']->getInternalDeps(); |
700 | 697 | } |
701 | 698 |
@@ -178,8 +178,7 @@ discard block |
||
178 | 178 | $search->compare( '==', $prefix . '.lists.domain', $key ), |
179 | 179 | $search->compare( '==', $prefix . '.lists.type', $domain ), |
180 | 180 | ] ); |
181 | - } |
|
182 | - else |
|
181 | + } else |
|
183 | 182 | { |
184 | 183 | $list[] = $search->compare( '==', $prefix . '.lists.domain', $domain ); |
185 | 184 | } |
@@ -187,8 +186,7 @@ discard block |
||
187 | 186 | |
188 | 187 | $expr[] = $search->or( $list ); |
189 | 188 | $search->setConditions( $search->and( $expr ) ); |
190 | - } |
|
191 | - else |
|
189 | + } else |
|
192 | 190 | { |
193 | 191 | $search->setConditions( $search->compare( '==', $prefix . '.lists.parentid', $ids ) ); |
194 | 192 | } |
@@ -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 | |
@@ -69,7 +72,9 @@ discard block |
||
69 | 72 | |
70 | 73 | $localeManager->save( $localeItem, false ); |
71 | 74 | } |
72 | - catch( \Aimeos\Base\DB\Exception $e ) {} // already in the database |
|
75 | + catch( \Aimeos\Base\DB\Exception $e ) |
|
76 | + { |
|
77 | +} // already in the database |
|
73 | 78 | } |
74 | 79 | |
75 | 80 | |
@@ -91,9 +96,12 @@ discard block |
||
91 | 96 | |
92 | 97 | foreach( $data as $key => $dataset ) |
93 | 98 | { |
94 | - try { |
|
99 | + try |
|
100 | + { |
|
95 | 101 | $item = $manager->insert( $manager->create()->fromArray( $dataset ), $parentId ); |
96 | - } catch( \Aimeos\Base\DB\Exception $e ) { |
|
102 | + } |
|
103 | + catch( \Aimeos\Base\DB\Exception $e ) |
|
104 | + { |
|
97 | 105 | $item = $manager->find( $key ); |
98 | 106 | } |
99 | 107 | |
@@ -162,9 +170,13 @@ discard block |
||
162 | 170 | ->set( 'site_id', $siteIds[$dataset['site']]['id'] ) |
163 | 171 | ->setSiteId( $siteIds[$dataset['site']]['site'] ); |
164 | 172 | |
165 | - try { |
|
173 | + try |
|
174 | + { |
|
166 | 175 | $localeManager->save( $item ); |
167 | - } catch( \Aimeos\Base\DB\Exception $e ) { ; } // if locale combination was already available |
|
176 | + } |
|
177 | + catch( \Aimeos\Base\DB\Exception $e ) |
|
178 | + { |
|
179 | +; } // if locale combination was already available |
|
168 | 180 | } |
169 | 181 | } |
170 | 182 | } |
@@ -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 | } |
@@ -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 | } |