fixup frozen bag deprecations

HeahDude · HeahDude · commit 63d39b0ac7e9 · 2022-12-17T14:14:19.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/FrozenParameterBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/FrozenParameterBag.php
@@ -28,7 +28,7 @@ class FrozenParameterBag extends ParameterBag
      */
     public function __construct(
         array $parameters = [],
-        private array $deprecatedParameters = [],
+        protected array $deprecatedParameters = [],
     ) {
         $this->parameters = $parameters;
         $this->resolved = true;
@@ -58,9 +58,4 @@ public function remove(string $name)
     {
         throw new LogicException('Impossible to call remove() on a frozen ParameterBag.');
     }
-
-    public function allDeprecated(): array
-    {
-        return $this->deprecatedParameters;
-    }
 }
diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php
@@ -24,7 +24,7 @@ class ParameterBag implements ParameterBagInterface
 {
     protected $parameters = [];
     protected $resolved = false;
-    private array $deprecatedParameters = [];
+    protected array $deprecatedParameters = [];
 
     public function __construct(array $parameters = [])
     {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/FrozenParameterBagTest.php b/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/FrozenParameterBagTest.php
@@ -12,10 +12,13 @@
 namespace Symfony\Component\DependencyInjection\Tests\ParameterBag;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
 
 class FrozenParameterBagTest extends TestCase
 {
+    use ExpectDeprecationTrait;
+
     public function testConstructor()
     {
         $parameters = [
@@ -53,4 +56,28 @@ public function testRemove()
         $bag = new FrozenParameterBag(['foo' => 'bar']);
         $bag->remove('foo');
     }
+
+    public function testDeprecate()
+    {
+        $this->expectException(\LogicException::class);
+        $bag = new FrozenParameterBag(['foo' => 'bar']);
+        $bag->deprecate('foo', 'symfony/test', '6.3');
+    }
+
+    /**
+     * The test should be kept in the group as it always expects a deprecation.
+     *
+     * @group legacy
+     */
+    public function testGetDeprecated()
+    {
+        $bag = new FrozenParameterBag(
+            ['foo' => 'bar'],
+            ['foo' => ['symfony/test', '6.3', 'The parameter "%s" is deprecated.', 'foo']]
+        );
+
+        $this->expectDeprecation('Since symfony/test 6.3: The parameter "foo" is deprecated.');
+
+        $bag->get('foo');
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ class FrozenParameterBag extends ParameterBag`
`28`	`28`	`*/`
`29`	`29`	`public function __construct(`
`30`	`30`	`array $parameters = [],`
`31`		`- private array $deprecatedParameters = [],`
	`31`	`+ protected array $deprecatedParameters = [],`
`32`	`32`	`) {`
`33`	`33`	`$this->parameters = $parameters;`
`34`	`34`	`$this->resolved = true;`
`@@ -58,9 +58,4 @@ public function remove(string $name)`
`58`	`58`	`{`
`59`	`59`	`throw new LogicException('Impossible to call remove() on a frozen ParameterBag.');`
`60`	`60`	`}`
`61`		`-`
`62`		`- public function allDeprecated(): array`
`63`		`- {`
`64`		`- return $this->deprecatedParameters;`
`65`		`- }`
`66`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class ParameterBag implements ParameterBagInterface`
`24`	`24`	`{`
`25`	`25`	`protected $parameters = [];`
`26`	`26`	`protected $resolved = false;`
`27`		`- private array $deprecatedParameters = [];`
	`27`	`+ protected array $deprecatedParameters = [];`
`28`	`28`
`29`	`29`	`public function __construct(array $parameters = [])`
`30`	`30`	`{`