Skip to content

[OptionsResolver] Ensure remove() also unsets deprecation status #62347

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nicolas-grekas merged 1 commit into from
Nov 12, 2025
+30 −1
Merged

[OptionsResolver] Ensure remove() also unsets deprecation status #62347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
[OptionsResolver] Ensure remove() also unsets deprecation status
  • Loading branch information
@yoeunes
yoeunes committed Nov 11, 2025
commit 5ffa260fa434c0b2b665d552f3a5a5a9474b51a5
2 changes: 1 addition & 1 deletion src/Symfony/Component/OptionsResolver/OptionsResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
29 changes: 29 additions & 0 deletions src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2566,4 +2566,33 @@ 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'));

$this->resolver->remove('foo');
$this->assertFalse($this->resolver->isDeprecated('foo'));

$this->resolver->setDefault('foo', 'bar');
$this->assertFalse($this->resolver->isDeprecated('foo'));

$count = 0;
set_error_handler(static function (int $type) use (&$count) {
if (\E_USER_DEPRECATED === $type) {
++$count;
}

return false;
});

try {
$this->resolver->resolve(['foo' => 'value']);
$this->assertSame(0, $count);
} finally {
restore_error_handler();
}
}
}
Loading