bug #4756 [Components][Config] don't show deprecated usage of Yaml::parse() (xabbuh)

wouterj · wouterj · commit d8e8d75961ea · 2015-01-08T12:53:14.000+01:00
This PR was merged into the 2.3 branch. Discussion ---------- [Components][Config] don't show deprecated usage of Yaml::parse() | Q | A | ------------- | --- | Doc fix? | yes | New docs? | no | Applies to | all | Fixed tickets | Commits ------- 16c23e7 don't show deprecated usage of Yaml::parse()
diff --git a/components/config/definition.rst b/components/config/definition.rst
@@ -576,8 +576,8 @@ Otherwise the result is a clean array of configuration values::
     use Symfony\Component\Config\Definition\Processor;
     use Acme\DatabaseConfiguration;
 
-    $config1 = Yaml::parse(__DIR__.'/src/Matthias/config/config.yml');
-    $config2 = Yaml::parse(__DIR__.'/src/Matthias/config/config_extra.yml');
+    $config1 = Yaml::parse(file_get_contents(__DIR__.'/src/Matthias/config/config.yml'));
+    $config2 = Yaml::parse(file_get_contents(__DIR__.'/src/Matthias/config/config_extra.yml'));
 
     $configs = array($config1, $config2);
 
diff --git a/components/config/resources.rst b/components/config/resources.rst
@@ -39,7 +39,7 @@ class, which allows for recursively importing other resources::
     {
         public function load($resource, $type = null)
         {
-            $configValues = Yaml::parse($resource);
+            $configValues = Yaml::parse(file_get_contents($resource));
 
             // ... handle the config values
 

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ class, which allows for recursively importing other resources::`
`39`	`39`	`{`
`40`	`40`	`public function load($resource, $type = null)`
`41`	`41`	`{`
`42`		`- $configValues = Yaml::parse($resource);`
	`42`	`+ $configValues = Yaml::parse(file_get_contents($resource));`
`43`	`43`
`44`	`44`	`// ... handle the config values`
`45`	`45`