@@ -46,21 +46,18 @@ |
||
| 46 | 46 | { |
| 47 | 47 | $options[$name] = (array) $options[$name]; |
| 48 | 48 | $options[$name][] = substr( $option, $pos + 1 ); |
| 49 | - } |
|
| 50 | - else |
|
| 49 | + } else |
|
| 51 | 50 | { |
| 52 | 51 | $options[$name] = substr( $option, $pos + 1 ); |
| 53 | 52 | } |
| 54 | 53 | |
| 55 | 54 | unset( $params[$key] ); |
| 56 | - } |
|
| 57 | - else |
|
| 55 | + } else |
|
| 58 | 56 | { |
| 59 | 57 | printf( "Invalid option \"%1\$s\"\n", $option ); |
| 60 | 58 | usage(); |
| 61 | 59 | } |
| 62 | - } |
|
| 63 | - elseif( $option[0] === '-' ) |
|
| 60 | + } elseif( $option[0] === '-' ) |
|
| 64 | 61 | { |
| 65 | 62 | $options[$option[1]] = substr( $option, 1 ); |
| 66 | 63 | unset( $params[$key] ); |
@@ -85,9 +85,13 @@ |
||
| 85 | 85 | $item->setPosition( $dataset['position'] ); |
| 86 | 86 | } |
| 87 | 87 | |
| 88 | - try { |
|
| 88 | + try |
|
| 89 | + { |
|
| 89 | 90 | $pluginManager->save( $item ); |
| 90 | - } catch( \Exception $e ) {; } // if plugin configuration was already available |
|
| 91 | + } |
|
| 92 | + catch( \Exception $e ) |
|
| 93 | + { |
|
| 94 | +; } // if plugin configuration was already available |
|
| 91 | 95 | } |
| 92 | 96 | } |
| 93 | 97 | } |
@@ -26,7 +26,8 @@ discard block |
||
| 26 | 26 | |
| 27 | 27 | public function test() |
| 28 | 28 | { |
| 29 | - try { |
|
| 29 | + try |
|
| 30 | + { |
|
| 30 | 31 | throw new \Aimeos\MShop\Plugin\Provider\Exception( 'msg', 13, null, $this->codes ); |
| 31 | 32 | } |
| 32 | 33 | catch( \Aimeos\MShop\Plugin\Provider\Exception $mppe ) |
@@ -36,7 +37,8 @@ discard block |
||
| 36 | 37 | $this->assertEquals( $this->codes, $mppe->getErrorCodes() ); |
| 37 | 38 | } |
| 38 | 39 | |
| 39 | - try { |
|
| 40 | + try |
|
| 41 | + { |
|
| 40 | 42 | throw new \Aimeos\MShop\Plugin\Provider\Exception( 'msg2', 11 ); |
| 41 | 43 | } |
| 42 | 44 | catch( \Aimeos\MShop\Plugin\Provider\Exception $e ) |
@@ -201,8 +201,7 @@ discard block |
||
| 201 | 201 | if( $level === \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE ) { |
| 202 | 202 | return $node; |
| 203 | 203 | } |
| 204 | - } |
|
| 205 | - else |
|
| 204 | + } else |
|
| 206 | 205 | { |
| 207 | 206 | $node = $this->getNodeById( $id ); |
| 208 | 207 | |
@@ -276,15 +275,13 @@ discard block |
||
| 276 | 275 | $node->left = $refNode->left; |
| 277 | 276 | $node->right = $refNode->left + 1; |
| 278 | 277 | $node->level = $refNode->level; |
| 279 | - } |
|
| 280 | - else if( $parentId !== null ) |
|
| 278 | + } else if( $parentId !== null ) |
|
| 281 | 279 | { |
| 282 | 280 | $parentNode = $this->getNode( $parentId, \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE ); |
| 283 | 281 | $node->left = $parentNode->right; |
| 284 | 282 | $node->right = $parentNode->right + 1; |
| 285 | 283 | $node->level = $parentNode->level + 1; |
| 286 | - } |
|
| 287 | - else |
|
| 284 | + } else |
|
| 288 | 285 | { |
| 289 | 286 | $node->left = 1; |
| 290 | 287 | $node->right = 2; |
@@ -375,8 +372,7 @@ discard block |
||
| 375 | 372 | $moveNodeRightBegin = $node->left + $diff + 1; |
| 376 | 373 | $moveNodeRightEnd = $node->right + $diff; |
| 377 | 374 | $movesize = $refNode->left - $node->left - $diff; |
| 378 | - } |
|
| 379 | - else |
|
| 375 | + } else |
|
| 380 | 376 | { |
| 381 | 377 | $moveNodeLeftBegin = $node->left; |
| 382 | 378 | $moveNodeLeftEnd = $node->right - 1; |
@@ -387,8 +383,7 @@ discard block |
||
| 387 | 383 | |
| 388 | 384 | $closeNodeLeftBegin = $node->left + $diff; |
| 389 | 385 | $closeNodeRightBegin = $node->left + $diff; |
| 390 | - } |
|
| 391 | - else |
|
| 386 | + } else |
|
| 392 | 387 | { |
| 393 | 388 | $refNode = $this->getNode( $newParentId, \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE ); |
| 394 | 389 | |
@@ -414,8 +409,7 @@ discard block |
||
| 414 | 409 | $moveNodeRightBegin = $node->left + $diff + 1; |
| 415 | 410 | $moveNodeRightEnd = $node->right + $diff; |
| 416 | 411 | $movesize = $refNode->right - $node->left - $diff; |
| 417 | - } |
|
| 418 | - else |
|
| 412 | + } else |
|
| 419 | 413 | { |
| 420 | 414 | $moveNodeLeftBegin = $node->left; |
| 421 | 415 | $moveNodeLeftEnd = $node->right - 1; |
@@ -155,8 +155,7 @@ |
||
| 155 | 155 | $files[] = $entry->getPathname(); |
| 156 | 156 | } |
| 157 | 157 | } |
| 158 | - } |
|
| 159 | - else |
|
| 158 | + } else |
|
| 160 | 159 | { |
| 161 | 160 | $files[] = $location; |
| 162 | 161 | } |
@@ -720,7 +720,7 @@ |
||
| 720 | 720 | $lastPos++; |
| 721 | 721 | } |
| 722 | 722 | } |
| 723 | - catch( \Exception $e ) { ; } // If no delivery service is available |
|
| 723 | + catch( \Exception $e ) {; } // If no delivery service is available |
|
| 724 | 724 | } |
| 725 | 725 | |
| 726 | 726 | |
@@ -725,7 +725,9 @@ |
||
| 725 | 725 | $lastPos++; |
| 726 | 726 | } |
| 727 | 727 | } |
| 728 | - catch( \Exception $e ) { ; } // If no delivery service is available |
|
| 728 | + catch( \Exception $e ) |
|
| 729 | + { |
|
| 730 | +; } // If no delivery service is available |
|
| 729 | 731 | } |
| 730 | 732 | |
| 731 | 733 | |
@@ -81,7 +81,7 @@ |
||
| 81 | 81 | $feconfig['directdebit.accountowner']['default'] = $fn . ' ' . $ln; |
| 82 | 82 | } |
| 83 | 83 | } |
| 84 | - catch( \Aimeos\MShop\Order\Exception $e ) { ; } // If address isn't available |
|
| 84 | + catch( \Aimeos\MShop\Order\Exception $e ) {; } // If address isn't available |
|
| 85 | 85 | |
| 86 | 86 | return $this->getConfigItems( $feconfig ); |
| 87 | 87 | } |
@@ -81,7 +81,9 @@ |
||
| 81 | 81 | $feconfig['directdebit.accountowner']['default'] = $fn . ' ' . $ln; |
| 82 | 82 | } |
| 83 | 83 | } |
| 84 | - catch( \Aimeos\MShop\Order\Exception $e ) { ; } // If address isn't available |
|
| 84 | + catch( \Aimeos\MShop\Order\Exception $e ) |
|
| 85 | + { |
|
| 86 | +; } // If address isn't available |
|
| 85 | 87 | |
| 86 | 88 | return $this->getConfigItems( $feconfig ); |
| 87 | 89 | } |
@@ -117,8 +117,7 @@ |
||
| 117 | 117 | return false; |
| 118 | 118 | } |
| 119 | 119 | } |
| 120 | - } |
|
| 121 | - elseif( ( $addresses = $basket->getAddress( Address\Base::TYPE_PAYMENT ) ) !== [] ) |
|
| 120 | + } elseif( ( $addresses = $basket->getAddress( Address\Base::TYPE_PAYMENT ) ) !== [] ) |
|
| 122 | 121 | { |
| 123 | 122 | // use billing address if no delivery address is available |
| 124 | 123 | foreach( $addresses as $address ) |
@@ -98,8 +98,7 @@ |
||
| 98 | 98 | foreach( $products as $prodItem ) { // calculate bundled products |
| 99 | 99 | $sum += $qty * $prodItem->getQuantity(); |
| 100 | 100 | } |
| 101 | - } |
|
| 102 | - else |
|
| 101 | + } else |
|
| 103 | 102 | { |
| 104 | 103 | $sum += $qty; |
| 105 | 104 | } |