Merge pull request #201 from MidnightDesign/patch-1

Allow PHP 8
maglnet · Jan 18, 2021 · 2a3c2de · 2a3c2de
2 parents 48bcb51 + 57ed1dc
commit 2a3c2de
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 17 deletions.
diff --git a/.github/workflows/phar-creation.yml b/.github/workflows/phar-creation.yml
@@ -17,6 +17,7 @@ jobs:
                     - "locked"
                 php-version:
                     - "7.4"
+                    - "8.0"
                 operating-system:
                     - "ubuntu-latest"
 
@@ -65,5 +66,5 @@ jobs:
             - name: "Upload phar file artifact"
               uses: actions/upload-artifact@v2
               with:
-                  name: composer-require-checker.phar
+                  name: composer-require-checker-${{ matrix.php-version }}.phar
                   path: build/composer-require-checker.phar
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -22,6 +22,7 @@ jobs:
                     - "locked"
                 php-version:
                     - "7.4"
+                    - "8.0"
                 operating-system:
                     - "ubuntu-latest"
                     - "windows-latest"

diff --git a/composer.json b/composer.json
@@ -26,14 +26,14 @@
         }
     ],
     "require": {
-        "php": "7.4.*",
+        "php": "^7.4 || ^8.0",
         "ext-json": "*",
         "ext-phar": "*",
         "composer-runtime-api": "^2.0.0",
         "nikic/php-parser": "^4.10.2",
         "symfony/console": "^5.1.8",
         "webmozart/assert": "^1.9.1",
-        "webmozart/glob": "^4.1.0"
+        "webmozart/glob": "^4.2.0"
     },
     "require-dev": {
         "ext-zend-opcache": "*",

diff --git a/composer.lock b/composer.lock