From 0c1e697d1d35b32c0c58ec878d3f4b2a08534d5d Mon Sep 17 00:00:00 2001
From: Yuxing Zheng <yuxzheng@ebay.com>
Date: Mon, 30 Mar 2015 17:31:09 -0500
Subject: [PATCH] MAGETWO-35610: Merge and Fix Tests
- Code style changes to fix L3
---
app/code/Magento/Email/Test/Unit/Model/TemplateTest.php | 3 ++-
app/code/Magento/GiftMessage/Model/Plugin/OrderSave.php | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/app/code/Magento/Email/Test/Unit/Model/TemplateTest.php b/app/code/Magento/Email/Test/Unit/Model/TemplateTest.php
index b566f172ea9..c18cab16cf5 100644
--- a/app/code/Magento/Email/Test/Unit/Model/TemplateTest.php
+++ b/app/code/Magento/Email/Test/Unit/Model/TemplateTest.php
@@ -542,7 +542,8 @@ class TemplateTest extends \PHPUnit_Framework_TestCase
'templateType' => \Magento\Framework\App\TemplateTypesInterface::TYPE_HTML,
'templateStyles' => '.body { color: orange }',
'templateText' => 'template text',
- 'expectedResult' => '<style type="text/css">' . "\n.body { color: orange }\n</style>\n" . 'template text',
+ 'expectedResult' =>
+ '<style type="text/css">' . "\n.body { color: orange }\n</style>\n" . 'template text',
],
];
}
diff --git a/app/code/Magento/GiftMessage/Model/Plugin/OrderSave.php b/app/code/Magento/GiftMessage/Model/Plugin/OrderSave.php
index eb378122ad1..a35cd8028fa 100644
--- a/app/code/Magento/GiftMessage/Model/Plugin/OrderSave.php
+++ b/app/code/Magento/GiftMessage/Model/Plugin/OrderSave.php
@@ -61,7 +61,7 @@ class OrderSave
*/
protected function saveOrderGiftMessage(\Magento\Sales\Api\Data\OrderInterface $order)
{
- if (!is_null($order->getExtensionAttributes())) {
+ if (null !== ($order->getExtensionAttributes())) {
/* @var \Magento\GiftMessage\Api\Data\MessageInterface $giftMessage */
$giftMessage = $order->getExtensionAttributes()->getGiftMessage();
try {
@@ -84,7 +84,7 @@ class OrderSave
if (null !== $order->getItems()) {
/** @var \Magento\Sales\Api\Data\OrderItemInterface $orderItem */
foreach ($order->getItems() as $orderItem) {
- if (!is_null($orderItem->getExtensionAttributes())) {
+ if (null !== ($orderItem->getExtensionAttributes())) {
/* @var \Magento\GiftMessage\Api\Data\MessageInterface $giftMessage */
$giftMessage = $orderItem->getExtensionAttributes()->getGiftMessage();
try {
--
GitLab