Merge pull request #90 from doctrine/1.1.x

greg0ire · web-flow · commit 28ffe8e19f0e · 2022-08-16T21:48:35.000+02:00
Merge 1.1.x up into 1.2.x
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -26,6 +26,7 @@ jobs:
           - "7.3"
           - "7.4"
           - "8.0"
+          - "8.1"
 
     steps:
       - name: "Checkout code"
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 /.phpcs-cache
 vendor/
 vendor-bin/**/vendor
+vendor-bin/phpunit/composer.lock
diff --git a/vendor-bin/phpunit/composer.json b/vendor-bin/phpunit/composer.json
@@ -1,11 +1,8 @@
 {
     "require": {
-        "phpunit/phpunit": "^7.0 || 8.0"
+        "phpunit/phpunit": "^7.0 || 8.0 || 9.5"
     },
     "config": {
-        "sort-packages": true,
-        "platform": {
-            "php": "7.1.0"
-        }
+        "sort-packages": true
     }
 }
diff --git a/vendor-bin/phpunit/composer.lock b/vendor-bin/phpunit/composer.lock

-Original file line number
+Diff line change
           - "7.3"
           - "7.4"
           - "8.0"
 +          - "8.1"
     steps:
       - name: "Checkout code"