Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce into MAGETWO-49154-updated

Author: slopukhov

app/code/Magento/Catalog/Controller/Adminhtml/Product/AddAttributeToTemplate.php

@@ -19,6 +19,7 @@
 use Magento\Framework\Api\SortOrderBuilder;
 use Magento\Framework\Exception\LocalizedException;
 use Psr\Log\LoggerInterface;
+use Magento\Framework\Api\ExtensionAttributesFactory;
 
 /**
  * Class AddAttributeToTemplate
@@ -72,6 +73,11 @@ class AddAttributeToTemplate extends \Magento\Catalog\Controller\Adminhtml\Produ
      */
     protected $logger;
 
+    /**
+     * @var ExtensionAttributesFactory
+     */
+    protected $extensionAttributesFactory;
+
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param Builder $productBuilder
@@ -84,6 +90,7 @@ class AddAttributeToTemplate extends \Magento\Catalog\Controller\Adminhtml\Produ
      * @param SortOrderBuilder $sortOrderBuilder
      * @param AttributeManagementInterface $attributeManagement
      * @param LoggerInterface $logger
+     * @param ExtensionAttributesFactory $extensionAttributesFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -97,7 +104,8 @@ public function __construct(
         SearchCriteriaBuilder $searchCriteriaBuilder,
         SortOrderBuilder $sortOrderBuilder,
         AttributeManagementInterface $attributeManagement,
-        LoggerInterface $logger
+        LoggerInterface $logger,
+        ExtensionAttributesFactory $extensionAttributesFactory
     ) {
         parent::__construct($context, $productBuilder);
         $this->resultJsonFactory = $resultJsonFactory;
@@ -109,6 +117,7 @@ public function __construct(
         $this->sortOrderBuilder = $sortOrderBuilder;
         $this->attributeManagement = $attributeManagement;
         $this->logger = $logger;
+        $this->extensionAttributesFactory = $extensionAttributesFactory;
     }
 
     /**
@@ -153,10 +162,14 @@ public function execute()
                 $attributeGroup = $this->attributeGroupFactory->create();
             }
 
-            $attributeGroup->setAttributeGroupCode($groupCode);
-            $attributeGroup->setSortOrder($groupSortOrder);
+            $extensionAttributes = $attributeGroup->getExtensionAttributes()
+                ?: $this->extensionAttributesFactory->create(AttributeGroupInterface::class);
+
+            $extensionAttributes->setAttributeGroupCode($groupCode);
+            $extensionAttributes->setSortOrder($groupSortOrder);
             $attributeGroup->setAttributeGroupName($groupName);
             $attributeGroup->setAttributeSetId($attributeSet->getAttributeSetId());
+            $attributeGroup->setExtensionAttributes($extensionAttributes);
 
             $this->attributeGroupRepository->save($attributeGroup);
 

app/code/Magento/Eav/Api/Data/AttributeGroupInterface.php

@@ -10,12 +10,10 @@
 interface AttributeGroupInterface extends ExtensibleDataInterface
 {
     const GROUP_ID = 'attribute_group_id';
+
     const GROUP_NAME = 'attribute_group_name';
+
     const ATTRIBUTE_SET_ID = 'attribute_set_id';
-    const SORT_ORDER = 'sort_order';
-    const DEFAULT_ID = 'default_id';
-    const ATTRIBUTE_GROUP_CODE = 'attribute_group_code';
-    const SCOPE_CODE = 'tab_group_code';
 
     /**
      * Retrieve id
@@ -62,66 +60,6 @@ public function getAttributeSetId();
      */
     public function setAttributeSetId($attributeSetId);
 
-    /**
-     * Retrieve sort order
-     *
-     * @return int
-     */
-    public function getSortOrder();
-
-    /**
-     * Set sort order
-     *
-     * @param int $sortOrder
-     * @return $this
-     */
-    public function setSortOrder($sortOrder);
-
-    /**
-     * Retrieve default ID
-     *
-     * @return int
-     */
-    public function getDefaultId();
-
-    /**
-     * Set default ID
-     *
-     * @param int $defaultId
-     * @return $this
-     */
-    public function setDefaultId($defaultId);
-
-    /**
-     * Retrieve attribute group code
-     *
-     * @return string
-     */
-    public function getAttributeGroupCode();
-
-    /**
-     * Set attribute group code
-     *
-     * @param string $attributeGroupCode
-     * @return $this
-     */
-    public function setAttributeGroupCode($attributeGroupCode);
-
-    /**
-     * Retrieve scope code
-     *
-     * @return string
-     */
-    public function getScopeCode();
-
-    /**
-     * Set scope code
-     *
-     * @param string $scopeCode
-     * @return $this
-     */
-    public function setScopeCode($scopeCode);
-
     /**
      * Retrieve existing extension attributes object.
      *

app/code/Magento/Eav/Model/Attribute/GroupRepository.php

@@ -199,12 +199,12 @@ protected function retrieveAttributeSetIdFromSearchCriteria(
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return null|string
      */
-    protected function retrieveAttributeGroupCodeFromSearchCriteria(
+    private function retrieveAttributeGroupCodeFromSearchCriteria(
         \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
     ) {
         foreach ($searchCriteria->getFilterGroups() as $group) {
             foreach ($group->getFilters() as $filter) {
-                if ($filter->getField() == 'attribute_group_code') {
+                if ($filter->getField() === 'attribute_group_code') {
                     return $filter->getValue();
                 }
             }

app/code/Magento/Eav/Model/Entity/Attribute/Group.php

@@ -13,6 +13,14 @@
  *
  * @method \Magento\Eav\Model\ResourceModel\Entity\Attribute\Group _getResource()
  * @method \Magento\Eav\Model\ResourceModel\Entity\Attribute\Group getResource()
+ * @method int getSortOrder()
+ * @method \Magento\Eav\Model\Entity\Attribute\Group setSortOrder(int $value)
+ * @method int getDefaultId()
+ * @method \Magento\Eav\Model\Entity\Attribute\Group setDefaultId(int $value)
+ * @method string getAttributeGroupCode()
+ * @method \Magento\Eav\Model\Entity\Attribute\Group setAttributeGroupCode(string $value)
+ * @method string getTabGroupCode()
+ * @method \Magento\Eav\Model\Entity\Attribute\Group setTabGroupCode(string $value)
  */
 class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
     \Magento\Eav\Api\Data\AttributeGroupInterface
@@ -164,70 +172,6 @@ public function setAttributeSetId($attributeSetId)
         return $this->setData(self::ATTRIBUTE_SET_ID, $attributeSetId);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getSortOrder()
-    {
-        return $this->getData(self::SORT_ORDER);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setSortOrder($sortOrder)
-    {
-        return $this->setData(self::SORT_ORDER, $sortOrder);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getDefaultId()
-    {
-        return $this->getData(self::DEFAULT_ID);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setDefaultId($defaultId)
-    {
-        return $this->setData(self::DEFAULT_ID, $defaultId);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getAttributeGroupCode()
-    {
-        return $this->getData(self::ATTRIBUTE_GROUP_CODE);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setAttributeGroupCode($attributeGroupCode)
-    {
-        return $this->setData(self::ATTRIBUTE_GROUP_CODE, $attributeGroupCode);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getScopeCode()
-    {
-        return $this->getData(self::SCOPE_CODE);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setScopeCode($scopeCode)
-    {
-        return $this->setData(self::SCOPE_CODE, $scopeCode);
-    }
-
     /**
      * {@inheritdoc}
      *

app/code/Magento/Eav/etc/extension_attributes.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Api/etc/extension_attributes.xsd">
+    <extension_attributes for="Magento\Eav\Api\Data\AttributeGroupInterface">
+        <attribute code="attribute_group_code" type="string" />
+        <attribute code="sort_order" type="string" />
+    </extension_attributes>
+</config>

dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeGroupRepositoryTest.php

@@ -165,11 +165,7 @@ protected function createGroupData($attributeSetId)
     {
         return [
             'attribute_group_name' => 'empty_attribute_group',
-            'attribute_set_id' => $attributeSetId,
-            'sort_order' => 10,
-            'default_id' => 5,
-            'attribute_group_code' => 'empty_attribute_group',
-            'scope_code' => 'default_tab',
+            'attribute_set_id' => $attributeSetId
         ];
     }