From 2038d7d00ae6428fd4aea976f275ff01924eecee Mon Sep 17 00:00:00 2001
From: Sergey Nezbritskiy <sergeyn@corra.com>
Date: Thu, 28 Mar 2019 10:23:27 +0200
Subject: [PATCH] Flush totalRecords when clearing data collection

---
 .../Entity/Collection/AbstractCollection.php  | 13 +-----------
 .../Adminhtml/Edit/Tab/View/CartTest.php      | 11 ----------
 .../Magento/Framework/Data/Collection.php     |  1 +
 .../Test/Unit/Data/CollectionTest.php         | 21 +++++++++++++++++++
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php b/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php
index dad420ea0b375..247ee2d5423cd 100644
--- a/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php
+++ b/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php
@@ -395,7 +395,7 @@ public function addAttributeToFilter($attribute, $condition = null, $joinType =
 
         if (!empty($conditionSql)) {
             $this->getSelect()->where($conditionSql, null, \Magento\Framework\DB\Select::TYPE_CONDITION);
-            $this->invalidateSize();
+            $this->_totalRecords = null;
         } else {
             throw new \Magento\Framework\Exception\LocalizedException(
                 __('Invalid attribute identifier for filter (%1)', get_class($attribute))
@@ -1720,15 +1720,4 @@ public function removeAllFieldsFromSelect()
         return $this->removeAttributeToSelect();
     }
 
-    /**
-     * Invalidates "Total Records Count".
-     * Invalidates saved "Total Records Count" attribute with last counting,
-     * so a next calling of method getSize() will query new total records count.
-     *
-     * @return void
-     */
-    private function invalidateSize(): void
-    {
-        $this->_totalRecords = null;
-    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/CartTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/CartTest.php
index 3bb10baff6572..396d3b60e4f20 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/CartTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/CartTest.php
@@ -100,15 +100,4 @@ public function testToHtmlCartItem()
         $this->assertContains('$10.00', $html);
         $this->assertContains('catalog/product/edit/id/1', $html);
     }
-
-    /**
-     * Verify that the customer has a single item in his cart.
-     *
-     * @magentoDataFixture Magento/Customer/_files/customer.php
-     * @magentoDataFixture Magento/Customer/_files/quote.php
-     */
-    public function testGetCollection()
-    {
-        $this->assertEquals(1, $this->block->getCollection()->getSize());
-    }
 }
diff --git a/lib/internal/Magento/Framework/Data/Collection.php b/lib/internal/Magento/Framework/Data/Collection.php
index dbafc9734e091..82f0ee1da464a 100644
--- a/lib/internal/Magento/Framework/Data/Collection.php
+++ b/lib/internal/Magento/Framework/Data/Collection.php
@@ -492,6 +492,7 @@ public function clear()
     {
         $this->_setIsLoaded(false);
         $this->_items = [];
+        $this->_totalRecords = null;
         return $this;
     }
 
diff --git a/lib/internal/Magento/Framework/Test/Unit/Data/CollectionTest.php b/lib/internal/Magento/Framework/Test/Unit/Data/CollectionTest.php
index 75f8b1cd0633f..913d5a577e62a 100644
--- a/lib/internal/Magento/Framework/Test/Unit/Data/CollectionTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/Data/CollectionTest.php
@@ -57,6 +57,27 @@ public function testWalk()
         );
     }
 
+    /**
+     * Ensure that getSize works correctly with clear
+     *
+     */
+    public function testClearTotalRecords()
+    {
+        $objOne = new \Magento\Framework\DataObject(['id' => 1, 'name' => 'one']);
+        $objTwo = new \Magento\Framework\DataObject(['id' => 2, 'name' => 'two']);
+        $objThree = new \Magento\Framework\DataObject(['id' => 3, 'name' => 'three']);
+
+        /** @noinspection PhpUnhandledExceptionInspection */
+        $this->collection->addItem($objOne);
+        /** @noinspection PhpUnhandledExceptionInspection */
+        $this->collection->addItem($objTwo);
+        /** @noinspection PhpUnhandledExceptionInspection */
+        $this->collection->addItem($objThree);
+        $this->assertEquals(3, $this->collection->getSize());
+        $this->collection->clear();
+        $this->assertEquals(0, $this->collection->getSize());
+    }
+
     /**
      * Callback function.
      *