Merge branch 'feature/doctrine-types-3'

Author: Haehnchen

src/main/java/de/espend/idea/php/annotation/doctrine/util/DoctrineUtil.java

@@ -168,6 +168,7 @@ public static void visitCustomTypes(@NotNull Project project, @NotNull ColumnTyp
             return true;
         });
 
+        // Doctrine <= 2
         for (PhpClass phpClass : phpClasses) {
             String name = PhpElementsUtil.getMethodReturnAsString(phpClass, "getName");
             if(name != null) {
@@ -176,6 +177,23 @@ public static void visitCustomTypes(@NotNull Project project, @NotNull ColumnTyp
             }
         }
 
+        // Doctrine >= 3.0
+        for (PhpClass phpClass : PhpIndex.getInstance(project).getClassesByFQN("\\Doctrine\\DBAL\\Types\\Types")) {
+            for (Field ownField : phpClass.getOwnFields()) {
+                if (ownField.isConstant() && ownField.getModifier().isPublic()) {
+                    PsiElement defaultValue = ownField.getDefaultValue();
+                    if (defaultValue != null) {
+                        String name = PhpElementsUtil.getStringValue(defaultValue);
+                        if(name != null) {
+                            found.add(name);
+                            visitor.visit(name, phpClass, defaultValue);
+                        }
+                    }
+                }
+            }
+        }
+
+        // static fallback
         Stream.of("id", "string", "integer", "smallint", "bigint", "boolean", "decimal", "date", "time", "datetime", "text", "array", "float")
             .filter(s -> !found.contains(s))
             .forEach(s -> visitor.visit(s, null, null));

src/main/java/de/espend/idea/php/annotation/util/PhpElementsUtil.java

@@ -158,7 +158,7 @@ public static PhpClass getClassInsideAnnotation(StringLiteralExpression phpDocSt
     }
 
     @Nullable
-    private static String getStringValue(@Nullable PsiElement psiElement) {
+    public static String getStringValue(@Nullable PsiElement psiElement) {
         return getStringValue(psiElement, 0);
     }
 

src/test/java/de/espend/idea/php/annotation/tests/doctrine/util/DoctrineUtilTest.java

@@ -0,0 +1,33 @@
+package de.espend.idea.php.annotation.tests.doctrine.util;
+
+import com.intellij.codeInsight.lookup.LookupElement;
+import de.espend.idea.php.annotation.doctrine.util.DoctrineUtil;
+import de.espend.idea.php.annotation.tests.AnnotationLightCodeInsightFixtureTestCase;
+
+import java.util.Collection;
+
+public class DoctrineUtilTest extends AnnotationLightCodeInsightFixtureTestCase {
+    public void setUp() throws Exception {
+        super.setUp();
+        myFixture.copyFileToProject("Type.php");
+        myFixture.copyFileToProject("Types.php");
+    }
+
+    public String getTestDataPath() {
+        return "src/test/java/de/espend/idea/php/annotation/tests/doctrine/util/fixtures";
+    }
+
+    public void testGetTypes() {
+        Collection<LookupElement> types = DoctrineUtil.getTypes(getProject());
+
+        // static
+        assertTrue(types.stream().anyMatch(lookupElement -> "id".equals(lookupElement.getLookupString())));
+        assertTrue(types.stream().anyMatch(lookupElement -> "array".equals(lookupElement.getLookupString())));
+
+        // Types
+        assertTrue(types.stream().anyMatch(lookupElement -> "datetime_immutable".equals(lookupElement.getLookupString())));
+
+        // Type by name
+        assertTrue(types.stream().anyMatch(lookupElement -> "my_type".equals(lookupElement.getLookupString())));
+    }
+}

src/test/java/de/espend/idea/php/annotation/tests/doctrine/util/fixtures/Type.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\DBAL\Types
+{
+    abstract class Type {}
+}
+
+namespace App {
+    class MyType extends \Doctrine\DBAL\Types\Type
+    {
+        public function getName()
+        {
+            return 'my_type';
+        }
+    }
+}
+
+
+

src/test/java/de/espend/idea/php/annotation/tests/doctrine/util/fixtures/Types.php

@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\DBAL\Types;
+
+/**
+ * Default built-in types provided by Doctrine DBAL.
+ */
+final class Types
+{
+    public const ASCII_STRING         = 'ascii_string';
+    public const BIGINT               = 'bigint';
+    public const BINARY               = 'binary';
+    public const BLOB                 = 'blob';
+    public const BOOLEAN              = 'boolean';
+    public const DATE_MUTABLE         = 'date';
+    public const DATE_IMMUTABLE       = 'date_immutable';
+    public const DATEINTERVAL         = 'dateinterval';
+    public const DATETIME_MUTABLE     = 'datetime';
+    public const DATETIME_IMMUTABLE   = 'datetime_immutable';
+    public const DATETIMETZ_MUTABLE   = 'datetimetz';
+    public const DATETIMETZ_IMMUTABLE = 'datetimetz_immutable';
+    public const DECIMAL              = 'decimal';
+    public const NUMBER               = 'number';
+    public const FLOAT                = 'float';
+    public const ENUM                 = 'enum';
+    public const GUID                 = 'guid';
+    public const INTEGER              = 'integer';
+    public const JSON                 = 'json';
+    public const JSONB                = 'jsonb';
+    public const SIMPLE_ARRAY         = 'simple_array';
+    public const SMALLFLOAT           = 'smallfloat';
+    public const SMALLINT             = 'smallint';
+    public const STRING               = 'string';
+    public const TEXT                 = 'text';
+    public const TIME_MUTABLE         = 'time';
+    public const TIME_IMMUTABLE       = 'time_immutable';
+
+    /** @codeCoverageIgnore */
+    private function __construct()
+    {
+    }
+}