[OptionsResolver] Ensure remove() also unsets deprecation status

yoeunes · yoeunes · commit d50c74dd09ff · 2025-11-08T20:47:53.000+01:00
diff --git a/src/Symfony/Component/OptionsResolver/OptionsResolver.php b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
@@ -803,7 +803,7 @@ public function remove(string|array $optionNames): static
 
         foreach ((array) $optionNames as $option) {
             unset($this->defined[$option], $this->defaults[$option], $this->required[$option], $this->resolved[$option]);
-            unset($this->lazy[$option], $this->normalizers[$option], $this->allowedTypes[$option], $this->allowedValues[$option], $this->info[$option]);
+            unset($this->lazy[$option], $this->normalizers[$option], $this->allowedTypes[$option], $this->allowedValues[$option], $this->info[$option], $this->deprecated[$option]);
         }
 
         return $this;
diff --git a/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php b/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php
@@ -2566,4 +2566,37 @@ public function testPrototypeDefinition()
 
         $this->assertSame($expectedOptions, $actualOptions);
     }
+
+    public function testRemoveAlsoRemovesDeprecation()
+    {
+        $this->resolver->setDefined('foo');
+        $this->resolver->setDeprecated('foo', 'vendor/package', '1.0');
+
+        $this->assertTrue($this->resolver->isDeprecated('foo'));
+
+        // Remove the option
+        $this->resolver->remove('foo');
+
+        // Assert the deprecation is also gone
+        $this->assertFalse($this->resolver->isDeprecated('foo'));
+
+        // Re-define it without deprecation (this should not fail)
+        $this->resolver->setDefault('foo', 'bar');
+        $this->assertFalse($this->resolver->isDeprecated('foo'));
+
+        // Make sure no deprecation warning is triggered
+        $count = 0;
+        set_error_handler(function (int $type) use (&$count) {
+            if (\E_USER_DEPRECATED === $type) {
+                ++$count;
+            }
+
+            return false;
+        });
+
+        $this->resolver->resolve(['foo' => 'value']);
+        $this->assertSame(0, $count);
+
+        restore_error_handler();
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -803,7 +803,7 @@ public function remove(string\|array $optionNames): static`
`803`	`803`
`804`	`804`	`foreach ((array) $optionNames as $option) {`
`805`	`805`	`unset($this->defined[$option], $this->defaults[$option], $this->required[$option], $this->resolved[$option]);`
`806`		`- unset($this->lazy[$option], $this->normalizers[$option], $this->allowedTypes[$option], $this->allowedValues[$option], $this->info[$option]);`
	`806`	`+ unset($this->lazy[$option], $this->normalizers[$option], $this->allowedTypes[$option], $this->allowedValues[$option], $this->info[$option], $this->deprecated[$option]);`
`807`	`807`	`}`
`808`	`808`
`809`	`809`	`return $this;`