Fix ActiveDataProviderTest::testPaginationBeforeModels

yiisoft · Nov 17, 2023 · 4a7639a · 4a7639a
1 parent 7fa103c
commit 4a7639a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/framework/data/BaseDataProvider.php b/framework/data/BaseDataProvider.php
@@ -210,16 +210,15 @@ public function getPagination()
     public function setPagination($value)
     {
         if (is_array($value)) {
-            $config = [
-                'class' => Pagination::className(),
-                'totalCount' => $this->getTotalCount(),
-            ];
+            $config = ['class' => Pagination::className()];
             if ($this->id !== null) {
                 $config['pageParam'] = $this->id . '-page';
                 $config['pageSizeParam'] = $this->id . '-per-page';
             }
-            $this->_pagination = Yii::createObject(array_merge($config, $value));
-        } elseif ($value instanceof Pagination || $value === false) {
+            $value = Yii::createObject(array_merge($config, $value));
+        }
+        if ($value instanceof Pagination || $value === false) {
+            $value->totalCount = $this->getTotalCount();
             $this->_pagination = $value;
         } else {
             throw new InvalidArgumentException('Only Pagination instance, configuration array or false is allowed.');

diff --git a/tests/framework/data/ActiveDataProviderTest.php b/tests/framework/data/ActiveDataProviderTest.php
@@ -170,9 +170,8 @@ public function testPaginationBeforeModels()
             'query' => $query->from('order')->orderBy('id'),
         ]);
         $pagination = $provider->getPagination();
-        $this->assertEquals(0, $pagination->getPageCount());
-        $this->assertCount(3, $provider->getModels());
         $this->assertEquals(1, $pagination->getPageCount());
+        $this->assertCount(3, $provider->getModels());
 
         $provider->getPagination()->pageSize = 2;
         $this->assertCount(3, $provider->getModels());