MAGETWO-35610: Merge and Fix Tests

marcozheng · marcozheng · commit 9ac81f9c6635 · 2015-03-30T18:02:37.000-05:00
- Additional code style changes to fix L3
diff --git a/app/code/Magento/GiftMessage/Model/Plugin/OrderSave.php b/app/code/Magento/GiftMessage/Model/Plugin/OrderSave.php
@@ -95,7 +95,8 @@ protected function saveOrderItemGiftMessage(\Magento\Sales\Api\Data\OrderInterfa
                         );
                     } catch (\Exception $e) {
                         throw new CouldNotSaveException(
-                            __('Could not add gift message to order\'s item: "%1"', $e->getMessage()), $e
+                            __('Could not add gift message to order\'s item: "%1"', $e->getMessage()),
+                            $e
                         );
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,8 @@ protected function saveOrderItemGiftMessage(\Magento\Sales\Api\Data\OrderInterfa`
`95`	`95`	`);`
`96`	`96`	`} catch (\Exception $e) {`
`97`	`97`	`throw new CouldNotSaveException(`
`98`		`- __('Could not add gift message to order\'s item: "%1"', $e->getMessage()), $e`
	`98`	`+ __('Could not add gift message to order\'s item: "%1"', $e->getMessage()),`
	`99`	`+ $e`
`99`	`100`	`);`
`100`	`101`	`}`
`101`	`102`	`}`