10000 [DependencyInjection] Add autowiring capabilities by dunglas · Pull Request #15613 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[DependencyInjection] Add autowiring capabilities #15613

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 19 commits into from
Closed

[DependencyInjection] Add autowiring capabilities #15613

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
9828da2
[DependencyInjection] Add autowiring capabilities
dunglas Aug 24, 2015
195f6c0
Fix CS
dunglas Aug 25, 2015
8d23c9d
Remove unused argument
dunglas Aug 25, 2015
27f4de8
Fix CS
dunglas Aug 25, 2015
5575ec1
Fix issues raised by @stof
dunglas Aug 25, 2015
edce23d
Better RunTime exception error.
dunglas Aug 26, 2015
07d475e
Fix CS
dunglas Aug 26, 2015
afe009a
Flag to enable/disable autowiring. no_autowiring tag.
dunglas Aug 27, 2015
7ab5b08
Fix some tests
dunglas Aug 27, 2015
a7ca3f2
Fix @meyerbaptiste comments
dunglas Aug 28, 2015
57c494c
Move the autowiring parameter to a setter
dunglas Aug 28, 2015
e642aa8
Fix SecurityBundle test
dunglas Aug 28, 2015
d00c7e3
Optin. Removed config flag.
dunglas Aug 28, 2015
55bb42c
Fix CS
dunglas Aug 30, 2015
7806487
[DependencyInjection] Rename types to autowiring_types
dunglas Sep 24, 2015
585616d
[DependencyInjection] Add the new 'autowire' syntax.
dunglas Sep 28, 2015
c717c69
Fix tests.
dunglas Sep 28, 2015
3b7f553
Fix @fabpot and @stof comments.
dunglas Oct 2, 2015
936a16a
Typehint against a non-existing class
dunglas Oct 2, 2015
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
Typehint against a non-existing class
  • Loading branch information
@dunglas
dunglas committed Oct 2, 2015
commit 936a16a3809bc5a8dddc849c0ff09b389faf93b5
42 changes: 26 additions & 16 deletions src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
View file
Open in desktop
try {
Original file line number Diff line number Diff line change
Expand Up @@ -71,31 +71,41 @@ private function completeDefinition($id, Definition $definition)

$arguments = $definition->getArguments();
foreach ($constructor->getParameters() as $index => $parameter) {
if (!$typeHint = $parameter->getClass()) {
continue;
}

$argumentExists = array_key_exists($index, $arguments);
if ($argumentExists && '' !== $arguments[$index]) {
continue;
}

if (null === $this->types) {
$this->populateAvailableTypes();
}
try {
if (!$typeHint = $parameter->getClass()) {
continue;
}

if (isset($this->types[$typeHint->name])) {
$value = new Reference($this->types[$typeHint->name]);
} else {
$value = $this->createAutowiredDefinition($typeHint, $id);
} catch (RuntimeException $e) {
if (!$parameter->isDefaultValueAvailable()) {
throw $e;
if (null === $this->types) {
$this->populateAvailableTypes();
}

if (isset($this->types[$typeHint->name])) {
$value = new Reference($this->types[$typeHint->name]);
} else {
try {
$value = $this->createAutowiredDefinition($typeHint, $id);
} catch (RuntimeException $e) {
if (!$parameter->isDefaultValueAvailable()) {
throw $e;
}

$value = $parameter->getDefaultValue();
}
}
} catch (\ReflectionException $reflectionException) {
// Typehint against a non-existing class

$value = $parameter->getDefaultValue();
if (!$parameter->isDefaultValueAvailable()) {
continue;
}

$value = $parameter->getDefaultValue();
}

if ($argumentExists) {
Expand Down
0