Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 526d396

Browse filesBrowse files
fabpotfabpot
committed
bug #21627 [DependencyInjection] make the service container builder register its own self referencing definition (hhamon)
This PR was merged into the 3.3-dev branch. Discussion ---------- [DependencyInjection] make the service container builder register its own self referencing definition | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | ~ | License | MIT | Doc PR | ~ Commits ------- 9c97496 [DependencyInjection] make the service container builder register the definition of its related service container service (and aliases) in order to make compiler passes be able to reference the special service_container service.
2 parents 4a70919 + 9c97496 commit 526d396
Copy full SHA for 526d396

39 files changed

+234
-21
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml
-4Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@
4040
<argument type="collection" />
4141
</service>
4242

43-
<service id="Psr\Container\ContainerInterface" alias="service_container" public="false" />
44-
<service id="Symfony\Component\DependencyInjection\ContainerInterface" alias="service_container" public="false" />
45-
<service id="Symfony\Component\DependencyInjection\Container" alias="service_container" public="false" />
46-
4743
<service id="kernel" synthetic="true" />
4844

4945
<service id="filesystem" class="Symfony\Component\Filesystem\Filesystem" />

‎src/Symfony/Component/DependencyInjection/ContainerBuilder.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/ContainerBuilder.php
+12Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Component\DependencyInjection;
1313

14+
use Psr\Container\ContainerInterface as PsrContainerInterface;
1415
use Symfony\Component\DependencyInjection\Argument\ClosureProxyArgument;
1516
use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
1617
use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
@@ -38,6 +39,7 @@
3839
use Symfony\Component\DependencyInjection\LazyProxy\Instantiator\RealServiceInstantiator;
3940
use Symfony\Component\DependencyInjection\LazyProxy\InheritanceProxyHelper;
4041
use Symfony\Component\DependencyInjection\LazyProxy\InheritanceProxyInterface;
42+
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
4143
use Symfony\Component\ExpressionLanguage\Expression;
4244
use Symfony\Component\ExpressionLanguage\ExpressionFunctionProviderInterface;
4345

@@ -117,6 +119,16 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
117119
*/
118120
private $vendors;
119121

122+
public function __construct(ParameterBagInterface $parameterBag = null)
123+
{
124+
parent::__construct($parameterBag);
125+
126+
$this->setDefinition('service_container', (new Definition(ContainerInterface::class))->setSynthetic(true));
127+
$this->setAlias(PsrContainerInterface::class, new Alias('service_container', false));
128+
$this->setAlias(ContainerInterface::class, new Alias('service_container', false));
129+
$this->setAlias(Container::class, new Alias('service_container', false));
130+
}
131+
120132
/**
121133
* @var \ReflectionClass[] a list of class reflectors
122134
*/

‎src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
+32-3Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
require_once __DIR__.'/Fixtures/includes/ProjectExtension.php';
1616

1717
use PHPUnit\Framework\TestCase;
18+
use Psr\Container\ContainerInterface as PsrContainerInterface;
1819
use Symfony\Component\Config\Resource\ComposerResource;
1920
use Symfony\Component\Config\Resource\ResourceInterface;
2021
use Symfony\Component\Config\Resource\DirectoryResource;
@@ -25,6 +26,7 @@
2526
use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
2627
use Symfony\Component\DependencyInjection\ChildDefinition;
2728
use Symfony\Component\DependencyInjection\Compiler\PassConfig;
29+
use Symfony\Component\DependencyInjection\Container;
2830
use Symfony\Component\DependencyInjection\ContainerBuilder;
2931
use Symfony\Component\DependencyInjection\ContainerInterface;
3032
use Symfony\Component\DependencyInjection\Definition;
@@ -42,6 +44,22 @@
4244

4345
class ContainerBuilderTest extends TestCase
4446
{
47+
public function testDefaultRegisteredDefinitions()
48+
{
49+
$builder = new ContainerBuilder();
50+
51+
$this->assertCount(1, $builder->getDefinitions());
52+
$this->assertTrue($builder->hasDefinition('service_container'));
53+
54+
$definition = $builder->getDefinition('service_container');
55+
$this->assertInstanceOf(Definition::class, $definition);
56+
$this->assertTrue($definition->isSynthetic());
57+
$this->assertSame(ContainerInterface::class, $definition->getClass());
58+
$this->assertTrue($builder->hasAlias(PsrContainerInterface::class));
59+
$this->assertTrue($builder->hasAlias(ContainerInterface::class));
60+
$this->assertTrue($builder->hasAlias(Container::class));
61+
}
62+
4563
public function testDefinitions()
4664
{
4765
$builder = new ContainerBuilder();
@@ -203,7 +221,18 @@ public function testGetServiceIds()
203221
$builder->register('foo', 'stdClass');
204222
$builder->bar = $bar = new \stdClass();
205223
$builder->register('bar', 'stdClass');
206-
$this->assertEquals(array('foo', 'bar', 'service_container'), $builder->getServiceIds(), '->getServiceIds() returns all defined service ids');
224+
$this->assertEquals(
225+
array(
226+
'service_container',
227+
'foo',
228+
'bar',
229+
'Psr\Container\ContainerInterface',
230+
'Symfony\Component\DependencyInjection\ContainerInterface',
231+
'Symfony\Component\DependencyInjection\Container',
232+
),
233+
$builder->getServiceIds(),
234+
'->getServiceIds() returns all defined service ids'
235+
);
207236
}
208237

209238
public function testAliases()
@@ -251,7 +280,7 @@ public function testGetAliases()
251280

252281
$builder->set('foobar', 'stdClass');
253282
$builder->set('moo', 'stdClass');
254-
$this->assertCount(0, $builder->getAliases(), '->getAliases() does not return aliased services that have been overridden');
283+
$this->assertCount(3, $builder->getAliases(), '->getAliases() does not return aliased services that have been overridden');
255284
}
256285

257286
public function testSetAliases()
@@ -538,7 +567,7 @@ public function testMerge()
538567
$config->setDefinition('baz', new Definition('BazClass'));
539568
$config->setAlias('alias_for_foo', 'foo');
540569
$container->merge($config);
541-
$this->assertEquals(array('foo', 'bar', 'baz'), array_keys($container->getDefinitions()), '->merge() merges definitions already defined ones');
570+
$this->assertEquals(array('service_container', 'foo', 'bar', 'baz'), array_keys($container->getDefinitions()), '->merge() merges definitions already defined ones');
542571

543572
$aliases = $container->getAliases();
544573
$this->assertTrue(isset($aliases['alias_for_foo']));

‎src/Symfony/Component/DependencyInjection/Tests/Dumper/XmlDumperTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Dumper/XmlDumperTest.php
+16Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ public function testDumpAnonymousServices()
7070
$this->assertEquals('<?xml version="1.0" encoding="utf-8"?>
7171
<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
7272
<services>
73+
<service id="service_container" class="Symfony\Component\DependencyInjection\ContainerInterface" synthetic="true"/>
7374
<service id="foo" class="FooClass">
7475
<argument type="service">
7576
<service class="BarClass">
@@ -79,6 +80,9 @@ public function testDumpAnonymousServices()
7980
</service>
8081
</argument>
8182
</service>
83+
<service id="Psr\Container\ContainerInterface" alias="service_container" public="false"/>
84+
<service id="Symfony\Component\DependencyInjection\ContainerInterface" alias="service_container" public="false"/>
85+
<service id="Symfony\Component\DependencyInjection\Container" alias="service_container" public="false"/>
8286
</services>
8387
</container>
8488
', $dumper->dump());
@@ -91,10 +95,14 @@ public function testDumpEntities()
9195
$this->assertEquals("<?xml version=\"1.0\" encoding=\"utf-8\"?>
9296
<container xmlns=\"http://symfony.com/schema/dic/services\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd\">
9397
<services>
98+
<service id=\"service_container\" class=\"Symfony\Component\DependencyInjection\ContainerInterface\" synthetic=\"true\"/>
9499
<service id=\"foo\" class=\"FooClass\Foo\">
95100
<tag name=\"foo&quot;bar\bar\" foo=\"foo&quot;barřž€\"/>
96101
<argument>foo&lt;&gt;&amp;bar</argument>
97102
</service>
103+
<service id=\"Psr\Container\ContainerInterface\" alias=\"service_container\" public=\"false\"/>
104+
<service id=\"Symfony\Component\DependencyInjection\ContainerInterface\" alias=\"service_container\" public=\"false\"/>
105+
<service id=\"Symfony\Component\DependencyInjection\Container\" alias=\"service_container\" public=\"false\"/>
98106
</services>
99107
</container>
100108
", $dumper->dump());
@@ -117,14 +125,22 @@ public function provideDecoratedServicesData()
117125
array("<?xml version=\"1.0\" encoding=\"utf-8\"?>
118126
<container xmlns=\"http://symfony.com/schema/dic/services\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd\">
119127
<services>
128+
<service id=\"service_container\" class=\"Symfony\Component\DependencyInjection\ContainerInterface\" synthetic=\"true\"/>
120129
<service id=\"foo\" class=\"FooClass\Foo\" decorates=\"bar\" decoration-inner-name=\"bar.woozy\"/>
130+
<service id=\"Psr\Container\ContainerInterface\" alias=\"service_container\" public=\"false\"/>
131+
<service id=\"Symfony\Component\DependencyInjection\ContainerInterface\" alias=\"service_container\" public=\"false\"/>
132+
<service id=\"Symfony\Component\DependencyInjection\Container\" alias=\"service_container\" public=\"false\"/>
121133
</services>
122134
</container>
123135
", include $fixturesPath.'/containers/container15.php'),
124136
array("<?xml version=\"1.0\" encoding=\"utf-8\"?>
125137
<container xmlns=\"http://symfony.com/schema/dic/services\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd\">
126138
<services>
139+
<service id=\"service_container\" class=\"Symfony\Component\DependencyInjection\ContainerInterface\" synthetic=\"true\"/>
127140
<service id=\"foo\" class=\"FooClass\Foo\" decorates=\"bar\"/>
141+
<service id=\"Psr\Container\ContainerInterface\" alias=\"service_container\" public=\"false\"/>
142+
<service id=\"Symfony\Component\DependencyInjection\ContainerInterface\" alias=\"service_container\" public=\"false\"/>
143+
<service id=\"Symfony\Component\DependencyInjection\Container\" alias=\"service_container\" public=\"false\"/>
128144
</services>
129145
</container>
130146
", include $fixturesPath.'/containers/container16.php'),

‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/graphviz/services1.dot

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Fixtures/graphviz/services1.dot
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ digraph sc {
33
node [fontsize="11" fontname="Arial" shape="record"];
44
edge [fontsize="9" fontname="Arial" color="grey" arrowhead="open" arrowsize="0.5"];
55

6-
node_service_container [label="service_container\nSymfony\\Component\\DependencyInjection\\ContainerBuilder\n", shape=record, fillcolor="#9999ff", style="filled"];
6+
node_service_container [label="service_container (Psr\Container\ContainerInterface, Symfony\Component\DependencyInjection\ContainerInterface, Symfony\Component\DependencyInjection\Container)\nSymfony\\Component\\DependencyInjection\\ContainerInterface\n", shape=record, fillcolor="#eeeeee", style="filled"];
77
}

‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/graphviz/services10-1.dot

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Fixtures/graphviz/services10-1.dot
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ digraph sc {
33
node [fontsize="13" fontname="Verdana" shape="square"];
44
edge [fontsize="12" fontname="Verdana" color="white" arrowhead="closed" arrowsize="1"];
55

6+
node_service_container [label="service_container (Psr\Container\ContainerInterface, Symfony\Component\DependencyInjection\ContainerInterface, Symfony\Component\DependencyInjection\Container)\nSymfony\\Component\\DependencyInjection\\ContainerInterface\n", shape=square, fillcolor="grey", style="filled"];
67
node_foo [label="foo\nFooClass\n", shape=square, fillcolor="grey", style="filled"];
7-
node_service_container [label="service_container\nSymfony\\Component\\DependencyInjection\\ContainerBuilder\n", shape=square, fillcolor="green", style="empty"];
88
node_bar [label="bar\n\n", shape=square, fillcolor="red", style="empty"];
99
node_foo -> node_bar [label="" style="filled"];
1010
}

‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/graphviz/services10.dot

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Fixtures/graphviz/services10.dot
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ digraph sc {
33
node [fontsize="11" fontname="Arial" shape="record"];
44
edge [fontsize="9" fontname="Arial" color="grey" arrowhead="open" arrowsize="0.5"];
55

6+
node_service_container [label="service_container (Psr\Container\ContainerInterface, Symfony\Component\DependencyInjection\ContainerInterface, Symfony\Component\DependencyInjection\Container)\nSymfony\\Component\\DependencyInjection\\ContainerInterface\n", shape=record, fillcolor="#eeeeee", style="filled"];
67
node_foo [label="foo\nFooClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
7-
node_service_container [label="service_container\nSymfony\\Component\\DependencyInjection\\ContainerBuilder\n", shape=record, fillcolor="#9999ff", style="filled"];
88
node_bar [label="bar\n\n", shape=record, fillcolor="#ff9999", style="filled"];
99
node_foo -> node_bar [label="" style="filled"];
1010
}

‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/graphviz/services13.dot

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Fixtures/graphviz/services13.dot
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ digraph sc {
33
node [fontsize="11" fontname="Arial" shape="record"];
44
edge [fontsize="9" fontname="Arial" color="grey" arrowhead="open" arrowsize="0.5"];
55

6+
node_service_container [label="service_container\nSymfony\\Component\\DependencyInjection\\ContainerInterface\n", shape=record, fillcolor="#eeeeee", style="filled"];
67
node_foo [label="foo\nFooClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
78
node_bar [label="bar\nBarClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
8-
node_service_container [label="service_container\nSymfony\\Component\\DependencyInjection\\ContainerBuilder\n", shape=record, fillcolor="#9999ff", style="filled"];
99
node_foo -> node_bar [label="" style="filled"];
1010
}

‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/graphviz/services14.dot

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Fixtures/graphviz/services14.dot
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ digraph sc {
33
node [fontsize="11" fontname="Arial" shape="record"];
44
edge [fontsize="9" fontname="Arial" color="grey" arrowhead="open" arrowsize="0.5"];
55

6-
node_service_container [label="service_container\nContainer14\\ProjectServiceContainer\n", shape=record, fillcolor="#9999ff", style="filled"];
6+
node_service_container [label="service_container (Psr\Container\ContainerInterface, Symfony\Component\DependencyInjection\ContainerInterface, Symfony\Component\DependencyInjection\Container)\nSymfony\\Component\\DependencyInjection\\ContainerInterface\n", shape=record, fillcolor="#eeeeee", style="filled"];
77
}

‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/graphviz/services17.dot

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Fixtures/graphviz/services17.dot
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ digraph sc {
33
node [fontsize="11" fontname="Arial" shape="record"];
44
edge [fontsize="9" fontname="Arial" color="grey" arrowhead="open" arrowsize="0.5"];
55

6+
node_service_container [label="service_container (Psr\Container\ContainerInterface, Symfony\Component\DependencyInjection\ContainerInterface, Symfony\Component\DependencyInjection\Container)\nSymfony\\Component\\DependencyInjection\\ContainerInterface\n", shape=record, fillcolor="#eeeeee", style="filled"];
67
node_foo [label="foo\n%foo.class%\n", shape=record, fillcolor="#eeeeee", style="filled"];
7-
node_service_container [label="service_container\nSymfony\\Component\\DependencyInjection\\ContainerBuilder\n", shape=record, fillcolor="#9999ff", style="filled"];
88
}

‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/graphviz/services9.dot

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Fixtures/graphviz/services9.dot
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ digraph sc {
33
node [fontsize="11" fontname="Arial" shape="record"];
44
edge [fontsize="9" fontname="Arial" color="grey" arrowhead="open" arrowsize="0.5"];
55

6+
node_service_container [label="service_container (Psr\Container\ContainerInterface, Symfony\Component\DependencyInjection\ContainerInterface, Symfony\Component\DependencyInjection\Container)\nSymfony\\Component\\DependencyInjection\\ContainerInterface\n", shape=record, fillcolor="#eeeeee", style="filled"];
67
node_foo [label="foo (alias_for_foo)\nBar\\FooClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
78
node_foo_baz [label="foo.baz\nBazClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
89
node_bar [label="bar\nBar\\FooClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
@@ -30,7 +31,6 @@ digraph sc {
3031
node_lazy_context_ignore_invalid_ref [label="lazy_context_ignore_invalid_ref\nLazyContext\n", shape=record, fillcolor="#eeeeee", style="filled"];
3132
node_closure_proxy [label="closure_proxy\nBarClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
3233
node_service_locator [label="service_locator\nBar\n", shape=record, fillcolor="#eeeeee", style="filled"];
33-
node_service_container [label="service_container\nSymfony\\Component\\DependencyInjection\\ContainerBuilder\n", shape=record, fillcolor="#9999ff", style="filled"];
3434
node_foo2 [label="foo2\n\n", shape=record, fillcolor="#ff9999", style="filled"];
3535
node_foo3 [label="foo3\n\n", shape=record, fillcolor="#ff9999", style="filled"];
3636
node_foobaz [label="foobaz\n\n", shape=record, fillcolor="#ff9999", style="filled"];

‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php
+5Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ class Container extends AbstractContainer
2929
public function __construct()
3030
{
3131
$this->services = array();
32+
$this->normalizedIds = array(
33+
'psr\\container\\containerinterface' => 'Psr\\Container\\ContainerInterface',
34+
'symfony\\component\\dependencyinjection\\container' => 'Symfony\\Component\\DependencyInjection\\Container',
35+
'symfony\\component\\dependencyinjection\\containerinterface' => 'Symfony\\Component\\DependencyInjection\\ContainerInterface',
36+
);
3237

3338
$this->aliases = array();
3439
}

‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php
+5Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ class ProjectServiceContainer extends Container
2828
public function __construct()
2929
{
3030
$this->services = array();
31+
$this->normalizedIds = array(
32+
'psr\\container\\containerinterface' => 'Psr\\Container\\ContainerInterface',
33+
'symfony\\component\\dependencyinjection\\container' => 'Symfony\\Component\\DependencyInjection\\Container',
34+
'symfony\\component\\dependencyinjection\\containerinterface' => 'Symfony\\Component\\DependencyInjection\\ContainerInterface',
35+
);
3136

3237
$this->aliases = array();
3338
}

‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
+5Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ public function __construct()
3030
$this->parameters = $this->getDefaultParameters();
3131

3232
$this->services = array();
33+
$this->normalizedIds = array(
34+
'psr\\container\\containerinterface' => 'Psr\\Container\\ContainerInterface',
35+
'symfony\\component\\dependencyinjection\\container' => 'Symfony\\Component\\DependencyInjection\\Container',
36+
'symfony\\component\\dependencyinjection\\containerinterface' => 'Symfony\\Component\\DependencyInjection\\ContainerInterface',
37+
);
3338
$this->methodMap = array(
3439
'test' => 'getTestService',
3540
);

‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php
+5Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ public function __construct()
3434
$this->parameters = $this->getDefaultParameters();
3535

3636
$this->services = array();
37+
$this->normalizedIds = array(
38+
'psr\\container\\containerinterface' => 'Psr\\Container\\ContainerInterface',
39+
'symfony\\component\\dependencyinjection\\container' => 'Symfony\\Component\\DependencyInjection\\Container',
40+
'symfony\\component\\dependencyinjection\\containerinterface' => 'Symfony\\Component\\DependencyInjection\\ContainerInterface',
41+
);
3742
$this->methodMap = array(
3843
'test' => 'getTestService',
3944
);

‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services13.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services13.php
+5Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ class ProjectServiceContainer extends Container
2828
public function __construct()
2929
{
3030
$this->services = array();
31+
$this->normalizedIds = array(
32+
'psr\\container\\containerinterface' => 'Psr\\Container\\ContainerInterface',
33+
'symfony\\component\\dependencyinjection\\container' => 'Symfony\\Component\\DependencyInjection\\Container',
34+
'symfony\\component\\dependencyinjection\\containerinterface' => 'Symfony\\Component\\DependencyInjection\\ContainerInterface',
35+
);
3136
$this->methodMap = array(
3237
'bar' => 'getBarService',
3338
);

‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php
+5Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ class ProjectServiceContainer extends Container
2828
public function __construct()
2929
{
3030
$this->services = array();
31+
$this->normalizedIds = array(
32+
'psr\\container\\containerinterface' => 'Psr\\Container\\ContainerInterface',
33+
'symfony\\component\\dependencyinjection\\container' => 'Symfony\\Component\\DependencyInjection\\Container',
34+
'symfony\\component\\dependencyinjection\\containerinterface' => 'Symfony\\Component\\DependencyInjection\\ContainerInterface',
35+
);
3136
$this->methodMap = array(
3237
'service_from_anonymous_factory' => 'getServiceFromAnonymousFactoryService',
3338
'service_with_method_call_and_factory' => 'getServiceWithMethodCallAndFactoryService',

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.