From 4c1989ee90e2cde19cb71445f4c07dd19f8f7b3a Mon Sep 17 00:00:00 2001
From: Julian van Drielen <julian@cream.nl>
Date: Sat, 2 Jun 2018 16:09:07 +0200
Subject: [PATCH 1/4] Forward pull for issue 4803 2.1->2.2

---
 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 9664cabc79ba0..b7c0f435a8fc2 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 215be5a9d10ec81d243b3a2225c45264632176ef Mon Sep 17 00:00:00 2001
From: Vishal Gelani <vishalgelani99@gmail.com>
Date: Sat, 9 Jun 2018 14:58:49 +0530
Subject: [PATCH 2/4] Fixed coding standard error

---
 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 b7c0f435a8fc2..b011304580c06 100644
--- a/app/code/Magento/Eav/Api/Data/AttributeInterface.php
+++ b/app/code/Magento/Eav/Api/Data/AttributeInterface.php
@@ -11,7 +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';
 

From 2639d0ec3ae7b0b2952f9fa1fd3f0f2d73f761c1 Mon Sep 17 00:00:00 2001
From: Vishal Gelani <vishalgelani99@gmail.com>
Date: Sat, 23 Jun 2018 14:36:14 +0530
Subject: [PATCH 3/4] Update AttributeInterface.php

---
 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 b011304580c06..1e87622244619 100644
--- a/app/code/Magento/Eav/Api/Data/AttributeInterface.php
+++ b/app/code/Magento/Eav/Api/Data/AttributeInterface.php
@@ -11,8 +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';
 

From 43dd85edfb856bca5fb3fdd6d11cdaec00cc96eb Mon Sep 17 00:00:00 2001
From: Vlad Veselov <orlangur@users.noreply.github.com>
Date: Fri, 3 Aug 2018 02:58:17 +0300
Subject: [PATCH 4/4] Fix coding style violations

---
 app/code/Magento/Eav/Api/Data/AttributeInterface.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Eav/Api/Data/AttributeInterface.php b/app/code/Magento/Eav/Api/Data/AttributeInterface.php
index 1e87622244619..49da8f24a6201 100644
--- a/app/code/Magento/Eav/Api/Data/AttributeInterface.php
+++ b/app/code/Magento/Eav/Api/Data/AttributeInterface.php
@@ -1,18 +1,19 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Eav\Api\Data;
 
+use Magento\Framework\Api\CustomAttributesDataInterface;
+use Magento\Framework\Api\MetadataObjectInterface;
+
 /**
  * Interface AttributeInterface
  * @api
  * @since 100.0.2
  */
-interface AttributeInterface extends \Magento\Framework\Api\CustomAttributesDataInterface,
-    \Magento\Framework\Api\MetadataObjectInterface
+interface AttributeInterface extends CustomAttributesDataInterface, MetadataObjectInterface
 {
     const ATTRIBUTE_ID = 'attribute_id';