From cecca326e465e04596f107da97b72552b4be3e7e Mon Sep 17 00:00:00 2001 From: Nathan Date: Wed, 10 Jun 2020 10:23:13 +1000 Subject: [PATCH] PHP 7.4 --- .travis.yml | 2 ++ tests/QueuedJobsAdminTest.php | 2 +- tests/QueuedJobsTest.php | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3986b521..3f3be125 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,8 @@ matrix: env: DB=MYSQL RECIPE_VERSION=4.5.x-dev PHPUNIT_TEST=1 - php: 7.3 env: DB=MYSQL RECIPE_VERSION=4.x-dev PHPUNIT_TEST=1 + - php: 7.4 + env: DB=MYSQL RECIPE_VERSION=4.x-dev PHPUNIT_TEST=1 before_script: - phpenv rehash diff --git a/tests/QueuedJobsAdminTest.php b/tests/QueuedJobsAdminTest.php index 4ff8b349..db84c668 100644 --- a/tests/QueuedJobsAdminTest.php +++ b/tests/QueuedJobsAdminTest.php @@ -53,7 +53,7 @@ protected function setUp() Injector::inst()->registerService($request, HTTPRequest::class); $this->admin->setRequest($request); - $mockQueue = $this->createMock(QueuedJobService::class); + $mockQueue = @$this->createMock(QueuedJobService::class); $this->admin->jobQueue = $mockQueue; $this->logInWithPermission('ADMIN'); diff --git a/tests/QueuedJobsTest.php b/tests/QueuedJobsTest.php index 5238ae25..382a4d24 100644 --- a/tests/QueuedJobsTest.php +++ b/tests/QueuedJobsTest.php @@ -42,7 +42,7 @@ protected function setUp() // Allow large memory limit in cases of integration tests Config::modify()->set(QueuedJobService::class, 'memory_limit', 2 * 1024 * 1024 * 1024); - Injector::inst()->registerService($this->createMock(LoggerInterface::class), LoggerInterface::class); + Injector::inst()->registerService(@$this->createMock(LoggerInterface::class), LoggerInterface::class); Config::modify()->set(QueuedJobService::class, 'use_shutdown_function', false);