Merge pull request #1272 from Haehnchen/feature/1271-symfony-43-route-default

Symfony 4.3: Support "Always Include Route Default Values" parameter syntax #1271

Author: Haehnchen

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

@@ -84,7 +84,7 @@ public Set<String> getVariables() {
         // possible fallback
         // /hello/{foo}/{foo1}/bar
         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/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/dict/StubIndexedRoute.java

@@ -14,7 +14,7 @@
 /**
  * @author Daniel Espendiller <daniel@espendiller.net>
  */
-public class StubIndexedRoute implements RouteInterface, Serializable{
+public class StubIndexedRoute implements RouteInterface, Serializable {
 
     @NotNull
     private final String name;

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

@@ -35,7 +35,7 @@ public void testIndexNullable() {
 
     @Test
     public void testControllerNullable() {
-        assertEquals(null, new Route("foo", new HashSet<>(), new HashMap<String, String>() {{
+        assertNull(new Route("foo", new HashSet<>(), new HashMap<String, String>() {{
             put("_controller", null);
         }}, new HashMap<>(), new ArrayList<>()).getController());
 
@@ -47,10 +47,24 @@ public void testControllerNullable() {
     @Test
     public void testPathVariables() {
         StubIndexedRoute route = new StubIndexedRoute("foobar");
-        route.setPath("/foo/{foo}/{foobar}/bar");
+        route.setPath("/foo/{foo}/{foobar}/{#foo1}/{|foo2}/bar");
 
-        assertTrue("foobar",
-            new Route(route).getVariables().containsAll(Arrays.asList("foo", "foobar"))
+        Set<String> variables = new Route(route).getVariables();
+        assertEquals(2, variables.size());
+        assertTrue("foobar", variables.containsAll(Arrays.asList("foo", "foobar")));
+    }
+
+    @Test
+    public void testPathVariablesForDefault() {
+        StubIndexedRoute route = new StubIndexedRoute("foobar");
+        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"))
         );
     }
 }