Merge branch 'phar-io:master' into master

danedane13 · Dec 5, 2024 · 9cb89c5 · 9cb89c5
2 parents c250ed6 + 9187251
commit 9cb89c5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
@@ -64,6 +64,7 @@ jobs:
           - "8.1"
           - "8.2"
           - "8.3"
+          - "8.4"
 
     env:
       PHP_EXTENSIONS: "dom, curl, gnupg, mbstring"
@@ -125,6 +126,7 @@ jobs:
           - "8.1"
           - "8.2"
           - "8.3"
+          - "8.4"
 
     env:
       PHP_EXTENSIONS: "dom, curl, gnupg, mbstring"

diff --git a/composer.json b/composer.json
@@ -29,7 +29,7 @@
     "phar-io/version": "^3.0.3"
   },
   "require-dev": {
-    "mikey179/vfsstream": "^1.6.4"
+    "mikey179/vfsstream": "^1.6.12"
   },
   "suggest": {
     "ext-gnupg": "*",

diff --git a/composer.lock b/composer.lock
-Original file line number
+Diff line change
@@ Expand Up / @@ -64,6 +64,7 @@ jobs: @@
               - "8.1"
               - "8.2"
               - "8.3"
+              - "8.4"
         env:
           PHP_EXTENSIONS: "dom, curl, gnupg, mbstring"
@@ Expand Down Expand Up / @@ -125,6 +126,7 @@ jobs: @@
               - "8.1"
               - "8.2"
               - "8.3"
+              - "8.4"
         env:
           PHP_EXTENSIONS: "dom, curl, gnupg, mbstring"
@@ Expand Down @@