ACPT-1327

No longer resetting _idFieldName or _map.
Also adding reset for Eav/Model/ResourceModel/Form/Attribute/Collection

Author: JacobBrownAustin

app/code/Magento/Cms/Model/ResourceModel/Block/Collection.php

@@ -54,16 +54,6 @@ protected function _construct()
         $this->_map['fields']['block_id'] = 'main_table.block_id';
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function _resetState(): void
-    {
-        parent::_resetState();
-        $this->_map['fields']['store'] = 'store_table.store_id';
-        $this->_map['fields']['block_id'] = 'main_table.block_id';
-    }
-
     /**
      * Returns pairs block_id - title
      *

app/code/Magento/Cms/Model/ResourceModel/Page/Collection.php

@@ -47,16 +47,6 @@ protected function _construct()
         $this->_map['fields']['store'] = 'store_table.store_id';
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function _resetState(): void
-    {
-        parent::_resetState();
-        $this->_map['fields']['page_id'] = 'main_table.page_id';
-        $this->_map['fields']['store'] = 'store_table.store_id';
-    }
-
     /**
      * Set first store flag
      *

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

@@ -96,6 +96,16 @@ protected function _construct()
         }
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        parent::_resetState();
+        $this->_store = null;
+        $this->_entityType = null;
+    }
+
     /**
      * Get EAV website table
      *

app/code/Magento/Newsletter/Model/ResourceModel/Queue/Collection.php

@@ -67,15 +67,6 @@ protected function _construct()
         $this->_init(\Magento\Newsletter\Model\Queue::class, \Magento\Newsletter\Model\ResourceModel\Queue::class);
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function _resetState(): void
-    {
-        parent::_resetState();
-        $this->_map['fields']['queue_id'] = 'main_table.queue_id';
-    }
-
     /**
      * Joins templates information
      *

app/code/Magento/Newsletter/Model/ResourceModel/Subscriber/Collection.php

@@ -106,22 +106,6 @@ protected function _construct()
         $this->_map['fields']['store_id'] = 'main_table.store_id';
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function _resetState(): void
-    {
-        parent::_resetState();
-        $this->_map['fields']['type'] = $this->getResource()->getConnection()->getCheckSql(
-            'main_table.customer_id = 0',
-            1,
-            2
-        );
-        $this->_map['fields']['website_id'] = 'store.website_id';
-        $this->_map['fields']['group_id'] = 'store.group_id';
-        $this->_map['fields']['store_id'] = 'main_table.store_id';
-    }
-
     /**
      * Set loading mode subscribers by queue
      *

app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php

@@ -96,15 +96,6 @@ protected function _construct()
         $this->_map['fields']['rule_id'] = 'main_table.rule_id';
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function _resetState(): void
-    {
-        parent::_resetState();
-        $this->_map['fields']['rule_id'] = 'main_table.rule_id';
-    }
-
     /**
      * Map data for associated entities
      *

lib/internal/Magento/Framework/Data/Collection/AbstractDb.php

@@ -127,10 +127,10 @@ public function _resetState(): void
     {
         parent::_resetState();
         $this->setConnection($this->_conn);
-        $this->_idFieldName = null;
+        // Note: not resetting _idFieldName because some subclasses define it class property
         $this->_bindParams = [];
         $this->_data = null;
-        $this->_map = null;
+        // Note: not resetting _map because some subclasses define it class property but not _construct method.
         $this->_fetchStmt = null;
         $this->_isOrdersRendered = false;
         $this->extensionAttributesJoinProcessor = null;