merge latest trunk

Automattic · Feb 19, 2025 · 1666400 · 1666400
2 parents 924279b + b842c6f
commit 1666400
Show file tree

Hide file tree

Showing 70 changed files with 6,902 additions and 7,147 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -61,9 +61,10 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Run Psalm
-        uses: docker://ghcr.io/psalm/psalm-github-actions
+        uses: docker://ghcr.io/psalm/psalm-github-actions:6.5.1
         with:
           composer_require_dev: true
+          php-version: '8.1'
 
   dependaban:
     name: Dependaban

diff --git a/composer.json b/composer.json
@@ -42,10 +42,10 @@
     "phpunit/phpunit": "^9",
     "slevomat/coding-standard": "^8.15",
     "php-stubs/wordpress-stubs": "^6.6",
-    "psalm/phar": "^6.0",
+    "psalm/phar": "^6.5",
     "mockery/mockery": "^1.6",
     "wp-phpunit/wp-phpunit": "^6.7",
-    "yoast/phpunit-polyfills": "^3.1",
+    "yoast/phpunit-polyfills": "^4.0",
     "php-stubs/wordpress-globals": "^0.2.0",
     "php-stubs/wordpress-tests-stubs": "^6.7"
   },