Merge pull request ampproject#7897 from ampproject/fix/php84

Improve PHP 8.4 compatibility
rtCamp · Nov 4, 2024 · 7b016fa · 7b016fa
2 parents 60a655c + d1e4a50
commit 7b016fa
Show file tree

Hide file tree

Showing 16 changed files with 330 additions and 280 deletions.
diff --git a/.github/workflows/build-test-measure.yml b/.github/workflows/build-test-measure.yml
diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
     "ext-json": "*",
     "ext-libxml": "*",
     "ext-spl": "*",
-    "ampproject/amp-toolbox": "0.11.5",
+    "ampproject/amp-toolbox": "0.11.6",
     "cweagans/composer-patches": "^1.0",
     "fasterimage/fasterimage": "1.5.0",
     "sabberworm/php-css-parser": "8.5.1"
@@ -23,7 +23,7 @@
     "automattic/vipwpcs": "^3.0",
     "civicrm/composer-downloads-plugin": "^4.0",
     "google/cloud-storage": "^1.0",
-    "mikey179/vfsstream": "1.6.11",
+    "mikey179/vfsstream": "1.6.12",
     "mustache/mustache": "^2",
     "php-stubs/wordpress-stubs": "^6.0",
     "phpcompatibility/phpcompatibility-wp": "2.1.5",