8000 [DependencyInjection] Introduce a flag to enable setter autowiring by dunglas · Pull Request #19631 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[DependencyInjection] Introduce a flag to enable setter autowiring #19631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

[DependencyInjection] Introduce a flag to enable setter autowiring #19631

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1bb1953
[DependencyInjection] Introduce a flag to enable setter autowiring
dunglas Aug 16, 2016
148912c
Rename settersAutowired to autowiredSetters
dunglas Aug 16, 2016
ca649aa
Add missing support for YAML and XML loaders
dunglas Aug 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Rename settersAutowired to autowiredSetters
  • Loading branch information
@dunglas
dunglas committed Aug 16, 2016
commit 148912cf9f430349c1fe6ffae9268c0bc09bcd5f
2 changes: 1 addition & 1 deletion src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ private function completeDefinition($id, Definition $definition)
$this->autowireMethod($id, $definition, $constructor, true);
}

if (!$definition->isSettersAutowired()) {
if (!$definition->hasAutowiredSetters()) {
return;
}

Expand Down
12 changes: 6 additions & 6 deletions src/Symfony/Component/DependencyInjection/Definition.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class Definition
private $lazy = false;
private $decoratedService;
private $autowired = false;
private $settersAutowired = false;
private $autowiredSetters = false;
private $autowiringTypes = array();

protected $arguments;
Expand Down Expand Up @@ -685,21 +685,21 @@ public function setAutowired($autowired)
*
* @return bool
*/
public function isSettersAutowired()
public function hasAutowiredSetters()
{
return $this->settersAutowired;
return $this->autowiredSetters;
}

/**
* Sets setters autowired.
*
* @param $settersAutowired
* @param $autowiredSetters
*
* @return Definition The current instance
*/
public function setSettersAutowired($settersAutowired)
public function setAutowiredSetters($autowiredSetters)
{
$this->settersAutowired = $settersAutowired;
$this->autowiredSetters = $autowiredSetters;

return $this;
}
Expand Down
4 changes: 2 additions & 2 deletions src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ public function testSetterInjection()
$container
->register('setter_injection', SetterInjection::class)
->setAutowired(true)
->setSettersAutowired(true)
->setAut D00F owiredSetters(true)
->addMethodCall('setWithCallsConfigured', array('manual_arg1', 'manual_arg2'))
;

Expand Down Expand Up @@ -546,7 +546,7 @@ public function testSetterInjectionCollisionThrowsException()
$container->register('c2', CollisionB::class);
$aDefinition = $container->register('setter_injection_collision', SetterInjectionCollision::class);
$aDefinition->setAutowired(true);
$aDefinition->setSettersAutowired(true);
$aDefinition->setAutowiredSetters(true);

$pass = new AutowirePass();
$pass->process($container);
Expand Down
6 changes: 3 additions & 3 deletions src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,9 +295,9 @@ public function testAutowired()
public function testSettersAutowired()
{
$def = new Definition('stdClass');
$this->assertFalse($def->isSettersAutowired());
$def->setSettersAutowired(true);
$this->assertTrue($def->isSettersAutowired());
$this->assertFalse($def->hasAutowiredSetters());
$def->setAutowiredSetters(true);
$this->assertTrue($def->hasAutowiredSetters());
}

public function testTypes()
Expand Down
0