From 19ca0905ae81d9d32ae5aa1f56e38b31b1bf7cd0 Mon Sep 17 00:00:00 2001 From: Julian van Drielen Date: Sat, 2 Jun 2018 17:00:31 +0200 Subject: [PATCH 1/4] Forward pull for issue 4803 2.1->2.3 --- 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 e8970d2b42149..e9ca06d716b28 100644 --- a/app/code/Magento/Eav/Api/Data/AttributeInterface.php +++ b/app/code/Magento/Eav/Api/Data/AttributeInterface.php @@ -11,7 +11,7 @@ * @api * @since 100.0.2 */ -interface AttributeInterface extends \Magento\Framework\Api\CustomAttributesDataInterface +interface AttributeInterface extends \Magento\Framework\Api\CustomAttributesDataInterface, \Magento\Framework\Api\MetadataObjectInterface { const ATTRIBUTE_ID = 'attribute_id'; From 4e51e9c056f29318564dd50ce293a9cedc84bbf1 Mon Sep 17 00:00:00 2001 From: Julian van Drielen Date: Sat, 2 Jun 2018 17:01:45 +0200 Subject: [PATCH 2/4] MEQP | Forward pull for issue 4803 2.1->2.3 --- 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 e9ca06d716b28..ef51215c39a6b 100644 --- a/app/code/Magento/Eav/Api/Data/AttributeInterface.php +++ b/app/code/Magento/Eav/Api/Data/AttributeInterface.php @@ -11,7 +11,9 @@ * @api * @since 100.0.2 */ -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 a8dc518ecd77b813ff79e8fb864c9cb4b01456e9 Mon Sep 17 00:00:00 2001 From: Julian van Drielen Date: Sat, 2 Jun 2018 23:35:41 +0200 Subject: [PATCH 3/4] MEQP | Forward pull for issue 4803 2.1->2.3 --- app/code/Magento/Eav/Api/Data/AttributeInterface.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/code/Magento/Eav/Api/Data/AttributeInterface.php b/app/code/Magento/Eav/Api/Data/AttributeInterface.php index ef51215c39a6b..3932222e6d575 100644 --- a/app/code/Magento/Eav/Api/Data/AttributeInterface.php +++ b/app/code/Magento/Eav/Api/Data/AttributeInterface.php @@ -11,10 +11,8 @@ * @api * @since 100.0.2 */ -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'; const IS_UNIQUE = 'is_unique'; From 40f046ef08df02f4c145e9bbe2ec11ac9eb47ae9 Mon Sep 17 00:00:00 2001 From: Julian van Drielen Date: Mon, 4 Jun 2018 10:17:28 +0200 Subject: [PATCH 4/4] MEQP | Forward pull for issue 4803 2.1->2.3 --- app/code/Magento/Eav/Api/Data/AttributeInterface.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Eav/Api/Data/AttributeInterface.php b/app/code/Magento/Eav/Api/Data/AttributeInterface.php index 3932222e6d575..8386ab33ab34f 100644 --- a/app/code/Magento/Eav/Api/Data/AttributeInterface.php +++ b/app/code/Magento/Eav/Api/Data/AttributeInterface.php @@ -12,7 +12,8 @@ * @since 100.0.2 */ interface AttributeInterface extends \Magento\Framework\Api\CustomAttributesDataInterface, - \Magento\Framework\Api\MetadataObjectInterface { + \Magento\Framework\Api\MetadataObjectInterface +{ const ATTRIBUTE_ID = 'attribute_id'; const IS_UNIQUE = 'is_unique';