Merge branch '8.5' into 9.6

* 8.5:
  Update PHP-CS-Fixer configuration

Author: sebastianbergmann

.php-cs-fixer.dist.php

@@ -342,7 +342,7 @@
         ],
         'types_spaces' => true,
         'unary_operator_spaces' => true,
-        'visibility_required' => [
+        'modifier_keywords' => [
             'elements' => [
                 'const',
                 'method',