Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[DI] Dont tell about autoregistration in strict autowiring mode #26635

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
Mar 22, 2018
Merged

[DI] Dont tell about autoregistration in strict autowiring mode #26635

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
24 changes: 17 additions & 7 deletions src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class AutowirePass extends AbstractRecursivePass
{
private $definedTypes = array();
private $types;
private $ambiguousServiceTypes = array();
private $ambiguousServiceTypes;
private $autowired = array();
private $lastFailure;
private $throwOnAutowiringException;
Expand Down Expand Up @@ -71,7 +71,7 @@ public function process(ContainerBuilder $container)
} finally {
$this->definedTypes = array();
$this->types = null;
$this->ambiguousServiceTypes = array();
$this->ambiguousServiceTypes = null;
$this->autowired = array();
}
}
Expand Down Expand Up @@ -286,7 +286,7 @@ private function getAutowiredReference(TypedReference $reference, $deprecationMe
}

if (null === $this->types) {
$this->populateAvailableTypes();
$this->populateAvailableTypes($this->strictMode);
}

if (isset($this->definedTypes[$type])) {
Expand Down Expand Up @@ -322,12 +322,15 @@ private function getAutowiredReference(TypedReference $reference, $deprecationMe
/**
* Populates the list of available types.
*/
private function populateAvailableTypes()
private function populateAvailableTypes($onlyAutowiringTypes = false)
{
$this->types = array();
if (!$onlyAutowiringTypes) {
$this->ambiguousServiceTypes = array();
}

foreach ($this->container->getDefinitions() as $id => $definition) {
$this->populateAvailableType($id, $definition);
$this->populateAvailableType($id, $definition, $onlyAutowiringTypes);
}
}

Expand All @@ -337,7 +340,7 @@ private function populateAvailableTypes()
* @param string $id
* @param Definition $definition
*/
private function populateAvailableType($id, Definition $definition)
private function populateAvailableType($id, Definition $definition, $onlyAutowiringTypes)
{
// Never use abstract services
if ($definition->isAbstract()) {
Expand All @@ -350,6 +353,10 @@ private function populateAvailableType($id, Definition $definition)
unset($this->ambiguousServiceTypes[$type]);
}

if ($onlyAutowiringTypes) {
return;
}

if (preg_match('/^\d+_[^~]++~[._a-zA-Z\d]{7}$/', $id) || $definition->isDeprecated() || !$reflectionClass = $this->container->getReflectionClass($definition->getClass(), false)) {
return;
}
Expand Down Expand Up @@ -479,12 +486,15 @@ private function createTypeAlternatives(TypedReference $reference)
if ($message = $this->getAliasesSuggestionForType($type = $reference->getType())) {
return ' '.$message;
}
if (null === $this->ambiguousServiceTypes) {
$this->populateAvailableTypes();
}

if (isset($this->ambiguousServiceTypes[$type])) {
$message = sprintf('one of these existing services: "%s"', implode('", "', $this->ambiguousServiceTypes[$type]));
} elseif (isset($this->types[$type])) {
$message = sprintf('the existing "%s" service', $this->types[$type]);
} elseif ($reference->getRequiringClass() && !$reference->canBeAutoregistered()) {
} elseif ($reference->getRequiringClass() && !$reference->canBeAutoregistered() && !$this->strictMode) {
return ' It cannot be auto-registered because it is from a different root namespace.';
} else {
return;
Expand Down