Skip to content

Commit

Permalink
bug #4756 [Components][Config] don't show deprecated usage of Yaml::p…
Browse files Browse the repository at this point in the history
…arse() (xabbuh)

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()
  • Loading branch information
wouterj committed Jan 8, 2015
2 parents 4e880c1 + 16c23e7 commit d8e8d75
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions components/config/definition.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion components/config/resources.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit d8e8d75

Please sign in to comment.