8000 [DependencyInjection] fix tests by xabbuh · Pull Request #24365 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[DependencyInjection] fix tests #24365

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
Sep 28, 2017
Merged

[DependencyInjection] fix tests #24365

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
7 changes: 3 additions & 4 deletions src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,8 +274,8 @@ use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
// Returns the public 'tagged_iterator' shared service.

return $this->services['tagged_iterator'] = new \Bar(new RewindableGenerator(function () {
yield 0 => ${($_ = isset($this->services['foo']) ? $this->services['foo'] : $this->load(__DIR__.'/getFooService.php')) && false ?: '_'};
yield 1 => ${($_ = isset($this->services['tagged_iterator_foo']) ? $this->services['tagged_iterator_foo'] : $this->services['tagged_iterator_foo'] = new \Bar()) && false ?: '_'};
yield 0 => ($this->services['foo'] ?? $this->load(__DIR__.'/getFooService.php'));
yield 1 => ($this->privates['tagged_iterator_foo'] ?? $this->privates['tagged_iterator_foo'] = new \Bar());
}, 2));

[Container%s/getTaggedIteratorFooService.php] => <?php
Expand All @@ -285,7 +285,7 @@ use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
// This file has been auto-generated by the Symfony Dependency Injection Component for internal use.
// Returns the private 'tagged_iterator_foo' shared service.

return $this->services['tagged_iterator_foo'] = new \Bar();
return $this->privates['tagged_iterator_foo'] = new \Bar();

[Container%s/Container.php] => <?php

Expand Down Expand Up @@ -348,7 +348,6 @@ class Container%s extends Container
'new_factory_service' => __DIR__.'/getNewFactoryServiceService.php',
'service_from_static_method' => __DIR__.'/getServiceFromStaticMethodService.php',
'tagged_iterator' => __DIR__.'/getTaggedIteratorService.php',
'tagged_iterator_foo' => __DIR__.'/getTaggedIteratorFooService.php',
);
$this->aliases = array(
'alias_for_alias' => 'foo',
Expand Down
15 changes: 2 additions & 13 deletions src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ public function __construct()
'new_factory_service' => 'getNewFactoryServiceService',
'service_from_static_method' => 'getServiceFromStaticMethodService',
'tagged_iterator' => 'getTaggedIteratorService',
'tagged_iterator_foo' => 'getTaggedIteratorFooService',
);
$this->aliases = array(
'alias_for_alias' => 'foo',
Expand Down Expand Up @@ -382,8 +381,8 @@ protected function getServiceFromStaticMethodService()
protected function getTaggedIteratorService()
{
return $this->services['tagged_iterator'] = new \Bar(new RewindableGenerator(function () {
yield 0 => ${($_ = isset($this->services['foo']) ? $this->services['foo'] : $this->getFooService()) && false ?: '_'};
yield 1 => ${($_ = isset($this->services['tagged_iterator_foo']) ? $this->services['tagged_iterator_foo'] : $this->services['tagged_iterator_foo'] = new \Bar()) && false ?: '_'};
yield 0 => ($this->services['foo'] ?? $this->getFooService());
yield 1 => ($this->privates['tagged_iterator_foo'] ?? $this->privates['tagged_iterator_foo'] = new \Bar());
}, 2));
}

Expand All @@ -401,16 +400,6 @@ protected function getFactorySimpleService()
return $this->privates['factory_simple'] = new \SimpleFactoryClass('foo');
}

/**
* Gets the private 'tagged_iterator_foo' shared service.
*
* @return \Bar
*/
protected function getTaggedIteratorFooService()
{
return $this->services['tagged_iterator_foo'] = new \Bar();
}

/**
* {@inheritdoc}
*/
Expand Down
0