Update FileLoader to fix issue symfony#10339

FileLoader now uses resolved FileLoader's (the one that explicitly
supports that resource) FileLocatorInterface instance before falling
back to its own when trying to load resources in import() method.

Author: msumme

src/Symfony/Component/Config/Loader/FileLoader.php

@@ -67,7 +67,8 @@ public function import($resource, $type = null, $ignoreErrors = false, $sourceRe
             $loader = $this->resolve($resource, $type);
 
             if ($loader instanceof FileLoader && null !== $this->currentDir) {
-                $resource = $this->locator->locate($resource, $this->currentDir, false);
+                $locator = $loader->getLocator() ?: $this->locator;
+                $resource = $locator->locate($resource, $this->currentDir, false);
             }
 
             $resources = is_array($resource) ? $resource : array($resource);

src/Symfony/Component/Config/Tests/Loader/FileLoaderTest.php

@@ -20,10 +20,12 @@ class FileLoaderTest extends \PHPUnit_Framework_TestCase
     /**
      * @covers Symfony\Component\Config\Loader\FileLoader
      */
-    public function testImport()
+    public function testImportWithFileLocatorDelegation()
     {
         $locatorMock = $this->getMock('Symfony\Component\Config\FileLocatorInterface');
-        $locatorMock->expects($this->any())->method('locate')->will($this->onConsecutiveCalls(
+
+        $locatorMockForAdditionalLoader = $this->getMock('Symfony\Component\Config\FileLocatorInterface');
+        $locatorMockForAdditionalLoader->expects($this->any())->method('locate')->will($this->onConsecutiveCalls(
                 array('path/to/file1'),                    // Default
                 array('path/to/file1', 'path/to/file2'),   // First is imported
                 array('path/to/file1', 'path/to/file2'),   // Second is imported
@@ -32,8 +34,13 @@ public function testImport()
                 ));
 
         $fileLoader = new TestFileLoader($locatorMock);
+        $fileLoader->setSupports(false);
         $fileLoader->setCurrentDir('.');
-        $fileLoader->setResolver($loaderResolver = new LoaderResolver(array($fileLoader)));
+
+        $additionalLoader = new TestFileLoader($locatorMockForAdditionalLoader);
+        $additionalLoader->setCurrentDir('.');
+
+        $fileLoader->setResolver($loaderResolver = new LoaderResolver(array($fileLoader, $additionalLoader)));
 
         // Default case
         $this->assertSame('path/to/file1', $fileLoader->import('my_resource'));
@@ -66,14 +73,16 @@ public function testImport()
 
 class TestFileLoader extends FileLoader
 {
+    private $supports = true;
+
     public function load($resource, $type = null)
     {
         return $resource;
     }
 
     public function supports($resource, $type = null)
     {
-        return true;
+        return $this->supports;
     }
 
     public function addLoading($resource)
@@ -90,4 +99,9 @@ public function clearLoading()
     {
         self::$loading = array();
     }
+
+    public function setSupports($supports)
+    {
+        $this->supports = $supports;
+    }
 }