apply suggestions from Nicolas

alexislefebvre · alexislefebvre · commit bcc0e19eeb65 · 2023-01-30T11:47:39.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowireRequiredMethodsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowireRequiredMethodsPass.php
@@ -69,6 +69,7 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
                     if (false === stripos($doc, '@inheritdoc') || !preg_match('#(?:^/\*\*|\n\s*+\*)\s*+(?:\{@inheritdoc\}|@inheritdoc)(?:\s|\*/$)#i', $doc)) {
                         break;
                     }
+                    trigger_deprecation('symfony/dependency-injection', '6.3', 'The "@required" annotation on methods is deprecated, use the "Symfony\Contracts\Service\Attribute\Required" attribute instead.');
                 }
                 try {
                     $r = $r->getPrototype();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -947,13 +947,9 @@ public function testWithFactory()
 
     /**
      * @dataProvider provideNotWireableCalls
-     *
-     * @group legacy
      */
     public function testNotWireableCalls($method, $expectedMsg)
     {
-        $this->expectDeprecation('Since symfony/dependency-injection 6.3: The "@required" annotation on methods is deprecated, use the "Symfony\Contracts\Service\Attribute\Required" attribute instead.');
-
         $container = new ContainerBuilder();
 
         $foo = $container->register('foo', NotWireable::class)->setAutowired(true)
@@ -986,13 +982,8 @@ public function provideNotWireableCalls()
         ];
     }
 
-    /**
-     * @group legacy
-     */
     public function testSuggestRegisteredServicesWithSimilarCase()
     {
-        $this->expectDeprecation('Since symfony/dependency-injection 6.3: The "@required" annotation on methods is deprecated, use the "Symfony\Contracts\Service\Attribute\Required" attribute instead.');
-
         $container = new ContainerBuilder();
 
         $container->register(LesTilleuls::class, LesTilleuls::class);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php
@@ -446,8 +446,6 @@ public function setOptionalArgNoAutowireable($other = 'default_val')
     {
     }
 
-    // @deprecated since Symfony 6.3, to be removed in 7.0
-    /** @required */
     protected function setProtectedMethod(A $a)
     {
     }

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,7 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed`
`69`	`69`	`if (false === stripos($doc, '@inheritdoc') \|\| !preg_match('#(?:^/\\\|\n\s+\)\s+(?:\{@inheritdoc\}\|@inheritdoc)(?:\s\|\/$)#i', $doc)) {`
`70`	`70`	`break;`
`71`	`71`	`}`
	`72`	`+ trigger_deprecation('symfony/dependency-injection', '6.3', 'The "@required" annotation on methods is deprecated, use the "Symfony\Contracts\Service\Attribute\Required" attribute instead.');`
`72`	`73`	`}`
`73`	`74`	`try {`
`74`	`75`	`$r = $r->getPrototype();`
Original file line number	Diff line number	Diff line change
`@@ -446,8 +446,6 @@ public function setOptionalArgNoAutowireable($other = 'default_val')`
`446`	`446`	`{`
`447`	`447`	`}`
`448`	`448`
`449`		`- // @deprecated since Symfony 6.3, to be removed in 7.0`
`450`		`- /** @required */`
`451`	`449`	`protected function setProtectedMethod(A $a)`
`452`	`450`	`{`
`453`	`451`	`}`