symfony
diff --git a/‎src/Symfony/Component/Routing/Loader/Configurator/CollectionConfigurator.php
Lines changed: 5 additions & 3 deletions b/‎src/Symfony/Component/Routing/Loader/Configurator/CollectionConfigurator.php
Lines changed: 5 additions & 3 deletions
diff --git a/‎src/Symfony/Component/Routing/Loader/Configurator/RouteConfigurator.php
Lines changed: 4 additions & 1 deletion b/‎src/Symfony/Component/Routing/Loader/Configurator/RouteConfigurator.php
Lines changed: 4 additions & 1 deletion
diff --git a/‎src/Symfony/Component/Routing/Loader/Configurator/Traits/AddTrait.php
Lines changed: 2 additions & 1 deletion b/‎src/Symfony/Component/Routing/Loader/Configurator/Traits/AddTrait.php
Lines changed: 2 additions & 1 deletion
diff --git a/‎src/Symfony/Component/Routing/Tests/Fixtures/php_dsl.php
Lines changed: 1 addition & 0 deletions b/‎src/Symfony/Component/Routing/Tests/Fixtures/php_dsl.php
Lines changed: 1 addition & 0 deletions
@@ -23,13 +23,15 @@ class CollectionConfigurator
     use Traits\RouteTrait;
 
     private $parent;
+    private $parentConfigurator;
 
-    public function __construct(RouteCollection $parent, $name)
+    public function __construct(RouteCollection $parent, $name, self $parentConfigurator = null)
     {
         $this->parent = $parent;
         $this->name = $name;
         $this->collection = new RouteCollection();
         $this->route = new Route('');
+        $this->parentConfigurator = $parentConfigurator; // for GC control
     }
 
     public function __destruct()
@@ -50,7 +52,7 @@ final public function add($name, $path)
     {
         $this->collection->add($this->name.$name, $route = clone $this->route);
 
-        return new RouteConfigurator($this->collection, $route->setPath($path), $this->name);
+        return new RouteConfigurator($this->collection, $route->setPath($path), $this->name, $this);
     }
 
     /**
@@ -60,7 +62,7 @@ final public function add($name, $path)
      */
     final public function collection($name = '')
     {
-        return new self($this->collection, $this->name.$name);
+        return new self($this->collection, $this->name.$name, $this);
     }
 
     /**
 
@@ -22,10 +22,13 @@ class RouteConfigurator
     use Traits\AddTrait;
     use Traits\RouteTrait;
 
-    public function __construct(RouteCollection $collection, Route $route, $name = '')
+    private $parentConfigurator;
+
+    public function __construct(RouteCollection $collection, Route $route, $name = '', CollectionConfigurator $parentConfigurator = null)
     {
         $this->collection = $collection;
         $this->route = $route;
         $this->name = $name;
+        $this->parentConfigurator = $parentConfigurator; // for GC control
     }
 }
@@ -34,9 +34,10 @@ trait AddTrait
      */
     final public function add($name, $path)
     {
+        $parentConfigurator = $this instanceof RouteConfigurator ? $this->parentConfigurator : null;
         $this->collection->add($this->name.$name, $route = new Route($path));
 
-        return new RouteConfigurator($this->collection, $route);
+        return new RouteConfigurator($this->collection, $route, $parentConfigurator);
     }
 
     /**
 
@@ -4,6 +4,7 @@
 
 return function (RoutingConfigurator $routes) {
     $routes
+        ->collection()
         ->add('foo', '/foo')
             ->condition('abc')
             ->options(array('utf8' => true))
Original file line number	Diff line number	Diff line change
`@@ -23,13 +23,15 @@ class CollectionConfigurator`
`23`	`23`	`use Traits\RouteTrait;`
`24`	`24`
`25`	`25`	`private $parent;`
	`26`	`+ private $parentConfigurator;`
`26`	`27`
`27`		`- public function __construct(RouteCollection $parent, $name)`
	`28`	`+ public function __construct(RouteCollection $parent, $name, self $parentConfigurator = null)`
`28`	`29`	`{`
`29`	`30`	`$this->parent = $parent;`
`30`	`31`	`$this->name = $name;`
`31`	`32`	`$this->collection = new RouteCollection();`
`32`	`33`	`$this->route = new Route('');`
	`34`	`+ $this->parentConfigurator = $parentConfigurator; // for GC control`
`33`	`35`	`}`
`34`	`36`
`35`	`37`	`public function __destruct()`
`@@ -50,7 +52,7 @@ final public function add($name, $path)`
`50`	`52`	`{`
`51`	`53`	`$this->collection->add($this->name.$name, $route = clone $this->route);`
`52`	`54`
`53`		`- return new RouteConfigurator($this->collection, $route->setPath($path), $this->name);`
	`55`	`+ return new RouteConfigurator($this->collection, $route->setPath($path), $this->name, $this);`
`54`	`56`	`}`
`55`	`57`
`56`	`58`	`/**`
`@@ -60,7 +62,7 @@ final public function add($name, $path)`
`60`	`62`	`*/`
`61`	`63`	`final public function collection($name = '')`
`62`	`64`	`{`
`63`		`- return new self($this->collection, $this->name.$name);`
	`65`	`+ return new self($this->collection, $this->name.$name, $this);`
`64`	`66`	`}`
`65`	`67`
`66`	`68`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,13 @@ class RouteConfigurator`
`22`	`22`	`use Traits\AddTrait;`
`23`	`23`	`use Traits\RouteTrait;`
`24`	`24`
`25`		`- public function __construct(RouteCollection $collection, Route $route, $name = '')`
	`25`	`+ private $parentConfigurator;`
	`26`	`+`
	`27`	`+ public function __construct(RouteCollection $collection, Route $route, $name = '', CollectionConfigurator $parentConfigurator = null)`
`26`	`28`	`{`
`27`	`29`	`$this->collection = $collection;`
`28`	`30`	`$this->route = $route;`
`29`	`31`	`$this->name = $name;`
	`32`	`+ $this->parentConfigurator = $parentConfigurator; // for GC control`
`30`	`33`	`}`
`31`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,9 +34,10 @@ trait AddTrait`
`34`	`34`	`*/`
`35`	`35`	`final public function add($name, $path)`
`36`	`36`	`{`
	`37`	`+ $parentConfigurator = $this instanceof RouteConfigurator ? $this->parentConfigurator : null;`
`37`	`38`	`$this->collection->add($this->name.$name, $route = new Route($path));`
`38`	`39`
`39`		`- return new RouteConfigurator($this->collection, $route);`
	`40`	`+ return new RouteConfigurator($this->collection, $route, $parentConfigurator);`
`40`	`41`	`}`
`41`	`42`
`42`	`43`	`/**`