Passed
Push — master ( 15d901...79d36f )
by Aimeos
03:44
created
controller/jobs/src/Controller/Jobs/Customer/Email/Watch/Standard.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -241,7 +241,9 @@
 block discarded – undo
241 241
 					}
242 242
 				}
243 243
 			}
244
-			catch( \Exception $e ) {; } // no price available
244
+			catch( \Exception $e )
245
+			{
246
+; } // no price available
245 247
 		}
246 248
 
247 249
 		return $result;
Please login to merge, or discard this patch.
client/html/src/Client/Html/Account/Favorite/Standard.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -86,22 +86,22 @@  discard block
 block discarded – undo
86 86
 		catch( \Aimeos\Client\Html\Exception $e )
87 87
 		{
88 88
 			$error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) );
89
-			$view->favoriteErrorList = array_merge($view->get( 'favoriteErrorList', [] ), $error);
89
+			$view->favoriteErrorList = array_merge( $view->get( 'favoriteErrorList', [] ), $error );
90 90
 		}
91 91
 		catch( \Aimeos\Controller\Frontend\Exception $e )
92 92
 		{
93 93
 			$error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
94
-			$view->favoriteErrorList = array_merge($view->get( 'favoriteErrorList', [] ), $error);
94
+			$view->favoriteErrorList = array_merge( $view->get( 'favoriteErrorList', [] ), $error );
95 95
 		}
96 96
 		catch( \Aimeos\MShop\Exception $e )
97 97
 		{
98 98
 			$error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
99
-			$view->favoriteErrorList = array_merge($view->get( 'favoriteErrorList', [] ), $error);
99
+			$view->favoriteErrorList = array_merge( $view->get( 'favoriteErrorList', [] ), $error );
100 100
 		}
101 101
 		catch( \Exception $e )
102 102
 		{
103 103
 			$error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) );
104
-			$view->favoriteErrorList = array_merge($view->get( 'favoriteErrorList', [] ), $error);
104
+			$view->favoriteErrorList = array_merge( $view->get( 'favoriteErrorList', [] ), $error );
105 105
 			$this->logException( $e );
106 106
 		}
107 107
 
@@ -302,22 +302,22 @@  discard block
 block discarded – undo
302 302
 		catch( \Aimeos\MShop\Exception $e )
303 303
 		{
304 304
 			$error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
305
-			$view->favoriteErrorList = array_merge($view->get( 'favoriteErrorList', [] ), $error);
305
+			$view->favoriteErrorList = array_merge( $view->get( 'favoriteErrorList', [] ), $error );
306 306
 		}
307 307
 		catch( \Aimeos\Controller\Frontend\Exception $e )
308 308
 		{
309 309
 			$error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
310
-			$view->favoriteErrorList = array_merge($view->get( 'favoriteErrorList', [] ), $error);
310
+			$view->favoriteErrorList = array_merge( $view->get( 'favoriteErrorList', [] ), $error );
311 311
 		}
312 312
 		catch( \Aimeos\Client\Html\Exception $e )
313 313
 		{
314 314
 			$error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) );
315
-			$view->favoriteErrorList = array_merge($view->get( 'favoriteErrorList', [] ), $error);
315
+			$view->favoriteErrorList = array_merge( $view->get( 'favoriteErrorList', [] ), $error );
316 316
 		}
317 317
 		catch( \Exception $e )
318 318
 		{
319 319
 			$error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) );
320
-			$view->favoriteErrorList = array_merge($view->get( 'favoriteErrorList', [] ), $error);
320
+			$view->favoriteErrorList = array_merge( $view->get( 'favoriteErrorList', [] ), $error );
321 321
 			$this->logException( $e );
322 322
 		}
323 323
 	}
Please login to merge, or discard this patch.
client/html/src/Client/Html/Checkout/Standard/Delivery/Standard.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -248,7 +248,7 @@
 block discarded – undo
248 248
 					catch( \Aimeos\Controller\Frontend\Basket\Exception $e )
249 249
 					{
250 250
 						$view->deliveryError = $e->getErrors();
251
-						$view->standardErrorList = array_merge($view->get( 'standardErrorList', [] ), $e->getErrors());
251
+						$view->standardErrorList = array_merge( $view->get( 'standardErrorList', [] ), $e->getErrors() );
252 252
 
253 253
 						throw $e;
254 254
 					}
Please login to merge, or discard this patch.
client/html/src/Client/Html/Checkout/Standard/Process/Standard.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -267,14 +267,12 @@  discard block
 block discarded – undo
267 267
 				$orderItem = $orderCntl->add( $basket->getId(), ['order.type' => 'web'] )->store();
268 268
 
269 269
 				$context->getSession()->set( 'aimeos/orderid', $orderItem->getId() );
270
-			}
271
-			elseif( $view->param( 'cp_payment', null ) !== null )
270
+			} elseif( $view->param( 'cp_payment', null ) !== null )
272 271
 			{
273 272
 				$parts = \Aimeos\MShop\Order\Item\Base\Base::PARTS_ALL;
274 273
 				$orderItem = $orderCntl->get( $context->getSession()->get( 'aimeos/orderid' ), false );
275 274
 				$basket = $basketCntl->load( $orderItem->getBaseId(), $parts, false );
276
-			}
277
-			else
275
+			} else
278 276
 			{
279 277
 				return;
280 278
 			}
@@ -286,8 +284,7 @@  discard block
 block discarded – undo
286 284
 				$view->standardProcessParams = $form->getValues();
287 285
 				$view->standardUrlExternal = $form->getExternal();
288 286
 				$view->standardHtml = $form->getHtml();
289
-			}
290
-			else // no payment service available
287
+			} else // no payment service available
291 288
 			{
292 289
 				$orderCntl->save( $orderItem->setPaymentStatus( \Aimeos\MShop\Order\Item\Base::PAY_AUTHORIZED ) );
293 290
 				$view->standardUrlNext = $this->getUrlConfirm( $view, [], [] );
Please login to merge, or discard this patch.
client/html/templates/basket/standard/body-standard.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -122,10 +122,13 @@
 block discarded – undo
122 122
 						href="<?= $enc->attr( $this->url( $checkoutTarget, $checkoutController, $checkoutAction, [], [], $checkoutConfig ) ); ?>">
123 123
 						<?= $enc->html( $this->translate( 'client', 'Checkout' ), $enc::TRUST ); ?>
124 124
 					</a>
125
-				<?php else : ?>
125
+				<?php else {
126
+	: ?>
126 127
 					<input type="hidden" name="<?= $enc->attr( $this->formparam( 'b_action' ) ) ?>" value="1" />
127 128
 					<button class="btn btn-primary btn-lg btn-action" type="submit">
128
-						<?= $enc->html( $this->translate( 'client', 'Check' ), $enc::TRUST ); ?>
129
+						<?= $enc->html( $this->translate( 'client', 'Check' ), $enc::TRUST );
130
+}
131
+?>
129 132
 					</button>
130 133
 				<?php endif; ?>
131 134
 
Please login to merge, or discard this patch.
client/html/src/Client/Html/Basket/Bulk/Standard.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -146,8 +146,7 @@  discard block
 block discarded – undo
146 146
 
147 147
 			$html = $view->render( $view->config( $tplconf, $default ) );
148 148
 			$this->setBasketCached( $key, $html );
149
-		}
150
-		else
149
+		} else
151 150
 		{
152 151
 			$html = $this->modifyBody( $html, $uid );
153 152
 		}
@@ -216,8 +215,7 @@  discard block
 block discarded – undo
216 215
 			{
217 216
 				$this->logException( $e );
218 217
 			}
219
-		}
220
-		else
218
+		} else
221 219
 		{
222 220
 			$html = $this->modifyHeader( $html, $uid );
223 221
 		}
Please login to merge, or discard this patch.
client/html/src/Client/Html/Checkout/Standard/Address/Delivery/Standard.php 1 patch
Braces   +8 added lines, -7 removed lines patch added patch discarded remove patch
@@ -471,19 +471,22 @@  discard block
 block discarded – undo
471 471
 		$disable = $view->config( 'client/html/checkout/standard/address/delivery/disable-new', false );
472 472
 		$type = \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_DELIVERY;
473 473
 
474
-		if( ( $option = $view->param( 'ca_deliveryoption', 'null' ) ) === 'null' && $disable === false ) // new address
474
+		if( ( $option = $view->param( 'ca_deliveryoption', 'null' ) ) === 'null' && $disable === false ) {
475
+			// new address
475 476
 		{
476 477
 			$params = $view->param( 'ca_delivery', [] );
478
+		}
477 479
 
478 480
 			if( ( $view->deliveryError = $this->checkFields( $params ) ) !== [] ) {
479 481
 				throw new \Aimeos\Client\Html\Exception( sprintf( 'At least one delivery address part is missing or invalid' ) );
480 482
 			}
481 483
 
482 484
 			$basketCtrl->addAddress( $type, $params, 0 );
483
-		}
484
-		else if( ( $option = $view->param( 'ca_deliveryoption', 'null' ) ) !== '-1' ) // existing address
485
+		} else if( ( $option = $view->param( 'ca_deliveryoption', 'null' ) ) !== '-1' ) {
486
+			// existing address
485 487
 		{
486 488
 			$params = $view->param( 'ca_delivery_' . $option, [] );
489
+		}
487 490
 
488 491
 			if( !empty( $params ) && ( $view->deliveryError = $this->checkFields( $params ) ) !== [] ) {
489 492
 				throw new \Aimeos\Client\Html\Exception( sprintf( 'At least one delivery address part is missing or invalid' ) );
@@ -498,8 +501,7 @@  discard block
 block discarded – undo
498 501
 			}
499 502
 
500 503
 			$basketCtrl->addAddress( $type, $params, 0 );
501
-		}
502
-		else
504
+		} else
503 505
 		{
504 506
 			$basketCtrl->deleteAddress( $type );
505 507
 		}
@@ -701,8 +703,7 @@  discard block
 block discarded – undo
701 703
 					$invalid[$key] = $name;
702 704
 					unset( $params[$key] );
703 705
 				}
704
-			}
705
-			else
706
+			} else
706 707
 			{
707 708
 				unset( $params[$key] );
708 709
 			}
Please login to merge, or discard this patch.
client/html/src/Client/Html/Basket/Standard/Standard.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -399,8 +399,7 @@  discard block
 block discarded – undo
399 399
 			$controller = $view->config( 'client/html/catalog/detail/url/controller', 'catalog' );
400 400
 			$action = $view->config( 'client/html/catalog/detail/url/action', 'detail' );
401 401
 			$config = $view->config( 'client/html/catalog/detail/url/config', [] );
402
-		}
403
-		else
402
+		} else
404 403
 		{
405 404
 			$params = $context->getSession()->get( 'aimeos/catalog/lists/params/last/' . $site, [] );
406 405
 
@@ -466,8 +465,7 @@  discard block
 block discarded – undo
466 465
 				$view->param( 'b_supplier' ),
467 466
 				$view->param( 'b_siteid' )
468 467
 			);
469
-		}
470
-		else
468
+		} else
471 469
 		{
472 470
 			$list = [];
473 471
 			$entries = (array) $view->param( 'b_prod', [] );
Please login to merge, or discard this patch.
client/html/templates/checkout/standard/process-body-standard.php 1 patch
Braces   +17 added lines, -10 removed lines patch added patch discarded remove patch
@@ -18,8 +18,7 @@  discard block
 block discarded – undo
18 18
 
19 19
 		return $name;
20 20
 	};
21
-}
22
-else
21
+} else
23 22
 {
24 23
 	$namefcn = function( $view, $key ) {
25 24
 		return $view->formparam( (array) $key );
@@ -93,9 +92,12 @@  discard block
 block discarded – undo
93 92
 		<p class="order-notice">
94 93
 			<?= $enc->html( $this->translate( 'client', 'Please enter your payment details' ), $enc::TRUST ); ?>
95 94
 		</p>
96
-	<?php else : ?>
95
+	<?php else {
96
+	: ?>
97 97
 		<p class="order-notice">
98
-			<?= $enc->html( $this->translate( 'client', 'You will now be forwarded to the next step' ), $enc::TRUST ); ?>
98
+			<?= $enc->html( $this->translate( 'client', 'You will now be forwarded to the next step' ), $enc::TRUST );
99
+}
100
+?>
99 101
 		</p>
100 102
 	<?php endif; ?>
101 103
 
@@ -111,8 +113,11 @@  discard block
 block discarded – undo
111 113
 				/>
112 114
 			<?php endforeach; ?>
113 115
 
114
-		<?php else : ?>
115
-			<input type="hidden" id="process-<?= $key; ?>"
116
+		<?php else {
117
+	: ?>
118
+			<input type="hidden" id="process-<?= $key;
119
+}
120
+?>"
116 121
 				name="<?= $enc->attr( $namefcn( $this, $item->getInternalCode() ) ); ?>"
117 122
 				value="<?= $enc->attr( $item->getDefault() ); ?>"
118 123
 			/>
@@ -205,8 +210,7 @@  discard block
 block discarded – undo
205 210
 						foreach( (array) $item->getDefault() as $key2 => $value ) {
206 211
 							$urlParams[] = $namefcn( $this, array( $item->getInternalCode(), $key2 ) ) . '=' . urlencode( $value );
207 212
 						}
208
-					}
209
-					else
213
+					} else
210 214
 					{
211 215
 						$urlParams[] = $namefcn( $this, $item->getInternalCode() ) . '=' . urlencode( $item->getDefault() );
212 216
 					}
@@ -220,9 +224,12 @@  discard block
 block discarded – undo
220 224
 				<?= $enc->html( $this->translate( 'client', 'Proceed' ), $enc::TRUST ); ?>
221 225
 			</a>
222 226
 
223
-		<?php else : ?>
227
+		<?php else {
228
+	: ?>
224 229
 			<button class="btn btn-primary btn-lg btn-action">
225
-				<?= $enc->html( $this->translate( 'client', 'Proceed' ), $enc::TRUST ); ?>
230
+				<?= $enc->html( $this->translate( 'client', 'Proceed' ), $enc::TRUST );
231
+}
232
+?>
226 233
 			</button>
227 234
 
228 235
 		<?php endif; ?>
Please login to merge, or discard this patch.