Merge pull request symbiote#310 from symbiote/nglasl-patch-1

PHP 7.4
ntd · Jun 10, 2020 · 306ad52 · 306ad52
2 parents 5024b93 + 3aaf447
commit 306ad52
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,6 +22,8 @@ matrix:
       env: DB=MYSQL PHPUNIT_TEST=1 PHPCS_TEST=1 RECIPE_VERSION="^4"
     - php: 7.3
       env: DB=MYSQL PHPUNIT_COVERAGE_TEST=1 RECIPE_VERSION="4.x-dev"
+    - php: 7.4
+      env: DB=MYSQL PHPUNIT_COVERAGE_TEST=1 RECIPE_VERSION="4.x-dev"
 
 before_script:
   - phpenv rehash

diff --git a/tests/GridFieldConfigurablePaginatorTest.php b/tests/GridFieldConfigurablePaginatorTest.php
@@ -205,9 +205,9 @@ public function testGetPagerActions()
             )
         );
 
-        $gridField = $this->getMockBuilder(GridField::class)->disableOriginalConstructor()->getMock();
         $paginator = new GridFieldConfigurablePaginator;
-        $result = $paginator->getPagerActions($controls, $gridField);
+        $paginator->setGridField($this->gridField);
+        $result = $paginator->getPagerActions($controls, $this->gridField);
 
         $this->assertCount(2, $result);
         $this->assertArrayHasKey('next', $result);