Movatterモバイル変換

[0]ホーム
URL:

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

 Sign up
Appearance settings

Commit03c7680

Browse files
[DI] Add getter injection
1 parentd614193 commit03c7680

16 files changed

+189
-14
lines changed

‎src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ public function process(ContainerBuilder $container)
7575

7676
if (!$this->onlyConstructorArguments) {
7777
$this->processArguments($definition->getMethodCalls());
78+
$this->processArguments($definition->getOverriddenGetters());
7879
$this->processArguments($definition->getProperties());
7980
if ($definition->getConfigurator()) {
8081
$this->processArguments(array($definition->getConfigurator()));
@@ -108,6 +109,7 @@ private function processArguments(array $arguments)
108109
}elseif ($argumentinstanceof Definition) {
109110
$this->processArguments($argument->getArguments());
110111
$this->processArguments($argument->getMethodCalls());
112+
$this->processArguments($argument->getOverriddenGetters());
111113
$this->processArguments($argument->getProperties());
112114

113115
if (is_array($argument->getFactory())) {

‎src/Symfony/Component/DependencyInjection/Compiler/CheckExceptionOnInvalidReferenceBehaviorPass.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ private function processDefinition(Definition $definition)
4141
{
4242
$this->processReferences($definition->getArguments());
4343
$this->processReferences($definition->getMethodCalls());
44+
$this->processReferences($definition->getOverriddenGetters());
4445
$this->processReferences($definition->getProperties());
4546
}
4647

‎src/Symfony/Component/DependencyInjection/Compiler/CheckReferenceValidityPass.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ public function process(ContainerBuilder $container)
4747

4848
$this->validateReferences($definition->getArguments());
4949
$this->validateReferences($definition->getMethodCalls());
50+
$this->validateReferences($definition->getOverriddenGetters());
5051
$this->validateReferences($definition->getProperties());
5152
}
5253
}

‎src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ private function inlineArguments(ContainerBuilder $container, array $arguments,
8484
}elseif ($argumentinstanceof Definition) {
8585
$argument->setArguments($this->inlineArguments($container,$argument->getArguments()));
8686
$argument->setMethodCalls($this->inlineArguments($container,$argument->getMethodCalls()));
87+
$argument->setOverriddenGetters($this->inlineArguments($container,$argument->getOverriddenGetters()));
8788
$argument->setProperties($this->inlineArguments($container,$argument->getProperties()));
8889

8990
$configurator =$this->inlineArguments($container,array($argument->getConfigurator()));

‎src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ public function process(ContainerBuilder $container)
7676
foreach ($container->getDefinitions()as$definitionId =>$definition) {
7777
$definition->setArguments($this->updateArgumentReferences($replacements,$definitionId,$definition->getArguments()));
7878
$definition->setMethodCalls($this->updateArgumentReferences($replacements,$definitionId,$definition->getMethodCalls()));
79+
$definition->setOverriddenGetters($this->updateArgumentReferences($replacements,$definitionId,$definition->getOverriddenGetters()));
7980
$definition->setProperties($this->updateArgumentReferences($replacements,$definitionId,$definition->getProperties()));
8081
$definition->setFactory($this->updateFactoryReference($replacements,$definition->getFactory()));
8182
}

‎src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ private function resolveArguments(ContainerBuilder $container, array $arguments,
7272
}
7373
$argument->setArguments($this->resolveArguments($container,$argument->getArguments()));
7474
$argument->setMethodCalls($this->resolveArguments($container,$argument->getMethodCalls()));
75+
$argument->setOverriddenGetters($this->resolveArguments($container,$argument->getOverriddenGetters()));
7576
$argument->setProperties($this->resolveArguments($container,$argument->getProperties()));
7677

7778
$configurator =$this->resolveArguments($container,array($argument->getConfigurator()));
@@ -131,6 +132,7 @@ private function doResolveDefinition(ContainerBuilder $container, ChildDefinitio
131132
$def->setClass($parentDef->getClass());
132133
$def->setArguments($parentDef->getArguments());
133134
$def->setMethodCalls($parentDef->getMethodCalls());
135+
$def->setOverriddenGetters($parentDef->getOverriddenGetters());
134136
$def->setProperties($parentDef->getProperties());
135137
$def->setAutowiringTypes($parentDef->getAutowiringTypes());
136138
if ($parentDef->isDeprecated()) {
@@ -203,6 +205,11 @@ private function doResolveDefinition(ContainerBuilder $container, ChildDefinitio
203205
$def->setMethodCalls(array_merge($def->getMethodCalls(),$calls));
204206
}
205207

208+
// merge overridden getters
209+
foreach ($definition->getOverriddenGetters()as$k =>$v) {
210+
$def->setOverriddenGetter($k,$v);
211+
}
212+
206213
// merge autowiring types
207214
foreach ($definition->getAutowiringTypes()as$autowiringType) {
208215
$def->addAutowiringType($autowiringType);

‎src/Symfony/Component/DependencyInjection/Compiler/ResolveInvalidReferencesPass.php‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,17 @@ public function process(ContainerBuilder $container)
5353
}
5454
$definition->setMethodCalls($calls);
5555

56+
$getters =array();
57+
foreach ($definition->getOverriddenGetters()as$name =>$value) {
58+
try {
59+
$value =$this->processArguments(array($value),true);
60+
$getters[$name] =reset($value);
61+
}catch (RuntimeException$e) {
62+
// this call is simply removed
63+
}
64+
}
65+
$definition->setOverriddenGetters($getters);
66+
5667
$properties =array();
5768
foreach ($definition->getProperties()as$name =>$value) {
5869
try {

‎src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ public function process(ContainerBuilder $container)
5151
}
5252
$definition->setMethodCalls($calls);
5353

54+
$definition->setOverriddenGetters($parameterBag->resolveValue($definition->getOverriddenGetters()));
5455
$definition->setProperties($parameterBag->resolveValue($definition->getProperties()));
5556
}catch (ParameterNotFoundException$e) {
5657
$e->setSourceId($id);

‎src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ public function process(ContainerBuilder $container)
4141

4242
$definition->setArguments($this->processArguments($definition->getArguments()));
4343
$definition->setMethodCalls($this->processArguments($definition->getMethodCalls()));
44+
$definition->setOverriddenGetters($this->processArguments($definition->getOverriddenGetters()));
4445
$definition->setProperties($this->processArguments($definition->getProperties()));
4546
$definition->setFactory($this->processFactory($definition->getFactory()));
4647
}

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ class Definition
2929
private$deprecationTemplate ='The "%service_id%" service is deprecated. You should stop using it, as it will soon be removed.';
3030
private$properties =array();
3131
private$calls =array();
32+
private$getters =array();
3233
private$configurator;
3334
private$tags =array();
3435
private$public =true;
@@ -319,6 +320,28 @@ public function getMethodCalls()
319320
return$this->calls;
320321
}
321322

323+
publicfunctionsetOverriddenGetter($name,$returnValue)
324+
{
325+
if (!$name) {
326+
thrownewInvalidArgumentException(sprintf('Getter name cannot be empty.'));
327+
}
328+
$this->getters[$name] =$returnValue;
329+
330+
return$this;
331+
}
332+
333+
publicfunctionsetOverriddenGetters(array$getters)
334+
{
335+
$this->getters =$getters;
336+
337+
return$this;
338+
}
339+
340+
publicfunctiongetOverriddenGetters()
341+
{
342+
return$this->getters;
343+
}
344+
322345
/**
323346
* Sets tags for this definition.
324347
*

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp