Merge pull request #17 from mikemix/php8

Allow php 8.0
mikemix · Oct 31, 2020 · 5f049a8 · 5f049a8
2 parents b8adf9d + 4b68f87
commit 5f049a8
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,7 @@ php:
   - 7.2
   - 7.3
   - 7.4
+  - nightly
 
 env:
   - DEPS=lowest

diff --git a/composer.json b/composer.json
@@ -2,14 +2,14 @@
   "name": "mikemix/tactician-module",
   "description": "Laminas Module to use the League of Extraordinary Packages' Tactician library - flexible command bus implementation",
   "require": {
-    "php": "^7.1",
+    "php": "^7.1 || ^8.0",
     "league/tactician": "^1.0",
     "laminas/laminas-mvc": "^3.1.1",
     "psr/container": "^1.0"
   },
   "require-dev": {
     "league/tactician-doctrine": "^1.0",
-    "phpunit/phpunit": "^7.5.20",
+    "phpunit/phpunit": "^7.5.20 || ^9.3.8",
     "doctrine/orm": "^2.5"
   },
   "keywords": [

diff --git a/test/Factory/CommandBusFactoryTest.php b/test/Factory/CommandBusFactoryTest.php
@@ -17,7 +17,7 @@ class CommandBusFactoryTest extends TestCase
     /** @var CommandBusFactory */
     private $factory;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->serviceLocator = new ServiceManager();
         $this->factory = new CommandBusFactory();

diff --git a/test/Factory/InMemoryLocatorFactoryTest.php b/test/Factory/InMemoryLocatorFactoryTest.php
@@ -18,7 +18,7 @@ class InMemoryLocatorFactoryTest extends TestCase
      */
     protected $factory;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->serviceLocator = new ServiceManager();
         $this->serviceLocator->setService('config', [

diff --git a/test/Factory/Plugin/DoctrineTransactionFactoryTest.php b/test/Factory/Plugin/DoctrineTransactionFactoryTest.php
@@ -15,7 +15,7 @@ class DoctrineTransactionFactoryTest extends TestCase
     /** @var DoctrineTransactionFactory */
     private $factory;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->container = $this->getMockBuilder(ContainerInterface::class)
             ->getMock();

diff --git a/test/Locator/ClassnameLaminasLocatorTest.php b/test/Locator/ClassnameLaminasLocatorTest.php
@@ -22,7 +22,7 @@ class ClassnameLaminasLocatorTest extends TestCase
      */
     private $locator;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->container = $this->getMockBuilder(ContainerInterface::class)
             ->getMock();

diff --git a/test/Locator/LaminasLocatorTest.php b/test/Locator/LaminasLocatorTest.php
@@ -20,7 +20,7 @@ class LaminasLocatorTest extends TestCase
      */
     private $locator;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->container = $this->getMockBuilder(ContainerInterface::class)
             ->getMock();

diff --git a/test/ModuleTest.php b/test/ModuleTest.php
@@ -11,8 +11,7 @@ class ModuleTest extends TestCase
     public function testConfig()
     {
         $module = new Module();
-
-        $this->assertInternalType('array', $module->getConfig());
+        $this->assertIsArray($module->getConfig());
     }
 
     public function testCreateCommandBusWithServiceManager()