minor #21466 [DI] Remove usages of ClassExistenceResource (nicolas-grekas)

fabpot · fabpot · commit b09dd17840b8 · 2017-01-31T13:44:19.000-08:00
This PR was merged into the 3.3-dev branch.

Discussion
----------

[DI] Remove usages of ClassExistenceResource

| Q             | A
| ------------- | ---
| Branch?       | master
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

As discussed in #21452 (see last comments)

Commits
-------

ec8f1ad453 [DI] Remove usages of ClassExistenceResource
diff --git a/Compiler/FactoryReturnTypePass.php b/Compiler/FactoryReturnTypePass.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\DependencyInjection\Compiler;
 
+use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
@@ -65,6 +66,9 @@ private function updateDefinition(ContainerBuilder $container, $id, Definition $
         if (is_string($factory)) {
             try {
                 $m = new \ReflectionFunction($factory);
+                if (false !== $m->getFileName() && file_exists($m->getFileName())) {
+                    $container->addResource(new FileResource($m->getFileName()));
+                }
             } catch (\ReflectionException $e) {
                 return;
             }
diff --git a/ContainerBuilder.php b/ContainerBuilder.php
@@ -1007,7 +1007,7 @@ public function resolveServices($value)
             if ('service_container' === $id = (string) $reference) {
                 $class = parent::class;
             } elseif (!$this->hasDefinition($id) && ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE !== $reference->getInvalidBehavior()) {
-                return null;
+                return;
             } else {
                 $class = $parameterBag->resolveValue($this->findDefinition($id)->getClass());
             }

Original file line number	Diff line number	Diff line change
`@@ -1007,7 +1007,7 @@ public function resolveServices($value)`
`1007`	`1007`	`if ('service_container' === $id = (string) $reference) {`
`1008`	`1008`	`$class = parent::class;`
`1009`	`1009`	`} elseif (!$this->hasDefinition($id) && ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE !== $reference->getInvalidBehavior()) {`
`1010`		`- return null;`
	`1010`	`+ return;`
`1011`	`1011`	`} else {`
`1012`	`1012`	`$class = $parameterBag->resolveValue($this->findDefinition($id)->getClass());`
`1013`	`1013`	`}`