Allow parameters resolution

symfony · GaryPEGEOT · Mar 4, 2019 · Mar 6, 2019 · Mar 6, 2019 · Mar 6, 2019
commit 903eaacd05d16304750ae4be22d09b6a86238079
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -759,14 +759,18 @@ private function resolveServices($value, $file, $isParameter = false)
                 return new Reference($id);
             }
             if ('yaml_file' === $value->getTag()) {
+                $filePath = $this->container->getParameterBag()->resolveValue((string) $argument);
                 $rootDir = \dirname($file);
-                $file = \is_file($argument) ? $argument : "$rootDir/$argument";
 
-                if (!\is_file($file)) {
+                if (!\is_file($filePath)) {
+                    $filePath = "$rootDir/$filePath";
+                }
+
+                if (!\is_file($filePath)) {
                     throw new InvalidArgumentException("Unable to locate file \"$argument\". Please provide a path relative to \"$rootDir\" or an absolute path.");
                 }
 
-                return $this->yamlParser->parseFile($file, Yaml::PARSE_CONSTANT);
+                return $this->yamlParser->parseFile($filePath, Yaml::PARSE_CONSTANT);
             }
 
             throw new InvalidArgumentException(sprintf('Unsupported tag "!%s".', $value->getTag()));

diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/baz/nested_test_yaml_file.yaml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/baz/nested_test_yaml_file.yaml
@@ -0,0 +1,3 @@
+foo:
+  bar: true
+  baz: 42
diff --git a/...onent/DependencyInjection/Tests/Fixtures/yaml/services_with_yaml_file_tag_with_params.yml b/...onent/DependencyInjection/Tests/Fixtures/yaml/services_with_yaml_file_tag_with_params.yml
@@ -0,0 +1,4 @@
+services:
+  my_awesome_service_with_yaml_inside:
+    arguments:
+      - !yaml_file '%fixture_path%/nested_test_yaml_file.yaml'
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
@@ -803,17 +803,30 @@ public function testFqcnLazyProxy()
         $this->assertSame([['interface' => 'SomeInterface']], $definition->getTag('proxy'));
     }
 
-    public function testYamlFileTag()
+    /**
+     * @dataProvider provideYamlFileResources
+     */
+    public function testYamlFileTag(string $resource)
     {
+        $path = self::$fixturesPath.'/yaml';
         $container = new ContainerBuilder();
+        $container->setParameter('fixture_path', "$path/baz");
 
-        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
-        $loader->load('services_with_yaml_file_tag.yml');
+        $loader = new YamlFileLoader($container, new FileLocator($path));
+        $loader->load($resource);
 
         $definition = $container->getDefinition('my_awesome_service_with_yaml_inside');
         $this->assertSame(['foo' => ['bar' => true, 'baz' => 42]], $definition->getArgument(0));
     }
 
+    public function provideYamlFileResources(): array
+    {
+        return [
+            'Relative path' => ['services_with_yaml_file_tag.yml'],
+            'Path with parameter' => ['services_with_yaml_file_tag_with_params.yml'],
+        ];
+    }
+
     public function testYamlFileTagNotFound()
     {
         $rootDir = self::$fixturesPath.'/yaml';