Completed
Push — master ( 86ce10...3f6ef7 )
by Aimeos
07:57
created
client/html/src/Client/Html/Catalog/Base.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -86,13 +86,11 @@
 block discarded – undo
86 86
 			}
87 87
 
88 88
 			return $filter;
89
-		}
90
-		elseif( $catid !== '' && $catfilter === true )
89
+		} elseif( $catid !== '' && $catfilter === true )
91 90
 		{
92 91
 			$catIds = $this->getCatalogIds( $catid );
93 92
 			return $controller->createIndexFilterCategory( $catIds, $sort, $sortdir, ( $page - 1 ) * $size, $size );
94
-		}
95
-		else
93
+		} else
96 94
 		{
97 95
 			return $controller->createIndexFilter( $sort, $sortdir, ( $page - 1 ) * $size, $size );
98 96
 		}
Please login to merge, or discard this patch.
client/html/src/Client/Html/Catalog/Session/Standard.php 1 patch
Braces   +9 added lines, -18 removed lines patch added patch discarded remove patch
@@ -103,23 +103,19 @@  discard block
 block discarded – undo
103 103
 				$html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
104 104
 			}
105 105
 			$view->sessionBody = $html;
106
-		}
107
-		catch( \Aimeos\Client\Html\Exception $e )
106
+		} catch( \Aimeos\Client\Html\Exception $e )
108 107
 		{
109 108
 			$error = array( $this->getContext()->getI18n()->dt( 'client', $e->getMessage() ) );
110 109
 			$view->sessionErrorList = $view->get( 'sessionErrorList', array() ) + $error;
111
-		}
112
-		catch( \Aimeos\Controller\Frontend\Exception $e )
110
+		} catch( \Aimeos\Controller\Frontend\Exception $e )
113 111
 		{
114 112
 			$error = array( $this->getContext()->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
115 113
 			$view->sessionErrorList = $view->get( 'sessionErrorList', array() ) + $error;
116
-		}
117
-		catch( \Aimeos\MShop\Exception $e )
114
+		} catch( \Aimeos\MShop\Exception $e )
118 115
 		{
119 116
 			$error = array( $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
120 117
 			$view->sessionErrorList = $view->get( 'sessionErrorList', array() ) + $error;
121
-		}
122
-		catch( \Exception $e )
118
+		} catch( \Exception $e )
123 119
 		{
124 120
 			$context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
125 121
 
@@ -199,8 +195,7 @@  discard block
 block discarded – undo
199 195
 			$default = 'catalog/session/header-default.php';
200 196
 
201 197
 			return $view->render( $view->config( $tplconf, $default ) );
202
-		}
203
-		catch( \Exception $e )
198
+		} catch( \Exception $e )
204 199
 		{
205 200
 			$this->getContext()->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
206 201
 		}
@@ -304,26 +299,22 @@  discard block
 block discarded – undo
304 299
 		try
305 300
 		{
306 301
 			parent::process();
307
-		}
308
-		catch( \Aimeos\Client\Html\Exception $e )
302
+		} catch( \Aimeos\Client\Html\Exception $e )
309 303
 		{
310 304
 			$view = $this->getView();
311 305
 			$error = array( $this->getContext()->getI18n()->dt( 'client', $e->getMessage() ) );
312 306
 			$view->sessionErrorList = $view->get( 'sessionErrorList', array() ) + $error;
313
-		}
314
-		catch( \Aimeos\Controller\Frontend\Exception $e )
307
+		} catch( \Aimeos\Controller\Frontend\Exception $e )
315 308
 		{
316 309
 			$view = $this->getView();
317 310
 			$error = array( $this->getContext()->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
318 311
 			$view->sessionErrorList = $view->get( 'sessionErrorList', array() ) + $error;
319
-		}
320
-		catch( \Aimeos\MShop\Exception $e )
312
+		} catch( \Aimeos\MShop\Exception $e )
321 313
 		{
322 314
 			$view = $this->getView();
323 315
 			$error = array( $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
324 316
 			$view->sessionErrorList = $view->get( 'sessionErrorList', array() ) + $error;
325
-		}
326
-		catch( \Exception $e )
317
+		} catch( \Exception $e )
327 318
 		{
328 319
 			$context = $this->getContext();
329 320
 			$context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
Please login to merge, or discard this patch.
client/html/src/Client/Html/Catalog/Stock/Standard.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -104,8 +104,7 @@  discard block
 block discarded – undo
104 104
 			$default = 'catalog/stock/body-default.php';
105 105
 
106 106
 			return $view->render( $view->config( $tplconf, $default ) );
107
-		}
108
-		catch( \Exception $e )
107
+		} catch( \Exception $e )
109 108
 		{
110 109
 			$this->getContext()->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
111 110
 		}
@@ -157,8 +156,7 @@  discard block
 block discarded – undo
157 156
 			$default = 'catalog/stock/header-default.php';
158 157
 
159 158
 			return $view->render( $view->config( $tplconf, $default ) );
160
-		}
161
-		catch( \Exception $e )
159
+		} catch( \Exception $e )
162 160
 		{
163 161
 			$this->getContext()->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
164 162
 		}
@@ -262,8 +260,7 @@  discard block
 block discarded – undo
262 260
 		try
263 261
 		{
264 262
 			parent::process();
265
-		}
266
-		catch( \Exception $e )
263
+		} catch( \Exception $e )
267 264
 		{
268 265
 			$this->getContext()->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
269 266
 		}
Please login to merge, or discard this patch.
client/html/src/Client/Html/Catalog/Count/Standard.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -125,8 +125,7 @@  discard block
 block discarded – undo
125 125
 			$default = 'catalog/count/body-default.php';
126 126
 
127 127
 			return $view->render( $view->config( $tplconf, $default ) );
128
-		}
129
-		catch( \Exception $e )
128
+		} catch( \Exception $e )
130 129
 		{
131 130
 			$this->getContext()->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
132 131
 		}
@@ -178,8 +177,7 @@  discard block
 block discarded – undo
178 177
 			$default = 'catalog/count/header-default.php';
179 178
 
180 179
 			return $view->render( $view->config( $tplconf, $default ) );
181
-		}
182
-		catch( \Exception $e )
180
+		} catch( \Exception $e )
183 181
 		{
184 182
 			$this->getContext()->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
185 183
 		}
@@ -283,8 +281,7 @@  discard block
 block discarded – undo
283 281
 		try
284 282
 		{
285 283
 			parent::process();
286
-		}
287
-		catch( \Exception $e )
284
+		} catch( \Exception $e )
288 285
 		{
289 286
 			$this->getContext()->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
290 287
 		}
Please login to merge, or discard this patch.
client/html/src/Client/Html/Catalog/Suggest/Standard.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -83,8 +83,7 @@  discard block
 block discarded – undo
83 83
 				$html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
84 84
 			}
85 85
 			$view->suggestBody = $html;
86
-		}
87
-		catch( \Exception $e )
86
+		} catch( \Exception $e )
88 87
 		{
89 88
 			$this->getContext()->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
90 89
 			return;
@@ -139,8 +138,7 @@  discard block
 block discarded – undo
139 138
 				$html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
140 139
 			}
141 140
 			$view->suggestHeader = $html;
142
-		}
143
-		catch( \Exception $e )
141
+		} catch( \Exception $e )
144 142
 		{
145 143
 			$this->getContext()->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
146 144
 			return;
@@ -274,8 +272,7 @@  discard block
 block discarded – undo
274 272
 		try
275 273
 		{
276 274
 			parent::process();
277
-		}
278
-		catch( \Exception $e )
275
+		} catch( \Exception $e )
279 276
 		{
280 277
 			$this->getContext()->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
281 278
 		}
Please login to merge, or discard this patch.
client/html/src/Client/Html/Catalog/Filter/Attribute/Standard.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -341,8 +341,7 @@
 block discarded – undo
341 341
 				}
342 342
 
343 343
 				$attrMap = $sortedMap;
344
-			}
345
-			else
344
+			} else
346 345
 			{
347 346
 				ksort( $attrMap );
348 347
 			}
Please login to merge, or discard this patch.
client/html/src/Client/Html/Catalog/Filter/Standard.php 1 patch
Braces   +11 added lines, -22 removed lines patch added patch discarded remove patch
@@ -133,23 +133,19 @@  discard block
 block discarded – undo
133 133
 					$html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
134 134
 				}
135 135
 				$view->filterBody = $html;
136
-			}
137
-			catch( \Aimeos\Client\Html\Exception $e )
136
+			} catch( \Aimeos\Client\Html\Exception $e )
138 137
 			{
139 138
 				$error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) );
140 139
 				$view->filterErrorList = $view->get( 'filterErrorList', array() ) + $error;
141
-			}
142
-			catch( \Aimeos\Controller\Frontend\Exception $e )
140
+			} catch( \Aimeos\Controller\Frontend\Exception $e )
143 141
 			{
144 142
 				$error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
145 143
 				$view->filterErrorList = $view->get( 'filterErrorList', array() ) + $error;
146
-			}
147
-			catch( \Aimeos\MShop\Exception $e )
144
+			} catch( \Aimeos\MShop\Exception $e )
148 145
 			{
149 146
 				$error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
150 147
 				$view->filterErrorList = $view->get( 'filterErrorList', array() ) + $error;
151
-			}
152
-			catch( \Exception $e )
148
+			} catch( \Exception $e )
153 149
 			{
154 150
 				$context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
155 151
 
@@ -183,8 +179,7 @@  discard block
 block discarded – undo
183 179
 			$html = $view->render( $view->config( $tplconf, $default ) );
184 180
 
185 181
 			$this->setCached( 'body', $uid, $prefixes, $confkey, $html, $tags, $expire );
186
-		}
187
-		else
182
+		} else
188 183
 		{
189 184
 			$html = $this->modifyBody( $html, $uid );
190 185
 		}
@@ -226,8 +221,7 @@  discard block
 block discarded – undo
226 221
 					$html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
227 222
 				}
228 223
 				$view->filterHeader = $html;
229
-			}
230
-			catch( \Exception $e )
224
+			} catch( \Exception $e )
231 225
 			{
232 226
 				$context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
233 227
 			}
@@ -259,8 +253,7 @@  discard block
 block discarded – undo
259 253
 			$html = $view->render( $view->config( $tplconf, $default ) );
260 254
 
261 255
 			$this->setCached( 'header', $uid, $prefixes, $confkey, $html, $tags, $expire );
262
-		}
263
-		else
256
+		} else
264 257
 		{
265 258
 			$html = $this->modifyHeader( $html, $uid );
266 259
 		}
@@ -384,23 +377,19 @@  discard block
 block discarded – undo
384 377
 		try
385 378
 		{
386 379
 			parent::process();
387
-		}
388
-		catch( \Aimeos\MShop\Exception $e )
380
+		} catch( \Aimeos\MShop\Exception $e )
389 381
 		{
390 382
 			$error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
391 383
 			$view->filterErrorList = $view->get( 'filterErrorList', array() ) + $error;
392
-		}
393
-		catch( \Aimeos\Controller\Frontend\Exception $e )
384
+		} catch( \Aimeos\Controller\Frontend\Exception $e )
394 385
 		{
395 386
 			$error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
396 387
 			$view->filterErrorList = $view->get( 'filterErrorList', array() ) + $error;
397
-		}
398
-		catch( \Aimeos\Client\Html\Exception $e )
388
+		} catch( \Aimeos\Client\Html\Exception $e )
399 389
 		{
400 390
 			$error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) );
401 391
 			$view->filterErrorList = $view->get( 'filterErrorList', array() ) + $error;
402
-		}
403
-		catch( \Exception $e )
392
+		} catch( \Exception $e )
404 393
 		{
405 394
 			$context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
406 395
 
Please login to merge, or discard this patch.
client/html/src/Client/Html/Checkout/Confirm/Standard.php 1 patch
Braces   +9 added lines, -18 removed lines patch added patch discarded remove patch
@@ -126,23 +126,19 @@  discard block
 block discarded – undo
126 126
 				$html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
127 127
 			}
128 128
 			$view->confirmBody = $html;
129
-		}
130
-		catch( \Aimeos\Client\Html\Exception $e )
129
+		} catch( \Aimeos\Client\Html\Exception $e )
131 130
 		{
132 131
 			$error = array( $this->getContext()->getI18n()->dt( 'client', $e->getMessage() ) );
133 132
 			$view->confirmErrorList = $view->get( 'confirmErrorList', array() ) + $error;
134
-		}
135
-		catch( \Aimeos\Controller\Frontend\Exception $e )
133
+		} catch( \Aimeos\Controller\Frontend\Exception $e )
136 134
 		{
137 135
 			$error = array( $this->getContext()->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
138 136
 			$view->confirmErrorList = $view->get( 'confirmErrorList', array() ) + $error;
139
-		}
140
-		catch( \Aimeos\MShop\Exception $e )
137
+		} catch( \Aimeos\MShop\Exception $e )
141 138
 		{
142 139
 			$error = array( $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
143 140
 			$view->confirmErrorList = $view->get( 'confirmErrorList', array() ) + $error;
144
-		}
145
-		catch( \Exception $e )
141
+		} catch( \Exception $e )
146 142
 		{
147 143
 			$context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
148 144
 
@@ -222,8 +218,7 @@  discard block
 block discarded – undo
222 218
 			$default = 'checkout/confirm/header-default.php';
223 219
 
224 220
 			return $view->render( $view->config( $tplconf, $default ) );
225
-		}
226
-		catch( \Exception $e )
221
+		} catch( \Exception $e )
227 222
 		{
228 223
 			$this->getContext()->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
229 224
 		}
@@ -354,23 +349,19 @@  discard block
 block discarded – undo
354 349
 
355 350
 			// Update stock, coupons, etc.
356 351
 			\Aimeos\Controller\Frontend\Factory::createController( $context, 'order' )->update( $orderItem );
357
-		}
358
-		catch( \Aimeos\Client\Html\Exception $e )
352
+		} catch( \Aimeos\Client\Html\Exception $e )
359 353
 		{
360 354
 			$error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) );
361 355
 			$view->confirmErrorList = $view->get( 'confirmErrorList', array() ) + $error;
362
-		}
363
-		catch( \Aimeos\Controller\Frontend\Exception $e )
356
+		} catch( \Aimeos\Controller\Frontend\Exception $e )
364 357
 		{
365 358
 			$error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
366 359
 			$view->confirmErrorList = $view->get( 'confirmErrorList', array() ) + $error;
367
-		}
368
-		catch( \Aimeos\MShop\Exception $e )
360
+		} catch( \Aimeos\MShop\Exception $e )
369 361
 		{
370 362
 			$error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
371 363
 			$view->confirmErrorList = $view->get( 'confirmErrorList', array() ) + $error;
372
-		}
373
-		catch( \Exception $e )
364
+		} catch( \Exception $e )
374 365
 		{
375 366
 			$context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
376 367
 
Please login to merge, or discard this patch.
client/html/src/Client/Html/Checkout/Standard/Process/Standard.php 1 patch
Braces   +5 added lines, -10 removed lines patch added patch discarded remove patch
@@ -301,8 +301,7 @@  discard block
 block discarded – undo
301 301
 				$view->standardMethod = $form->getMethod();
302 302
 				$view->standardProcessParams = $form->getValues();
303 303
 				$view->standardUrlExternal = $form->getExternal();
304
-			}
305
-			else
304
+			} else
306 305
 			{
307 306
 				$view->standardUrlNext = $this->getUrlConfirm( $view, array(), array() );
308 307
 				$view->standardMethod = 'GET';
@@ -310,23 +309,19 @@  discard block
 block discarded – undo
310 309
 
311 310
 
312 311
 			parent::process();
313
-		}
314
-		catch( \Aimeos\Client\Html\Exception $e )
312
+		} catch( \Aimeos\Client\Html\Exception $e )
315 313
 		{
316 314
 			$error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) );
317 315
 			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
318
-		}
319
-		catch( \Aimeos\Controller\Frontend\Exception $e )
316
+		} catch( \Aimeos\Controller\Frontend\Exception $e )
320 317
 		{
321 318
 			$error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
322 319
 			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
323
-		}
324
-		catch( \Aimeos\MShop\Exception $e )
320
+		} catch( \Aimeos\MShop\Exception $e )
325 321
 		{
326 322
 			$error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
327 323
 			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
328
-		}
329
-		catch( \Exception $e )
324
+		} catch( \Exception $e )
330 325
 		{
331 326
 			$context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
332 327
 
Please login to merge, or discard this patch.