| @@ -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; | 
| @@ -88,7 +88,8 @@ | ||
| 88 | 88 | return array_pop( $this->connections[$name] ); | 
| 89 | 89 | |
| 90 | 90 | } | 
| 91 | -		catch( \Exception $e ) { | |
| 91 | + catch( \Exception $e ) | |
| 92 | +		{ | |
| 92 | 93 | throw new \Aimeos\MW\DB\Exception( $e->getMessage(), $e->getCode() ); | 
| 93 | 94 | } | 
| 94 | 95 | } | 
| @@ -385,8 +385,7 @@ discard block | ||
| 385 | 385 | $attributes[$attribute->getParentId()][] = $attribute; | 
| 386 | 386 | $attribute->setParentId( null ); | 
| 387 | 387 | $attribute->setId( null ); | 
| 388 | - } | |
| 389 | - else | |
| 388 | + } else | |
| 390 | 389 |  			{ | 
| 391 | 390 | $attributes[$attribute->getParentId()][$id] = $attribute; | 
| 392 | 391 | } | 
| @@ -405,8 +404,7 @@ discard block | ||
| 405 | 404 | $map[$item->getBaseId()][$item->getPosition()] = $item; | 
| 406 | 405 | |
| 407 | 406 | $subProducts = []; | 
| 408 | - } | |
| 409 | - else | |
| 407 | + } else | |
| 410 | 408 |  			{	// in case it's a sub-product | 
| 411 | 409 | $subProducts[$item->getPosition()] = $item; | 
| 412 | 410 | } | 
| @@ -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 | } | 
| @@ -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 | } | 
| @@ -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 | } | 
| @@ -713,7 +713,7 @@ | ||
| 713 | 713 | |
| 714 | 714 |  				try { | 
| 715 | 715 | $stmt->execute()->finish(); | 
| 716 | -				} catch( \Aimeos\MW\DB\Exception $e ) { ; } // Ignore duplicates | |
| 716 | +				} catch( \Aimeos\MW\DB\Exception $e ) {; } // Ignore duplicates | |
| 717 | 717 | } | 
| 718 | 718 | } | 
| 719 | 719 | } | 
| @@ -701,9 +701,13 @@ | ||
| 701 | 701 | $stmt->bind( 7, $date ); // mtime | 
| 702 | 702 | $stmt->bind( 8, $siteid ); | 
| 703 | 703 | |
| 704 | -				try { | |
| 704 | + try | |
| 705 | +				{ | |
| 705 | 706 | $stmt->execute()->finish(); | 
| 706 | -				} catch( \Aimeos\MW\DB\Exception $e ) { ; } // Ignore duplicates | |
| 707 | + } | |
| 708 | + catch( \Aimeos\MW\DB\Exception $e ) | |
| 709 | +				{ | |
| 710 | +; } // Ignore duplicates | |
| 707 | 711 | } | 
| 708 | 712 | } | 
| 709 | 713 | } | 
| @@ -521,7 +521,7 @@ | ||
| 521 | 521 | |
| 522 | 522 |  					try { | 
| 523 | 523 | $stmt->execute()->finish(); | 
| 524 | -					} catch( \Aimeos\MW\DB\Exception $e ) { ; } // Ignore duplicates | |
| 524 | +					} catch( \Aimeos\MW\DB\Exception $e ) {; } // Ignore duplicates | |
| 525 | 525 | } | 
| 526 | 526 | } | 
| 527 | 527 | |
| @@ -463,9 +463,13 @@ | ||
| 463 | 463 | $stmt->bind( 5, $date ); //mtime | 
| 464 | 464 | $stmt->bind( 6, $siteid ); | 
| 465 | 465 | |
| 466 | -					try { | |
| 466 | + try | |
| 467 | +					{ | |
| 467 | 468 | $stmt->execute()->finish(); | 
| 468 | -					} catch( \Aimeos\MW\DB\Exception $e ) { ; } // Ignore duplicates | |
| 469 | + } | |
| 470 | + catch( \Aimeos\MW\DB\Exception $e ) | |
| 471 | +					{ | |
| 472 | +; } // Ignore duplicates | |
| 469 | 473 | } | 
| 470 | 474 | } | 
| 471 | 475 | |
| @@ -922,7 +922,7 @@ | ||
| 922 | 922 | |
| 923 | 923 |  		try { | 
| 924 | 924 | $stmt->execute()->finish(); | 
| 925 | -		} catch( \Aimeos\MW\DB\Exception $e ) { ; } // Ignore duplicates | |
| 925 | +		} catch( \Aimeos\MW\DB\Exception $e ) {; } // Ignore duplicates | |
| 926 | 926 | } | 
| 927 | 927 | |
| 928 | 928 | |
| @@ -778,9 +778,13 @@ | ||
| 778 | 778 | $stmt->bind( 6, $date ); //mtime | 
| 779 | 779 | $stmt->bind( 7, $siteid ); | 
| 780 | 780 | |
| 781 | -		try { | |
| 781 | + try | |
| 782 | +		{ | |
| 782 | 783 | $stmt->execute()->finish(); | 
| 783 | -		} catch( \Aimeos\MW\DB\Exception $e ) { ; } // Ignore duplicates | |
| 784 | + } | |
| 785 | + catch( \Aimeos\MW\DB\Exception $e ) | |
| 786 | +		{ | |
| 787 | +; } // Ignore duplicates | |
| 784 | 788 | } | 
| 785 | 789 | |
| 786 | 790 | |
| @@ -110,8 +110,7 @@ | ||
| 110 | 110 | \Aimeos\MW\Common\Base::checkClass( \Aimeos\MShop\Order\Item\Base\Product\Iface::class, $orderProduct ); | 
| 111 | 111 | $list[] = $orderProduct->getProductId(); | 
| 112 | 112 | } | 
| 113 | - } | |
| 114 | - else | |
| 113 | + } else | |
| 115 | 114 |  		{ | 
| 116 | 115 | \Aimeos\MW\Common\Base::checkClass( \Aimeos\MShop\Order\Item\Base\Product\Iface::class, $value ); | 
| 117 | 116 | $list[] = $value->getProductId(); |