Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

[DependencyInjection] Shared private services becomes public after a public service is accessed #48591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 15, 2022
Merged

[DependencyInjection] Shared private services becomes public after a public service is accessed #48591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions 18 src/Symfony/Component/DependencyInjection/ContainerBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,8 +546,8 @@ public function has(string $id)
*/
public function get(string $id, int $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE)
{
if ($this->isCompiled() && isset($this->removedIds[$id]) && ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE >= $invalidBehavior) {
return parent::get($id);
if ($this->isCompiled() && isset($this->removedIds[$id])) {
return ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE >= $invalidBehavior ? parent::get($id) : null;
}

return $this->doGet($id, $invalidBehavior);
Expand All @@ -564,9 +564,9 @@ private function doGet(string $id, int $invalidBehavior = ContainerInterface::EX
}
try {
if (ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE === $invalidBehavior) {
return parent::get($id, $invalidBehavior);
return $this->privates[$id] ?? parent::get($id, $invalidBehavior);
}
if ($service = parent::get($id, ContainerInterface::NULL_ON_INVALID_REFERENCE)) {
if (null !== $service = $this->privates[$id] ?? parent::get($id, ContainerInterface::NULL_ON_INVALID_REFERENCE)) {
return $service;
}
} catch (ServiceCircularReferenceException $e) {
Expand Down Expand Up @@ -1085,8 +1085,8 @@ private function createService(Definition $definition, array &$inlineServices, b
}
}

if (null !== $id && $definition->isShared() && isset($this->services[$id]) && ($tryProxy || !$definition->isLazy())) {
return $this->services[$id];
if (null !== $id && $definition->isShared() && (isset($this->services[$id]) || isset($this->privates[$id])) && ($tryProxy || !$definition->isLazy())) {
return $this->services[$id] ?? $this->privates[$id];
}

if (null !== $factory) {
Expand Down Expand Up @@ -1665,7 +1665,11 @@ private function shareService(Definition $definition, $service, ?string $id, arr
$inlineServices[$id ?? spl_object_hash($definition)] = $service;

if (null !== $id && $definition->isShared()) {
$this->services[$id] = $service;
if ($definition->isPrivate() && $this->isCompiled()) {
$this->privates[$id] = $service;
} else {
$this->services[$id] = $service;
}
unset($this->loading[$id]);
}
}
Expand Down
7 changes: 1 addition & 6 deletions 7 src/Symfony/Component/DependencyInjection/ReverseContainer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,6 @@ public function getId(object $service): ?string
*/
public function getService(string $id): object
{
if ($this->serviceContainer->has($id)) {
return $this->serviceContainer->get($id);
}

if ($this->reversibleLocator->has($id)) {
return $this->reversibleLocator->get($id);
}
Expand All @@ -75,7 +71,6 @@ public function getService(string $id): object
throw new ServiceNotFoundException($id, null, null, [], sprintf('The "%s" service is private and cannot be accessed by reference. You should either make it public, or tag it as "%s".', $id, $this->tagName));
}

// will throw a ServiceNotFoundException
$this->serviceContainer->get($id);
return $this->serviceContainer->get($id);
}
}
9 changes: 9 additions & 0 deletions 9 src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1105,10 +1105,19 @@ public function testPrivateServiceUser()
$container->addDefinitions([
'bar' => $fooDefinition,
'bar_user' => $fooUserDefinition->setPublic(true),
'bar_user2' => $fooUserDefinition->setPublic(true),
]);

$container->compile();
$this->assertNull($container->get('bar', $container::NULL_ON_INVALID_REFERENCE));
$this->assertInstanceOf(\BarClass::class, $container->get('bar_user')->bar);

// Ensure that accessing a public service with a shared private service
// does not make the private service available.
$this->assertNull($container->get('bar', $container::NULL_ON_INVALID_REFERENCE));

// Ensure the private service is still shared.
$this->assertSame($container->get('bar_user')->bar, $container->get('bar_user2')->bar);
}

public function testThrowsExceptionWhenSetServiceOnACompiledContainer()
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.