Merge branch '4.0'

nicolas-grekas · nicolas-grekas · commit f45e4898880f · 2018-02-26T19:13:01.000+01:00
* 4.0:
  fix merge
diff --git a/Loader/Configurator/RouteConfigurator.php b/Loader/Configurator/RouteConfigurator.php
@@ -22,6 +22,8 @@ class RouteConfigurator
     use Traits\AddTrait;
     use Traits\RouteTrait;
 
+    private $parentConfigurator;
+
     public function __construct(RouteCollection $collection, Route $route, string $name = '', CollectionConfigurator $parentConfigurator = null)
     {
         $this->collection = $collection;

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,8 @@ class RouteConfigurator`
`22`	`22`	`use Traits\AddTrait;`
`23`	`23`	`use Traits\RouteTrait;`
`24`	`24`
	`25`	`+ private $parentConfigurator;`
	`26`	`+`
`25`	`27`	`public function __construct(RouteCollection $collection, Route $route, string $name = '', CollectionConfigurator $parentConfigurator = null)`
`26`	`28`	`{`
`27`	`29`	`$this->collection = $collection;`