diff --git a/src/Symfony/Component/OptionsResolver/OptionConfigurator.php b/src/Symfony/Component/OptionsResolver/OptionConfigurator.php index 54d12e803dfa..47f5bea557b7 100644 --- a/src/Symfony/Component/OptionsResolver/OptionConfigurator.php +++ b/src/Symfony/Component/OptionsResolver/OptionConfigurator.php @@ -90,21 +90,8 @@ public function define(string $option): self * * @return $this */ - public function deprecated(/*string $package, string $version, $message = 'The option "%name%" is deprecated.'*/): self + public function deprecated(string $package, string $version, $message = 'The option "%name%" is deprecated.'): self { - $args = \func_get_args(); - - if (\func_num_args() < 2) { - trigger_deprecation('symfony/options-resolver', '5.1', 'The signature of method "%s()" requires 2 new arguments: "string $package, string $version", not defining them is deprecated.', __METHOD__); - - $message = $args[0] ?? 'The option "%name%" is deprecated.'; - $package = (string) $version = ''; - } else { - $package = (string) $args[0]; - $version = (string) $args[1]; - $message = (string) ($args[2] ?? 'The option "%name%" is deprecated.'); - } - $this->resolver->setDeprecated($this->name, $package, $version, $message); return $this; diff --git a/src/Symfony/Component/OptionsResolver/OptionsResolver.php b/src/Symfony/Component/OptionsResolver/OptionsResolver.php index 8e462266f2e8..88c1e3c03146 100644 --- a/src/Symfony/Component/OptionsResolver/OptionsResolver.php +++ b/src/Symfony/Component/OptionsResolver/OptionsResolver.php @@ -733,7 +733,7 @@ public function addAllowedTypes(string $option, $allowedTypes) public function define(string $option): OptionConfigurator { if (isset($this->defined[$option])) { - throw new OptionDefinitionException(sprintf('The options "%s" is already defined.', $option)); + throw new OptionDefinitionException(sprintf('The option "%s" is already defined.', $option)); } return new OptionConfigurator($option, $this); diff --git a/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php b/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php index e2c9acca72d1..983114618532 100644 --- a/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php +++ b/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php @@ -2388,24 +2388,11 @@ public function testAccessToParentOptionFromNestedNormalizerAndLazyOption() public function testFailsIfOptionIsAlreadyDefined() { $this->expectException('Symfony\Component\OptionsResolver\Exception\OptionDefinitionException'); - $this->expectExceptionMessage('The options "foo" is already defined.'); + $this->expectExceptionMessage('The option "foo" is already defined.'); $this->resolver->define('foo'); $this->resolver->define('foo'); } - /** - * @group legacy - */ - public function testDeprecatedByOptionConfiguratorWithoutPackageAndVersion() - { - $this->expectDeprecation('Since symfony/options-resolver 5.1: The signature of method "Symfony\Component\OptionsResolver\OptionConfigurator::deprecated()" requires 2 new arguments: "string $package, string $version", not defining them is deprecated.'); - - $this->resolver - ->define('foo') - ->deprecated() - ; - } - public function testResolveOptionsDefinedByOptionConfigurator() { $this->resolver->define('foo')