Merge branch '4.0'

* 4.0: fix merge
2018-02-26 19:13:01 +01:00 · 2018-02-26 19:13:01 +01:00 · 308e12cb59
commit 308e12cb59
parent add5d84e8c 6c32bcd77e
1 changed files with 2 additions and 0 deletions
--- a/src/Symfony/Component/Routing/Loader/Configurator/RouteConfigurator.php
+++ b/src/Symfony/Component/Routing/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;