Completed
Push — master ( 1d1c91...d8b85b )
by Aimeos
02:51
created
client/html/templates/email/account/text-body-standard.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -20,8 +20,11 @@
 block discarded – undo
20 20
 
21 21
 <?php if( ( $pass = $this->get( 'extAccountPassword' ) ) !== null ) : ?>
22 22
 	<?= $this->translate( 'client', 'Password' ); ?>: <?= $pass; ?>
23
-<?php else : ?>
24
-	<?= $this->translate( 'client', 'Password' ); ?>: <?= $this->translate( 'client', 'Like entered by you' ); ?>
23
+<?php else {
24
+	: ?>
25
+	<?= $this->translate( 'client', 'Password' );
26
+}
27
+?>: <?= $this->translate( 'client', 'Like entered by you' ); ?>
25 28
 <?php endif; ?>
26 29
 
27 30
 
Please login to merge, or discard this patch.
client/html/src/Client/Html/Email/Payment/Standard.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -522,12 +522,10 @@
 block discarded – undo
522 522
 				{
523 523
 					throw new \Aimeos\Client\Html\Exception( $e->getMessage() );
524 524
 				}
525
-			}
526
-			else if( function_exists( 'mime_content_type' ) )
525
+			} else if( function_exists( 'mime_content_type' ) )
527 526
 			{
528 527
 				$mimetype = mime_content_type( $filename );
529
-			}
530
-			else
528
+			} else
531 529
 			{
532 530
 				$mimetype = 'application/binary';
533 531
 			}
Please login to merge, or discard this patch.
client/html/src/Client/Html/Catalog/Stage/Standard.php 2 patches
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -190,8 +190,7 @@  discard block
 block discarded – undo
190 190
 			}
191 191
 
192 192
 			$html = $view->render( $view->config( $tplconf, $default ) );
193
-		}
194
-		else
193
+		} else
195 194
 		{
196 195
 			$html = $this->modifyBody( $html, $uid );
197 196
 		}
@@ -261,8 +260,7 @@  discard block
 block discarded – undo
261 260
 			{
262 261
 				$this->logException( $e );
263 262
 			}
264
-		}
265
-		else
263
+		} else
266 264
 		{
267 265
 			$html = $this->modifyHeader( $html, $uid );
268 266
 		}
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -390,7 +390,7 @@
 block discarded – undo
390 390
 	 * Returns the parameters used by the html client.
391 391
 	 *
392 392
 	 * @param string[] $params Associative list of all parameters
393
-	 * @param array $prefixes List of prefixes the parameters must start with
393
+	 * @param string[] $prefixes List of prefixes the parameters must start with
394 394
 	 * @return array Associative list of parameters used by the html client
395 395
 	 */
396 396
 	protected function getClientParams( array $params, array $prefixes = ['f_', 'l_', 'd_'] ) : array
Please login to merge, or discard this patch.
client/html/src/Client/Html/Catalog/Filter/Standard.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -190,8 +190,7 @@  discard block
 block discarded – undo
190 190
 			}
191 191
 
192 192
 			$html = $view->render( $view->config( $tplconf, $default ) );
193
-		}
194
-		else
193
+		} else
195 194
 		{
196 195
 			$html = $this->modifyBody( $html, $uid );
197 196
 		}
@@ -261,8 +260,7 @@  discard block
 block discarded – undo
261 260
 			{
262 261
 				$this->logException( $e );
263 262
 			}
264
-		}
265
-		else
263
+		} else
266 264
 		{
267 265
 			$html = $this->modifyHeader( $html, $uid );
268 266
 		}
Please login to merge, or discard this patch.
client/html/templates/catalog/lists/pagination-standard.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -14,8 +14,7 @@
 block discarded – undo
14 14
 	$listController = $this->config( 'client/html/catalog/tree/url/controller', 'catalog' );
15 15
 	$listAction = $this->config( 'client/html/catalog/tree/url/action', 'tree' );
16 16
 	$listConfig = $this->config( 'client/html/catalog/tree/url/config', [] );
17
-}
18
-else
17
+} else
19 18
 {
20 19
 	$listTarget = $this->config( 'client/html/catalog/lists/url/target' );
21 20
 	$listController = $this->config( 'client/html/catalog/lists/url/controller', 'catalog' );
Please login to merge, or discard this patch.
client/html/templates/catalog/lists/body-standard.php 1 patch
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -16,8 +16,7 @@  discard block
 block discarded – undo
16 16
 	$cntl = $this->config( 'client/html/catalog/tree/url/controller', 'catalog' );
17 17
 	$action = $this->config( 'client/html/catalog/tree/url/action', 'tree' );
18 18
 	$config = $this->config( 'client/html/catalog/tree/url/config', [] );
19
-}
20
-else
19
+} else
21 20
 {
22 21
 	$target = $this->config( 'client/html/catalog/lists/url/target' );
23 22
 	$cntl = $this->config( 'client/html/catalog/lists/url/controller', 'catalog' );
@@ -159,14 +158,17 @@  discard block
 block discarded – undo
159 158
 					$searchText,
160 159
 					$total
161 160
 				), $enc::TRUST ); ?>
162
-			<?php else : ?>
161
+			<?php else {
162
+	: ?>
163 163
 				<?= $enc->html( sprintf(
164 164
 					$this->translate(
165 165
 						'client',
166 166
 						'No articles found for <span class="searchstring">"%1$s"</span>. Please try again with a different keyword.'
167 167
 					),
168 168
 					$searchText
169
-				), $enc::TRUST ); ?>
169
+				), $enc::TRUST );
170
+}
171
+?>
170 172
 			<?php endif; ?>
171 173
 
172 174
 		</div>
Please login to merge, or discard this patch.
client/html/templates/email/common/text-summary-partial.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -54,7 +54,8 @@  discard block
 block discarded – undo
54 54
 			array( 'addresses' => $addrItems, 'separator' => "\n" )
55 55
 		);
56 56
 ?>
57
-<?php else : ?>
57
+<?php else {
58
+	: ?>
58 59
 <?=		$this->translate( 'client', 'like billing address' ) ?>
59 60
 <?php endif ?>
60 61
 
@@ -69,6 +70,7 @@  discard block
 block discarded – undo
69 70
 <?php		foreach( $service->getAttributeItems() as $attribute )
70 71
 			{
71 72
 				$name = ( $attribute->getName() != '' ? $attribute->getName() : $this->translate( 'client/code', $attribute->getCode() ) );
73
+}
72 74
 
73 75
 				switch( $attribute->getValue() )
74 76
 				{
Please login to merge, or discard this patch.
controller/jobs/src/Controller/Jobs/Customer/Email/Watch/Standard.php 2 patches
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.
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
 	 * Returns the list items for the given customer IDs and list type ID
186 186
 	 *
187 187
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context item object
188
-	 * @param array $custIds List of customer IDs
188
+	 * @param \Aimeos\Map $custIds List of customer IDs
189 189
 	 * @return \Aimeos\Map List of customer list items implementing \Aimeos\MShop\Common\Item\Lists\Iface
190 190
 	 */
191 191
 	protected function getListItems( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\Map $custIds ) : \Aimeos\Map
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
 	/**
209 209
 	 * Returns a filtered list of products for which a notification should be sent
210 210
 	 *
211
-	 * @param \Aimeos\MShop\Product\Item\Iface[] $products List of product items
211
+	 * @param \Aimeos\Map $products List of product items
212 212
 	 * @param \Aimeos\MShop\Common\Item\Lists\Iface[] $listItems List of customer list items
213 213
 	 * @return array Multi-dimensional associative list of list IDs as key and product / price item maps as values
214 214
 	 */
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.