Merge branch '8.5' into 9.5

Author: sebastianbergmann

.github/workflows/ci.yml

@@ -246,9 +246,10 @@ jobs:
           tools: none
 
       - name: Install java
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.8
+          distribution: zulu
+          java-version: 11
 
       - name: Build PHAR
         run: ant phar-snapshot
@@ -300,9 +301,10 @@ jobs:
           tools: none
 
       - name: Install java
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.8
+          distribution: zulu
+          java-version: 11
 
       - name: Download PHAR
         uses: actions/download-artifact@v3