Skip to content

Commit aa388f8

Browse files
authored
Merge pull request #1627 from Haehnchen/feature/1624-phpstorm
#1624 secure yaml key class resolving for PhpStorm 2021.3
2 parents 70f5e93 + 34d75fd commit aa388f8

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

src/main/java/fr/adrienbrault/idea/symfony2plugin/util/yaml/YamlHelper.java

+7-3
Original file line numberDiff line numberDiff line change
@@ -1318,9 +1318,13 @@ public static Collection<PhpClass> getNamespaceResourcesClasses(@NotNull YAMLKey
13181318
if (valueText.endsWith("\\")) {
13191319
Collection<String> resource = YamlHelper.getYamlKeyValueStringOrArray(yamlKeyValue, "resource");
13201320
if (!resource.isEmpty()) {
1321-
phpClasses.addAll(ServiceContainerUtil.getPhpClassFromResources(
1322-
yamlKeyValue.getProject(), valueText, yamlKeyValue.getContainingFile().getVirtualFile(), resource, YamlHelper.getYamlKeyValueStringOrArray(yamlKeyValue, "exclude"))
1323-
);
1321+
PsiFile containingFile = yamlKeyValue.getContainingFile();
1322+
// PhpStorm 2021.1 needs file check
1323+
if (containingFile != null) {
1324+
phpClasses.addAll(ServiceContainerUtil.getPhpClassFromResources(
1325+
yamlKeyValue.getProject(), valueText, containingFile.getVirtualFile(), resource, YamlHelper.getYamlKeyValueStringOrArray(yamlKeyValue, "exclude"))
1326+
);
1327+
}
13241328
}
13251329
}
13261330

0 commit comments

Comments
 (0)