8000 [DI] Fix autowire error for inlined services by weaverryan · Pull Request #22857 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[DI] Fix autowire error for inlined services #22857

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

Closed
wants to merge 2 commits into from
Closed

[DI] Fix autowire error for inlined services #22857

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75b11d5
Fixing a bug where inlined services did not get autowiring exceptions
weaverryan May 22, 2017
aeb38f6
Freeing up some memory references
weaverryan May 22, 2017
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
Prev Previous commit
Freeing up some memory references
  • Loading branch information
@weaverryan
weaverryan committed May 22, 2017
commit aeb38f642a73e37635c91b73d49c682e1173def6
13 changes: 12 additions & 1 deletion src/Symfony/Component/DependencyInjection/Compiler/AutowireExceptionPass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,19 @@ public function __construct(AutowirePass $autowirePass, InlineServiceDefinitions

public function process(ContainerBuilder $container)
{
// the pass should only be run once
if (null === $this->autowirePass || null === $this->inlineServicePass) {
return;
}

$inlinedIds = $this->inlineServicePass->getInlinedServiceIds();
foreach ($this->autowirePass->getAutowiringExceptions() as $exception) {
$exceptions = $this->autowirePass->getAutowiringExceptions();

// free up references
$this->autowirePass = null;
$this->inlineServicePass = null;

foreach ($exceptions as $exception) {
if ($container->hasDefinition($exception->getServiceId()) || in_array($exception->getServiceId(), $inlinedIds)) {
throw $exception;
} 979D
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
namespace Symfony\Component\DependencyInjection\Compiler;

use Symfony\Component\DependencyInjection\Argument\ArgumentInterface;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Definition;
use Symfony\Component\DependencyInjection\Reference;

Expand Down
0