Skip to content

Commit 8b3b1fe

Browse files
committed
add blank fix for empty doctrine repository index value #609
1 parent 096f430 commit 8b3b1fe

File tree

4 files changed

+8
-2
lines changed

4 files changed

+8
-2
lines changed

META-INF/plugin.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<idea-plugin version="2" url="https://github.com/Haehnchen/idea-php-symfony2-plugin">
22
<id>fr.adrienbrault.idea.symfony2plugin</id>
33
<name>Symfony2 Plugin</name>
4-
<version>0.11.99</version>
4+
<version>0.11.100</version>
55
<vendor email="daniel@espendiller.net" url="http://espend.de">Daniel Espendiller</vendor>
66

77
<description><![CDATA[

src/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/util/DoctrineMetadataUtil.java

+4
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,10 @@ public Result<Map<String, Collection<String>>> compute() {
124124
Map<String, Collection<String>> repositoryMap = new HashMap<String, Collection<String>>();
125125
for (String key : FileIndexCaches.getIndexKeysCache(project, CLASS_KEYS, DoctrineMetadataFileStubIndex.KEY)) {
126126
for (String repositoryDefinition : FileBasedIndex.getInstance().getValues(DoctrineMetadataFileStubIndex.KEY, key, GlobalSearchScope.allScope(project))) {
127+
if(StringUtils.isBlank(repositoryDefinition)) {
128+
continue;
129+
}
130+
127131
PhpClass phpClass = PhpElementsUtil.getClassInsideNamespaceScope(project, key, repositoryDefinition);
128132
if(phpClass != null && phpClass.getPresentableFQN() != null) {
129133
String presentableFQN = phpClass.getPresentableFQN();

tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/util/DoctrineMetadataUtilTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,8 @@ public boolean value(VirtualFile virtualFile) {
206206
assertNotNull(ContainerUtil.find(DoctrineMetadataUtil.findMetadataForRepositoryClass(getProject(), "Foo\\Bar\\Repository\\FooBarRepository"), condition));
207207
assertNotNull(ContainerUtil.find(DoctrineMetadataUtil.findMetadataForRepositoryClass(getProject(), "Entity\\BarRepository"), condition));
208208
assertNotNull(ContainerUtil.find(DoctrineMetadataUtil.findMetadataForRepositoryClass(PhpElementsUtil.getClassInterface(getProject(), "Entity\\BarRepository")), condition));
209+
assertNull(ContainerUtil.find(DoctrineMetadataUtil.findMetadataForRepositoryClass(getProject(), "Entity\\BarEmpty"), condition))
210+
;
209211
}
210212

211213
/**

tests/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/util/fixtures/doctrine.odm.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@
1717
</document>
1818

1919
<document name="Entity\Bar" repository-class="BarRepository"/>
20-
20+
<document name="Entity\BarEmpty"/>
2121
</doctrine-mapping>

0 commit comments

Comments
 (0)