MAGETWO-51943: Required varchar and text EAV Attributes Can be Saved as Empty String

Author: Alex Akimov

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

@@ -593,15 +593,13 @@ protected function _getDefaultSourceModel()
      */
     public function isValueEmpty($value)
     {
-        $attrType = $this->getBackend()->getType();
-        $isEmpty = (is_array($value) && count($value) == 0) ||
-            $value === null ||
-            $value === false && $attrType != 'int' ||
-            $value === '' && ($attrType == 'int' ||
-            $attrType == 'decimal' ||
-            $attrType == 'datetime');
-
-        return $isEmpty;
+        /** @var array $emptyStringTypes list of attribute types that treat empty string as a possible value */
+        $emptyStringTypes = ['int', 'decimal', 'datetime', 'varchar', 'text'];
+        $attributeType = $this->getBackend()->getType();
+        return (is_array($value) && count($value) == 0)
+            || $value === null
+            || ($value === false && $attributeType != 'int')
+            || ($value === '' && in_array($attributeType, $emptyStringTypes));
     }
 
     /**

app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/AbstractAttributeTest.php

@@ -175,4 +175,59 @@ public function testGetValidationRulesWhenRuleIsEmpty()
 
         $this->assertEquals([], $model->getValidationRules());
     }
+
+    /**
+     * @param bool $isEmpty
+     * @param mixed $value
+     * @param string $attributeType
+     * @dataProvider attributeValueDataProvider
+     */
+    public function testIsValueEmpty($isEmpty, $value, $attributeType)
+    {
+        /** @var \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $model */
+        $model = $this->getMockForAbstractClass(
+            '\Magento\Eav\Model\Entity\Attribute\AbstractAttribute',
+            [],
+            '',
+            false,
+            false,
+            true,
+            [
+                'getBackend'
+            ]
+        );
+        $backendModelMock = $this->getMockForAbstractClass(
+            '\Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend',
+            [],
+            '',
+            false,
+            false,
+            true,
+            [
+                'getType'
+            ]
+        );
+        $backendModelMock->expects($this->any())->method('getType')->willReturn($attributeType);
+        $model->expects($this->once())->method('getBackend')->willReturn($backendModelMock);
+        $this->assertEquals($isEmpty, $model->isValueEmpty($value));
+    }
+
+    /**
+     * @return array
+     */
+    public function attributeValueDataProvider()
+    {
+        return [
+            [true, '', 'int'],
+            [true, '', 'decimal'],
+            [true, '', 'datetime'],
+            [true, '', 'varchar'],
+            [true, '', 'text'],
+            [true, null, 'varchar'],
+            [true, [], 'varchar'],
+            [true, false, 'varchar'],
+            [false, 'not empty value', 'varchar'],
+            [false, false, 'int'],
+        ];
+    }
 }