Remove one dependency

Nyholm · Nyholm · commit c80564cdeb33 · 2021-04-12T13:55:43.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php
@@ -33,13 +33,11 @@
 class PhpFileLoader extends FileLoader
 {
     protected $autoRegisterAliasesForSinglyImplementedInterfaces = false;
-    private $buildDir;
     private $generator;
 
-    public function __construct(ContainerBuilder $container, FileLocatorInterface $locator, string $env = null, string $buildDir = null, ConfigBuilderGeneratorInterface $generator = null)
+    public function __construct(ContainerBuilder $container, FileLocatorInterface $locator, string $env = null, ConfigBuilderGeneratorInterface $generator = null)
     {
         parent::__construct($container, $locator, $env);
-        $this->buildDir = $buildDir;
         $this->generator = $generator;
     }
 
@@ -147,8 +145,8 @@ private function configBuilder(string $namespace): ConfigBuilderInterface
             throw new \LogicException('You cannot use the config builder as the Config component is not installed. Try running "composer require symfony/config".');
         }
 
-        if (null === $this->buildDir) {
-            throw new \LogicException('You cannot use the config builder without providing a path to the directory where to store the generated ConfigBuilders.');
+        if (null === $this->generator) {
+            throw new \LogicException('You cannot use the config builder without providing a class implementing ConfigBuilderGeneratorInterface.');
         }
 
         // If class exists and implements ConfigBuilderInterface
@@ -175,7 +173,6 @@ private function configBuilder(string $namespace): ConfigBuilderInterface
         }
 
         $configuration = $extension->getConfiguration([], $this->container);
-        $this->generator = $this->generator ?? new ConfigBuilderGenerator($this->buildDir);
         $loader = $this->generator->build($configuration);
 
         return $loader();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php
@@ -15,6 +15,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
+use Symfony\Component\Config\Builder\ConfigBuilderGenerator;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Dumper\PhpDumper;
@@ -64,7 +65,7 @@ public function testConfig($file)
         $fixtures = realpath(__DIR__.'/../Fixtures');
         $container = new ContainerBuilder();
         $container->registerExtension(new \AcmeExtension());
-        $loader = new PhpFileLoader($container, new FileLocator(), 'prod', sys_get_temp_dir());
+        $loader = new PhpFileLoader($container, new FileLocator(), 'prod', new ConfigBuilderGenerator(sys_get_temp_dir()));
         $loader->load($fixtures.'/config/'.$file.'.php');
 
         $container->compile();
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -13,6 +13,7 @@
 
 use Symfony\Bridge\ProxyManager\LazyProxy\Instantiator\RuntimeInstantiator;
 use Symfony\Bridge\ProxyManager\LazyProxy\PhpDumper\ProxyDumper;
+use Symfony\Component\Config\Builder\ConfigBuilderGenerator;
 use Symfony\Component\Config\ConfigCache;
 use Symfony\Component\Config\Loader\DelegatingLoader;
 use Symfony\Component\Config\Loader\LoaderResolver;
@@ -758,7 +759,7 @@ protected function getContainerLoader(ContainerInterface $container)
             new XmlFileLoader($container, $locator, $env),
             new YamlFileLoader($container, $locator, $env),
             new IniFileLoader($container, $locator, $env),
-            new PhpFileLoader($container, $locator, $env, $this->getBuildDir()),
+            new PhpFileLoader($container, $locator, $env, new ConfigBuilderGenerator($this->getBuildDir())),
             new GlobFileLoader($container, $locator, $env),
             new DirectoryLoader($container, $locator, $env),
             new ClosureLoader($container, $env),

Original file line number	Diff line number	Diff line change
`@@ -33,13 +33,11 @@`
`33`	`33`	`class PhpFileLoader extends FileLoader`
`34`	`34`	`{`
`35`	`35`	`protected $autoRegisterAliasesForSinglyImplementedInterfaces = false;`
`36`		`- private $buildDir;`
`37`	`36`	`private $generator;`
`38`	`37`
`39`		`- public function __construct(ContainerBuilder $container, FileLocatorInterface $locator, string $env = null, string $buildDir = null, ConfigBuilderGeneratorInterface $generator = null)`
	`38`	`+ public function __construct(ContainerBuilder $container, FileLocatorInterface $locator, string $env = null, ConfigBuilderGeneratorInterface $generator = null)`
`40`	`39`	`{`
`41`	`40`	`parent::__construct($container, $locator, $env);`
`42`		`- $this->buildDir = $buildDir;`
`43`	`41`	`$this->generator = $generator;`
`44`	`42`	`}`
`45`	`43`
`@@ -147,8 +145,8 @@ private function configBuilder(string $namespace): ConfigBuilderInterface`
`147`	`145`	`throw new \LogicException('You cannot use the config builder as the Config component is not installed. Try running "composer require symfony/config".');`
`148`	`146`	`}`
`149`	`147`
`150`		`- if (null === $this->buildDir) {`
`151`		`- throw new \LogicException('You cannot use the config builder without providing a path to the directory where to store the generated ConfigBuilders.');`
	`148`	`+ if (null === $this->generator) {`
	`149`	`+ throw new \LogicException('You cannot use the config builder without providing a class implementing ConfigBuilderGeneratorInterface.');`
`152`	`150`	`}`
`153`	`151`
`154`	`152`	`// If class exists and implements ConfigBuilderInterface`
`@@ -175,7 +173,6 @@ private function configBuilder(string $namespace): ConfigBuilderInterface`
`175`	`173`	`}`
`176`	`174`
`177`	`175`	`$configuration = $extension->getConfiguration([], $this->container);`
`178`		`- $this->generator = $this->generator ?? new ConfigBuilderGenerator($this->buildDir);`
`179`	`176`	`$loader = $this->generator->build($configuration);`
`180`	`177`
`181`	`178`	`return $loader();`