Merge branch '2.3' into 2.7

nicolas-grekas · nicolas-grekas · commit ad97d11970b8 · 2016-02-04T14:52:46.000+01:00
* 2.3:
  add files used in FileResource objects
diff --git a/ContainerBuilder.php b/ContainerBuilder.php
@@ -255,7 +255,9 @@ public function addClassResource(\ReflectionClass $class)
         }
 
         do {
-            $this->addResource(new FileResource($class->getFileName()));
+            if (is_file($class->getFileName())) {
+                $this->addResource(new FileResource($class->getFileName()));
+            }
         } while ($class = $class->getParentClass());
 
         return $this;

Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,9 @@ public function addClassResource(\ReflectionClass $class)`
`255`	`255`	`}`
`256`	`256`
`257`	`257`	`do {`
`258`		`- $this->addResource(new FileResource($class->getFileName()));`
	`258`	`+ if (is_file($class->getFileName())) {`
	`259`	`+ $this->addResource(new FileResource($class->getFileName()));`
	`260`	`+ }`
`259`	`261`	`} while ($class = $class->getParentClass());`
`260`	`262`
`261`	`263`	`return $this;`