Merge branch '9.6' into 10.5

sebastianbergmann · Oct 18, 2024 · 627c915 · 627c915
2 parents 0c843b0 + 83eb2c7
commit 627c915
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 7 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -166,7 +166,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,

diff --git a/src/Framework/TestSuite.php b/src/Framework/TestSuite.php
@@ -246,7 +246,6 @@ public function addTestFile(string $filename): void
         try {
             if (str_ends_with($filename, '.phpt') && is_file($filename)) {
                 $this->addTest(new PhptTestCase($filename));
-
             } else {
                 $this->addTestSuite(
                     (new TestSuiteLoader)->load($filename),

diff --git a/tests/_files/mock-object/MethodWIthVariadicVariables.php b/tests/_files/mock-object/MethodWIthVariadicVariables.php
@@ -13,7 +13,6 @@ class MethodWIthVariadicVariables
 {
     public function testVariadic(string $foo, mixed ...$arguments): array
     {
-
         return [$foo, ...$arguments];
     }
 }
diff --git a/tests/unit/Framework/ExecutionOrderDependencyTest.php b/tests/unit/Framework/ExecutionOrderDependencyTest.php
@@ -120,6 +120,5 @@ public function testEmptyClassOrCallable(): void
         $this->assertFalse($empty->deepClone());
         $this->assertFalse($empty->targetIsClass());
         $this->assertSame('', $empty->getTargetClassName());
-
     }
 }
diff --git a/tests/unit/Metadata/Api/DataProviderTest.php b/tests/unit/Metadata/Api/DataProviderTest.php
@@ -83,7 +83,6 @@ public function testWithVariousIterableDataProvidersFromParent(): void
             ['P'],
             ['Q'],
             ['R'],
-
         ], $dataSets);
     }
 
@@ -101,7 +100,6 @@ public function testWithVariousIterableDataProvidersInParent(): void
             ['P'],
             ['Q'],
             ['R'],
-
         ], $dataSets);
     }
 
@@ -119,7 +117,6 @@ public function testWithVariousIterableAbstractDataProviders(): void
             ['Y'],
             ['Z'],
             ['P'],
-
         ], $dataSets);
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,6 @@ class MethodWIthVariadicVariables @@
     {
         public function testVariadic(string $foo, mixed ...$arguments): array
         {
             return [$foo, ...$arguments];
         }
     }