@@ -159,22 +159,22 @@ discard block |
||
159 | 159 | catch( \Aimeos\Client\Html\Exception $e ) |
160 | 160 | { |
161 | 161 | $error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) ); |
162 | - $view->stageErrorList = array_merge($view->get( 'stageErrorList', [] ), $error); |
|
162 | + $view->stageErrorList = array_merge( $view->get( 'stageErrorList', [] ), $error ); |
|
163 | 163 | } |
164 | 164 | catch( \Aimeos\Controller\Frontend\Exception $e ) |
165 | 165 | { |
166 | 166 | $error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) ); |
167 | - $view->stageErrorList = array_merge($view->get( 'stageErrorList', [] ), $error); |
|
167 | + $view->stageErrorList = array_merge( $view->get( 'stageErrorList', [] ), $error ); |
|
168 | 168 | } |
169 | 169 | catch( \Aimeos\MShop\Exception $e ) |
170 | 170 | { |
171 | 171 | $error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
172 | - $view->stageErrorList = array_merge($view->get( 'stageErrorList', [] ), $error); |
|
172 | + $view->stageErrorList = array_merge( $view->get( 'stageErrorList', [] ), $error ); |
|
173 | 173 | } |
174 | 174 | catch( \Exception $e ) |
175 | 175 | { |
176 | 176 | $error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) ); |
177 | - $view->stageErrorList = array_merge($view->get( 'stageErrorList', [] ), $error); |
|
177 | + $view->stageErrorList = array_merge( $view->get( 'stageErrorList', [] ), $error ); |
|
178 | 178 | $this->logException( $e ); |
179 | 179 | } |
180 | 180 | |
@@ -362,22 +362,22 @@ discard block |
||
362 | 362 | catch( \Aimeos\Client\Html\Exception $e ) |
363 | 363 | { |
364 | 364 | $error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) ); |
365 | - $view->stageErrorList = array_merge($view->get( 'stageErrorList', [] ), $error); |
|
365 | + $view->stageErrorList = array_merge( $view->get( 'stageErrorList', [] ), $error ); |
|
366 | 366 | } |
367 | 367 | catch( \Aimeos\Controller\Frontend\Exception $e ) |
368 | 368 | { |
369 | 369 | $error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) ); |
370 | - $view->stageErrorList = array_merge($view->get( 'stageErrorList', [] ), $error); |
|
370 | + $view->stageErrorList = array_merge( $view->get( 'stageErrorList', [] ), $error ); |
|
371 | 371 | } |
372 | 372 | catch( \Aimeos\MShop\Exception $e ) |
373 | 373 | { |
374 | 374 | $error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
375 | - $view->stageErrorList = array_merge($view->get( 'stageErrorList', [] ), $error); |
|
375 | + $view->stageErrorList = array_merge( $view->get( 'stageErrorList', [] ), $error ); |
|
376 | 376 | } |
377 | 377 | catch( \Exception $e ) |
378 | 378 | { |
379 | 379 | $error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) ); |
380 | - $view->stageErrorList = array_merge($view->get( 'stageErrorList', [] ), $error); |
|
380 | + $view->stageErrorList = array_merge( $view->get( 'stageErrorList', [] ), $error ); |
|
381 | 381 | $this->logException( $e ); |
382 | 382 | } |
383 | 383 | } |
@@ -248,7 +248,7 @@ |
||
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 | } |
@@ -185,22 +185,22 @@ discard block |
||
185 | 185 | catch( \Aimeos\Client\Html\Exception $e ) |
186 | 186 | { |
187 | 187 | $error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) ); |
188 | - $view->listErrorList = array_merge($view->get( 'listErrorList', [] ), $error); |
|
188 | + $view->listErrorList = array_merge( $view->get( 'listErrorList', [] ), $error ); |
|
189 | 189 | } |
190 | 190 | catch( \Aimeos\Controller\Frontend\Exception $e ) |
191 | 191 | { |
192 | 192 | $error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) ); |
193 | - $view->listErrorList = array_merge($view->get( 'listErrorList', [] ), $error); |
|
193 | + $view->listErrorList = array_merge( $view->get( 'listErrorList', [] ), $error ); |
|
194 | 194 | } |
195 | 195 | catch( \Aimeos\MShop\Exception $e ) |
196 | 196 | { |
197 | 197 | $error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
198 | - $view->listErrorList = array_merge($view->get( 'listErrorList', [] ), $error); |
|
198 | + $view->listErrorList = array_merge( $view->get( 'listErrorList', [] ), $error ); |
|
199 | 199 | } |
200 | 200 | catch( \Exception $e ) |
201 | 201 | { |
202 | 202 | $error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) ); |
203 | - $view->listErrorList = array_merge($view->get( 'listErrorList', [] ), $error); |
|
203 | + $view->listErrorList = array_merge( $view->get( 'listErrorList', [] ), $error ); |
|
204 | 204 | $this->logException( $e ); |
205 | 205 | } |
206 | 206 | |
@@ -417,22 +417,22 @@ discard block |
||
417 | 417 | catch( \Aimeos\Client\Html\Exception $e ) |
418 | 418 | { |
419 | 419 | $error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) ); |
420 | - $view->listErrorList = array_merge($view->get( 'listErrorList', [] ), $error); |
|
420 | + $view->listErrorList = array_merge( $view->get( 'listErrorList', [] ), $error ); |
|
421 | 421 | } |
422 | 422 | catch( \Aimeos\Controller\Frontend\Exception $e ) |
423 | 423 | { |
424 | 424 | $error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) ); |
425 | - $view->listErrorList = array_merge($view->get( 'listErrorList', [] ), $error); |
|
425 | + $view->listErrorList = array_merge( $view->get( 'listErrorList', [] ), $error ); |
|
426 | 426 | } |
427 | 427 | catch( \Aimeos\MShop\Exception $e ) |
428 | 428 | { |
429 | 429 | $error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
430 | - $view->listErrorList = array_merge($view->get( 'listErrorList', [] ), $error); |
|
430 | + $view->listErrorList = array_merge( $view->get( 'listErrorList', [] ), $error ); |
|
431 | 431 | } |
432 | 432 | catch( \Exception $e ) |
433 | 433 | { |
434 | 434 | $error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) ); |
435 | - $view->listErrorList = array_merge($view->get( 'listErrorList', [] ), $error); |
|
435 | + $view->listErrorList = array_merge( $view->get( 'listErrorList', [] ), $error ); |
|
436 | 436 | $this->logException( $e ); |
437 | 437 | } |
438 | 438 | } |
@@ -657,7 +657,7 @@ discard block |
||
657 | 657 | |
658 | 658 | if( $catids != null ) |
659 | 659 | { |
660 | - $controller = \Aimeos\Controller\Frontend::create( $context, 'catalog' )->uses($domains); |
|
660 | + $controller = \Aimeos\Controller\Frontend::create( $context, 'catalog' )->uses( $domains ); |
|
661 | 661 | $listCatPath = $controller->getPath( is_array( $catids ) ? reset( $catids ) : $catids ); |
662 | 662 | |
663 | 663 | if( ( $categoryItem = end( $listCatPath ) ) !== false ) { |
@@ -101,22 +101,22 @@ |
||
101 | 101 | catch( \Aimeos\Client\Html\Exception $e ) |
102 | 102 | { |
103 | 103 | $error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) ); |
104 | - $view->bulkErrorList = array_merge($view->get( 'bulkErrorList', [] ), $error); |
|
104 | + $view->bulkErrorList = array_merge( $view->get( 'bulkErrorList', [] ), $error ); |
|
105 | 105 | } |
106 | 106 | catch( \Aimeos\Controller\Frontend\Exception $e ) |
107 | 107 | { |
108 | 108 | $error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) ); |
109 | - $view->bulkErrorList = array_merge($view->get( 'bulkErrorList', [] ), $error); |
|
109 | + $view->bulkErrorList = array_merge( $view->get( 'bulkErrorList', [] ), $error ); |
|
110 | 110 | } |
111 | 111 | catch( \Aimeos\MShop\Exception $e ) |
112 | 112 | { |
113 | 113 | $error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
114 | - $view->bulkErrorList = array_merge($view->get( 'bulkErrorList', [] ), $error); |
|
114 | + $view->bulkErrorList = array_merge( $view->get( 'bulkErrorList', [] ), $error ); |
|
115 | 115 | } |
116 | 116 | catch( \Exception $e ) |
117 | 117 | { |
118 | 118 | $error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) ); |
119 | - $view->bulkErrorList = array_merge($view->get( 'bulkErrorList', [] ), $error); |
|
119 | + $view->bulkErrorList = array_merge( $view->get( 'bulkErrorList', [] ), $error ); |
|
120 | 120 | $this->logException( $e ); |
121 | 121 | } |
122 | 122 |
@@ -218,7 +218,7 @@ |
||
218 | 218 | |
219 | 219 | foreach( $map as $pos => $data ) |
220 | 220 | { |
221 | - $addrItem = ( !isset( $addrItems[$pos] ) ? $cntl->createAddressItem() : $addrItems[$pos] ); |
|
221 | + $addrItem = ( !isset( $addrItems[$pos] ) ? $cntl->createAddressItem() : $addrItems[$pos] ); |
|
222 | 222 | $cntl->addAddressItem( $addrItem->fromArray( $data ), $pos ); |
223 | 223 | unset( $addrItems[$pos] ); |
224 | 224 | } |