fix #259 Incorrect Doctrine deprecation flagged on OpenApi attributes

Haehnchen · Jun 10, 2023 · 510982e · 510982e
1 parent f4f69bd
commit 510982e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/...a/de/espend/idea/php/annotation/doctrine/inspection/DoctrineTypeDeprecatedInspection.java b/...a/de/espend/idea/php/annotation/doctrine/inspection/DoctrineTypeDeprecatedInspection.java
@@ -78,11 +78,11 @@ private static String getContentIfTypeValid(@NotNull PsiElement psiElement, @Not
             PsiElement attributeNamePsi = PhpPsiUtil.getPrevSibling(psiElement, psiElement1 -> psiElement1 instanceof PsiWhiteSpace || psiElement1.getNode().getElementType() == PhpTokenTypes.opCOLON);
             if (attributeNamePsi != null && attributeNamePsi.getNode().getElementType() == PhpTokenTypes.IDENTIFIER) {
                 String text = attributeNamePsi.getText();
-                if (text.equals("type")) {
+                if (property.equals(text)) {
                     PhpAttribute phpAttribute = PsiTreeUtil.getParentOfType(psiElement, PhpAttribute.class);
                     if (phpAttribute != null) {
                         String fqn = phpAttribute.getFQN();
-                        if (fqn != null) {
+                        if (PhpLangUtil.equalsClassNames(clazz, fqn)) {
                             return ((StringLiteralExpression) psiElement).getContents();
                         }
                     }

diff --git a/.../de/espend/idea/php/annotation/tests/inspection/DoctrineTypeDeprecatedInspectionTest.java b/.../de/espend/idea/php/annotation/tests/inspection/DoctrineTypeDeprecatedInspectionTest.java
@@ -51,5 +51,14 @@ public void testThatDeprecatedInspectionIsDisplayedDoctrineColumnTypesForAttribu
                 "}",
             "[Annotations] Deprecated: Use JsonType instead"
         );
+
+        assertLocalInspectionIsEmpty("test.php", "<?php\n" +
+                "use Doctrine\\ORM\\Mapping as ORM;\n" +
+                "\n" +
+                "#[ORM\\Foobar(type: 'json<caret>_array')]\n" +
+                "class Foo\n" +
+                "{\n" +
+                "}"
+        );
     }
 }