minor #36509 [OptionsResolver] remove not needed BC layer (xabbuh)

fabpot · fabpot · commit 418c8479b0c2 · 2020-04-21T23:43:03.000+02:00
This PR was merged into the 5.1-dev branch. Discussion ---------- [OptionsResolver] remove not needed BC layer | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | | License | MIT | Doc PR | Commits ------- 1452619 remove not needed BC layer
diff --git 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
@@ -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
@@ -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')

Original file line number	Diff line number	Diff line change
`@@ -733,7 +733,7 @@ public function addAllowedTypes(string $option, $allowedTypes)`
`733`	`733`	`public function define(string $option): OptionConfigurator`
`734`	`734`	`{`
`735`	`735`	`if (isset($this->defined[$option])) {`
`736`		`- throw new OptionDefinitionException(sprintf('The options "%s" is already defined.', $option));`
	`736`	`+ throw new OptionDefinitionException(sprintf('The option "%s" is already defined.', $option));`
`737`	`737`	`}`
`738`	`738`
`739`	`739`	`return new OptionConfigurator($option, $this);`