From 2dd4b18a810b629b187fb99d92e6d0646018b33e Mon Sep 17 00:00:00 2001
From: Farhad Safarov <farhad.safarov@gmail.com>
Date: Tue, 8 Dec 2020 12:45:11 +0300
Subject: [PATCH] [internal] allow development on php8 (#114)

---
 .github/workflows/integrate.yaml         | 9 +++++----
 .gitignore                               | 1 +
 composer.json                            | 6 +++---
 tests/unit/Symfony/ContainerMetaTest.php | 4 ++--
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
index b99e0cb..6070f26 100644
--- a/.github/workflows/integrate.yaml
+++ b/.github/workflows/integrate.yaml
@@ -17,8 +17,9 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - 7.4
           - 7.3
+          - 7.4
+          - 8.0
 
         dependencies:
           - highest
@@ -73,7 +74,7 @@ jobs:
         php-version:
           - 7.3
           - 7.4
-          - nightly
+          - 8.0
 
         symfony-version:
           - 3
@@ -81,8 +82,8 @@ jobs:
           - 5
 
         exclude:
-          - php-version: 7.1
-            symfony-version: 5
+          - php-version: 8.0
+            symfony-version: 3
 
     steps:
       - name: "Checkout"
diff --git a/.gitignore b/.gitignore
index 714e4e0..f9e6148 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ composer.lock
 .php_cs.cache
 tests/_run
 /.idea
+/.phpunit.result.cache
diff --git a/composer.json b/composer.json
index 587c975..b9ad836 100644
--- a/composer.json
+++ b/composer.json
@@ -16,8 +16,8 @@
         "vimeo/psalm": "^4.0"
     },
     "require-dev": {
-        "doctrine/orm": "^2.7",
-        "phpunit/phpunit": "~7.5",
+        "doctrine/orm": "^2.8",
+        "phpunit/phpunit": "~7.5 || ~9.5",
         "symfony/cache-contracts": "^1.0 || ^2.0",
         "symfony/console": "*",
         "symfony/messenger": "^4.2 || ^5.0",
@@ -25,7 +25,7 @@
         "symfony/serializer": "^4.0 || ^5.0",
         "symfony/validator": "*",
         "twig/twig": "^2.10 || ^3.0",
-        "weirdan/codeception-psalm-module": "~0.9"
+        "weirdan/codeception-psalm-module": "^0.13.1"
     },
     "autoload": {
         "psr-4": {
diff --git a/tests/unit/Symfony/ContainerMetaTest.php b/tests/unit/Symfony/ContainerMetaTest.php
index 472006e..f0378ea 100644
--- a/tests/unit/Symfony/ContainerMetaTest.php
+++ b/tests/unit/Symfony/ContainerMetaTest.php
@@ -18,12 +18,12 @@ class ContainerMetaTest extends TestCase
      */
     private $containerMeta;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->containerMeta = new ContainerMeta([__DIR__.'/../../acceptance/container.xml']);
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         unset($this->containerMeta);
     }