[HttpKernel] Deprecate returning a ContainerBuilder from KernelInterface::registerContainerConfiguration()

nicolas-grekas · nicolas-grekas · commit 4449b553a89f · 2021-03-10T09:24:39.000+01:00
diff --git a/UPGRADE-5.3.md b/UPGRADE-5.3.md
@@ -46,7 +46,8 @@ HttpKernel
 
  * Deprecate `ArgumentInterface`
  * Deprecate `ArgumentMetadata::getAttribute()`, use `getAttributes()` instead
- * Marked the class `Symfony\Component\HttpKernel\EventListener\DebugHandlersListener` as internal
+ * Mark the class `Symfony\Component\HttpKernel\EventListener\DebugHandlersListener` as internal
+ * Deprecate returning a `ContainerBuilder` from `KernelInterface::registerContainerConfiguration()`
 
 Messenger
 ---------
diff --git a/UPGRADE-6.0.md b/UPGRADE-6.0.md
@@ -94,8 +94,9 @@ HttpKernel
 
  * Remove `ArgumentInterface`
  * Remove `ArgumentMetadata::getAttribute()`, use `getAttributes()` instead
- * Made `WarmableInterface::warmUp()` return a list of classes or files to preload on PHP 7.4+
- * Removed support for `service:action` syntax to reference controllers. Use `serviceOrFqcn::method` instead.
+ * Make `WarmableInterface::warmUp()` return a list of classes or files to preload on PHP 7.4+
+ * Remove support for `service:action` syntax to reference controllers. Use `serviceOrFqcn::method` instead.
+ * Remove support for returning a `ContainerBuilder` from `KernelInterface::registerContainerConfiguration()`
 
 Inflector
 ---------
diff --git a/src/Symfony/Component/HttpKernel/CHANGELOG.md b/src/Symfony/Component/HttpKernel/CHANGELOG.md
@@ -7,7 +7,8 @@ CHANGELOG
  * Deprecate `ArgumentInterface`
  * Add `ArgumentMetadata::getAttributes()`
  * Deprecate `ArgumentMetadata::getAttribute()`, use `getAttributes()` instead
- * marked the class `Symfony\Component\HttpKernel\EventListener\DebugHandlersListener` as internal
+ * Mark the class `Symfony\Component\HttpKernel\EventListener\DebugHandlersListener` as internal
+ * Deprecate returning a `ContainerBuilder` from `KernelInterface::registerContainerConfiguration()`
 
 5.2.0
 -----
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -642,6 +642,7 @@ protected function buildContainer()
         $this->prepareContainer($container);
 
         if (null !== $cont = $this->registerContainerConfiguration($this->getContainerLoader($container))) {
+            trigger_deprecation('symfony/http-kernel', '5.3', 'Returning a ContainerBuilder from "%s::registerContainerConfiguration()" is deprecated.', get_debug_type($this));
             $container->merge($cont);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -642,6 +642,7 @@ protected function buildContainer()`
`642`	`642`	`$this->prepareContainer($container);`
`643`	`643`
`644`	`644`	`if (null !== $cont = $this->registerContainerConfiguration($this->getContainerLoader($container))) {`
	`645`	`+ trigger_deprecation('symfony/http-kernel', '5.3', 'Returning a ContainerBuilder from "%s::registerContainerConfiguration()" is deprecated.', get_debug_type($this));`
`645`	`646`	`$container->merge($cont);`
`646`	`647`	`}`
`647`	`648`