Merge pull request Haehnchen#1500 from Haehnchen/feature/array-access

fix possible array issues on service resource linemarker

Author: Haehnchen

src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/ServiceIndexUtil.java

@@ -166,10 +166,10 @@ public static boolean matchesResourcesGlob(@NotNull VirtualFile serviceFileAsBas
 
  VirtualFile serviceFile = serviceFileAsBase.getParent();
  String[] split = replace.split("/");
- String[] split2 = split;
+ String[] replacePathParts = split;
  for (String s : split) {
  if (s.equals("..")) {
- split2 = Arrays.copyOfRange(split2, 1, split2.length);
+ replacePathParts = Arrays.copyOfRange(replacePathParts, 1, replacePathParts.length);
  serviceFile = serviceFile.getParent();
  } else {
  break;
@@ -180,18 +180,23 @@ public static boolean matchesResourcesGlob(@NotNull VirtualFile serviceFileAsBas
  return false;
  }
 
- if (split2[split2.length - 1].equals("*")) {
- split2[split2.length - 1] = "**";
+ // ending one wildcard must be *
+ // "src/*" => "src/**"
+ String path = (serviceFile.getPath() + "/" + StringUtils.join(replacePathParts, "/"))
+ .replaceAll("[^*]([*])$", "**");
+
+ // force "**" at the end
+ if (!path.endsWith("*")) {
+ path += "**";
  }
 
- String path = serviceFile.getPath() + "/" + StringUtils.join(split2, "/");
- String path1 = phpClassFile.getPath();
+ String phpClassPath = phpClassFile.getPath();
 
  if (exclude == null) {
- return isMatchingGlobResource(path, path1);
+ return isMatchingGlobResource(path, phpClassPath);
  }
 
- return isMatchingGlobResource(path, path1)
+ return isMatchingGlobResource(path, phpClassPath)
  && !matchesResourcesGlob(serviceFileAsBase, phpClassFile, exclude, null);
  }
 

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/dict/ServiceUtilTempProjectTest.java

@@ -55,4 +55,30 @@ public void testServiceResourcesWithDepth() {
  assertTrue(ServiceIndexUtil.matchesResourcesGlob(file, file2, "../../*", null));
  assertFalse(ServiceIndexUtil.matchesResourcesGlob(file, file2, "../../*", "../../Bar"));
  }
+
+ public void testPossibleResourceCondition() {
+ VirtualFile file = createFile(
+ "src/Foo/Resources/config/services.yml",
+ "services:\n" +
+ " App\\:\n" +
+ " resource: ''\n"
+ );
+
+ VirtualFile file2 = createFile(
+ "src/Foo/Bar/Bar.php",
+ "<?php\n" +
+ "namespace App\\Foobar;\n" +
+ "class Bar {}\n"
+ );
+
+ assertFalse(ServiceIndexUtil.matchesResourcesGlob(file, file2, "", ""));
+ assertFalse(ServiceIndexUtil.matchesResourcesGlob(file, file2, "src", "src"));
+ assertFalse(ServiceIndexUtil.matchesResourcesGlob(file, file2, "/aaa", "/aaaa"));
+ assertFalse(ServiceIndexUtil.matchesResourcesGlob(file, file2, "/", "/"));
+ assertFalse(ServiceIndexUtil.matchesResourcesGlob(file, file2, "a", "/"));
+ assertFalse(ServiceIndexUtil.matchesResourcesGlob(file, file2, "", null));
+ assertFalse(ServiceIndexUtil.matchesResourcesGlob(file, file2, "src", null));
+ assertFalse(ServiceIndexUtil.matchesResourcesGlob(file, file2, "/", null));
+ assertFalse(ServiceIndexUtil.matchesResourcesGlob(file, file2, "..", ".."));
+ }
 }