Merge branch '8.5' into 9.6

Author: sebastianbergmann

.php-cs-fixer.dist.php

@@ -156,7 +156,24 @@
         'no_empty_comment' => true,
         'no_empty_phpdoc' => true,
         'no_empty_statement' => true,
-        'no_extra_blank_lines' => true,
+        'no_extra_blank_lines' => [
+            'tokens' => [
+                'attribute',
+                'break',
+                'case',
+                'continue',
+                'curly_brace_block',
+                'default',
+                'extra',
+                'parenthesis_brace_block',
+                'return',
+                'square_brace_block',
+                'switch',
+                'throw',
+                'use',
+                'use_trait',
+            ],
+        ],
         'no_homoglyph_names' => true,
         'no_leading_import_slash' => true,
         'no_leading_namespace_whitespace' => true,

src/Framework/Constraint/String/IsJson.php

@@ -10,7 +10,6 @@
 namespace PHPUnit\Framework\Constraint;
 
 use function json_decode;
-
 use function json_last_error;
 use function sprintf;
 use SebastianBergmann\RecursionContext\InvalidArgumentException;

tests/unit/Util/TestClassTest.php

@@ -983,7 +983,6 @@ public function testWithVariousIterableDataProvidersFromParent(): void
             ['P'],
             ['Q'],
             ['R'],
-
         ], $dataSets);
     }
 
@@ -1001,7 +1000,6 @@ public function testWithVariousIterableDataProvidersInParent(): void
             ['P'],
             ['Q'],
             ['R'],
-
         ], $dataSets);
     }
 
@@ -1019,7 +1017,6 @@ public function testWithVariousIterableAbstractDataProviders(): void
             ['Y'],
             ['Z'],
             ['P'],
-
         ], $dataSets);
     }
 
@@ -1411,7 +1408,6 @@ public function getLinesToBeCoveredProvider(): array
                 [
                     TEST_FILES_PATH . 'CoveredClass.php' => range(37, 41),
                 ],
-
             ],
             [
                 CoveragePublicTest::class,