[DI][Routing] add wither to configure the path of PHP-DSL configurators

Author: nicolas-grekas

Loader/Configurator/ContainerConfigurator.php

@@ -34,16 +34,14 @@ class ContainerConfigurator extends AbstractConfigurator
     private $path;
     private $file;
     private $anonymousCount = 0;
-    private $defaultDefinition;
 
-    public function __construct(ContainerBuilder $container, PhpFileLoader $loader, array &$instanceof, string $path, string $file, Definition $defaultDefinition = null)
+    public function __construct(ContainerBuilder $container, PhpFileLoader $loader, array &$instanceof, string $path, string $file)
     {
         $this->container = $container;
         $this->loader = $loader;
         $this->instanceof = &$instanceof;
         $this->path = $path;
         $this->file = $file;
-        $this->defaultDefinition = $defaultDefinition;
     }
 
     final public function extension(string $namespace, array $config)
@@ -69,7 +67,18 @@ final public function parameters(): ParametersConfigurator
 
     final public function services(): ServicesConfigurator
     {
-        return new ServicesConfigurator($this->container, $this->loader, $this->instanceof, $this->path, $this->anonymousCount, $this->defaultDefinition);
+        return new ServicesConfigurator($this->container, $this->loader, $this->instanceof, $this->path, $this->anonymousCount);
+    }
+
+    /**
+     * @return static
+     */
+    final public function withPath(string $path): self
+    {
+        $clone = clone $this;
+        $clone->path = $clone->file = $path;
+
+        return $clone;
     }
 }
 

Loader/Configurator/ServicesConfigurator.php

@@ -32,19 +32,16 @@ class ServicesConfigurator extends AbstractConfigurator
     private $path;
     private $anonymousHash;
     private $anonymousCount;
-    private $defaultDefinition;
 
-    public function __construct(ContainerBuilder $container, PhpFileLoader $loader, array &$instanceof, string $path = null, int &$anonymousCount = 0, Definition $defaultDefinition = null)
+    public function __construct(ContainerBuilder $container, PhpFileLoader $loader, array &$instanceof, string $path = null, int &$anonymousCount = 0)
     {
-        $defaultDefinition = $defaultDefinition ?? new Definition();
-        $this->defaults = clone $defaultDefinition;
+        $this->defaults = new Definition();
         $this->container = $container;
         $this->loader = $loader;
         $this->instanceof = &$instanceof;
         $this->path = $path;
         $this->anonymousHash = ContainerBuilder::hash($path ?: mt_rand());
         $this->anonymousCount = &$anonymousCount;
-        $this->defaultDefinition = $defaultDefinition;
         $instanceof = [];
     }
 
@@ -53,7 +50,7 @@ public function __construct(ContainerBuilder $container, PhpFileLoader $loader,
      */
     final public function defaults(): DefaultsConfigurator
     {
-        return new DefaultsConfigurator($this, $this->defaults = clone $this->defaultDefinition, $this->path);
+        return new DefaultsConfigurator($this, $this->defaults = new Definition(), $this->path);
     }
 
     /**