ACPT-1194-part2

Reset Validators
DON'T reset EAV's Attribute/Collection

Author: JacobBrownAustin

app/code/Magento/Eav/Model/ResourceModel/Attribute/Collection.php

@@ -64,6 +64,15 @@ public function __construct(
         parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $eavConfig, $connection, $resource);
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        /* Note: because Eav attribute loading takes significant performance,
+        we are not resetting it like other collections. */
+    }
+
     /**
      * Default attribute entity type code
      *

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

@@ -69,6 +69,18 @@ public function __construct(
         $this->ignoredAttributesByTypesList = $ignoredAttributesByTypesList;
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        parent::_resetState();
+        $this->_attributes = [];
+        $this->allowedAttributesList = [];
+        $this->deniedAttributesList = [];
+        $this->_data = [];
+    }
+
     /**
      * Set list of attributes for validation in isValid method.
      *

lib/internal/Magento/Framework/Validator/AbstractValidator.php

@@ -6,6 +6,7 @@
 namespace Magento\Framework\Validator;
 
 use Laminas\Validator\Translator\TranslatorInterface;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 
 /**
  * Abstract validator class.
@@ -14,7 +15,7 @@
  * @api
  * @since 100.0.2
  */
-abstract class AbstractValidator implements ValidatorInterface
+abstract class AbstractValidator implements ValidatorInterface, ResetAfterRequestInterface
 {
     /**
      * @var TranslatorInterface|null
@@ -31,6 +32,15 @@ abstract class AbstractValidator implements ValidatorInterface
      */
     protected $_messages = [];
 
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->_translator = null;
+        $this->_messages = [];
+    }
+
     /**
      * Set default translator instance
      *