minor #6295 PhpUnitTestCaseIndicator - Check if PHPUnit-test class ex…

…tends anothe… (SpacePossum) This PR was merged into the master branch. Discussion ---------- PhpUnitTestCaseIndicator - Check if PHPUnit-test class extends anothe… …r class closes #6016 Commits ------- 7d4b0b0 PhpUnitTestCaseIndicator - Check if PHPUnit-test class extends another class
PHP-CS-Fixer · Feb 21, 2022 · 7528a4e · 7528a4e
2 parents 7df9f15 + 7d4b0b0
commit 7528a4e
Show file tree

Hide file tree

Showing 7 changed files with 158 additions and 132 deletions.
diff --git a/src/Indicator/PhpUnitTestCaseIndicator.php b/src/Indicator/PhpUnitTestCaseIndicator.php
@@ -34,6 +34,12 @@ public function isPhpUnitClass(Tokens $tokens, int $index): bool
             return false;
         }
 
+        $extendsIndex = $tokens->getNextTokenOfKind($index, ['{', [T_EXTENDS]]);
+
+        if (!$tokens[$extendsIndex]->isGivenKind(T_EXTENDS)) {
+            return false;
+        }
+
         if (0 !== Preg::match('/(?:Test|TestCase)$/', $tokens[$index]->getContent())) {
             return true;
         }

diff --git a/tests/Fixer/PhpUnit/PhpUnitInternalClassFixerTest.php b/tests/Fixer/PhpUnit/PhpUnitInternalClassFixerTest.php
@@ -276,7 +276,7 @@ class Test extends TestCase
             'By default it will not mark an abstract class as internal' => [
                 '<?php
 
-abstract class Test
+abstract class Test extends TestCase
 {
 }
 ',
@@ -287,13 +287,13 @@ abstract class Test
 /**
  * @internal
  */
-abstract class Test
+abstract class Test extends TestCase
 {
 }
 ',
                 '<?php
 
-abstract class Test
+abstract class Test extends TestCase
 {
 }
 ',
@@ -304,7 +304,7 @@ abstract class Test
             'If final is not added as an option, final classes will not be marked internal' => [
                 '<?php
 
-final class Test
+final class Test extends TestCase
 {
 }
 ',
@@ -316,7 +316,7 @@ final class Test
             'If normal is not added as an option, normal classes will not be marked internal' => [
                 '<?php
 
-class Test
+class Test extends TestCase
 {
 }
 ',
@@ -331,11 +331,11 @@ class Test
 /**
  * @internal
  */
-class Test
+class Test extends TestCase
 {
 }
 
-abstract class Test
+abstract class Test2 extends TestCase
 {
 }
 
@@ -352,11 +352,11 @@ class Test extends TestCase
 ',
                 '<?php
 
-class Test
+class Test extends TestCase
 {
 }
 
-abstract class Test
+abstract class Test2 extends TestCase
 {
 }
 

diff --git a/tests/Fixer/PhpUnit/PhpUnitSizeClassFixerTest.php b/tests/Fixer/PhpUnit/PhpUnitSizeClassFixerTest.php
@@ -273,11 +273,11 @@ abstract class Test
 /**
  * @small
  */
-class Test
+class Test extends TestCase
 {
 }
 
-abstract class Test
+abstract class Test2 extends TestCase
 {
 }
 
@@ -288,25 +288,25 @@ class FooBar
 /**
  * @small
  */
-class Test extends TestCase
+class Test3 extends TestCase
 {
 }
 ',
                 '<?php
 
-class Test
+class Test extends TestCase
 {
 }
 
-abstract class Test
+abstract class Test2 extends TestCase
 {
 }
 
 class FooBar
 {
 }
 
-class Test extends TestCase
+class Test3 extends TestCase
 {
 }
 ',

diff --git a/tests/Fixtures/Integration/priority/php_unit_test_annotation,no_empty_phpdoc.test b/tests/Fixtures/Integration/priority/php_unit_test_annotation,no_empty_phpdoc.test
@@ -4,15 +4,15 @@ Integration of fixers: php_unit_test_annotation,no_empty_phpdoc.
 {"php_unit_test_annotation": true, "no_empty_phpdoc" : true}
 --EXPECT--
 <?php
-class Test
+class Test extends TestCase
 {
 
     public function testFooBar() {}
 }
 
 --INPUT--
 <?php
-class Test
+class Test extends TestCase
 {
     /**
      * @test

diff --git a/tests/Fixtures/Integration/priority/php_unit_test_annotation,php_unit_method_casing.test b/tests/Fixtures/Integration/priority/php_unit_test_annotation,php_unit_method_casing.test
@@ -4,7 +4,7 @@ Integration of fixers: php_unit_test_annotation,php_unit_method_casing.
 {"php_unit_test_annotation": true, "php_unit_method_casing" :  {"case": "snake_case"}}
 --EXPECT--
 <?php
-class Test
+class Test extends TestCase
 {
     /**
      * It does thing for foo and bar
@@ -15,7 +15,7 @@ class Test
 
 --INPUT--
 <?php
-class Test
+class Test extends TestCase
 {
     /**
      * It does thing for foo and bar

diff --git a/tests/Fixtures/Integration/priority/php_unit_test_annotation,phpdoc_trim.test b/tests/Fixtures/Integration/priority/php_unit_test_annotation,phpdoc_trim.test
@@ -4,7 +4,7 @@ Integration of fixers: php_unit_test_annotation,phpdoc_trim.
 {"php_unit_test_annotation": true, "phpdoc_trim" : true}
 --EXPECT--
 <?php
-class Test
+class Test extends TestCase
 {
     /**
      * It does thing for foo and bar
@@ -14,7 +14,7 @@ class Test
 
 --INPUT--
 <?php
-class Test
+class Test extends TestCase
 {
     /**
      * It does thing for foo and bar