aimeos / ai-controller-frontend

controller/frontend/tests/Controller/Frontend/Basket/StandardTest.php

Braces +4 added lines, -8 removed lines

@@ -359,8 +359,7 @@ 
 		{
 			$this->object->addProduct( $item->getId(), 5, array(), array(), array(), array(), array(), 'unit_warehouse3' );
 			throw new \Exception( 'Expected exception not thrown' );
-		}
-		catch( \Aimeos\Controller\Frontend\Basket\Exception $e )
+		} catch( \Aimeos\Controller\Frontend\Basket\Exception $e )
 		{
 			$item = $this->object->get()->getProduct( 0 );
 			$this->assertEquals( 3, $item->getQuantity() );
@@ -385,8 +384,7 @@ 
 		{
 			$this->object->addProduct( $item->getId(), 5, array(), array(), array(), array(), array(), 'unit_warehouse2' );
 			throw new \Exception( 'Expected exception not thrown' );
-		}
-		catch( \Aimeos\Controller\Frontend\Basket\Exception $e )
+		} catch( \Aimeos\Controller\Frontend\Basket\Exception $e )
 		{
 			$this->assertEquals( array(), $this->object->get()->getProducts() );
 		}
@@ -619,8 +617,7 @@ 
 		{
 			$this->object->editProduct( 0, 5 );
 			throw new \Exception( 'Expected exception not thrown' );
-		}
-		catch( \Aimeos\Controller\Frontend\Basket\Exception $e )
+		} catch( \Aimeos\Controller\Frontend\Basket\Exception $e )
 		{
 			$item = $this->object->get()->getProduct( 0 );
 			$this->assertEquals( 3, $item->getQuantity() );
@@ -657,8 +654,7 @@ 
 		{
 			$this->object->editProduct( $pos, 5 );
 			throw new \Exception( 'Expected exception not thrown' );
-		}
-		catch( \Aimeos\Controller\Frontend\Basket\Exception $e )
+		} catch( \Aimeos\Controller\Frontend\Basket\Exception $e )
 		{
 			$this->assertEquals( 3, $this->object->get()->getProduct( $pos )->getQuantity() );
 		}

controller/frontend/src/Controller/Frontend/Service/Standard.php

Braces +1 added lines, -2 removed lines

@@ -67,8 +67,7 @@
 				} else {
 					unset( $this->items[$type][$id] );
 				}
-			}
-			catch( \Aimeos\MShop\Service\Exception $e )
+			} catch( \Aimeos\MShop\Service\Exception $e )
 			{
 				$msg = sprintf( 'Unable to create provider "%1$s" for service with ID "%2$s"', $service->getCode(), $id );
 				$this->getContext()->getLogger()->log( $msg, \Aimeos\MW\Logger\Base::WARN );

controller/frontend/src/Controller/Frontend/Basket/Standard.php

Braces +13 added lines, -18 removed lines

@@ -288,17 +288,14 @@ 
 		{
 			$address->copyFrom( $value );
 			$this->basket->setAddress( $address, $type );
-		}
-		else if( is_array( $value ) )
+		} else if( is_array( $value ) )
 		{
 			$this->setAddressFromArray( $address, $value );
 			$this->basket->setAddress( $address, $type );
-		}
-		else if( $value === null )
+		} else if( $value === null )
 		{
 			$this->basket->deleteAddress( $type );
-		}
-		else
+		} else
 		{
 			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Invalid value for address type "%1$s"', $type ) );
 		}
@@ -564,8 +561,7 @@ 
 			{
 				$this->setAddress( $type, $item->toArray() );
 				$basket->deleteAddress( $type );
-			}
-			catch( \Exception $e )
+			} catch( \Exception $e )
 			{
 				$logger = $this->getContext()->getLogger();
 				$str = 'Error migrating address with type "%1$s" in basket to locale "%2$s": %3$s';
@@ -594,8 +590,7 @@ 
 			{
 				$this->addCoupon( $code );
 				$basket->deleteCoupon( $code, true );
-			}
-			catch( \Exception $e )
+			} catch( \Exception $e )
 			{
 				$logger = $this->getContext()->getLogger();
 				$str = 'Error migrating coupon with code "%1$s" in basket to locale "%2$s": %3$s';
@@ -644,8 +639,7 @@ 
 				);
 
 				$basket->deleteProduct( $pos );
-			}
-			catch( \Exception $e )
+			} catch( \Exception $e )
 			{
 				$code = $product->getProductCode();
 				$logger = $this->getContext()->getLogger();
@@ -680,8 +674,7 @@ 
 
 				$this->setService( $type, $item->getServiceId(), $attributes );
 				$basket->deleteService( $type );
-			}
-			catch( \Exception $e ) {; } // Don't notify the user as appropriate services can be added automatically
+			} catch( \Exception $e ) {; } // Don't notify the user as appropriate services can be added automatically
 		}
 
 		return $errors;
@@ -1087,10 +1080,11 @@ 
 		{
 			$msg = sprintf( 'No unique article found for selected attributes and product ID "%1$s"', $productItem->getId() );
 			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
-		}
-		else if( ( $result = reset( $productItems ) ) !== false ) // count == 1
+		} else if( ( $result = reset( $productItems ) ) !== false ) {
+			// count == 1
 		{
 			$productItem = $result;
+		}
 			$orderBaseProductItem->setProductCode( $productItem->getCode() );
 
 			$subprices = $productItem->getRefItems( 'price', 'default', 'default' );
@@ -1110,10 +1104,11 @@ 
 
 				$attr[] = $orderAttributeItem;
 			}
-		}
-		else if( !isset( $options['variant'] ) || $options['variant'] != false ) // count == 0
+		} else if( !isset( $options['variant'] ) || $options['variant'] != false ) {
+			// count == 0
 		{
 			$msg = sprintf( 'No article found for selected attributes and product ID "%1$s"', $productItem->getId() );
+		}
 			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
 		}