[pull] master from Haehnchen:master

CHANGELOG.md

@@ -13,6 +13,16 @@ Changelog
 * 0.10.x: PhpStorm 7 (no support)
 * 0.9.x: PhpStorm 6 (no support)
 
+## 0.18.178
+* Support new node tree structure of Symfony configuration and fix pattern for possible empty file of config file detection [#1344](https://github.com/Haehnchen/idea-php-symfony2-plugin/issues/1344) (Daniel Espendiller)
+* Support more dotenv files [#1345](https://github.com/Haehnchen/idea-php-symfony2-plugin/issues/1345) (Daniel Espendiller)
+
+## 0.18.177
+* Support default form types for different Symfony versions (Daniel Espendiller) [#1343](https://github.com/Haehnchen/idea-php-symfony2-plugin/issues/1343)
+* Improve completion support for FQCN::method routes (Daniel Espendiller) [#1231](https://github.com/Haehnchen/idea-php-symfony2-plugin/issues/1231) [#1159](https://github.com/Haehnchen/idea-php-symfony2-plugin/issues/1159)
+* Support @IsGranted attribute in annotations (Daniel Espendiller) [#1341](https://github.com/Haehnchen/idea-php-symfony2-plugin/issues/1341) [#1189](https://github.com/Haehnchen/idea-php-symfony2-plugin/issues/1189)
+* ContainerBuilderStubIndex: remove accessing to another indexes in the indexer, use more suitable API for extracting classes from file (AlexMovsesov) [#1339](https://github.com/Haehnchen/idea-php-symfony2-plugin/issues/1339) [#1340](https://github.com/Haehnchen/idea-php-symfony2-plugin/issues/1340)
+
 ## 0.18.176
 * Fixed injection range for heredoc/nowdoc literals in automatic injectors (Andrey Sokolov) [#1337](https://github.com/Haehnchen/idea-php-symfony2-plugin/issues/1337)
 * Fix typo/wrong YAML service attribute for autowiring_types (Thomas Schulz) [#1335](https://github.com/Haehnchen/idea-php-symfony2-plugin/issues/1335)

src/main/java/fr/adrienbrault/idea/symfony2plugin/config/utils/ConfigUtil.java

@@ -8,9 +8,7 @@
 import com.intellij.psi.util.*;
 import com.intellij.util.containers.ContainerUtil;
 import com.jetbrains.php.PhpIndex;
-import com.jetbrains.php.lang.psi.elements.Method;
-import com.jetbrains.php.lang.psi.elements.MethodReference;
-import com.jetbrains.php.lang.psi.elements.PhpClass;
+import com.jetbrains.php.lang.psi.elements.*;
 import fr.adrienbrault.idea.symfony2plugin.util.FilesystemUtil;
 import fr.adrienbrault.idea.symfony2plugin.util.PhpElementsUtil;
 import org.apache.commons.lang.StringUtils;
@@ -107,12 +105,28 @@ private static void visitTreeSignatures(@NotNull Collection<PhpClass> classes, @
  continue;
  }
 
+ Collection<ParameterListOwner> parameterOwners = new ArrayList<>();
+
+ // Symfony < 4.1: (new TreeBuilder())->root('foobar')
  for(MethodReference methodReference: PsiTreeUtil.findChildrenOfType(method, MethodReference.class)) {
  if(!PhpElementsUtil.isMethodReferenceInstanceOf(methodReference, "Symfony\\Component\\Config\\Definition\\Builder\\TreeBuilder", "root")) {
  continue;
  }
 
- PsiElement[] parameters = methodReference.getParameters();
+ parameterOwners.add(methodReference);
+ }
+
+ // Symfony >= 4.1: new TreeBuilder('foobar')
+ for(NewExpression methodReference: PsiTreeUtil.findChildrenOfType(method, NewExpression.class)) {
+ if(!PhpElementsUtil.isNewExpressionPhpClassWithInstance(methodReference, "Symfony\\Component\\Config\\Definition\\Builder\\TreeBuilder")) {
+ continue;
+ }
+
+ parameterOwners.add(methodReference);
+ }
+
+ for (ParameterListOwner ownerParameters : parameterOwners) {
+ PsiElement[] parameters = ownerParameters.getParameters();
  if (parameters.length == 0) {
  continue;
  }

src/main/java/fr/adrienbrault/idea/symfony2plugin/config/yaml/YamlElementPatternHelper.java

@@ -2,6 +2,7 @@
 
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.patterns.*;
+import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiWhiteSpace;
@@ -43,6 +44,8 @@ public class YamlElementPatternHelper {
  *
  * /../config/packages/doctrine.yml
  * /../config/packages/test/doctrine.yml
+ *
+ * /../config/packages/doctrine.yaml
  */
  private static final PatternCondition<PsiFile> CONFIG_YAML_PATTERN = new PatternCondition<PsiFile>("Yaml Configuration") {
  @Override
@@ -55,12 +58,19 @@ public boolean accepts(@NotNull PsiFile psiFile, ProcessingContext processingCon
  return true;
  }
 
- VirtualFile virtualFile = psiFile.getVirtualFile();
- if(virtualFile == null) {
+ // psiFile.virtualFile is empty; check via folder structure
+ PsiDirectory containingDirectory = psiFile.getContainingDirectory();
+ if (containingDirectory == null) {
  return false;
  }
 
- String relativePath = VfsExUtil.getRelativeProjectPath(psiFile.getProject(), virtualFile);
+ if ("packages".equals(containingDirectory.getName())) {
+ return true;
+ }
+
+ VirtualFile virtualDirectoryFile = containingDirectory.getVirtualFile();
+
+ String relativePath = VfsExUtil.getRelativeProjectPath(psiFile.getProject(), virtualDirectoryFile);
  return relativePath != null && relativePath.contains("config/packages/");
  }
  };

src/main/resources/META-INF/change-notes.html

@@ -1,7 +1,6 @@
 <html>
 <ul>
- <li>Fixed injection range for heredoc/nowdoc literals in automatic injectors (Andrey Sokolov) <a href="https://github.com/Haehnchen/idea-php-symfony2-plugin/issues/1337">#1337</a></li>
- <li>Fix typo/wrong YAML service attribute for autowiring_types (Thomas Schulz) <a href="https://github.com/Haehnchen/idea-php-symfony2-plugin/issues/1335">#1335</a></li>
- <li>Container stub index performance: move to unrecursive indexer (AlexMovsesov) <a href="https://github.com/Haehnchen/idea-php-symfony2-plugin/issues/1333">#1333</a></li>
+ <li>Support new node tree structure of Symfony configuration and fix pattern for possible empty file of config file detection <a href="https://github.com/Haehnchen/idea-php-symfony2-plugin/issues/1344">#1344</a> (Daniel Espendiller)</li>
+ <li>Support more dotenv files <a href="https://github.com/Haehnchen/idea-php-symfony2-plugin/issues/1345">#1345</a> (Daniel Espendiller)</li>
 </ul>
-</html>
+</html>

src/main/resources/META-INF/plugin.xml

@@ -1,7 +1,7 @@
 <idea-plugin url="https://github.com/Haehnchen/idea-php-symfony2-plugin">
  <id>fr.adrienbrault.idea.symfony2plugin</id>
  <name>Symfony Support</name>
- <version>0.18.176</version>
+ <version>0.18.178</version>
  <vendor email="daniel@espendiller.net" url="http://espend.de">Daniel Espendiller</vendor>
 
  <description><![CDATA[

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/utils/ConfigUtilTest.java

@@ -31,6 +31,7 @@ public void testGetTreeSignatures() {
 
  assertContainsElements(signatures.get("foobar_root"), "\\Foo\\Bar\\MyConfiguration");
  assertContainsElements(signatures.get("foobar_root"), "\\Foo\\Bar\\MyNextConfiguration");
+ assertContainsElements(signatures.get("foobar_root_11"), "\\Foo\\Bar\\MyNextConfiguration");
  }
 
  /**

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/utils/fixtures/ConfigUtilTest.php

@@ -43,6 +43,7 @@ public function getConfigTreeBuilder()
  if(true) {
  foreach([] as $_) {
  (new TreeBuilder())->root('foobar_root');
+ (new TreeBuilder('foobar_root_11'));
  }
  }
  }