Completed
Push — master ( ac3c49...e09568 )
by Aimeos
02:38
created
controller/frontend/src/Controller/Frontend/Basket/Iface.php 1 patch
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -150,7 +150,6 @@
 block discarded – undo
150 150
 	 * Adds the delivery/payment service item based on the service ID.
151 151
 	 *
152 152
 	 * @param string $type Service type code like 'payment' or 'delivery'
153
-	 * @param string $id|null Unique ID of the service item or null to remove it
154 153
 	 * @param array $attributes Associative list of key/value pairs containing the attributes selected or
155 154
 	 * 	entered by the customer when choosing one of the delivery or payment options
156 155
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If there is no price to the service item attached
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Basket/Standard.php 1 patch
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -455,7 +455,6 @@
 block discarded – undo
455 455
 	 * Adds the delivery/payment service item based on the service ID.
456 456
 	 *
457 457
 	 * @param string $type Service type code like 'payment' or 'delivery'
458
-	 * @param string $id|null Unique ID of the service item or null to remove it
459 458
 	 * @param array $attributes Associative list of key/value pairs containing the attributes selected or
460 459
 	 * 	entered by the customer when choosing one of the delivery or payment options
461 460
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If there is no price to the service item attached
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Basket/Base.php 1 patch
Braces   +4 added lines, -8 removed lines patch added patch discarded remove patch
@@ -225,8 +225,7 @@  discard block
 block discarded – undo
225 225
 			{
226 226
 				$this->setAddress( $type, $item->toArray() );
227 227
 				$basket->deleteAddress( $type );
228
-			}
229
-			catch( \Exception $e )
228
+			} catch( \Exception $e )
230 229
 			{
231 230
 				$logger = $this->getContext()->getLogger();
232 231
 				$str = 'Error migrating address with type "%1$s" in basket to locale "%2$s": %3$s';
@@ -255,8 +254,7 @@  discard block
 block discarded – undo
255 254
 			{
256 255
 				$this->addCoupon( $code );
257 256
 				$basket->deleteCoupon( $code, true );
258
-			}
259
-			catch( \Exception $e )
257
+			} catch( \Exception $e )
260 258
 			{
261 259
 				$logger = $this->getContext()->getLogger();
262 260
 				$str = 'Error migrating coupon with code "%1$s" in basket to locale "%2$s": %3$s';
@@ -305,8 +303,7 @@  discard block
 block discarded – undo
305 303
 				);
306 304
 
307 305
 				$basket->deleteProduct( $pos );
308
-			}
309
-			catch( \Exception $e )
306
+			} catch( \Exception $e )
310 307
 			{
311 308
 				$code = $product->getProductCode();
312 309
 				$logger = $this->getContext()->getLogger();
@@ -344,8 +341,7 @@  discard block
 block discarded – undo
344 341
 
345 342
 					$this->addService( $type, $item->getServiceId(), $attributes );
346 343
 					$basket->deleteService( $type );
347
-				}
348
-				catch( \Exception $e ) { ; } // Don't notify the user as appropriate services can be added automatically
344
+				} catch( \Exception $e ) { ; } // Don't notify the user as appropriate services can be added automatically
349 345
 			}
350 346
 		}
351 347
 
Please login to merge, or discard this patch.