Skip to content

Simplify MemoizingContainer #5019

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
staabm merged 1 commit into from
Feb 21, 2026
Merged

Simplify MemoizingContainer #5019

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
20 changes: 2 additions & 18 deletions src/DependencyInjection/MemoizingContainer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

namespace PHPStan\DependencyInjection;

use function array_key_exists;

#[AutowiredService(as: Container::class)]
final class MemoizingContainer implements Container
{
Expand All @@ -28,26 +26,12 @@ public function hasService(string $serviceName): bool

public function getService(string $serviceName)
{
if (array_key_exists($serviceName, $this->servicesByName)) {
return $this->servicesByName[$serviceName];
}

$service = $this->originalContainer->getService($serviceName);
$this->servicesByName[$serviceName] = $service;

return $service;
return $this->servicesByName[$serviceName] ??= $this->originalContainer->getService($serviceName);
}

public function getByType(string $className)
{
if (array_key_exists($className, $this->servicesByType)) {
return $this->servicesByType[$className];
}

$service = $this->originalContainer->getByType($className);
$this->servicesByType[$className] = $service;

return $service;
return $this->servicesByType[$className] ??= $this->originalContainer->getByType($className);
}

public function findServiceNamesByType(string $className): array
Expand Down
Loading