@@ -60,8 +60,7 @@ |
||
| 60 | 60 | $sort = 'mindte_ft.RANK'; |
| 61 | 61 | |
| 62 | 62 | $func = $this->getFunctionRelevance(); |
| 63 | - } |
|
| 64 | - else |
|
| 63 | + } else |
|
| 65 | 64 | { |
| 66 | 65 | $search = ':site AND mindte."langid" = $1 AND CHARINDEX( $2, content )'; |
| 67 | 66 | $sort = '-CHARINDEX( $2, content )'; |
@@ -349,8 +349,7 @@ |
||
| 349 | 349 | */ |
| 350 | 350 | $path = 'mshop/supplier/manager/insert'; |
| 351 | 351 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
| 352 | - } |
|
| 353 | - else |
|
| 352 | + } else |
|
| 354 | 353 | { |
| 355 | 354 | /** mshop/supplier/manager/update/mysql |
| 356 | 355 | * Updates an existing supplier record in the database |
@@ -305,8 +305,7 @@ |
||
| 305 | 305 | */ |
| 306 | 306 | $path = 'mshop/customer/manager/group/insert'; |
| 307 | 307 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
| 308 | - } |
|
| 309 | - else |
|
| 308 | + } else |
|
| 310 | 309 | { |
| 311 | 310 | /** mshop/customer/manager/group/update/mysql |
| 312 | 311 | * Updates an existing customer group record in the database |
@@ -513,8 +513,7 @@ |
||
| 513 | 513 | */ |
| 514 | 514 | $path = 'mshop/customer/manager/insert'; |
| 515 | 515 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
| 516 | - } |
|
| 517 | - else |
|
| 516 | + } else |
|
| 518 | 517 | { |
| 519 | 518 | /** mshop/customer/manager/update/mysql |
| 520 | 519 | * Updates an existing customer record in the database |
@@ -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\Locale\Manager\Factory::create( $this->context(), '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 | } |
@@ -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 | } |