From d409248d850d2118370e1d8f102c60dda10f3e64 Mon Sep 17 00:00:00 2001 From: Julian van Drielen Date: Sat, 2 Jun 2018 14:37:59 +0200 Subject: [PATCH 1/3] Added Magento\Framework\Api\MetadataObjectInterface to extends of Magento\Eav\Api\Data\AttributeInterface as suggested by vkublytskyi --- app/code/Magento/Eav/Api/Data/AttributeInterface.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Eav/Api/Data/AttributeInterface.php b/app/code/Magento/Eav/Api/Data/AttributeInterface.php index c8c72ed509559..6be6bfea47b09 100644 --- a/app/code/Magento/Eav/Api/Data/AttributeInterface.php +++ b/app/code/Magento/Eav/Api/Data/AttributeInterface.php @@ -10,7 +10,7 @@ * Interface AttributeInterface * @api */ -interface AttributeInterface extends \Magento\Framework\Api\CustomAttributesDataInterface +interface AttributeInterface extends \Magento\Framework\Api\CustomAttributesDataInterface, \Magento\Framework\Api\MetadataObjectInterface { const ATTRIBUTE_ID = 'attribute_id'; From 90f37dce6c35d17537ed4efc73e3bbb3b8901967 Mon Sep 17 00:00:00 2001 From: cream-julian <35022803+cream-julian@users.noreply.github.com> Date: Sat, 2 Jun 2018 17:04:50 +0200 Subject: [PATCH 2/3] MEQP | Forward pull for issue 4803 2.1->2.2 --- app/code/Magento/Eav/Api/Data/AttributeInterface.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Eav/Api/Data/AttributeInterface.php b/app/code/Magento/Eav/Api/Data/AttributeInterface.php index 6be6bfea47b09..15b37e9586d50 100644 --- a/app/code/Magento/Eav/Api/Data/AttributeInterface.php +++ b/app/code/Magento/Eav/Api/Data/AttributeInterface.php @@ -10,7 +10,9 @@ * Interface AttributeInterface * @api */ -interface AttributeInterface extends \Magento\Framework\Api\CustomAttributesDataInterface, \Magento\Framework\Api\MetadataObjectInterface +interface AttributeInterface extends + \Magento\Framework\Api\CustomAttributesDataInterface, + \Magento\Framework\Api\MetadataObjectInterface { const ATTRIBUTE_ID = 'attribute_id'; From b064cd77d9f763d0e997af93619840836f9efb70 Mon Sep 17 00:00:00 2001 From: Vishal Gelani Date: Sat, 9 Jun 2018 15:00:40 +0530 Subject: [PATCH 3/3] Fixed white space issue at end of line --- app/code/Magento/Eav/Api/Data/AttributeInterface.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Eav/Api/Data/AttributeInterface.php b/app/code/Magento/Eav/Api/Data/AttributeInterface.php index 15b37e9586d50..aafc7293d13cc 100644 --- a/app/code/Magento/Eav/Api/Data/AttributeInterface.php +++ b/app/code/Magento/Eav/Api/Data/AttributeInterface.php @@ -10,8 +10,8 @@ * Interface AttributeInterface * @api */ -interface AttributeInterface extends - \Magento\Framework\Api\CustomAttributesDataInterface, +interface AttributeInterface extends + \Magento\Framework\Api\CustomAttributesDataInterface, \Magento\Framework\Api\MetadataObjectInterface { const ATTRIBUTE_ID = 'attribute_id';