Completed
Push — master ( 8bb0eb...f332f4 )
by Aimeos
04:25
created
controller/frontend/src/Controller/Frontend/Basket/Standard.php 1 patch
Braces   +10 added lines, -12 removed lines patch added patch discarded remove patch
@@ -296,17 +296,14 @@  discard block
 block discarded – undo
296 296
 		{
297 297
 			$address->copyFrom( $value );
298 298
 			$this->basket->setAddress( $address, $type );
299
-		}
300
-		else if( is_array( $value ) )
299
+		} else if( is_array( $value ) )
301 300
 		{
302 301
 			$this->setAddressFromArray( $address, $value );
303 302
 			$this->basket->setAddress( $address, $type );
304
-		}
305
-		else if( $value === null )
303
+		} else if( $value === null )
306 304
 		{
307 305
 			$this->basket->deleteAddress( $type );
308
-		}
309
-		else
306
+		} else
310 307
 		{
311 308
 			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Invalid value for address type "%1$s"', $type ) );
312 309
 		}
@@ -446,8 +443,7 @@  discard block
 block discarded – undo
446 443
 					$orderBaseProductItem->setQuantity( $stocklevel );
447 444
 					$this->get()->addProduct( $orderBaseProductItem, $position );
448 445
 				}
449
-			}
450
-			catch( \Aimeos\MShop\Order\Exception $e ) {} // hide error if product position changed by plugin
446
+			} catch( \Aimeos\MShop\Order\Exception $e ) {} // hide error if product position changed by plugin
451 447
 		}
452 448
 
453 449
 		if( $stocklevel !== null && $stocklevel < $quantity )
@@ -596,10 +592,11 @@  discard block
 block discarded – undo
596 592
 		{
597 593
 			$msg = sprintf( 'No unique article found for selected attributes and product ID "%1$s"', $productItem->getId() );
598 594
 			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
599
-		}
600
-		else if( ( $result = reset( $productItems ) ) !== false ) // count == 1
595
+		} else if( ( $result = reset( $productItems ) ) !== false ) {
596
+			// count == 1
601 597
 		{
602 598
 			$productItem = $result;
599
+		}
603 600
 			$orderBaseProductItem->setProductCode( $productItem->getCode() );
604 601
 
605 602
 			$subprices = $productItem->getRefItems( 'price', 'default', 'default' );
@@ -619,10 +616,11 @@  discard block
 block discarded – undo
619 616
 
620 617
 				$attr[] = $orderAttributeItem;
621 618
 			}
622
-		}
623
-		else if( !isset( $options['variant'] ) || $options['variant'] != false ) // count == 0
619
+		} else if( !isset( $options['variant'] ) || $options['variant'] != false ) {
620
+			// count == 0
624 621
 		{
625 622
 			$msg = sprintf( 'No article found for selected attributes and product ID "%1$s"', $productItem->getId() );
623
+		}
626 624
 			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
627 625
 		}
628 626
 
Please login to merge, or discard this patch.