Inspection of "Fixed duplicate config lines in plugin panel" - aimeos/ai-admin-jqadm - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 0229de...f71bfb )

by Aimeos

created 2019-01-17 14:36 UTC

Status

Braces +2 added lines, -4 removed lines patch added patch discarded remove patch

@@ -111,14 +111,12 @@
 block discarded – undo
 			foreach( $this->getSubClients() as $client ) {
 				$view->listBody .= $client->search();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'dashboard' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'dashboard' => $e->getMessage() );
 			$view->errors = $view->get( 'errors', [] ) + $error;

Please login to merge, or discard this patch.

admin/jqadm/src/Admin/JQAdm/Service/Standard.php 1 patch

Braces +13 added lines, -26 removed lines patch added patch discarded remove patch

@@ -125,14 +125,12 @@  discard block
 block discarded – undo
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->copy();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'service-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -177,14 +175,12 @@  discard block
 block discarded – undo
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->create();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'service-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -225,14 +221,12 @@  discard block
 block discarded – undo
 
 			$this->nextAction( $view, 'search', 'service', null, 'delete' );
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'service-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -277,14 +271,12 @@  discard block
 block discarded – undo
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->get();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'service-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -321,18 +313,15 @@  discard block
 block discarded – undo
 
 			$this->nextAction( $view, $view->param( 'next' ), 'service', $view->item->getId(), 'save' );
 			return;
-		}
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
+		} catch( \Aimeos\Admin\JQAdm\Exception $e )
 		{
 			// fall through to create
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'service-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -375,14 +364,12 @@  discard block
 block discarded – undo
 			foreach( $this->getSubClients() as $client ) {
 				$view->itemBody .= $client->search();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'service-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;

Please login to merge, or discard this patch.

admin/jqadm/src/Admin/JQAdm/Customer/Standard.php 1 patch

Braces +13 added lines, -26 removed lines patch added patch discarded remove patch

@@ -122,14 +122,12 @@  discard block
 block discarded – undo
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->copy();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'customer-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'customer-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -172,14 +170,12 @@  discard block
 block discarded – undo
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->create();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'customer-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'customer-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -220,14 +216,12 @@  discard block
 block discarded – undo
 
 			$this->nextAction( $view, 'search', 'customer', null, 'delete' );
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'customer-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'customer-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -269,14 +263,12 @@  discard block
 block discarded – undo
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->get();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'customer-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'customer-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -313,18 +305,15 @@  discard block
 block discarded – undo
 
 			$this->nextAction( $view, $view->param( 'next' ), 'customer', $view->item->getId(), 'save' );
 			return;
-		}
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
+		} catch( \Aimeos\Admin\JQAdm\Exception $e )
 		{
 			// fall through to create
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'customer-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'customer-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -363,14 +352,12 @@  discard block
 block discarded – undo
 			foreach( $this->getSubClients() as $client ) {
 				$view->itemBody .= $client->search();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'customer-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'customer-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;

Please login to merge, or discard this patch.

admin/jqadm/src/Admin/JQAdm/Log/Standard.php 1 patch

Braces +2 added lines, -4 removed lines patch added patch discarded remove patch

@@ -84,14 +84,12 @@
 block discarded – undo
 			foreach( $this->getSubClients() as $client ) {
 				$view->itemBody .= $client->search();
 			}
-		}
-		catch( \Aimeos\MAdmin\Exception $e )
+		} catch( \Aimeos\MAdmin\Exception $e )
 		{
 			$error = array( 'log-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'log-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;

Please login to merge, or discard this patch.

admin/jqadm/src/Admin/JQAdm/Supplier/Standard.php 1 patch

Braces +13 added lines, -26 removed lines patch added patch discarded remove patch

@@ -121,14 +121,12 @@  discard block
 block discarded – undo
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->copy();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'supplier-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'supplier-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -170,14 +168,12 @@  discard block
 block discarded – undo
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->create();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'supplier-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'supplier-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -218,14 +214,12 @@  discard block
 block discarded – undo
 
 			$this->nextAction( $view, 'search', 'supplier', null, 'delete' );
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'supplier-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'supplier-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -266,14 +260,12 @@  discard block
 block discarded – undo
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->get();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'supplier-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'supplier-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -310,18 +302,15 @@  discard block
 block discarded – undo
 
 			$this->nextAction( $view, $view->param( 'next' ), 'supplier', $view->item->getId(), 'save' );
 			return;
-		}
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
+		} catch( \Aimeos\Admin\JQAdm\Exception $e )
 		{
 			// fall through to create
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'supplier-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'supplier-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -360,14 +349,12 @@  discard block
 block discarded – undo
 			foreach( $this->getSubClients() as $client ) {
 				$view->itemBody .= $client->search();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'supplier-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'supplier-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;

Please login to merge, or discard this patch.

admin/jqadm/src/Admin/JQAdm/Attribute/Standard.php 1 patch

Braces +13 added lines, -26 removed lines patch added patch discarded remove patch

@@ -133,14 +133,12 @@  discard block
 block discarded – undo
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->copy();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'attribute-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'attribute-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -183,14 +181,12 @@  discard block
 block discarded – undo
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->create();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'attribute-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'attribute-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -231,14 +227,12 @@  discard block
 block discarded – undo
 
 			$this->nextAction( $view, 'search', 'attribute', null, 'delete' );
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'attribute-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'attribute-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -280,14 +274,12 @@  discard block
 block discarded – undo
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->get();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'attribute-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'attribute-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -324,18 +316,15 @@  discard block
 block discarded – undo
 
 			$this->nextAction( $view, $view->param( 'next' ), 'attribute', $view->item->getId(), 'save' );
 			return;
-		}
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
+		} catch( \Aimeos\Admin\JQAdm\Exception $e )
 		{
 			// fall through to create
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'attribute-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'attribute-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -375,14 +364,12 @@  discard block
 block discarded – undo
 			foreach( $this->getSubClients() as $client ) {
 				$view->itemBody .= $client->search();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'attribute-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'attribute-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;

Please login to merge, or discard this patch.

admin/jqadm/src/Admin/JQAdm/Order/Standard.php 1 patch

Braces +14 added lines, -28 removed lines patch added patch discarded remove patch

@@ -99,14 +99,12 @@  discard block
 block discarded – undo
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->copy();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'order-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'order-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -148,14 +146,12 @@  discard block
 block discarded – undo
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->create();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'order-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'order-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -194,14 +190,12 @@  discard block
 block discarded – undo
 
 			$msg = $context->getI18n()->dt( 'admin', 'Your export will be available in a few minutes for download' );
 			$view->info = $view->get( 'info', [] ) + ['order-item' => $msg];
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'order-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'order-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -240,14 +234,12 @@  discard block
 block discarded – undo
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->get();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'order-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'order-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -284,18 +276,15 @@  discard block
 block discarded – undo
 
 			$this->nextAction( $view, $view->param( 'next' ), 'order', $view->item->getId(), 'save' );
 			return;
-		}
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
+		} catch( \Aimeos\Admin\JQAdm\Exception $e )
 		{
 			// fall through to create
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'order-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'order-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -338,14 +327,12 @@  discard block
 block discarded – undo
 			foreach( $this->getSubClients() as $client ) {
 				$view->itemBody .= $client->search();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'order-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'order-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -556,8 +543,7 @@  discard block
 block discarded – undo
 						{
 							$attrItem = $attrItems[$array['order.base.service.attribute.id']];
 							unset( $attrItems[$array['order.base.service.attribute.id']] );
-						}
-						else
+						} else
 						{
 							$attrItem = $attrManager->createItem();
 						}

Please login to merge, or discard this patch.

admin/jqadm/src/Admin/JQAdm/Coupon/Standard.php 1 patch

Braces +13 added lines, -26 removed lines patch added patch discarded remove patch

@@ -102,14 +102,12 @@  discard block
 block discarded – undo
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->copy();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'coupon-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'coupon-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -153,14 +151,12 @@  discard block
 block discarded – undo
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->create();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'coupon-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'coupon-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -201,14 +197,12 @@  discard block
 block discarded – undo
 
 			$this->nextAction( $view, 'search', 'coupon', null, 'delete' );
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'coupon-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'coupon-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -252,14 +246,12 @@  discard block
 block discarded – undo
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->get();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'coupon-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'coupon-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -296,18 +288,15 @@  discard block
 block discarded – undo
 
 			$this->nextAction( $view, $view->param( 'next' ), 'coupon', $view->item->getId(), 'save' );
 			return;
-		}
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
+		} catch( \Aimeos\Admin\JQAdm\Exception $e )
 		{
 			// fall through to create
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'coupon-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'coupon-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -346,14 +335,12 @@  discard block
 block discarded – undo
 			foreach( $this->getSubClients() as $client ) {
 				$view->itemBody .= $client->search();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'coupon-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'coupon-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;

Please login to merge, or discard this patch.

admin/jqadm/src/Admin/JQAdm/Type/Text/Lists/Standard.php 1 patch

Braces +13 added lines, -26 removed lines patch added patch discarded remove patch

@@ -88,14 +88,12 @@  discard block
 block discarded – undo
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->copy();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'type-text-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'type-text-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -137,14 +135,12 @@  discard block
 block discarded – undo
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->create();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'type-text-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'type-text-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -185,14 +181,12 @@  discard block
 block discarded – undo
 
 			$this->nextAction( $view, 'search', 'type/text/lists', null, 'delete' );
 			return;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'type-text-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'type-text-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -233,14 +227,12 @@  discard block
 block discarded – undo
 				$view->tabindex = ++$idx + 1;
 				$view->itemBody .= $client->get();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'type-text-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'type-text-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -277,18 +269,15 @@  discard block
 block discarded – undo
 
 			$this->nextAction( $view, $view->param( 'next' ), 'type/text/lists', $view->item->getId(), 'save' );
 			return;
-		}
-		catch( \Aimeos\Admin\JQAdm\Exception $e )
+		} catch( \Aimeos\Admin\JQAdm\Exception $e )
 		{
 			// fall through to create
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'type-text-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'type-text-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;
@@ -327,14 +316,12 @@  discard block
 block discarded – undo
 			foreach( $this->getSubClients() as $client ) {
 				$view->itemBody .= $client->search();
 			}
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( 'type-text-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->errors = $view->get( 'errors', [] ) + $error;
 			$this->logException( $e );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$error = array( 'type-text-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
 			$view->errors = $view->get( 'errors', [] ) + $error;

Please login to merge, or discard this patch.

		@@ -102,14 +102,12 @@ discard block
		block discarded – undo
102	102	$view->tabindex = ++$idx + 1;
103	103	$view->itemBody .= $client->copy();
104	104	}
105		- }
106		- catch( \Aimeos\MShop\Exception $e )
	105	+ } catch( \Aimeos\MShop\Exception $e )
107	106	{
108	107	$error = array( 'coupon-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
109	108	$view->errors = $view->get( 'errors', [] ) + $error;
110	109	$this->logException( $e );
111		- }
112		- catch( \Exception $e )
	110	+ } catch( \Exception $e )
113	111	{
114	112	$error = array( 'coupon-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
115	113	$view->errors = $view->get( 'errors', [] ) + $error;
		@@ -153,14 +151,12 @@ discard block
		block discarded – undo
153	151	$view->tabindex = ++$idx + 1;
154	152	$view->itemBody .= $client->create();
155	153	}
156		- }
157		- catch( \Aimeos\MShop\Exception $e )
	154	+ } catch( \Aimeos\MShop\Exception $e )
158	155	{
159	156	$error = array( 'coupon-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
160	157	$view->errors = $view->get( 'errors', [] ) + $error;
161	158	$this->logException( $e );
162		- }
163		- catch( \Exception $e )
	159	+ } catch( \Exception $e )
164	160	{
165	161	$error = array( 'coupon-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
166	162	$view->errors = $view->get( 'errors', [] ) + $error;
		@@ -201,14 +197,12 @@ discard block
		block discarded – undo
201	197
202	198	$this->nextAction( $view, 'search', 'coupon', null, 'delete' );
203	199	return;
204		- }
205		- catch( \Aimeos\MShop\Exception $e )
	200	+ } catch( \Aimeos\MShop\Exception $e )
206	201	{
207	202	$error = array( 'coupon-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
208	203	$view->errors = $view->get( 'errors', [] ) + $error;
209	204	$this->logException( $e );
210		- }
211		- catch( \Exception $e )
	205	+ } catch( \Exception $e )
212	206	{
213	207	$error = array( 'coupon-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
214	208	$view->errors = $view->get( 'errors', [] ) + $error;
		@@ -252,14 +246,12 @@ discard block
		block discarded – undo
252	246	$view->tabindex = ++$idx + 1;
253	247	$view->itemBody .= $client->get();
254	248	}
255		- }
256		- catch( \Aimeos\MShop\Exception $e )
	249	+ } catch( \Aimeos\MShop\Exception $e )
257	250	{
258	251	$error = array( 'coupon-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
259	252	$view->errors = $view->get( 'errors', [] ) + $error;
260	253	$this->logException( $e );
261		- }
262		- catch( \Exception $e )
	254	+ } catch( \Exception $e )
263	255	{
264	256	$error = array( 'coupon-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
265	257	$view->errors = $view->get( 'errors', [] ) + $error;
		@@ -296,18 +288,15 @@ discard block
		block discarded – undo
296	288
297	289	$this->nextAction( $view, $view->param( 'next' ), 'coupon', $view->item->getId(), 'save' );
298	290	return;
299		- }
300		- catch( \Aimeos\Admin\JQAdm\Exception $e )
	291	+ } catch( \Aimeos\Admin\JQAdm\Exception $e )
301	292	{
302	293	// fall through to create
303		- }
304		- catch( \Aimeos\MShop\Exception $e )
	294	+ } catch( \Aimeos\MShop\Exception $e )
305	295	{
306	296	$error = array( 'coupon-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
307	297	$view->errors = $view->get( 'errors', [] ) + $error;
308	298	$this->logException( $e );
309		- }
310		- catch( \Exception $e )
	299	+ } catch( \Exception $e )
311	300	{
312	301	$error = array( 'coupon-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
313	302	$view->errors = $view->get( 'errors', [] ) + $error;
		@@ -346,14 +335,12 @@ discard block
		block discarded – undo
346	335	foreach( $this->getSubClients() as $client ) {
347	336	$view->itemBody .= $client->search();
348	337	}
349		- }
350		- catch( \Aimeos\MShop\Exception $e )
	338	+ } catch( \Aimeos\MShop\Exception $e )
351	339	{
352	340	$error = array( 'coupon-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
353	341	$view->errors = $view->get( 'errors', [] ) + $error;
354	342	$this->logException( $e );
355		- }
356		- catch( \Exception $e )
	343	+ } catch( \Exception $e )
357	344	{
358	345	$error = array( 'coupon-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
359	346	$view->errors = $view->get( 'errors', [] ) + $error;

		@@ -111,14 +111,12 @@
		block discarded – undo
111	111	foreach( $this->getSubClients() as $client ) {
112	112	$view->listBody .= $client->search();
113	113	}
114		- }
115		- catch( \Aimeos\MShop\Exception $e )
	114	+ } catch( \Aimeos\MShop\Exception $e )
116	115	{
117	116	$error = array( 'dashboard' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
118	117	$view->errors = $view->get( 'errors', [] ) + $error;
119	118	$this->logException( $e );
120		- }
121		- catch( \Exception $e )
	119	+ } catch( \Exception $e )
122	120	{
123	121	$error = array( 'dashboard' => $e->getMessage() );
124	122	$view->errors = $view->get( 'errors', [] ) + $error;

		@@ -125,14 +125,12 @@ discard block
		block discarded – undo
125	125	$view->tabindex = ++$idx + 1;
126	126	$view->itemBody .= $client->copy();
127	127	}
128		- }
129		- catch( \Aimeos\MShop\Exception $e )
	128	+ } catch( \Aimeos\MShop\Exception $e )
130	129	{
131	130	$error = array( 'service-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
132	131	$view->errors = $view->get( 'errors', [] ) + $error;
133	132	$this->logException( $e );
134		- }
135		- catch( \Exception $e )
	133	+ } catch( \Exception $e )
136	134	{
137	135	$error = array( 'service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
138	136	$view->errors = $view->get( 'errors', [] ) + $error;
		@@ -177,14 +175,12 @@ discard block
		block discarded – undo
177	175	$view->tabindex = ++$idx + 1;
178	176	$view->itemBody .= $client->create();
179	177	}
180		- }
181		- catch( \Aimeos\MShop\Exception $e )
	178	+ } catch( \Aimeos\MShop\Exception $e )
182	179	{
183	180	$error = array( 'service-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
184	181	$view->errors = $view->get( 'errors', [] ) + $error;
185	182	$this->logException( $e );
186		- }
187		- catch( \Exception $e )
	183	+ } catch( \Exception $e )
188	184	{
189	185	$error = array( 'service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
190	186	$view->errors = $view->get( 'errors', [] ) + $error;
		@@ -225,14 +221,12 @@ discard block
		block discarded – undo
225	221
226	222	$this->nextAction( $view, 'search', 'service', null, 'delete' );
227	223	return;
228		- }
229		- catch( \Aimeos\MShop\Exception $e )
	224	+ } catch( \Aimeos\MShop\Exception $e )
230	225	{
231	226	$error = array( 'service-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
232	227	$view->errors = $view->get( 'errors', [] ) + $error;
233	228	$this->logException( $e );
234		- }
235		- catch( \Exception $e )
	229	+ } catch( \Exception $e )
236	230	{
237	231	$error = array( 'service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
238	232	$view->errors = $view->get( 'errors', [] ) + $error;
		@@ -277,14 +271,12 @@ discard block
		block discarded – undo
277	271	$view->tabindex = ++$idx + 1;
278	272	$view->itemBody .= $client->get();
279	273	}
280		- }
281		- catch( \Aimeos\MShop\Exception $e )
	274	+ } catch( \Aimeos\MShop\Exception $e )
282	275	{
283	276	$error = array( 'service-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
284	277	$view->errors = $view->get( 'errors', [] ) + $error;
285	278	$this->logException( $e );
286		- }
287		- catch( \Exception $e )
	279	+ } catch( \Exception $e )
288	280	{
289	281	$error = array( 'service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
290	282	$view->errors = $view->get( 'errors', [] ) + $error;
		@@ -321,18 +313,15 @@ discard block
		block discarded – undo
321	313
322	314	$this->nextAction( $view, $view->param( 'next' ), 'service', $view->item->getId(), 'save' );
323	315	return;
324		- }
325		- catch( \Aimeos\Admin\JQAdm\Exception $e )
	316	+ } catch( \Aimeos\Admin\JQAdm\Exception $e )
326	317	{
327	318	// fall through to create
328		- }
329		- catch( \Aimeos\MShop\Exception $e )
	319	+ } catch( \Aimeos\MShop\Exception $e )
330	320	{
331	321	$error = array( 'service-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
332	322	$view->errors = $view->get( 'errors', [] ) + $error;
333	323	$this->logException( $e );
334		- }
335		- catch( \Exception $e )
	324	+ } catch( \Exception $e )
336	325	{
337	326	$error = array( 'service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
338	327	$view->errors = $view->get( 'errors', [] ) + $error;
		@@ -375,14 +364,12 @@ discard block
		block discarded – undo
375	364	foreach( $this->getSubClients() as $client ) {
376	365	$view->itemBody .= $client->search();
377	366	}
378		- }
379		- catch( \Aimeos\MShop\Exception $e )
	367	+ } catch( \Aimeos\MShop\Exception $e )
380	368	{
381	369	$error = array( 'service-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
382	370	$view->errors = $view->get( 'errors', [] ) + $error;
383	371	$this->logException( $e );
384		- }
385		- catch( \Exception $e )
	372	+ } catch( \Exception $e )
386	373	{
387	374	$error = array( 'service-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
388	375	$view->errors = $view->get( 'errors', [] ) + $error;

		@@ -122,14 +122,12 @@ discard block
		block discarded – undo
122	122	$view->tabindex = ++$idx + 1;
123	123	$view->itemBody .= $client->copy();
124	124	}
125		- }
126		- catch( \Aimeos\MShop\Exception $e )
	125	+ } catch( \Aimeos\MShop\Exception $e )
127	126	{
128	127	$error = array( 'customer-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
129	128	$view->errors = $view->get( 'errors', [] ) + $error;
130	129	$this->logException( $e );
131		- }
132		- catch( \Exception $e )
	130	+ } catch( \Exception $e )
133	131	{
134	132	$error = array( 'customer-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
135	133	$view->errors = $view->get( 'errors', [] ) + $error;
		@@ -172,14 +170,12 @@ discard block
		block discarded – undo
172	170	$view->tabindex = ++$idx + 1;
173	171	$view->itemBody .= $client->create();
174	172	}
175		- }
176		- catch( \Aimeos\MShop\Exception $e )
	173	+ } catch( \Aimeos\MShop\Exception $e )
177	174	{
178	175	$error = array( 'customer-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
179	176	$view->errors = $view->get( 'errors', [] ) + $error;
180	177	$this->logException( $e );
181		- }
182		- catch( \Exception $e )
	178	+ } catch( \Exception $e )
183	179	{
184	180	$error = array( 'customer-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
185	181	$view->errors = $view->get( 'errors', [] ) + $error;
		@@ -220,14 +216,12 @@ discard block
		block discarded – undo
220	216
221	217	$this->nextAction( $view, 'search', 'customer', null, 'delete' );
222	218	return;
223		- }
224		- catch( \Aimeos\MShop\Exception $e )
	219	+ } catch( \Aimeos\MShop\Exception $e )
225	220	{
226	221	$error = array( 'customer-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
227	222	$view->errors = $view->get( 'errors', [] ) + $error;
228	223	$this->logException( $e );
229		- }
230		- catch( \Exception $e )
	224	+ } catch( \Exception $e )
231	225	{
232	226	$error = array( 'customer-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
233	227	$view->errors = $view->get( 'errors', [] ) + $error;
		@@ -269,14 +263,12 @@ discard block
		block discarded – undo
269	263	$view->tabindex = ++$idx + 1;
270	264	$view->itemBody .= $client->get();
271	265	}
272		- }
273		- catch( \Aimeos\MShop\Exception $e )
	266	+ } catch( \Aimeos\MShop\Exception $e )
274	267	{
275	268	$error = array( 'customer-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
276	269	$view->errors = $view->get( 'errors', [] ) + $error;
277	270	$this->logException( $e );
278		- }
279		- catch( \Exception $e )
	271	+ } catch( \Exception $e )
280	272	{
281	273	$error = array( 'customer-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
282	274	$view->errors = $view->get( 'errors', [] ) + $error;
		@@ -313,18 +305,15 @@ discard block
		block discarded – undo
313	305
314	306	$this->nextAction( $view, $view->param( 'next' ), 'customer', $view->item->getId(), 'save' );
315	307	return;
316		- }
317		- catch( \Aimeos\Admin\JQAdm\Exception $e )
	308	+ } catch( \Aimeos\Admin\JQAdm\Exception $e )
318	309	{
319	310	// fall through to create
320		- }
321		- catch( \Aimeos\MShop\Exception $e )
	311	+ } catch( \Aimeos\MShop\Exception $e )
322	312	{
323	313	$error = array( 'customer-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
324	314	$view->errors = $view->get( 'errors', [] ) + $error;
325	315	$this->logException( $e );
326		- }
327		- catch( \Exception $e )
	316	+ } catch( \Exception $e )
328	317	{
329	318	$error = array( 'customer-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
330	319	$view->errors = $view->get( 'errors', [] ) + $error;
		@@ -363,14 +352,12 @@ discard block
		block discarded – undo
363	352	foreach( $this->getSubClients() as $client ) {
364	353	$view->itemBody .= $client->search();
365	354	}
366		- }
367		- catch( \Aimeos\MShop\Exception $e )
	355	+ } catch( \Aimeos\MShop\Exception $e )
368	356	{
369	357	$error = array( 'customer-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
370	358	$view->errors = $view->get( 'errors', [] ) + $error;
371	359	$this->logException( $e );
372		- }
373		- catch( \Exception $e )
	360	+ } catch( \Exception $e )
374	361	{
375	362	$error = array( 'customer-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
376	363	$view->errors = $view->get( 'errors', [] ) + $error;

		@@ -84,14 +84,12 @@
		block discarded – undo
84	84	foreach( $this->getSubClients() as $client ) {
85	85	$view->itemBody .= $client->search();
86	86	}
87		- }
88		- catch( \Aimeos\MAdmin\Exception $e )
	87	+ } catch( \Aimeos\MAdmin\Exception $e )
89	88	{
90	89	$error = array( 'log-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
91	90	$view->errors = $view->get( 'errors', [] ) + $error;
92	91	$this->logException( $e );
93		- }
94		- catch( \Exception $e )
	92	+ } catch( \Exception $e )
95	93	{
96	94	$error = array( 'log-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
97	95	$view->errors = $view->get( 'errors', [] ) + $error;

		@@ -121,14 +121,12 @@ discard block
		block discarded – undo
121	121	$view->tabindex = ++$idx + 1;
122	122	$view->itemBody .= $client->copy();
123	123	}
124		- }
125		- catch( \Aimeos\MShop\Exception $e )
	124	+ } catch( \Aimeos\MShop\Exception $e )
126	125	{
127	126	$error = array( 'supplier-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
128	127	$view->errors = $view->get( 'errors', [] ) + $error;
129	128	$this->logException( $e );
130		- }
131		- catch( \Exception $e )
	129	+ } catch( \Exception $e )
132	130	{
133	131	$error = array( 'supplier-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
134	132	$view->errors = $view->get( 'errors', [] ) + $error;
		@@ -170,14 +168,12 @@ discard block
		block discarded – undo
170	168	$view->tabindex = ++$idx + 1;
171	169	$view->itemBody .= $client->create();
172	170	}
173		- }
174		- catch( \Aimeos\MShop\Exception $e )
	171	+ } catch( \Aimeos\MShop\Exception $e )
175	172	{
176	173	$error = array( 'supplier-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
177	174	$view->errors = $view->get( 'errors', [] ) + $error;
178	175	$this->logException( $e );
179		- }
180		- catch( \Exception $e )
	176	+ } catch( \Exception $e )
181	177	{
182	178	$error = array( 'supplier-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
183	179	$view->errors = $view->get( 'errors', [] ) + $error;
		@@ -218,14 +214,12 @@ discard block
		block discarded – undo
218	214
219	215	$this->nextAction( $view, 'search', 'supplier', null, 'delete' );
220	216	return;
221		- }
222		- catch( \Aimeos\MShop\Exception $e )
	217	+ } catch( \Aimeos\MShop\Exception $e )
223	218	{
224	219	$error = array( 'supplier-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
225	220	$view->errors = $view->get( 'errors', [] ) + $error;
226	221	$this->logException( $e );
227		- }
228		- catch( \Exception $e )
	222	+ } catch( \Exception $e )
229	223	{
230	224	$error = array( 'supplier-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
231	225	$view->errors = $view->get( 'errors', [] ) + $error;
		@@ -266,14 +260,12 @@ discard block
		block discarded – undo
266	260	$view->tabindex = ++$idx + 1;
267	261	$view->itemBody .= $client->get();
268	262	}
269		- }
270		- catch( \Aimeos\MShop\Exception $e )
	263	+ } catch( \Aimeos\MShop\Exception $e )
271	264	{
272	265	$error = array( 'supplier-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
273	266	$view->errors = $view->get( 'errors', [] ) + $error;
274	267	$this->logException( $e );
275		- }
276		- catch( \Exception $e )
	268	+ } catch( \Exception $e )
277	269	{
278	270	$error = array( 'supplier-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
279	271	$view->errors = $view->get( 'errors', [] ) + $error;
		@@ -310,18 +302,15 @@ discard block
		block discarded – undo
310	302
311	303	$this->nextAction( $view, $view->param( 'next' ), 'supplier', $view->item->getId(), 'save' );
312	304	return;
313		- }
314		- catch( \Aimeos\Admin\JQAdm\Exception $e )
	305	+ } catch( \Aimeos\Admin\JQAdm\Exception $e )
315	306	{
316	307	// fall through to create
317		- }
318		- catch( \Aimeos\MShop\Exception $e )
	308	+ } catch( \Aimeos\MShop\Exception $e )
319	309	{
320	310	$error = array( 'supplier-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
321	311	$view->errors = $view->get( 'errors', [] ) + $error;
322	312	$this->logException( $e );
323		- }
324		- catch( \Exception $e )
	313	+ } catch( \Exception $e )
325	314	{
326	315	$error = array( 'supplier-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
327	316	$view->errors = $view->get( 'errors', [] ) + $error;
		@@ -360,14 +349,12 @@ discard block
		block discarded – undo
360	349	foreach( $this->getSubClients() as $client ) {
361	350	$view->itemBody .= $client->search();
362	351	}
363		- }
364		- catch( \Aimeos\MShop\Exception $e )
	352	+ } catch( \Aimeos\MShop\Exception $e )
365	353	{
366	354	$error = array( 'supplier-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
367	355	$view->errors = $view->get( 'errors', [] ) + $error;
368	356	$this->logException( $e );
369		- }
370		- catch( \Exception $e )
	357	+ } catch( \Exception $e )
371	358	{
372	359	$error = array( 'supplier-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
373	360	$view->errors = $view->get( 'errors', [] ) + $error;

		@@ -133,14 +133,12 @@ discard block
		block discarded – undo
133	133	$view->tabindex = ++$idx + 1;
134	134	$view->itemBody .= $client->copy();
135	135	}
136		- }
137		- catch( \Aimeos\MShop\Exception $e )
	136	+ } catch( \Aimeos\MShop\Exception $e )
138	137	{
139	138	$error = array( 'attribute-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
140	139	$view->errors = $view->get( 'errors', [] ) + $error;
141	140	$this->logException( $e );
142		- }
143		- catch( \Exception $e )
	141	+ } catch( \Exception $e )
144	142	{
145	143	$error = array( 'attribute-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
146	144	$view->errors = $view->get( 'errors', [] ) + $error;
		@@ -183,14 +181,12 @@ discard block
		block discarded – undo
183	181	$view->tabindex = ++$idx + 1;
184	182	$view->itemBody .= $client->create();
185	183	}
186		- }
187		- catch( \Aimeos\MShop\Exception $e )
	184	+ } catch( \Aimeos\MShop\Exception $e )
188	185	{
189	186	$error = array( 'attribute-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
190	187	$view->errors = $view->get( 'errors', [] ) + $error;
191	188	$this->logException( $e );
192		- }
193		- catch( \Exception $e )
	189	+ } catch( \Exception $e )
194	190	{
195	191	$error = array( 'attribute-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
196	192	$view->errors = $view->get( 'errors', [] ) + $error;
		@@ -231,14 +227,12 @@ discard block
		block discarded – undo
231	227
232	228	$this->nextAction( $view, 'search', 'attribute', null, 'delete' );
233	229	return;
234		- }
235		- catch( \Aimeos\MShop\Exception $e )
	230	+ } catch( \Aimeos\MShop\Exception $e )
236	231	{
237	232	$error = array( 'attribute-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
238	233	$view->errors = $view->get( 'errors', [] ) + $error;
239	234	$this->logException( $e );
240		- }
241		- catch( \Exception $e )
	235	+ } catch( \Exception $e )
242	236	{
243	237	$error = array( 'attribute-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
244	238	$view->errors = $view->get( 'errors', [] ) + $error;
		@@ -280,14 +274,12 @@ discard block
		block discarded – undo
280	274	$view->tabindex = ++$idx + 1;
281	275	$view->itemBody .= $client->get();
282	276	}
283		- }
284		- catch( \Aimeos\MShop\Exception $e )
	277	+ } catch( \Aimeos\MShop\Exception $e )
285	278	{
286	279	$error = array( 'attribute-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
287	280	$view->errors = $view->get( 'errors', [] ) + $error;
288	281	$this->logException( $e );
289		- }
290		- catch( \Exception $e )
	282	+ } catch( \Exception $e )
291	283	{
292	284	$error = array( 'attribute-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
293	285	$view->errors = $view->get( 'errors', [] ) + $error;
		@@ -324,18 +316,15 @@ discard block
		block discarded – undo
324	316
325	317	$this->nextAction( $view, $view->param( 'next' ), 'attribute', $view->item->getId(), 'save' );
326	318	return;
327		- }
328		- catch( \Aimeos\Admin\JQAdm\Exception $e )
	319	+ } catch( \Aimeos\Admin\JQAdm\Exception $e )
329	320	{
330	321	// fall through to create
331		- }
332		- catch( \Aimeos\MShop\Exception $e )
	322	+ } catch( \Aimeos\MShop\Exception $e )
333	323	{
334	324	$error = array( 'attribute-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
335	325	$view->errors = $view->get( 'errors', [] ) + $error;
336	326	$this->logException( $e );
337		- }
338		- catch( \Exception $e )
	327	+ } catch( \Exception $e )
339	328	{
340	329	$error = array( 'attribute-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
341	330	$view->errors = $view->get( 'errors', [] ) + $error;
		@@ -375,14 +364,12 @@ discard block
		block discarded – undo
375	364	foreach( $this->getSubClients() as $client ) {
376	365	$view->itemBody .= $client->search();
377	366	}
378		- }
379		- catch( \Aimeos\MShop\Exception $e )
	367	+ } catch( \Aimeos\MShop\Exception $e )
380	368	{
381	369	$error = array( 'attribute-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
382	370	$view->errors = $view->get( 'errors', [] ) + $error;
383	371	$this->logException( $e );
384		- }
385		- catch( \Exception $e )
	372	+ } catch( \Exception $e )
386	373	{
387	374	$error = array( 'attribute-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
388	375	$view->errors = $view->get( 'errors', [] ) + $error;

		@@ -99,14 +99,12 @@ discard block
		block discarded – undo
99	99	$view->tabindex = ++$idx + 1;
100	100	$view->itemBody .= $client->copy();
101	101	}
102		- }
103		- catch( \Aimeos\MShop\Exception $e )
	102	+ } catch( \Aimeos\MShop\Exception $e )
104	103	{
105	104	$error = array( 'order-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
106	105	$view->errors = $view->get( 'errors', [] ) + $error;
107	106	$this->logException( $e );
108		- }
109		- catch( \Exception $e )
	107	+ } catch( \Exception $e )
110	108	{
111	109	$error = array( 'order-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
112	110	$view->errors = $view->get( 'errors', [] ) + $error;
		@@ -148,14 +146,12 @@ discard block
		block discarded – undo
148	146	$view->tabindex = ++$idx + 1;
149	147	$view->itemBody .= $client->create();
150	148	}
151		- }
152		- catch( \Aimeos\MShop\Exception $e )
	149	+ } catch( \Aimeos\MShop\Exception $e )
153	150	{
154	151	$error = array( 'order-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
155	152	$view->errors = $view->get( 'errors', [] ) + $error;
156	153	$this->logException( $e );
157		- }
158		- catch( \Exception $e )
	154	+ } catch( \Exception $e )
159	155	{
160	156	$error = array( 'order-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
161	157	$view->errors = $view->get( 'errors', [] ) + $error;
		@@ -194,14 +190,12 @@ discard block
		block discarded – undo
194	190
195	191	$msg = $context->getI18n()->dt( 'admin', 'Your export will be available in a few minutes for download' );
196	192	$view->info = $view->get( 'info', [] ) + ['order-item' => $msg];
197		- }
198		- catch( \Aimeos\MShop\Exception $e )
	193	+ } catch( \Aimeos\MShop\Exception $e )
199	194	{
200	195	$error = array( 'order-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
201	196	$view->errors = $view->get( 'errors', [] ) + $error;
202	197	$this->logException( $e );
203		- }
204		- catch( \Exception $e )
	198	+ } catch( \Exception $e )
205	199	{
206	200	$error = array( 'order-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
207	201	$view->errors = $view->get( 'errors', [] ) + $error;
		@@ -240,14 +234,12 @@ discard block
		block discarded – undo
240	234	$view->tabindex = ++$idx + 1;
241	235	$view->itemBody .= $client->get();
242	236	}
243		- }
244		- catch( \Aimeos\MShop\Exception $e )
	237	+ } catch( \Aimeos\MShop\Exception $e )
245	238	{
246	239	$error = array( 'order-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
247	240	$view->errors = $view->get( 'errors', [] ) + $error;
248	241	$this->logException( $e );
249		- }
250		- catch( \Exception $e )
	242	+ } catch( \Exception $e )
251	243	{
252	244	$error = array( 'order-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
253	245	$view->errors = $view->get( 'errors', [] ) + $error;
		@@ -284,18 +276,15 @@ discard block
		block discarded – undo
284	276
285	277	$this->nextAction( $view, $view->param( 'next' ), 'order', $view->item->getId(), 'save' );
286	278	return;
287		- }
288		- catch( \Aimeos\Admin\JQAdm\Exception $e )
	279	+ } catch( \Aimeos\Admin\JQAdm\Exception $e )
289	280	{
290	281	// fall through to create
291		- }
292		- catch( \Aimeos\MShop\Exception $e )
	282	+ } catch( \Aimeos\MShop\Exception $e )
293	283	{
294	284	$error = array( 'order-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
295	285	$view->errors = $view->get( 'errors', [] ) + $error;
296	286	$this->logException( $e );
297		- }
298		- catch( \Exception $e )
	287	+ } catch( \Exception $e )
299	288	{
300	289	$error = array( 'order-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
301	290	$view->errors = $view->get( 'errors', [] ) + $error;
		@@ -338,14 +327,12 @@ discard block
		block discarded – undo
338	327	foreach( $this->getSubClients() as $client ) {
339	328	$view->itemBody .= $client->search();
340	329	}
341		- }
342		- catch( \Aimeos\MShop\Exception $e )
	330	+ } catch( \Aimeos\MShop\Exception $e )
343	331	{
344	332	$error = array( 'order-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
345	333	$view->errors = $view->get( 'errors', [] ) + $error;
346	334	$this->logException( $e );
347		- }
348		- catch( \Exception $e )
	335	+ } catch( \Exception $e )
349	336	{
350	337	$error = array( 'order-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
351	338	$view->errors = $view->get( 'errors', [] ) + $error;
		@@ -556,8 +543,7 @@ discard block
		block discarded – undo
556	543	{
557	544	$attrItem = $attrItems[$array['order.base.service.attribute.id']];
558	545	unset( $attrItems[$array['order.base.service.attribute.id']] );
559		- }
560		- else
	546	+ } else
561	547	{
562	548	$attrItem = $attrManager->createItem();
563	549	}

		@@ -88,14 +88,12 @@ discard block
		block discarded – undo
88	88	$view->tabindex = ++$idx + 1;
89	89	$view->itemBody .= $client->copy();
90	90	}
91		- }
92		- catch( \Aimeos\MShop\Exception $e )
	91	+ } catch( \Aimeos\MShop\Exception $e )
93	92	{
94	93	$error = array( 'type-text-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
95	94	$view->errors = $view->get( 'errors', [] ) + $error;
96	95	$this->logException( $e );
97		- }
98		- catch( \Exception $e )
	96	+ } catch( \Exception $e )
99	97	{
100	98	$error = array( 'type-text-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
101	99	$view->errors = $view->get( 'errors', [] ) + $error;
		@@ -137,14 +135,12 @@ discard block
		block discarded – undo
137	135	$view->tabindex = ++$idx + 1;
138	136	$view->itemBody .= $client->create();
139	137	}
140		- }
141		- catch( \Aimeos\MShop\Exception $e )
	138	+ } catch( \Aimeos\MShop\Exception $e )
142	139	{
143	140	$error = array( 'type-text-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
144	141	$view->errors = $view->get( 'errors', [] ) + $error;
145	142	$this->logException( $e );
146		- }
147		- catch( \Exception $e )
	143	+ } catch( \Exception $e )
148	144	{
149	145	$error = array( 'type-text-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
150	146	$view->errors = $view->get( 'errors', [] ) + $error;
		@@ -185,14 +181,12 @@ discard block
		block discarded – undo
185	181
186	182	$this->nextAction( $view, 'search', 'type/text/lists', null, 'delete' );
187	183	return;
188		- }
189		- catch( \Aimeos\MShop\Exception $e )
	184	+ } catch( \Aimeos\MShop\Exception $e )
190	185	{
191	186	$error = array( 'type-text-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
192	187	$view->errors = $view->get( 'errors', [] ) + $error;
193	188	$this->logException( $e );
194		- }
195		- catch( \Exception $e )
	189	+ } catch( \Exception $e )
196	190	{
197	191	$error = array( 'type-text-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
198	192	$view->errors = $view->get( 'errors', [] ) + $error;
		@@ -233,14 +227,12 @@ discard block
		block discarded – undo
233	227	$view->tabindex = ++$idx + 1;
234	228	$view->itemBody .= $client->get();
235	229	}
236		- }
237		- catch( \Aimeos\MShop\Exception $e )
	230	+ } catch( \Aimeos\MShop\Exception $e )
238	231	{
239	232	$error = array( 'type-text-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
240	233	$view->errors = $view->get( 'errors', [] ) + $error;
241	234	$this->logException( $e );
242		- }
243		- catch( \Exception $e )
	235	+ } catch( \Exception $e )
244	236	{
245	237	$error = array( 'type-text-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
246	238	$view->errors = $view->get( 'errors', [] ) + $error;
		@@ -277,18 +269,15 @@ discard block
		block discarded – undo
277	269
278	270	$this->nextAction( $view, $view->param( 'next' ), 'type/text/lists', $view->item->getId(), 'save' );
279	271	return;
280		- }
281		- catch( \Aimeos\Admin\JQAdm\Exception $e )
	272	+ } catch( \Aimeos\Admin\JQAdm\Exception $e )
282	273	{
283	274	// fall through to create
284		- }
285		- catch( \Aimeos\MShop\Exception $e )
	275	+ } catch( \Aimeos\MShop\Exception $e )
286	276	{
287	277	$error = array( 'type-text-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
288	278	$view->errors = $view->get( 'errors', [] ) + $error;
289	279	$this->logException( $e );
290		- }
291		- catch( \Exception $e )
	280	+ } catch( \Exception $e )
292	281	{
293	282	$error = array( 'type-text-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
294	283	$view->errors = $view->get( 'errors', [] ) + $error;
		@@ -327,14 +316,12 @@ discard block
		block discarded – undo
327	316	foreach( $this->getSubClients() as $client ) {
328	317	$view->itemBody .= $client->search();
329	318	}
330		- }
331		- catch( \Aimeos\MShop\Exception $e )
	319	+ } catch( \Aimeos\MShop\Exception $e )
332	320	{
333	321	$error = array( 'type-text-lists-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
334	322	$view->errors = $view->get( 'errors', [] ) + $error;
335	323	$this->logException( $e );
336		- }
337		- catch( \Exception $e )
	324	+ } catch( \Exception $e )
338	325	{
339	326	$error = array( 'type-text-lists-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() );
340	327	$view->errors = $view->get( 'errors', [] ) + $error;

aimeos / ai-admin-jqadm

Push — master ( 0229de...f71bfb )

Status

Category

Braces +2 added lines, -4 removed lines patch added patch discarded remove patch

Braces +13 added lines, -26 removed lines patch added patch discarded remove patch

Braces +13 added lines, -26 removed lines patch added patch discarded remove patch

Braces +2 added lines, -4 removed lines patch added patch discarded remove patch

Braces +13 added lines, -26 removed lines patch added patch discarded remove patch

Braces +13 added lines, -26 removed lines patch added patch discarded remove patch

Braces +14 added lines, -28 removed lines patch added patch discarded remove patch

Braces +13 added lines, -26 removed lines patch added patch discarded remove patch

Braces +13 added lines, -26 removed lines patch added patch discarded remove patch