Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
[DependencyInjection] fix #29930 add $lazyLoad flag to the generated …
…factory code for lazy non-shared services | Q | A | ------------- | --- | Branch? | 4.1 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #29930 | License | MIT | Doc PR | n/a Fix #29930 by adding $lazyLoad context to the generated code for lazy non-shared service by PhpDumper
- Loading branch information
Anthony MARTIN
committed
Feb 7, 2019
1 parent
32e1400
commit df8dd1d
Showing
5 changed files
with
144 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 5 additions & 0 deletions
5
...ony/Component/DependencyInjection/Tests/Fixtures/containers/container_non_shared_lazy.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
<?php | ||
|
||
use Symfony\Component\DependencyInjection\ContainerBuilder; | ||
|
||
return new ContainerBuilder(); |
7 changes: 7 additions & 0 deletions
7
src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/foo_lazy.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
<?php | ||
|
||
namespace Bar; | ||
|
||
class FooLazyClass | ||
{ | ||
} |
110 changes: 110 additions & 0 deletions
110
...ny/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy_as_files.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,110 @@ | ||
Array | ||
( | ||
[Container%s/removed-ids.php] => <?php | ||
|
||
return [ | ||
'Psr\\Container\\ContainerInterface' => true, | ||
'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true, | ||
]; | ||
|
||
[Container%s/getNonSharedFooService.php] => <?php | ||
|
||
use Symfony\Component\DependencyInjection\Argument\RewindableGenerator; | ||
use Symfony\Component\DependencyInjection\Exception\RuntimeException; | ||
|
||
// This file has been auto-generated by the Symfony Dependency Injection Component for internal use. | ||
// Returns the public 'non_shared_foo' service. | ||
|
||
include_once ($this->targetDirs[0].'/Fixtures/includes/foo_lazy.php'); | ||
|
||
$this->factories['non_shared_foo'] = function ($lazyLoad = true) { | ||
return new \Bar\FooLazyClass(); | ||
}; | ||
|
||
return $this->factories['non_shared_foo'](); | ||
|
||
[Container%s/ProjectServiceContainer.php] => <?php | ||
|
||
namespace Container%s; | ||
|
||
use Symfony\Component\DependencyInjection\Argument\RewindableGenerator; | ||
use Symfony\Component\DependencyInjection\ContainerInterface; | ||
use Symfony\Component\DependencyInjection\Container; | ||
use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException; | ||
use Symfony\Component\DependencyInjection\Exception\LogicException; | ||
use Symfony\Component\DependencyInjection\Exception\RuntimeException; | ||
use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag; | ||
|
||
/** | ||
* This class has been auto-generated | ||
* by the Symfony Dependency Injection Component. | ||
* | ||
* @final since Symfony 3.3 | ||
*/ | ||
class ProjectServiceContainer extends Container | ||
{ | ||
private $buildParameters; | ||
private $containerDir; | ||
private $parameters; | ||
private $targetDirs = []; | ||
|
||
public function __construct(array $buildParameters = [], $containerDir = __DIR__) | ||
{ | ||
$dir = $this->targetDirs[0] = \dirname($containerDir); | ||
for ($i = 1; $i <= 5; ++$i) { | ||
$this->targetDirs[$i] = $dir = \dirname($dir); | ||
} | ||
$this->buildParameters = $buildParameters; | ||
$this->containerDir = $containerDir; | ||
$this->services = $this->privates = []; | ||
$this->fileMap = [ | ||
'non_shared_foo' => 'getNonSharedFooService.php', | ||
]; | ||
|
||
$this->aliases = []; | ||
} | ||
|
||
public function compile() | ||
{ | ||
throw new LogicException('You cannot compile a dumped container that was already compiled.'); | ||
} | ||
|
||
public function isCompiled() | ||
{ | ||
return true; | ||
} | ||
|
||
public function getRemovedIds() | ||
{ | ||
return require $this->containerDir.\DIRECTORY_SEPARATOR.'removed-ids.php'; | ||
} | ||
|
||
protected function load($file, $lazyLoad = true) | ||
{ | ||
return require $this->containerDir.\DIRECTORY_SEPARATOR.$file; | ||
} | ||
} | ||
|
||
[ProjectServiceContainer.php] => <?php | ||
|
||
// This file has been auto-generated by the Symfony Dependency Injection Component for internal use. | ||
|
||
if (\class_exists(\Container%s\ProjectServiceContainer::class, false)) { | ||
// no-op | ||
} elseif (!include __DIR__.'/Container%s/ProjectServiceContainer.php') { | ||
touch(__DIR__.'/Container%s.legacy'); | ||
|
||
return; | ||
} | ||
|
||
if (!\class_exists(ProjectServiceContainer::class, false)) { | ||
\class_alias(\Container%s\ProjectServiceContainer::class, ProjectServiceContainer::class, false); | ||
} | ||
|
||
return new \Container%s\ProjectServiceContainer([ | ||
'container.build_hash' => '%s', | ||
'container.build_id' => '%s', | ||
'container.build_time' => %d, | ||
], __DIR__.\DIRECTORY_SEPARATOR.'Container%s'); | ||
|
||
) |