ACPT-1194-part2 Resetting state in more Collection classes

People shouldn't be dependency injecting collection classes as if they were service classes.
But they do anyways!
So, we have to reset them.  :-(

Author: JacobBrownAustin

app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php

@@ -128,7 +128,6 @@ public function __construct(
             $metadataPool,
             $tableMaintainer
         );
-
         $this->stockItem = $stockItem
             ?? ObjectManager::getInstance()->get(\Magento\CatalogInventory\Model\ResourceModel\Stock\Item::class);
     }
@@ -145,6 +144,17 @@ protected function _construct()
         $this->_selectionTable = $this->getTable('catalog_product_bundle_selection');
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        parent::_resetState();
+        $this->itemPrototype = null;
+        $this->catalogRuleProcessor = null;
+        $this->websiteScopePriceJoined = false;
+    }
+
     /**
      * Set store id for each collection item when collection was loaded.
      * phpcs:disable Generic.CodeAnalysis.UselessOverridingMethod

app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php

@@ -137,6 +137,18 @@ protected function _construct()
         $this->_init(Category::class, \Magento\Catalog\Model\ResourceModel\Category::class);
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        parent::_resetState();
+        $this->_productTable = null;
+        $this->_productStoreId = null;
+        $this->_productWebsiteTable = null;
+        $this->_loadWithProductCount = false;
+    }
+
     /**
      * Add Id filter
      *

app/code/Magento/Catalog/Model/ResourceModel/Collection/AbstractCollection.php

@@ -76,6 +76,15 @@ public function __construct(
         );
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        parent::_resetState();
+        $this->_storeId = null;
+    }
+
     /**
      * Retrieve Entity Primary Key
      *

app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php

@@ -102,6 +102,11 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Collection\Abstrac
      */
     protected $_productLimitationFilters;
 
+    /**
+     * @var ProductLimitationFactory
+     */
+    private $productLimitationFactory;
+
     /**
      * Category product count select
      *
@@ -354,10 +359,10 @@ public function __construct(
         $this->_resourceHelper = $resourceHelper;
         $this->dateTime = $dateTime;
         $this->_groupManagement = $groupManagement;
-        $productLimitationFactory = $productLimitationFactory ?: ObjectManager::getInstance()->get(
+        $this->productLimitationFactory = $productLimitationFactory ?: ObjectManager::getInstance()->get(
             \Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory::class
         );
-        $this->_productLimitationFilters = $productLimitationFactory->create();
+        $this->_productLimitationFilters = $this->productLimitationFactory->create();
         $this->metadataPool = $metadataPool ?: ObjectManager::getInstance()->get(MetadataPool::class);
         parent::__construct(
             $entityFactory,
@@ -387,6 +392,36 @@ public function __construct(
             ->get(Gallery::class);
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        parent::_resetState();
+        $this->_flatEnabled = [];
+        $this->_initTables();
+        $this->_addUrlRewrite = false;
+        $this->_urlRewriteCategory = '';
+        $this->_addFinalPrice = false;
+        $this->_allIdsCache = null;
+        $this->_addTaxPercents = false;
+        $this->_productLimitationFilters = $this->productLimitationFactory->create();
+        $this->_productCountSelect = null;
+        $this->_isWebsiteFilter = false;
+        $this->_priceDataFieldFilters = [];
+        $this->_priceExpression = null;
+        $this->_additionalPriceExpression = null;
+        $this->_maxPrice = null;
+        $this->_minPrice = null;
+        $this->_priceStandardDeviation = null;
+        $this->_pricesCount = null;
+        $this->_catalogPreparePriceSelect = null;
+        $this->needToAddWebsiteNamesToResult = null;
+        $this->linkField = null;
+        $this->backend = null;
+        $this->emptyItem = null;
+    }
+
     /**
      * Get cloned Select after dispatching 'catalog_prepare_price_select' event
      *

app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php

@@ -180,6 +180,18 @@ protected function _construct()
     {
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        parent::_resetState();
+        $this->_itemsById = [];
+        $this->_staticFields = [];
+        $this->_entity = null;
+        $this->_reset();
+    }
+
     /**
      * Retrieve table name
      *
@@ -1597,14 +1609,12 @@ protected function _afterLoad()
     protected function _reset()
     {
         parent::_reset();
-
         $this->_selectEntityTypes = [];
         $this->_selectAttributes = [];
         $this->_filterAttributes = [];
         $this->_joinEntities = [];
         $this->_joinAttributes = [];
         $this->_joinFields = [];
-
         return $this;
     }
 

app/code/Magento/Review/Model/ResourceModel/Review/Product/Collection.php

@@ -159,6 +159,17 @@ protected function _construct()
         $this->_initTables();
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        parent::_resetState();
+        $this->_entitiesAlias = [];
+        $this->_addStoreDataFlag = false;
+        $this->_storesIds = [];
+    }
+
     /**
      * Initialize select
      *

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

@@ -125,14 +125,12 @@ public function __construct(
     public function _resetState(): void
     {
         parent::_resetState();
-        $this->setConnection($this->_conn);
+        $this->_reset();
         $this->_idFieldName = null;
         $this->_bindParams = [];
-        $this->_data = null;
         $this->map = null;
         $this->_fetchStmt = null;
         $this->_isOrdersRendered = false;
-        $this->extensionAttributesJoinProcessor = null;
     }
 
     /**