Merge branch '8.5' into 9.6

sebastianbergmann · sebastianbergmann · commit 2212345057cc · 2024-10-19T08:19:55.000+02:00
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -171,7 +171,6 @@
                 'switch',
                 'throw',
                 'use',
-                'use_trait',
             ],
         ],
         'no_homoglyph_names' => true,
