Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit 478a98846ef1 · 2016-02-04T14:53:00.000+01:00
* 2.7:
  add files used in FileResource objects
diff --git a/ContainerBuilder.php b/ContainerBuilder.php
@@ -260,7 +260,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
`@@ -260,7 +260,9 @@ public function addClassResource(\ReflectionClass $class)`
`260`	`260`	`}`
`261`	`261`
`262`	`262`	`do {`
`263`		`- $this->addResource(new FileResource($class->getFileName()));`
	`263`	`+ if (is_file($class->getFileName())) {`
	`264`	`+ $this->addResource(new FileResource($class->getFileName()));`
	`265`	`+ }`
`264`	`266`	`} while ($class = $class->getParentClass());`
`265`	`267`
`266`	`268`	`return $this;`