Completed
Push — master ( 33a95e...daccbb )
by Aimeos
09:31
created
client/html/src/Client/Html/Basket/Related/Standard.php 1 patch
Braces   +5 added lines, -10 removed lines patch added patch discarded remove patch
@@ -82,23 +82,19 @@  discard block
 block discarded – undo
82 82
 				$html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
83 83
 			}
84 84
 			$view->watchBody = $html;
85
-		}
86
-		catch( \Aimeos\Client\Html\Exception $e )
85
+		} catch( \Aimeos\Client\Html\Exception $e )
87 86
 		{
88 87
 			$error = array( $this->getContext()->getI18n()->dt( 'client', $e->getMessage() ) );
89 88
 			$view->watchErrorList = $view->get( 'watchErrorList', array() ) + $error;
90
-		}
91
-		catch( \Aimeos\Controller\Frontend\Exception $e )
89
+		} catch( \Aimeos\Controller\Frontend\Exception $e )
92 90
 		{
93 91
 			$error = array( $this->getContext()->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
94 92
 			$view->watchErrorList = $view->get( 'watchErrorList', array() ) + $error;
95
-		}
96
-		catch( \Aimeos\MShop\Exception $e )
93
+		} catch( \Aimeos\MShop\Exception $e )
97 94
 		{
98 95
 			$error = array( $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
99 96
 			$view->watchErrorList = $view->get( 'watchErrorList', array() ) + $error;
100
-		}
101
-		catch( \Exception $e )
97
+		} catch( \Exception $e )
102 98
 		{
103 99
 			$context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
104 100
 
@@ -178,8 +174,7 @@  discard block
 block discarded – undo
178 174
 			$default = 'account/watch/header-default.php';
179 175
 
180 176
 			return $view->render( $view->config( $tplconf, $default ) );
181
-		}
182
-		catch( \Exception $e )
177
+		} catch( \Exception $e )
183 178
 		{
184 179
 			$this->getContext()->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
185 180
 		}
Please login to merge, or discard this patch.
html/tests/Client/Html/Checkout/Standard/Address/Billing/StandardTest.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -132,8 +132,7 @@  discard block
 block discarded – undo
132 132
 		try
133 133
 		{
134 134
 			$this->object->process();
135
-		}
136
-		catch( \Aimeos\Client\Html\Exception $e )
135
+		} catch( \Aimeos\Client\Html\Exception $e )
137 136
 		{
138 137
 			$this->assertEquals( 2, count( $view->deliveryError ) );
139 138
 			$this->assertArrayHasKey( 'order.base.address.salutation', $view->deliveryError );
@@ -203,8 +202,7 @@  discard block
 block discarded – undo
203 202
 		try
204 203
 		{
205 204
 			$this->object->process();
206
-		}
207
-		catch( \Aimeos\Client\Html\Exception $e )
205
+		} catch( \Aimeos\Client\Html\Exception $e )
208 206
 		{
209 207
 			$this->assertEquals( 1, count( $view->deliveryError ) );
210 208
 			$this->assertArrayHasKey( 'order.base.address.postal', $view->deliveryError );
Please login to merge, or discard this patch.
client/html/templates/account/watch/body-default.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -32,9 +32,12 @@
 block discarded – undo
32 32
 				<div class="media-item" style="background-image: url('<?php echo $mediaUrl; ?>')" itemscope="" itemtype="http://schema.org/ImageObject">
33 33
 					<meta itemprop="contentUrl" content="<?php echo $mediaUrl; ?>" />
34 34
 				</div>
35
-<?php			else : ?>
35
+<?php			else {
36
+    : ?>
36 37
 				<div class="media-item"></div>
37
-<?php			endif; ?>
38
+<?php			endif;
39
+}
40
+?>
38 41
 				<h3 class="name" itemprop="name"><?php echo $enc->html( $productItem->getName(), $enc::TRUST ); ?></h3>
39 42
 				<div class="price-list" itemprop="offers" itemscope itemtype="http://schema.org/Offer">
40 43
 <?php			echo $this->partial( $this->config( 'client/html/common/partials/price', 'common/partials/price-default.php' ), array( 'prices' => $productItem->getRefItems( 'price', null, 'default' ) ) ); ?>
Please login to merge, or discard this patch.
client/html/templates/account/favorite/body-default.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -32,9 +32,12 @@
 block discarded – undo
32 32
 				<div class="media-item" style="background-image: url('<?php echo $mediaUrl; ?>')" itemscope="" itemtype="http://schema.org/ImageObject">
33 33
 					<meta itemprop="contentUrl" content="<?php echo $mediaUrl; ?>" />
34 34
 				</div>
35
-<?php			else : ?>
35
+<?php			else {
36
+    : ?>
36 37
 				<div class="media-item"></div>
37
-<?php			endif; ?>
38
+<?php			endif;
39
+}
40
+?>
38 41
 				<h3 class="name" itemprop="name"><?php echo $enc->html( $productItem->getName(), $enc::TRUST ); ?></h3>
39 42
 				<div class="price-list" itemprop="offers" itemscope itemtype="http://schema.org/Offer">
40 43
 <?php			echo $this->partial( $this->config( 'client/html/common/partials/price', 'common/partials/price-default.php' ), array( 'prices' => $productItem->getRefItems( 'price', null, 'default' ) ) ); ?>
Please login to merge, or discard this patch.
client/html/templates/basket/mini/main-body-default.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -16,8 +16,7 @@
 block discarded – undo
16 16
 {
17 17
 	$orderService = $this->standardBasket->getService( 'payment' );
18 18
 	$orderServiceId = $orderService->getServiceId();
19
-}
20
-catch( Exception $e )
19
+} catch( Exception $e )
21 20
 {
22 21
 	$orderService = null;
23 22
 	$orderServiceId = null;
Please login to merge, or discard this patch.
client/html/templates/basket/mini/product-body-default.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -16,8 +16,7 @@
 block discarded – undo
16 16
 {
17 17
 	$orderService = $this->standardBasket->getService( 'payment' );
18 18
 	$orderServiceId = $orderService->getServiceId();
19
-}
20
-catch( Exception $e )
19
+} catch( Exception $e )
21 20
 {
22 21
 	$orderService = null;
23 22
 	$orderServiceId = null;
Please login to merge, or discard this patch.
client/html/templates/email/common/text-salutation-body-default.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -16,8 +16,7 @@
 block discarded – undo
16 16
 {
17 17
 	$orderService = $this->standardBasket->getService( 'payment' );
18 18
 	$orderServiceId = $orderService->getServiceId();
19
-}
20
-catch( Exception $e )
19
+} catch( Exception $e )
21 20
 {
22 21
 	$orderService = null;
23 22
 	$orderServiceId = null;
Please login to merge, or discard this patch.
client/html/templates/email/common/text-summary-address-body-default.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -71,8 +71,7 @@  discard block
 block discarded – undo
71 71
 			$addr->getWebsite(),
72 72
 			$addr->getVatID()
73 73
 		) ) ) );
74
-	}
75
-	catch( Exception $e ) { ; }
74
+	} catch( Exception $e ) { ; }
76 75
 ?>
77 76
 		</div>
78 77
 	</div><div class="item delivery <?php echo ( isset( $errors['address']['delivery'] ) ? 'error' : '' ); ?>">
@@ -127,8 +126,7 @@  discard block
 block discarded – undo
127 126
 			$addr->getWebsite(),
128 127
 			$addr->getVatID()
129 128
 		) ) ) );
130
-	}
131
-	catch( Exception $e )
129
+	} catch( Exception $e )
132 130
 	{
133 131
 		echo $enc->html( $this->translate( 'client', 'like billing address' ), $enc::TRUST );
134 132
 	}
Please login to merge, or discard this patch.
client/html/templates/email/common/html-salutation-body-default.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -16,8 +16,7 @@
 block discarded – undo
16 16
 {
17 17
 	$orderService = $this->standardBasket->getService( 'payment' );
18 18
 	$orderServiceId = $orderService->getServiceId();
19
-}
20
-catch( Exception $e )
19
+} catch( Exception $e )
21 20
 {
22 21
 	$orderService = null;
23 22
 	$orderServiceId = null;
Please login to merge, or discard this patch.