MAGETWO-57934: [GitHub] Can't use "configurable" as group name in attribute sets M2.1 #6123

Author: eugene-petrov

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

@@ -45,8 +45,8 @@ class Group extends \Magento\Framework\Model\AbstractExtensibleModel implements
      * @param \Magento\Framework\Filter\Translit $translitFilter
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
-     * @param array $reservedSystemNames (optional)
      * @param array $data (optional)
+     * @param array $reservedSystemNames (optional)
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -56,8 +56,8 @@ public function __construct(
         \Magento\Framework\Filter\Translit $translitFilter,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $reservedSystemNames = [],
-        array $data = []
+        array $data = [],
+        array $reservedSystemNames = []
     ) {
         parent::__construct(
             $context,
@@ -66,7 +66,6 @@ public function __construct(
             $customAttributeFactory,
             $resource,
             $resourceCollection,
-            $reservedSystemNames,
             $data
         );
         $this->reservedSystemNames = $reservedSystemNames;