[FinalInternalClassFixer] Fix Entities with Repo (#18)

Slamdunk · May 31, 2022 · b229ded · b229ded
1 parent 85e2263
commit b229ded
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/lib/FinalInternalClassFixer.php b/lib/FinalInternalClassFixer.php
@@ -14,6 +14,8 @@
 
 final class FinalInternalClassFixer extends AbstractFixer
 {
+    private const REGEX = '(?:final|\\\\Doctrine\\\\ORM\\\\Mapping\\\\Entity|ORM\\\\Mapping\\\\Entity|ORM\\\\Entity|Entity)';
+
     public function getDefinition(): FixerDefinitionInterface
     {
         return new FixerDefinition(
@@ -65,7 +67,7 @@ protected function applyFix(SplFileInfo $file, Tokens $tokens): void
     private static function isDoctrineEntity(Tokens $tokens, int $classIndex): bool
     {
         $docToken = $tokens[$tokens->getPrevNonWhitespace($classIndex)];
-        if ($docToken->isGivenKind(\T_DOC_COMMENT) && false !== \mb_strpos($docToken->getContent(), '@ORM\Entity')) {
+        if ($docToken->isGivenKind(\T_DOC_COMMENT) && 1 === \preg_match(\sprintf('/@%s/', self::REGEX), $docToken->getContent())) {
             return true;
         }
 
@@ -76,10 +78,7 @@ private static function isDoctrineEntity(Tokens $tokens, int $classIndex): bool
             for ($index = $attributeOpenIndex; $index < $classIndex; ++$index) {
                 $content .= $tokens[$index]->getContent();
             }
-            if (false !== \mb_strpos($content, '#[ORM\Entity]')) {
-                return true;
-            }
-            if (false !== \mb_strpos($content, '#[\Doctrine\ORM\Mapping\Entity')) {
+            if (1 === \preg_match(\sprintf('/^#\[%s/', self::REGEX), $content)) {
                 return true;
             }
 

diff --git a/tests/FinalInternalClassFixerTest.php b/tests/FinalInternalClassFixerTest.php
@@ -42,12 +42,18 @@ public function provideCases(): array
             [
                 "<?php\n/**\n * @ORM\\Entity\n */\nclass MyEntity {}",
             ],
+            [
+                "<?php\n/**\n * @final\n */\nclass MyEntity {}",
+            ],
             [
                 "<?php\n#[ORM\\Entity]\nclass MyEntity {}",
             ],
             [
                 "<?php\n#[ORM\\Entity]\n#[CustomAttribute]\nclass MyEntity {}",
             ],
+            [
+                "<?php\n#[ORM\\Entity(repositoryClass: \\MyClass::class)]\n#[CustomAttribute]\nclass MyEntity {}",
+            ],
             [
                 "<?php\n#[\\Doctrine\\ORM\\Mapping\\Entity(repositoryClass: \\MyClass::class)]\nclass MyEntity {}",
             ],