From 3aaf4479cea34b7e77f62a0bd1077169a0352b5b Mon Sep 17 00:00:00 2001 From: Nathan Date: Wed, 10 Jun 2020 10:23:45 +1000 Subject: [PATCH] PHP 7.4 --- .travis.yml | 2 ++ tests/GridFieldConfigurablePaginatorTest.php | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 403c77a..3941a76 100644 --- 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 index d61aba6..fdc7493 100644 --- a/tests/GridFieldConfigurablePaginatorTest.php +++ b/tests/GridFieldConfigurablePaginatorTest.php @@ -205,9 +205,9 @@ class GridFieldConfigurablePaginatorTest extends SapphireTest ) ); - $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);