Skip to content

Commit

Permalink
Merge branch '3.4' into 4.1
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
fabpot committed Sep 30, 2018
2 parents e8614ca + 61973ec commit ac5af7c
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions Tests/ParserTest.php
Expand Up @@ -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);

Expand Down

0 comments on commit ac5af7c

Please sign in to comment.