Merge pull request Haehnchen#1274 from Haehnchen/feature/1273-route-inlined-wildcard

Routes: Adding support for inlined wildcard requirements Haehnchen#1273

Author: Haehnchen

src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/Route.java

@@ -83,8 +83,10 @@ public Set<String> getVariables() {
 
         // possible fallback
         // /hello/{foo}/{foo1}/bar
+        // /hello/{!foo}/{!foo<\d+>}
+        // /hello/{foo<\d+>}
         Set<String> hashSet = new TreeSet<>();
-        Matcher matcher = Pattern.compile("\\{!?(\\w+)}").matcher(this.path);
+        Matcher matcher = Pattern.compile("\\{!?(\\w+)[<[^}].*>]*}").matcher(this.path);
         while(matcher.find()){
             hashSet.add(matcher.group(1));
         }

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/RouteTest.java

@@ -60,11 +60,18 @@ public void testPathVariablesForDefault() {
         route.setPath("/foo/{!foo}/{!foobar}//{Foobar2}bar");
 
         Set<String> variables = new Route(route).getVariables();
-
         assertEquals(3, variables.size());
-        assertTrue(
-            "foobar",
-            variables.containsAll(Arrays.asList("foo", "foobar", "Foobar2"))
-        );
+        assertTrue(variables.containsAll(Arrays.asList("foo", "foobar", "Foobar2")));
+    }
+
+    @Test
+    public void testPathVariablesForWildcardInlineRequirements() {
+        StubIndexedRoute route = new StubIndexedRoute("foobar");
+        route.setPath("/foo/{!foo<.*>}/aaa{foobar<.*>}aaa/{page<\\d+>}/{page2<\\d+}>}/aaaa/{page3<\\{}d+}>}/");
+
+        Set<String> variables = new Route(route).getVariables();
+        assertEquals(5, variables.size());
+
+        assertTrue(variables.containsAll(Arrays.asList("foo", "foobar", "page", "page2", "page3")));
     }
 }

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/RoutesStubIndexTest.java

@@ -110,6 +110,14 @@ public void testAnnotationIndexOfMethodPatternAndClassPrefix() {
         assertEquals("My\\PostController::editAction", route.getController());
     }
 
+    public void testAnnotationIndexOfMethodPatternAndClassPrefixWithSpecialPath() {
+        assertIndexContains(RoutesStubIndex.KEY, "blog_home_special");
+        RouteInterface route = getFirstValue("blog_home_special");
+
+        assertEquals("blog_home_special", route.getName());
+        assertEquals("/foo/edit/{!id<.*>}/{!id<\\d+>}////", route.getPath());
+    }
+
     public void testAnnotationThatEmptyRouteNameUseBundleMethodName() {
         assertIndexContains(RoutesStubIndex.KEY, "myfoobar_car_index");
         RouteInterface route = getFirstValue("myfoobar_car_index");

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/fixtures/RoutesStubIndex.php

@@ -18,6 +18,14 @@ public function editAction()
         {
         }
 
+        /**
+         * @Route("/edit/{!id<.*>}/{!id<\d+>}////", name="blog_home_special")
+         * @Method("GET")
+         */
+        public function specialAction()
+        {
+        }
+
         /**
          * @Route("/edit/{id}", name="blog_home_get_head")
          * @Method({"GET","HEAD"})