@@ -114,7 +114,9 @@ |
||
| 114 | 114 | $feconfig['time.hourminute']['default'] = $value; |
| 115 | 115 | } |
| 116 | 116 | } |
| 117 | - catch( \Aimeos\MShop\Service\Exception $e ) {} // If service isn't available |
|
| 117 | + catch( \Aimeos\MShop\Service\Exception $e ) |
|
| 118 | + { |
|
| 119 | +} // If service isn't available |
|
| 118 | 120 | |
| 119 | 121 | return array_merge( $this->getProvider()->getConfigFE( $basket ), $this->getConfigItems( $feconfig ) ); |
| 120 | 122 | } |
@@ -119,12 +119,13 @@ |
||
| 119 | 119 | return false; |
| 120 | 120 | } |
| 121 | 121 | } |
| 122 | - } |
|
| 123 | - elseif( ( $addresses = $basket->getAddress( $paymentType ) ) !== [] ) // use billing address if no delivery address is available |
|
| 122 | + } elseif( ( $addresses = $basket->getAddress( $paymentType ) ) !== [] ) { |
|
| 123 | + // use billing address if no delivery address is available |
|
| 124 | 124 | { |
| 125 | 125 | foreach( $addresses as $address ) |
| 126 | 126 | { |
| 127 | 127 | $code = $address->getPostal(); |
| 128 | + } |
|
| 128 | 129 | |
| 129 | 130 | if( $this->checkPostalCode( $code, 'postal.delivery-include' ) === false |
| 130 | 131 | || $this->checkPostalCode( $code, 'postal.delivery-exclude' ) === true |
@@ -97,7 +97,9 @@ |
||
| 97 | 97 | $feconfig['date.value']['default'] = $value; |
| 98 | 98 | } |
| 99 | 99 | } |
| 100 | - catch( \Aimeos\MShop\Service\Exception $e ) {} // If service isn't available |
|
| 100 | + catch( \Aimeos\MShop\Service\Exception $e ) |
|
| 101 | + { |
|
| 102 | +} // If service isn't available |
|
| 101 | 103 | |
| 102 | 104 | return array_merge( $this->getProvider()->getConfigFE( $basket ), $this->getConfigItems( $feconfig ) ); |
| 103 | 105 | } |
@@ -129,7 +129,9 @@ |
||
| 129 | 129 | $feconfig['delivery.type']['default'] = $values; |
| 130 | 130 | } |
| 131 | 131 | } |
| 132 | - catch( \Aimeos\MShop\Service\Exception $e ) {} // If service isn't available |
|
| 132 | + catch( \Aimeos\MShop\Service\Exception $e ) |
|
| 133 | + { |
|
| 134 | +} // If service isn't available |
|
| 133 | 135 | |
| 134 | 136 | return array_merge( $this->getProvider()->getConfigFE( $basket ), $this->getConfigItems( $feconfig ) ); |
| 135 | 137 | } |
@@ -207,7 +207,7 @@ |
||
| 207 | 207 | { |
| 208 | 208 | $items = []; |
| 209 | 209 | $level = \Aimeos\MShop\Locale\Manager\Base::SITE_PATH; |
| 210 | - $search = (clone $search)->add( $this->siteCondition( 'locale.siteid', $level ) ); |
|
| 210 | + $search = ( clone $search )->add( $this->siteCondition( 'locale.siteid', $level ) ); |
|
| 211 | 211 | |
| 212 | 212 | foreach( $this->searchEntries( $search, $ref, $total ) as $row ) |
| 213 | 213 | { |
@@ -267,9 +267,13 @@ discard block |
||
| 267 | 267 | */ |
| 268 | 268 | public function create( array $values = [] ) : \Aimeos\MShop\Common\Item\Iface |
| 269 | 269 | { |
| 270 | - try { |
|
| 270 | + try |
|
| 271 | + { |
|
| 271 | 272 | $values['locale.siteid'] = $values['locale.siteid'] ?? $this->context()->locale()->getSiteId(); |
| 272 | - } catch( \Exception $e ) {} // if no locale item is available |
|
| 273 | + } |
|
| 274 | + catch( \Exception $e ) |
|
| 275 | + { |
|
| 276 | +} // if no locale item is available |
|
| 273 | 277 | |
| 274 | 278 | return $this->createItemBase( $values ); |
| 275 | 279 | } |
@@ -431,8 +435,7 @@ discard block |
||
| 431 | 435 | */ |
| 432 | 436 | $path = 'mshop/locale/manager/insert'; |
| 433 | 437 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
| 434 | - } |
|
| 435 | - else |
|
| 438 | + } else |
|
| 436 | 439 | { |
| 437 | 440 | /** mshop/locale/manager/update/mysql |
| 438 | 441 | * Updates an existing locale record in the database |
@@ -59,8 +59,7 @@ discard block |
||
| 59 | 59 | foreach( $value as $key => $product ) { |
| 60 | 60 | $value[$key] = $this->updatePrice( $product ); |
| 61 | 61 | } |
| 62 | - } |
|
| 63 | - else |
|
| 62 | + } else |
|
| 64 | 63 | { |
| 65 | 64 | $value = $this->updatePrice( $value ); |
| 66 | 65 | } |
@@ -139,8 +138,7 @@ discard block |
||
| 139 | 138 | { |
| 140 | 139 | $priceManager = \Aimeos\MShop::create( $this->context(), 'price' ); |
| 141 | 140 | |
| 142 | - $sortFcn = function( $a, $b ) use( $priceManager, $attrQtys ) |
|
| 143 | - { |
|
| 141 | + $sortFcn = function( $a, $b ) use( $priceManager, $attrQtys ) { |
|
| 144 | 142 | if( ( $pricesA = $a->getRefItems( 'price', 'default', 'default' )->toArray() ) === [] ) { |
| 145 | 143 | return 1; |
| 146 | 144 | } |
@@ -203,8 +201,7 @@ discard block |
||
| 203 | 201 | { |
| 204 | 202 | $list = $this->sortByPrice( $list, $attrQtys ); |
| 205 | 203 | $priceItem = $this->addPrices( $priceItem, $list, $attrQtys, (int) $prodConf[$type] ); |
| 206 | - } |
|
| 207 | - else |
|
| 204 | + } else |
|
| 208 | 205 | { |
| 209 | 206 | $priceItem = $this->addPrices( $priceItem, $list, $attrQtys, 0 ); |
| 210 | 207 | } |
@@ -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 | } |
@@ -679,9 +679,13 @@ |
||
| 679 | 679 | $stmt->bind( 7, $context->datetime() ); // mtime |
| 680 | 680 | $stmt->bind( 8, $siteid ); |
| 681 | 681 | |
| 682 | - try { |
|
| 682 | + try |
|
| 683 | + { |
|
| 683 | 684 | $stmt->execute()->finish(); |
| 684 | - } catch( \Aimeos\Base\DB\Exception $e ) { ; } // Ignore duplicates |
|
| 685 | + } |
|
| 686 | + catch( \Aimeos\Base\DB\Exception $e ) |
|
| 687 | + { |
|
| 688 | +; } // Ignore duplicates |
|
| 685 | 689 | } |
| 686 | 690 | } |
| 687 | 691 | } |
@@ -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 | } |
@@ -490,9 +490,13 @@ |
||
| 490 | 490 | $stmt->bind( 7, $context->datetime() ); //mtime |
| 491 | 491 | $stmt->bind( 8, $siteid ); |
| 492 | 492 | |
| 493 | - try { |
|
| 493 | + try |
|
| 494 | + { |
|
| 494 | 495 | $stmt->execute()->finish(); |
| 495 | - } catch( \Aimeos\Base\DB\Exception $e ) { ; } // Ignore duplicates |
|
| 496 | + } |
|
| 497 | + catch( \Aimeos\Base\DB\Exception $e ) |
|
| 498 | + { |
|
| 499 | +; } // Ignore duplicates |
|
| 496 | 500 | } |
| 497 | 501 | } |
| 498 | 502 | } |