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

PHP 7.4
symbiote · Jun 10, 2020 · aa9e2be · aa9e2be
2 parents ca269d0 + cecca32
commit aa9e2be
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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);