Merge pull request #46 from WyriHaximus/add-php-8-support

Add PHP 8 support
WyriHaximus · Nov 25, 2020 · d01d59a · d01d59a
2 parents e651cf4 + 04970d5
commit d01d59a
Show file tree

Hide file tree

Showing 4 changed files with 877 additions and 425 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,12 +12,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [7.4]
+        php: [7.4, 8.0-rc]
         composer: [lowest, current, highest]
     needs: lint
     runs-on: ubuntu-latest
     container:
-      image: wyrihaximusnet/php:${{ matrix.php }}-zts-alpine3.11-dev-root
+      image: wyrihaximusnet/php:${{ matrix.php }}-nts-alpine3.12-dev-root
     steps:
       - uses: actions/checkout@v1
       - name: Cache composer packages
@@ -38,13 +38,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [7.4]
+        php: [7.4, 8.0-rc]
         composer: [lowest, current, highest]
-        qa: [lint, cs, stan, psalm, unit-ci, infection, composer-require-checker, composer-unused, backward-compatibility-check]
+        qa: [lint, cs, stan, psalm, unit, infection, composer-require-checker, composer-unused, backward-compatibility-check]
     needs: composer-install
     runs-on: ubuntu-latest
     container:
-      image: wyrihaximusnet/php:${{ matrix.php }}-zts-alpine3.11-dev-root
+      image: wyrihaximusnet/php:${{ matrix.php }}-nts-alpine3.12-dev-root
     steps:
       - uses: actions/checkout@v1
       - name: Cache composer packages

diff --git a/composer.json b/composer.json
@@ -9,13 +9,13 @@
         }
     ],
     "require": {
-        "php": "^7.4",
+        "php": "^8 || ^7.4",
         "doctrine/instantiator": "^1.0.5",
         "thecodingmachine/safe": "^1.1",
         "wyrihaximus/json-utilities": "^1.2"
     },
     "require-dev": {
-        "wyrihaximus/test-utilities": "^2.5"
+        "wyrihaximus/test-utilities": "^3.3.1"
     },
     "config": {
         "platform": {