Merge branch '8.5' into 9.6

Author: sebastianbergmann

.github/workflows/ci.yaml

@@ -255,9 +255,10 @@ jobs:
         run: cat build/artifacts/phpunit-snapshot.phar | grep -q PHPUnit\\\\DeepCopy\\\\Exception\\\\CloneException || (echo "phpunit-snapshot.phar is not scoped." && false)
 
       - name: Upload PHAR
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: phpunit-snapshot-phar
+          overwrite: true
           path: ./build/artifacts/phpunit-snapshot.phar
           retention-days: 7
 
@@ -309,7 +310,7 @@ jobs:
           java-version: 11
 
       - name: Download PHAR
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: phpunit-snapshot-phar
           path: ./build/artifacts/