Merge branch '8.5' into 9.6

Author: sebastianbergmann

.github/workflows/ci.yaml

@@ -58,7 +58,7 @@ jobs:
           tools: none
 
       - name: Run PHP-CS-Fixer
-        run: ./tools/php-cs-fixer fix --dry-run --show-progress=dots --using-cache=no --verbose
+        run: ./tools/php-cs-fixer check --show-progress=dots --using-cache=no --verbose
 
   type-checker:
     name: Type Checker