ACPT-1360

Fixing resetState methods so that the object's state is the same as it was when first constructed

Author: JacobBrownAustin

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

@@ -81,8 +81,8 @@ public function __construct(
      */
     public function _resetState(): void
     {
-        parent::_resetState();
         $this->_storeId = null;
+        parent::_resetState();
     }
 
     /**

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

@@ -397,7 +397,6 @@ public function __construct(
      */
     public function _resetState(): void
     {
-        parent::_resetState();
         $this->_flatEnabled = [];
         $this->_addUrlRewrite = false;
         $this->_urlRewriteCategory = '';
@@ -419,7 +418,7 @@ public function _resetState(): void
         $this->linkField = null;
         $this->backend = null;
         $this->emptyItem = null;
-        $this->_construct();
+        parent::_resetState();
     }
 
     /**

app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php

@@ -224,13 +224,13 @@ public function __construct(
      */
     public function _resetState(): void
     {
-        parent::_resetState();
         $this->queryText = null;
         $this->search = null;
         $this->searchCriteriaBuilder = null;
         $this->searchResult = null;
         $this->filterBuilder = null;
         $this->searchOrders = null;
+        parent::_resetState();
     }
 
     /**

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

@@ -186,7 +186,6 @@ protected function _construct()
      */
     public function _resetState(): void
     {
-        parent::_resetState();
         $this->_itemsById = [];
         $this->_staticFields = [];
         $this->_entity = null;
@@ -196,6 +195,11 @@ public function _resetState(): void
         $this->_joinEntities = [];
         $this->_joinAttributes = [];
         $this->_joinFields = [];
+        parent::_resetState();
+        $this->_construct();
+        $this->setConnection($this->getEntity()->getConnection());
+        $this->_prepareStaticFields();
+        $this->_initSelect();
     }
 
     /**

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

@@ -101,9 +101,9 @@ protected function _construct()
      */
     public function _resetState(): void
     {
-        parent::_resetState();
         $this->_store = null;
         $this->_entityType = null;
+        parent::_resetState();
     }
 
     /**

app/code/Magento/Reports/Model/ResourceModel/Report/Collection.php

@@ -55,7 +55,7 @@ class Collection extends \Magento\Framework\Data\Collection
     protected $_reports;
 
     /**
-     * Page size
+     * Page size|null
      *
      * @var int
      */
@@ -100,6 +100,15 @@ public function __construct(
         parent::__construct($entityFactory);
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->_pageSize = null;
+        parent::_resetState();
+    }
+
     /**
      * Set period
      *

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

@@ -933,7 +933,7 @@ public function __wakeup()
     public function _resetState(): void
     {
         $this->clear();
-        // TODO: Is it safe to move the following into clear() ?
+        $this->_isCollectionLoaded = null;
         $this->_orders = [];
         $this->_filters = [];
         $this->_isFiltersRendered = false;

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

@@ -151,17 +151,12 @@ protected function _construct() //phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
     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();
     }

lib/internal/Magento/Framework/View/Asset/Repository.php

@@ -50,12 +50,12 @@ class Repository implements ResetAfterRequestInterface
     private $assetSource;
 
     /**
-     * @var \Magento\Framework\View\Asset\ContextInterface[]
+     * @var \Magento\Framework\View\Asset\ContextInterface[]|null
      */
     private $fallbackContext;
 
     /**
-     * @var \Magento\Framework\View\Asset\ContextInterface[]
+     * @var \Magento\Framework\View\Asset\ContextInterface[]|null
      */
     private $fileContext;
 
@@ -475,7 +475,7 @@ private function getRepositoryFilesMap($fileId, array $params)
      */
     public function _resetState(): void
     {
-        $this->fallbackContext = [];
-        $this->fileContext = [];
+        $this->fallbackContext = null;
+        $this->fileContext = null;
     }
 }