bug #40872 [DependencyInjection] [AliasDeprecatedPublicServicesPass] Noop when the service is private (fancyweb)

fabpot · fabpot · commit d4844ef28f79 · 2021-04-20T07:26:14.000+02:00
This PR was merged into the 5.2 branch. Discussion ---------- [DependencyInjection] [AliasDeprecatedPublicServicesPass] Noop when the service is private | Q | A | ------------- | --- | Branch? | 5.2 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - If the service is already private, I think we can just ignore the tag and do nothing. Moreover, when we deprecate a public service, if an user already sets its definition to private, it will be transparent instead of throwing. Commits ------- 00048a9 [DependencyInjection][AliasDeprecatedPublicServicesPass] Noop when the service is private
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AliasDeprecatedPublicServicesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/AliasDeprecatedPublicServicesPass.php
@@ -54,7 +54,7 @@ public function process(ContainerBuilder $container)
 
             $definition = $container->getDefinition($id);
             if (!$definition->isPublic() || $definition->isPrivate()) {
-                throw new InvalidArgumentException(sprintf('The "%s" service is private: it cannot have the "%s" tag.', $id, $this->tagName));
+                continue;
             }
 
             $container
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AliasDeprecatedPublicServicesPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AliasDeprecatedPublicServicesPassTest.php
@@ -59,14 +59,13 @@ public function processWithMissingAttributeProvider()
 
     public function testProcessWithNonPublicService()
     {
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('The "foo" service is private: it cannot have the "container.private" tag.');
-
         $container = new ContainerBuilder();
         $container
             ->register('foo')
             ->addTag('container.private', ['package' => 'foo/bar', 'version' => '1.2']);
 
         (new AliasDeprecatedPublicServicesPass())->process($container);
+
+        $this->assertTrue($container->hasDefinition('foo'));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public function process(ContainerBuilder $container)`
`54`	`54`
`55`	`55`	`$definition = $container->getDefinition($id);`
`56`	`56`	`if (!$definition->isPublic() \|\| $definition->isPrivate()) {`
`57`		`- throw new InvalidArgumentException(sprintf('The "%s" service is private: it cannot have the "%s" tag.', $id, $this->tagName));`
	`57`	`+ continue;`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`$container`
Original file line number	Diff line number	Diff line change
`@@ -59,14 +59,13 @@ public function processWithMissingAttributeProvider()`
`59`	`59`
`60`	`60`	`public function testProcessWithNonPublicService()`
`61`	`61`	`{`
`62`		`- $this->expectException(InvalidArgumentException::class);`
`63`		`- $this->expectExceptionMessage('The "foo" service is private: it cannot have the "container.private" tag.');`
`64`		`-`
`65`	`62`	`$container = new ContainerBuilder();`
`66`	`63`	`$container`
`67`	`64`	`->register('foo')`
`68`	`65`	`->addTag('container.private', ['package' => 'foo/bar', 'version' => '1.2']);`
`69`	`66`
`70`	`67`	`(new AliasDeprecatedPublicServicesPass())->process($container);`
	`68`	`+`
	`69`	`+ $this->assertTrue($container->hasDefinition('foo'));`
`71`	`70`	`}`
`72`	`71`	`}`