Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
bug #12784 [DependencyInjection] make paths relative to __DIR__ in th…
…e generated container (nicolas-grekas) This PR was merged into the 2.3 branch. Discussion ---------- [DependencyInjection] make paths relative to __DIR__ in the generated container | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #6484, #3079, partially #9238, #10894, #10999 | License | MIT | Doc PR | n/a This is an alternative approach to #10999 for removing absolute paths from the generated container: instead of trying to fix the container file after it has been dumped, telling to the PhpDumper where its output will be written allows it to replace parts of strings by an equivalent value based on `__DIR__`. This should be safe, thus the PR is on 2.3. Commits ------- edd7057 [DependencyInjection] make paths relative to __DIR__ in the generated container
- Loading branch information
Showing
4 changed files
with
183 additions
and
6 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
110 changes: 110 additions & 0 deletions
110
src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.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,110 @@ | ||
| <?php | ||
|
|
||
| use Symfony\Component\DependencyInjection\ContainerInterface; | ||
| use Symfony\Component\DependencyInjection\Container; | ||
| use Symfony\Component\DependencyInjection\Exception\InactiveScopeException; | ||
| use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException; | ||
| use Symfony\Component\DependencyInjection\Exception\LogicException; | ||
| use Symfony\Component\DependencyInjection\Exception\RuntimeException; | ||
| use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag; | ||
|
|
||
| /** | ||
| * ProjectServiceContainer | ||
| * | ||
| * This class has been auto-generated | ||
| * by the Symfony Dependency Injection Component. | ||
| */ | ||
| class ProjectServiceContainer extends Container | ||
| { | ||
| /** | ||
| * Constructor. | ||
| */ | ||
| public function __construct() | ||
| { | ||
| $this->parameters = $this->getDefaultParameters(); | ||
|
|
||
| $this->services = | ||
| $this->scopedServices = | ||
| $this->scopeStacks = array(); | ||
|
|
||
| $this->set('service_container', $this); | ||
|
|
||
| $this->scopes = array(); | ||
| $this->scopeChildren = array(); | ||
| $this->methodMap = array( | ||
| 'test' => 'getTestService', | ||
| ); | ||
|
|
||
| $this->aliases = array(); | ||
| } | ||
|
|
||
| /** | ||
| * Gets the 'test' service. | ||
| * | ||
| * This service is shared. | ||
| * This method always returns the same instance of the service. | ||
| * | ||
| * @return \stdClass A stdClass instance. | ||
| */ | ||
| protected function getTestService() | ||
| { | ||
| return $this->services['test'] = new \stdClass(('wiz'.dirname(__DIR__)), array(('wiz'.dirname(__DIR__)) => ('wiz'.dirname(__DIR__)))); | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function getParameter($name) | ||
| { | ||
| $name = strtolower($name); | ||
|
|
||
| if (!(isset($this->parameters[$name]) || array_key_exists($name, $this->parameters))) { | ||
| throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name)); | ||
| } | ||
|
|
||
| return $this->parameters[$name]; | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function hasParameter($name) | ||
| { | ||
| $name = strtolower($name); | ||
|
|
||
| return isset($this->parameters[$name]) || array_key_exists($name, $this->parameters); | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function setParameter($name, $value) | ||
| { | ||
| throw new LogicException('Impossible to call set() on a frozen ParameterBag.'); | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function getParameterBag() | ||
| { | ||
| if (null === $this->parameterBag) { | ||
| $this->parameterBag = new FrozenParameterBag($this->parameters); | ||
| } | ||
|
|
||
| return $this->parameterBag; | ||
| } | ||
| /** | ||
| * Gets the default parameters. | ||
| * | ||
| * @return array An array of the default parameters | ||
| */ | ||
| protected function getDefaultParameters() | ||
| { | ||
| return array( | ||
| 'foo' => ('wiz'.dirname(__DIR__)), | ||
| 'bar' => __DIR__, | ||
| 'baz' => (__DIR__.'/PhpDumperTest.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