ACPT-1194 ... part2

Now making all Collections reset after request... WOW!

Author: JacobBrownAustin

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

@@ -58,6 +58,16 @@ 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

@@ -51,6 +51,16 @@ 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/Customer/Model/ResourceModel/Address/Grid/Collection.php

@@ -94,6 +94,15 @@ public function __construct(
         );
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        parent::_resetState();
+        $this->_idFieldName = 'entity_id';
+    }
+
     /**
      * @inheritdoc
      */

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

@@ -69,6 +69,15 @@ 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

@@ -107,6 +107,22 @@ 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,6 +96,15 @@ 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/Api/SearchCriteriaBuilder.php

@@ -9,7 +9,6 @@
 namespace Magento\Framework\Api;
 
 use Magento\Framework\Api\Search\FilterGroupBuilder;
-use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 
 /**
  * Builder for SearchCriteria Service Data Object

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

@@ -933,5 +933,12 @@ public function __wakeup()
     public function _resetState(): void
     {
         $this->clear();
+        // TODO: Is it safe to move the following into clear() ?
+        $this->_orders = [];
+        $this->_filters = [];
+        $this->_isFiltersRendered = false;
+        $this->_curPage = 1;
+        $this->_pageSize = false;
+        $this->_flags = [];
     }
 }

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

@@ -119,6 +119,22 @@ public function __construct(
         $this->_logger = $logger;
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        parent::_resetState();
+        $this->setConnection($this->_conn);
+        $this->_idFieldName = null;
+        $this->_bindParams = [];
+        $this->_data = null;
+        $this->map = null;
+        $this->_fetchStmt = null;
+        $this->_isOrdersRendered = false;
+        $this->extensionAttributesJoinProcessor = null;
+    }
+
     /**
      * Get resource instance.
      *

lib/internal/Magento/Framework/Model/ResourceModel/Db/Collection/AbstractCollection.php

@@ -145,6 +145,27 @@ protected function _construct() //phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
     {
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        parent::_resetState();
+        $this->_model = null;
+        $this->_resourceModel = null;
+        $this->_fieldsToSelect = null;
+        $this->expressionFieldsToSelect = [];
+        $this->_initialFieldsToSelect = null;
+        $this->_fieldsToSelectChanged = false;
+        $this->_joinedTables = [];
+        $this->_mainTable = null;
+        $this->_resetItemsDataChanged = false;
+        $this->_eventPrefix = '';
+        $this->_eventObject = '';
+        $this->_construct();
+        $this->_initSelect();
+    }
+
     /**
      * Retrieve main table
      *