Revert "bug symfony#39861 [DependencyInjection] Skip deprecated definitions in CheckTypeDeclarationsPass (chalasr)"

chalasr · chalasr · commit e3e0ccff5816 · 2021-09-30T23:54:41.000+02:00
This reverts commit 5ba237a, reversing changes made to 833a9e0.
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/TestBundle.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/TestBundle.php
@@ -33,6 +33,6 @@ public function process(ContainerBuilder $container)
             }
         });
 
-        $container->addCompilerPass(new CheckTypeDeclarationsPass(true), PassConfig::TYPE_AFTER_REMOVING, -100);
+        $container->addCompilerPass(new CheckTypeDeclarationsPass(), PassConfig::TYPE_AFTER_REMOVING, -100);
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php
@@ -84,7 +84,7 @@ protected function processValue($value, $isRoot = false)
             return $value;
         }
 
-        if (!$value instanceof Definition || $value->hasErrors() || $value->isDeprecated()) {
+        if (!$value instanceof Definition || $value->hasErrors()) {
             return parent::processValue($value, $isRoot);
         }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckTypeDeclarationsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckTypeDeclarationsPassTest.php
@@ -26,7 +26,6 @@
 use Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\BarMethodCall;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\BarOptionalArgument;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\BarOptionalArgumentNotNull;
-use Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\Deprecated;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\Foo;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\FooObject;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\IntersectionConstructor;
@@ -728,19 +727,6 @@ public function testProcessSkipSkippedIds()
         $this->addToAssertionCount(1);
     }
 
-    public function testProcessSkipsDeprecatedDefinitions()
-    {
-        $container = new ContainerBuilder();
-        $container
-            ->register('foobar', Deprecated::class)
-            ->setDeprecated(true)
-        ;
-
-        (new CheckTypeDeclarationsPass(true))->process($container);
-
-        $this->addToAssertionCount(1);
-    }
-
     public function testProcessHandleClosureForCallable()
     {
         $closureDefinition = new Definition(\Closure::class);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/CheckTypeDeclarationsPass/Deprecated.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/CheckTypeDeclarationsPass/Deprecated.php

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,6 @@ public function process(ContainerBuilder $container)`
`33`	`33`	`}`
`34`	`34`	`});`
`35`	`35`
`36`		`- $container->addCompilerPass(new CheckTypeDeclarationsPass(true), PassConfig::TYPE_AFTER_REMOVING, -100);`
	`36`	`+ $container->addCompilerPass(new CheckTypeDeclarationsPass(), PassConfig::TYPE_AFTER_REMOVING, -100);`
`37`	`37`	`}`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ protected function processValue($value, $isRoot = false)`
`84`	`84`	`return $value;`
`85`	`85`	`}`
`86`	`86`
`87`		`- if (!$value instanceof Definition \|\| $value->hasErrors() \|\| $value->isDeprecated()) {`
	`87`	`+ if (!$value instanceof Definition \|\| $value->hasErrors()) {`
`88`	`88`	`return parent::processValue($value, $isRoot);`
`89`	`89`	`}`
`90`	`90`