symfony · nicolas-grekas · Jun 30, 2023 · Jun 6, 2023
diff --git a/.github/expected-missing-return-types.diff b/.github/expected-missing-return-types.diff
@@ -60,17 +60,6 @@ index b275304d7d..48ba999884 100644
 +    public function getTime(): int
      {
          $time = 0;
-diff --git a/src/Symfony/Bridge/Doctrine/DataFixtures/ContainerAwareLoader.php b/src/Symfony/Bridge/Doctrine/DataFixtures/ContainerAwareLoader.php
-index 448da935d9..06c97eb70c 100644
---- a/src/Symfony/Bridge/Doctrine/DataFixtures/ContainerAwareLoader.php
-+++ b/src/Symfony/Bridge/Doctrine/DataFixtures/ContainerAwareLoader.php
-@@ -40,5 +40,5 @@ class ContainerAwareLoader extends Loader
-      * @return void
-      */
--    public function addFixture(FixtureInterface $fixture)
-+    public function addFixture(FixtureInterface $fixture): void
-     {
-         if ($fixture instanceof ContainerAwareInterface) {
 diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
 index 1ce0ffd40c..585265fb38 100644
 --- a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
@@ -566,17 +555,17 @@ index 94b95e5029..c8a563163e 100644
      {
          if (!$configuration) {
 diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php
-index 02709ba649..5a3e972793 100644
+index 0451b31fe1..14806da8ee 100644
 --- a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php
 +++ b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php
-@@ -56,5 +56,5 @@ class Application extends BaseApplication
+@@ -55,5 +55,5 @@ class Application extends BaseApplication
       * @return void
       */
 -    public function reset()
 +    public function reset(): void
      {
          if ($this->kernel->getContainer()->has('services_resetter')) {
-@@ -145,5 +145,5 @@ class Application extends BaseApplication
+@@ -137,5 +137,5 @@ class Application extends BaseApplication
       * @return void
       */
 -    protected function registerCommands()
@@ -3733,10 +3722,10 @@ index 3f070dcc0c..aa0e5186bf 100644
      {
          foreach ($container->findTaggedServiceIds('auto_alias') as $serviceId => $tags) {
 diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
-index e28b60c6ea..a5b3d3d00b 100644
+index 3e94ed1b2c..1fd3fa27ea 100644
 --- a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
 +++ b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
-@@ -73,5 +73,5 @@ class AutowirePass extends AbstractRecursivePass
+@@ -72,5 +72,5 @@ class AutowirePass extends AbstractRecursivePass
       * @return void
       */
 -    public function process(ContainerBuilder $container)
@@ -4190,27 +4179,6 @@ index 3ea2228b94..f1d7078383 100644
 +    protected function load(string $file): mixed
      {
          return require $file;
-diff --git a/src/Symfony/Component/DependencyInjection/ContainerAwareInterface.php b/src/Symfony/Component/DependencyInjection/ContainerAwareInterface.php
-index 9b3709c965..97b54712c9 100644
---- a/src/Symfony/Component/DependencyInjection/ContainerAwareInterface.php
-+++ b/src/Symfony/Component/DependencyInjection/ContainerAwareInterface.php
-@@ -26,4 +26,4 @@ interface ContainerAwareInterface
-      * @return void
-      */
--    public function setContainer(?ContainerInterface $container);
-+    public function setContainer(?ContainerInterface $container): void;
- }
-diff --git a/src/Symfony/Component/DependencyInjection/ContainerAwareTrait.php b/src/Symfony/Component/DependencyInjection/ContainerAwareTrait.php
-index 4174fec8d0..f6a7b2da12 100644
---- a/src/Symfony/Component/DependencyInjection/ContainerAwareTrait.php
-+++ b/src/Symfony/Component/DependencyInjection/ContainerAwareTrait.php
-@@ -31,5 +31,5 @@ trait ContainerAwareTrait
-      * @return void
-      */
--    public function setContainer(ContainerInterface $container = null)
-+    public function setContainer(ContainerInterface $container = null): void
-     {
-         if (1 > \func_num_args()) {
 diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
 index a7a9c145aa..bd16e937ca 100644
 --- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -4631,52 +4599,52 @@ index 1ede090384..7b6b63c599 100644
      {
          throw new LogicException('Impossible to call remove() on a frozen ParameterBag.');
 diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php
-index c1cd9087f0..a9efa77a6d 100644
+index 40447dbbcb..9d0cd64d85 100644
 --- a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php
 +++ b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php
-@@ -35,5 +35,5 @@ class ParameterBag implements ParameterBagInterface
+@@ -36,5 +36,5 @@ class ParameterBag implements ParameterBagInterface
       * @return void
       */
 -    public function clear()
 +    public function clear(): void
      {
          $this->parameters = [];
-@@ -43,5 +43,5 @@ class ParameterBag implements ParameterBagInterface
+@@ -44,5 +44,5 @@ class ParameterBag implements ParameterBagInterface
       * @return void
       */
 -    public function add(array $parameters)
 +    public function add(array $parameters): void
      {
          foreach ($parameters as $key => $value) {
-@@ -104,5 +104,5 @@ class ParameterBag implements ParameterBagInterface
+@@ -105,5 +105,5 @@ class ParameterBag implements ParameterBagInterface
       * @return void
       */
 -    public function set(string $name, array|bool|string|int|float|\UnitEnum|null $value)
 +    public function set(string $name, array|bool|string|int|float|\UnitEnum|null $value): void
      {
          if (is_numeric($name)) {
-@@ -122,5 +122,5 @@ class ParameterBag implements ParameterBagInterface
+@@ -121,5 +121,5 @@ class ParameterBag implements ParameterBagInterface
       * @throws ParameterNotFoundException if the parameter is not defined
       */
 -    public function deprecate(string $name, string $package, string $version, string $message = 'The parameter "%s" is deprecated.')
 +    public function deprecate(string $name, string $package, string $version, string $message = 'The parameter "%s" is deprecated.'): void
      {
          if (!\array_key_exists($name, $this->parameters)) {
-@@ -139,5 +139,5 @@ class ParameterBag implements ParameterBagInterface
+@@ -138,5 +138,5 @@ class ParameterBag implements ParameterBagInterface
       * @return void
       */
 -    public function remove(string $name)
 +    public function remove(string $name): void
      {
          unset($this->parameters[$name], $this->deprecatedParameters[$name]);
-@@ -147,5 +147,5 @@ class ParameterBag implements ParameterBagInterface
+@@ -146,5 +146,5 @@ class ParameterBag implements ParameterBagInterface
       * @return void
       */
 -    public function resolve()
 +    public function resolve(): void
      {
          if ($this->resolved) {
-@@ -259,5 +259,5 @@ class ParameterBag implements ParameterBagInterface
+@@ -258,5 +258,5 @@ class ParameterBag implements ParameterBagInterface
       * @return bool
       */
 -    public function isResolved()
@@ -8297,31 +8265,31 @@ index af21469b1c..7b024368c5 100644
      {
      }
 diff --git a/src/Symfony/Component/HttpKernel/Bundle/BundleInterface.php b/src/Symfony/Component/HttpKernel/Bundle/BundleInterface.php
-index fe200629f4..692c41ec53 100644
+index 400a9e0c92..870cbe80e5 100644
 --- a/src/Symfony/Component/HttpKernel/Bundle/BundleInterface.php
 +++ b/src/Symfony/Component/HttpKernel/Bundle/BundleInterface.php
-@@ -29,5 +29,5 @@ interface BundleInterface extends ContainerAwareInterface
+@@ -28,5 +28,5 @@ interface BundleInterface
       * @return void
       */
 -    public function boot();
 +    public function boot(): void;
 
      /**
-@@ -36,5 +36,5 @@ interface BundleInterface extends ContainerAwareInterface
+@@ -35,5 +35,5 @@ interface BundleInterface
       * @return void
       */
 -    public function shutdown();
 +    public function shutdown(): void;
 
      /**
-@@ -45,5 +45,5 @@ interface BundleInterface extends ContainerAwareInterface
+@@ -44,5 +44,5 @@ interface BundleInterface
       * @return void
       */
 -    public function build(ContainerBuilder $container);
 +    public function build(ContainerBuilder $container): void;
 
      /**
-@@ -72,4 +72,4 @@ interface BundleInterface extends ContainerAwareInterface
+@@ -71,4 +71,4 @@ interface BundleInterface
       * @return void
       */
 -    public function setContainer(?ContainerInterface $container);

diff --git a/UPGRADE-7.0.md b/UPGRADE-7.0.md
@@ -17,6 +17,18 @@ Console
  * Passing null to `*Command::setApplication()`, `*FormatterStyle::setForeground/setBackground()`, `Helper::setHelpSet()`, `Input*::setDefault()` and `Question::setAutocompleterCallback/setValidator()` must be done explicitly
  * Remove `StringInput::REGEX_STRING`
 
+DependencyInjection
+-------------------
+
+ * Remove `#[MapDecorated]`, use `#[AutowireDecorated]` instead
+ * Remove `ProxyHelper`, use `Symfony\Component\VarExporter\ProxyHelper` instead
+ * Remove `ReferenceSetArgumentTrait`
+ * Remove support of `@required` annotation, use the `Symfony\Contracts\Service\Attribute\Required` attribute instead
+ * Passing `null` to `ContainerAwareTrait::setContainer()` must be done explicitly
+ * Remove `PhpDumper` options `inline_factories_parameter` and `inline_class_loader_parameter`, use options `inline_factories` and `inline_class_loader` instead
+ * Parameter names of `ParameterBag` cannot be numerics
+ * Remove `ContainerAwareInterface` and `ContainerAwareTrait`, use dependency injection instead
+
 DoctrineBridge
 --------------
 
@@ -25,6 +37,7 @@ DoctrineBridge
  * Remove `RememberMeTokenProviderDoctrineSchemaSubscriber`, use `RememberMeTokenProviderDoctrineSchemaListener` instead
  * Remove `DbalLogger`, use a middleware instead
  * Remove `DoctrineDataCollector::addLogger()`, use a `DebugDataHolder` instead
+ * Remove `ContainerAwareLoader`, use dependency injection in your fixtures instead
  * `ContainerAwareEventManager::getListeners()` must be called with an event name
  * DoctrineBridge now requires `doctrine/event-manager:^2`
  * Add parameter `$isSameDatabase` to `DoctrineTokenProvider::configureSchema()`

diff --git a/src/Symfony/Bridge/Doctrine/CHANGELOG.md b/src/Symfony/Bridge/Doctrine/CHANGELOG.md
@@ -9,6 +9,7 @@ CHANGELOG
  * Remove `RememberMeTokenProviderDoctrineSchemaSubscriber`, use `RememberMeTokenProviderDoctrineSchemaListener` instead
  * Remove `DbalLogger`, use a middleware instead
  * Remove `DoctrineDataCollector::addLogger()`, use a `DebugDataHolder` instead
+ * Remove `ContainerAwareLoader`, use dependency injection in your fixtures instead
  * `ContainerAwareEventManager::getListeners()` must be called with an event name
  * DoctrineBridge now requires `doctrine/event-manager:^2`
  * Add parameter `$isSameDatabase` to `DoctrineTokenProvider::configureSchema()`

diff --git a/src/Symfony/Bridge/Doctrine/DataFixtures/ContainerAwareLoader.php b/src/Symfony/Bridge/Doctrine/DataFixtures/ContainerAwareLoader.php
diff --git a/src/Symfony/Bridge/Doctrine/Tests/DataFixtures/ContainerAwareLoaderTest.php b/src/Symfony/Bridge/Doctrine/Tests/DataFixtures/ContainerAwareLoaderTest.php
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Fixtures/ContainerAwareFixture.php b/src/Symfony/Bridge/Doctrine/Tests/Fixtures/ContainerAwareFixture.php
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php
@@ -19,7 +19,6 @@
 use Symfony\Component\Console\Output\ConsoleOutputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\HttpKernel\KernelInterface;
@@ -112,14 +111,7 @@ public function get(string $name): Command
     {
         $this->registerCommands();
 
-        $command = parent::get($name);
-
-        if ($command instanceof ContainerAwareInterface) {
-            trigger_deprecation('symfony/dependency-injection', '6.4', 'Relying on "%s" to get the container in "%s" is deprecated, register the command as a service and use dependency injection instead.', ContainerAwareInterface::class, get_debug_type($command));
-            $command->setContainer($this->kernel->getContainer());
-        }
-
-        return $command;
+        return parent::get($name);
     }
 
     public function all(string $namespace = null): array

diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerResolver.php b/src/Symfony/Bundle/FrameworkBundle/Controller/ControllerResolver.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Controller;
 
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\HttpKernel\Controller\ContainerControllerResolver;
 
 /**
@@ -25,10 +24,6 @@ protected function instantiateController(string $class): object
     {
         $controller = parent::instantiateController($class);
 
-        if ($controller instanceof ContainerAwareInterface) {
-            trigger_deprecation('symfony/dependency-injection', '6.4', 'Relying on "%s" to get the container in "%s" is deprecated, register the controller as a service and use dependency injection instead.', ContainerAwareInterface::class, get_debug_type($controller));
-            $controller->setContainer($this->container);
-        }
         if ($controller instanceof AbstractController) {
             if (null === $previousContainer = $controller->setContainer($this->container)) {
                 throw new \LogicException(sprintf('"%s" has no container set, did you forget to define it as a service subscriber?', $class));