[Config] Allow schemed path in FileResource

nicolas-grekas · nicolas-grekas · commit c73f34d2bc19 · 2016-05-20T13:48:17.000+02:00
diff --git a/src/Symfony/Component/Config/Resource/FileResource.php b/src/Symfony/Component/Config/Resource/FileResource.php
@@ -36,6 +36,10 @@ public function __construct($resource)
     {
         $this->resource = realpath($resource);
 
+        if (false === $this->resource && file_exists($resource)) {
+            $this->resource = $resource;
+        }
+
         if (false === $this->resource) {
             throw new \InvalidArgumentException(sprintf('The file "%s" does not exist.', $resource));
         }
diff --git a/src/Symfony/Component/Config/Tests/Resource/FileResourceTest.php b/src/Symfony/Component/Config/Tests/Resource/FileResourceTest.php
@@ -21,7 +21,7 @@ class FileResourceTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->file = realpath(sys_get_temp_dir()).'/tmp.xml';
+        $this->file = sys_get_temp_dir().'/tmp.xml';
         $this->time = time();
         touch($this->file, $this->time);
         $this->resource = new FileResource($this->file);
@@ -41,6 +41,12 @@ public function testGetResource()
         $this->assertSame(realpath($this->file), $this->resource->getResource(), '->getResource() returns the path to the resource');
     }
 
+    public function testGetResourceWithScheme()
+    {
+        $resource = new FileResource('file://'.$this->file);
+        $this->assertSame('file://'.$this->file, $resource->getResource(), '->getResource() returns the path to the schemed resource');
+    }
+
     public function testToString()
     {
         $this->assertSame(realpath($this->file), (string) $this->resource);

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,10 @@ public function __construct($resource)`
`36`	`36`	`{`
`37`	`37`	`$this->resource = realpath($resource);`
`38`	`38`
	`39`	`+ if (false === $this->resource && file_exists($resource)) {`
	`40`	`+ $this->resource = $resource;`
	`41`	`+ }`
	`42`	`+`
`39`	`43`	`if (false === $this->resource) {`
`40`	`44`	`throw new \InvalidArgumentException(sprintf('The file "%s" does not exist.', $resource));`
`41`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class FileResourceTest extends \PHPUnit_Framework_TestCase`
`21`	`21`
`22`	`22`	`protected function setUp()`
`23`	`23`	`{`
`24`		`- $this->file = realpath(sys_get_temp_dir()).'/tmp.xml';`
	`24`	`+ $this->file = sys_get_temp_dir().'/tmp.xml';`
`25`	`25`	`$this->time = time();`
`26`	`26`	`touch($this->file, $this->time);`
`27`	`27`	`$this->resource = new FileResource($this->file);`
`@@ -41,6 +41,12 @@ public function testGetResource()`
`41`	`41`	`$this->assertSame(realpath($this->file), $this->resource->getResource(), '->getResource() returns the path to the resource');`
`42`	`42`	`}`
`43`	`43`
	`44`	`+ public function testGetResourceWithScheme()`
	`45`	`+ {`
	`46`	`+ $resource = new FileResource('file://'.$this->file);`
	`47`	`+ $this->assertSame('file://'.$this->file, $resource->getResource(), '->getResource() returns the path to the schemed resource');`
	`48`	`+ }`
	`49`	`+`
`44`	`50`	`public function testToString()`
`45`	`51`	`{`
`46`	`52`	`$this->assertSame(realpath($this->file), (string) $this->resource);`