Remove the default values from setters with a nullable parameter.

Author: derrabus

CHANGELOG.md

@@ -9,6 +9,8 @@ CHANGELOG
  * Add `enum` env var processor
  * Add `shuffle` env var processor
  * Allow #[When] to be extended
+ * Change the signature of `ContainerAwareInterface::setContainer()` to `setContainer(?ContainerInterface $container)`
+ * Deprecate calling `ContainerAwareTrait::setContainer()` without arguments
 
 6.1
 ---

ContainerAwareInterface.php

@@ -21,5 +21,5 @@ interface ContainerAwareInterface
     /**
      * Sets the container.
      */
-    public function setContainer(ContainerInterface $container = null);
+    public function setContainer(?ContainerInterface $container);
 }

ContainerAwareTrait.php

@@ -25,6 +25,10 @@ trait ContainerAwareTrait
 
     public function setContainer(ContainerInterface $container = null)
     {
+        if (1 > \func_num_args()) {
+            trigger_deprecation('symfony/dependency-injection', '6.2', 'Calling "%s::%s()" without any arguments is deprecated. Please explicitly pass null if you want to unset the container.', static::class, __FUNCTION__);
+        }
+
         $this->container = $container;
     }
 }

Tests/ContainerAwareTraitTest.php

@@ -0,0 +1,64 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerAwareTrait;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+class ContainerAwareTraitTest extends TestCase
+{
+    use ExpectDeprecationTrait;
+
+    /**
+     * @group legacy
+     */
+    public function testSetContainerLegacy()
+    {
+        $container = $this->createMock(ContainerInterface::class);
+
+        $dummy = new ContainerAwareDummy();
+        $dummy->setContainer($container);
+
+        self::assertSame($container, $dummy->getContainer());
+
+        $this->expectDeprecation('Since symfony/dependency-injection 6.2: Calling "Symfony\Component\DependencyInjection\Tests\ContainerAwareDummy::setContainer()" without any arguments is deprecated. Please explicitly pass null if you want to unset the container.');
+
+        $dummy->setContainer();
+        self::assertNull($dummy->getContainer());
+    }
+
+    public function testSetContainer()
+    {
+        $container = $this->createMock(ContainerInterface::class);
+
+        $dummy = new ContainerAwareDummy();
+        $dummy->setContainer($container);
+
+        self::assertSame($container, $dummy->getContainer());
+
+        $dummy->setContainer(null);
+        self::assertNull($dummy->getContainer());
+    }
+}
+
+class ContainerAwareDummy implements ContainerAwareInterface
+{
+    use ContainerAwareTrait;
+
+    public function getContainer(): ?ContainerInterface
+    {
+        return $this->container;
+    }
+}