Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: symfony/yaml
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v4.1.4
Choose a base ref
...
head repository: symfony/yaml
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v4.1.5
Choose a head ref
  • 5 commits
  • 2 files changed
  • 5 contributors

Commits on Aug 29, 2018

  1. Fix code examples in PHPDoc

    maidmaid committed Aug 29, 2018
    Copy the full SHA
    5baf0f8 View commit details

Commits on Sep 2, 2018

  1. Merge branch '2.8' into 3.4

    * 2.8:
      Use the real image URL for the filesystem tests
      [Finder] Update PHPdoc append()
      [DI] Fix phpdoc
      Fix code examples in PHPDoc
      [HttpKernel] Fix inheritdocs
    nicolas-grekas committed Sep 2, 2018
    Copy the full SHA
    84fa64e View commit details
  2. Merge branch '3.4' into 4.1

    * 3.4:
      Use the real image URL for the filesystem tests
      [Finder] Update PHPdoc append()
      [DI] Fix phpdoc
      Fix code examples in PHPDoc
      [HttpKernel] Fix inheritdocs
      bumped Symfony version to 3.4.16
      updated VERSION for 3.4.15
      updated CHANGELOG for 3.4.15
    sroze committed Sep 2, 2018
    Copy the full SHA
    e8614ca View commit details

Commits on Sep 24, 2018

  1. Copy the full SHA
    61973ec View commit details

Commits on Sep 30, 2018

  1. Merge branch '3.4' into 4.1

    * 3.4:
      [Console] simplified code
      removed useless phpdoc
      improve docblocks around group sequences
      [Cache] prevent getting older entries when the version key is evicted
      [WebProfilerBundle] added a note in the README
      [Yaml] Skip parser test with root user
      [Filesystem] Skip tests on readable file when run with root user
      [FWBundle] Fix an error in WebTestCase::createClient's PHPDoc
      [HttpFoundation][Security] forward locale and format to subrequests
      [Console] Send the right exit code to console.terminate listeners
      [HttpFoundation] fix hidding warnings from session handlers
      Caching missed templates on cache warmup
    fabpot committed Sep 30, 2018
    Copy the full SHA
    ac5af7c View commit details
Showing with 8 additions and 5 deletions.
  1. +4 −0 Tests/ParserTest.php
  2. +4 −5 Yaml.php
4 changes: 4 additions & 0 deletions Tests/ParserTest.php
Original file line number Diff line number Diff line change
@@ -1945,6 +1945,10 @@ public function testParsingNotReadableFilesThrowsException()
$this->markTestSkipped('chmod is not supported on Windows');
}

if (!getenv('USER') || 'root' === getenv('USER')) {
$this->markTestSkipped('This test will fail if run under superuser');
}

$file = __DIR__.'/Fixtures/not_readable.yml';
chmod($file, 0200);

9 changes: 4 additions & 5 deletions Yaml.php
Original file line number Diff line number Diff line change
@@ -37,11 +37,10 @@ class Yaml
/**
* Parses a YAML file into a PHP value.
*
* Usage:
* <code>
* $array = Yaml::parseFile('config.yml');
* print_r($array);
* </code>
* Usage:
*
* $array = Yaml::parseFile('config.yml');
* print_r($array);
*
* @param string $filename The path to the YAML file to be parsed
* @param int $flags A bit field of PARSE_* constants to customize the YAML parser behavior