Completed
Push — master ( 8086a8...921503 )
by Aimeos
01:52
created
controller/frontend/src/Controller/Frontend/Catalog/Decorator/Base.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -278,7 +278,7 @@
 block discarded – undo
278 278
 	/**
279 279
 	 * Returns the frontend controller
280 280
 	 *
281
-	 * @return \Aimeos\Controller\Frontend\Catalog\Iface Frontend controller object
281
+	 * @return \Aimeos\Controller\Frontend\Iface Frontend controller object
282 282
 	 */
283 283
 	protected function getController()
284 284
 	{
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Order/Decorator/Base.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -152,7 +152,7 @@
 block discarded – undo
152 152
 	/**
153 153
 	 * Returns the frontend controller
154 154
 	 *
155
-	 * @return \Aimeos\Controller\Frontend\Order\Iface Frontend controller object
155
+	 * @return \Aimeos\Controller\Frontend\Iface Frontend controller object
156 156
 	 */
157 157
 	protected function getController()
158 158
 	{
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Service/Decorator/Base.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -128,7 +128,7 @@
 block discarded – undo
128 128
 	/**
129 129
 	 * Returns the frontend controller
130 130
 	 *
131
-	 * @return \Aimeos\Controller\Frontend\Service\Iface Frontend controller object
131
+	 * @return \Aimeos\Controller\Frontend\Iface Frontend controller object
132 132
 	 */
133 133
 	protected function getController()
134 134
 	{
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Attribute/Decorator/Base.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -128,7 +128,7 @@
 block discarded – undo
128 128
 	/**
129 129
 	 * Returns the frontend controller
130 130
 	 *
131
-	 * @return \Aimeos\Controller\Frontend\Attribute\Iface Frontend controller object
131
+	 * @return \Aimeos\Controller\Frontend\Iface Frontend controller object
132 132
 	 */
133 133
 	protected function getController()
134 134
 	{
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Stock/Decorator/Base.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -140,7 +140,7 @@
 block discarded – undo
140 140
 	/**
141 141
 	 * Returns the frontend controller
142 142
 	 *
143
-	 * @return \Aimeos\Controller\Frontend\Stock\Iface Frontend controller object
143
+	 * @return \Aimeos\Controller\Frontend\Iface Frontend controller object
144 144
 	 */
145 145
 	protected function getController()
146 146
 	{
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Locale/Decorator/Base.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -104,7 +104,7 @@
 block discarded – undo
104 104
 	/**
105 105
 	 * Returns the frontend controller
106 106
 	 *
107
-	 * @return \Aimeos\Controller\Frontend\Locale\Iface Frontend controller object
107
+	 * @return \Aimeos\Controller\Frontend\Iface Frontend controller object
108 108
 	 */
109 109
 	protected function getController()
110 110
 	{
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Customer/Decorator/Base.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -231,7 +231,7 @@
 block discarded – undo
231 231
 	/**
232 232
 	 * Returns the frontend controller
233 233
 	 *
234
-	 * @return \Aimeos\Controller\Frontend\Customer\Iface Frontend controller object
234
+	 * @return \Aimeos\Controller\Frontend\Iface Frontend controller object
235 235
 	 * @since 2017.04
236 236
 	 */
237 237
 	protected function getController()
Please login to merge, or discard this patch.
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 2 patches
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.
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -410,16 +410,13 @@
 block discarded – undo
410 410
 		if( $value instanceof \Aimeos\MShop\Common\Item\Address\Iface )
411 411
 		{
412 412
 			$this->get()->setAddress( $address->copyFrom( $value ), $type );
413
-		}
414
-		else if( is_array( $value ) )
413
+		} else if( is_array( $value ) )
415 414
 		{
416 415
 			$this->get()->setAddress( $this->setAddressFromArray( $address, $value ), $type );
417
-		}
418
-		else if( $value === null )
416
+		} else if( $value === null )
419 417
 		{
420 418
 			$this->get()->deleteAddress( $type );
421
-		}
422
-		else
419
+		} else
423 420
 		{
424 421
 			$msg = $context->getI18n()->dt( 'controller/frontend', 'Invalid value for address type "%1$s"' );
425 422
 			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( $msg, $type ) );
Please login to merge, or discard this patch.