Merge remote-tracking branch 'mpi/MAGETWO-99140' into PR-05-29-2019

Author: Spandana Chittimala

app/code/Magento/Eav/Model/Validator/Attribute/Code.php

@@ -7,6 +7,7 @@
 
 namespace Magento\Eav\Model\Validator\Attribute;
 
+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
 use Magento\Eav\Model\Entity\Attribute;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Validator\AbstractValidator;
@@ -65,6 +66,16 @@ public function isValid($attributeCode): bool
             );
         }
 
+        /**
+         * Check attribute_code for prohibited prefix
+         */
+        if (strpos($attributeCode, AbstractModifier::CONTAINER_PREFIX) === 0) {
+            $errorMessages[] = __(
+                '"%1" prefix is reserved by the system and cannot be used in attribute code names.',
+                AbstractModifier::CONTAINER_PREFIX
+            );
+        }
+
         $this->_addMessages($errorMessages);
 
         return !$this->hasMessages();

app/code/Magento/Eav/Test/Unit/Model/Validator/Attribute/CodeTest.php

@@ -61,7 +61,10 @@ public function isValidDataProvider(): array
             ], [
                 'more_than_60_chars_more_than_60_chars_more_than_60_chars_more',
                 false
-            ]
+            ], [
+                'container_attribute',
+                false,
+            ],
         ];
     }
 }