8000 Using Definition instead of ChildDefinition for instanceofConditionals · symfony/symfony@5e39c5d · GitHub
[go: up one dir, main page]
Skip to content

Commit 5e39c5d

Browse files
weaverryanweaverryan
committed
Using Definition instead of ChildDefinition for instanceofConditionals
1 parent 8fd3738 commit 5e39c5d

File tree

6 files changed

+17
-16
lines changed

6 files changed

+17
-16
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ public function getMethodCalls()
339339
/**
340340
* Sets the definition templates to conditionally apply on the current definition, keyed by parent interface/class.
341341
*
342-
* @param $instanceof ChildDefinition[]
342+
* @param $instanceof Definition[]
343343
*/
344344
public function setInstanceofConditionals(array $instanceof)
345345
{
@@ -351,7 +351,7 @@ public function setInstanceofConditionals(array $instanceof)
351351
/**
352352
* Gets the definition templates to conditionally apply on the current definition, keyed by parent interface/class.
353353
*
354-
* @return ChildDefinition[]
354+
* @return Definition[]
355355
*/
356356
public function getInstanceofConditionals()
357357
{

‎src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ private function parseDefinition(\DOMElement $service, $file, array $defaults =
210210
}
211211

212212
if ($this->isLoadingInstanceof) {
213-
$definition = new ChildDefinition('');
213+
$definition = new Definition();
214214
} elseif ($parent = $service->getAttribute('parent')) {
215215
$definition = new ChildDefinition($parent);
216216

‎src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ private function parseDefinition($id, $service, $file, array $defaults)
351351
}
352352

353353
if ($this->isLoadingInstanceof) {
354-
$definition = new ChildDefinition('');
354+
$definition = new Definition();
355355
} elseif (isset($service['parent'])) {
356356
$definition = new ChildDefinition($service['parent']);
357357 10000

‎src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ public function testConfigurationOverridePriority()
142142
// overrides instanceof below
143143
->setAutowired(true)
144144
->setInstanceofConditionals(array(
145-
parent::class => (new ChildDefinition(''))
145+
parent::class => (new Definition())
146146
->setLazy(true)
147147
// both autowired and configurator are overridden
148148
->setAutowired(false)

‎src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveDefinitionInheritancePassTest.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
namespace Symfony\Component\DependencyInjection\Tests\Compiler;
1313

1414
use PHPUnit\Framework\TestCase;
15-
use Symfony\Component\DependencyInjection\ChildDefinition;
1615
use Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionInheritancePass;
1716
use Symfony\Component\DependencyInjection\ContainerBuilder;
17+
use Symfony\Component\DependencyInjection\Definition;
1818

1919
class ResolveDefinitionInheritancePassTest extends TestCase
2020
{
@@ -24,7 +24,7 @@ public function testProcess()
2424
$def = $container->register('parent', self::class)
2525
->setProperty('foo', 'moo');
2626
$def->setInstanceofConditionals(array(
27-
parent::class => (new ChildDefinition(''))
27+
parent::class => (new Definition())
2828
->setShared(false)
2929
->setLazy(true)
3030
->setPublic(false)
@@ -61,7 +61,7 @@ public function testProcessMergesMethodCallsAlways()
6161
->addMethodCall('setBaz', array('sunshine_baz'));
6262

6363
$def->setInstanceofConditionals(array(
64-
parent::class => (new ChildDefinition(''))
64+
parent::class => (new Definition())
6565
->addMethodCall('bar', array('foo'))
6666
->addMethodCall('setBaz', array('rainbow_baz')),
6767
));
@@ -84,7 +84,7 @@ public function testProcessDoesReplaceShared()
8484
$def = $container->register('parent', 'stdClass');
8585

8686
$def->setInstanceofConditionals(array(
87-
'stdClass' => (new ChildDefinition(''))->setShared(false),
87+
'stdClass' => (new Definition())->setShared(false),
8888
));
8989

9090
$this->process($container);
@@ -102,8 +102,8 @@ public function testProcessHandlesMultipleInheritance()
102102
;
103103

104104
$def->setInstanceofConditionals(array(
105-
parent::class => (new ChildDefinition(''))->setProperty('bar', 'barval_changed'),
106-
self::class => (new ChildDefinition(''))->setProperty('foo', 'fooval_changed'),
105+
parent::class => (new Definition())->setProperty('bar', 'barval_changed'),
106+
self::class => (new Definition())->setProperty('foo', 'fooval_changed'),
107107
));
108108

109109
$this->process($container);
@@ -118,7 +118,7 @@ public function testSetLazyOnServiceHasParent()
118118
$def = $container->register('parent', 'stdClass');
119119

120120
$def->setInstanceofConditionals(array(
121-
'stdClass' => (new ChildDefinition(''))->setLazy(true),
121+
'stdClass' => (new Definition())->setLazy(true),
122122
));
123123

124124
$this->process($container);
@@ -136,7 +136,7 @@ public function testProcessInheritTags()
136136
;
137137

138138
$def->setInstanceofConditionals(array(
139-
parent::class => (new ChildDefinition(''))
139+
parent::class => (new Definition())
140140
->addTag('tag_bar', array('priority' => 500))
141141
->addTag('tag_baz'),
142142
));
@@ -167,7 +167,7 @@ public function testConfigurationOverridePriority()
167167
->setTrackChanges(true);
168168

169169
$def->setInstanceofConditionals(array(
170-
parent::class => (new ChildDefinition(''))
170+
parent::class => (new Definition())
171171
// overrides autowired on _defaults
172172
->setAutowired(false)
173173
->setConfigurator('foo_configurator')

‎src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
use Symfony\Component\DependencyInjection\ChildDefinition;
1616
use Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass;
1717
use Symfony\Component\DependencyInjection\ContainerBuilder;
18+
use Symfony\Component\DependencyInjection\Definition;
1819

1920
class ResolveDefinitionTemplatesPassTest extends TestCase
2021
{
@@ -370,10 +371,10 @@ public function testProcessInstanceofConditionals()
370371

371372
$container
372373
->register('parent')
373-
->setInstanceofConditionals(array('Foo' => (new ChildDefinition(''))->setLazy(true)))
374+
->setInstanceofConditionals(array('Foo' => (new Definition())->setLazy(true)))
374375
;
375376

376-
$conditionals = array('stdClass' => (new ChildDefinition(''))->setAutowired(true), 'Bar' => (new ChildDefinition(''))->setShared(false));
377+
$conditionals = array('stdClass' => (new Definition())->setAutowired(true), 'Bar' => (new Definition())->setShared(false));
377378
$container
378379
->setDefinition('child', new ChildDefinition('parent'))
379380
->setInstanceofConditionals($conditionals)

0 commit comments

Comments
 (0)
0