add method type hint class importer for events Haehnchen#564

Author: Haehnchen

src/fr/adrienbrault/idea/symfony2plugin/config/yaml/inspection/EventMethodCallInspection.java

@@ -261,6 +261,11 @@ public StringBuilder getStringBuilder() {
 
  String parameter = "";
  if(taggedEventMethodParameter != null) {
+ String s = PhpElementsUtil.insertUseIfNecessary(phpClass, taggedEventMethodParameter);
+ if(s != null) {
+ taggedEventMethodParameter = s;
+ }
+
  parameter = taggedEventMethodParameter + " $event";
  }
 

src/fr/adrienbrault/idea/symfony2plugin/util/PhpElementsUtil.java

@@ -1383,4 +1383,28 @@ public static PhpClass getMethodTypeHintParameterPhpClass(@NotNull Method method
  return PhpElementsUtil.getClassInterface(method.getProject(), className);
  }
 
+ @Nullable
+ public static String insertUseIfNecessary(@NotNull PsiElement phpClass, @NotNull String fqnClasName) {
+ if(!fqnClasName.startsWith("\\")) {
+ fqnClasName = "\\" + fqnClasName;
+ }
+
+ PhpPsiElement scopeForUseOperator = PhpCodeInsightUtil.findScopeForUseOperator(phpClass);
+ if(scopeForUseOperator == null) {
+ return null;
+ }
+
+ if(!PhpCodeInsightUtil.getAliasesInScope(scopeForUseOperator).values().contains(fqnClasName)) {
+ PhpAliasImporter.insertUseStatement(fqnClasName, scopeForUseOperator);
+ }
+
+ for (Map.Entry<String, String> entry : PhpCodeInsightUtil.getAliasesInScope(scopeForUseOperator).entrySet()) {
+ if(fqnClasName.equals(entry.getValue())) {
+ return entry.getKey();
+ }
+ }
+
+ return null;
+ }
+
 }

tests/fr/adrienbrault/idea/symfony2plugin/tests/util/PhpElementsUtilTest.java

@@ -135,4 +135,26 @@ public void testIsInstanceOf() {
  ));
  }
  }
+
+ /**
+ * @see fr.adrienbrault.idea.symfony2plugin.util.PhpElementsUtil#insertUseIfNecessary
+ */
+ public void testUseImports() {
+ assertEquals("Bar", PhpElementsUtil.insertUseIfNecessary(PhpPsiElementFactory.createPhpPsiFromText(getProject(), PhpClass.class, "<?php\n" +
+ "namespace Foo;\n" +
+ "class Foo{}\n"
+ ), "\\Foo\\Bar"));
+
+ assertEquals("Bar", PhpElementsUtil.insertUseIfNecessary(PhpPsiElementFactory.createPhpPsiFromText(getProject(), PhpClass.class, "<?php\n" +
+ "namespace Foo;\n" +
+ "use Foo\\Bar;\n" +
+ "class Foo{}\n"
+ ), "\\Foo\\Bar"));
+
+ assertEquals("Apple", PhpElementsUtil.insertUseIfNecessary(PhpPsiElementFactory.createPhpPsiFromText(getProject(), PhpClass.class, "<?php\n" +
+ "namespace Bar\\Bar;\n" +
+ "use Foo as Car;\n" +
+ "class Foo{}\n"
+ ), "Foo\\Cool\\Apple"));
+ }
 }