Merge branch '1.x' into 2.x

* 1.x:
  Escape __DIR__ in the test suite
This commit is contained in:
Fabien Potencier
2019-06-18 17:33:26 +02:00
+2 -2
View File
@@ -203,14 +203,14 @@ EOHTML
public function testTwigLeakOutputInDebugMode()
{
$output = exec(sprintf('%s %s debug', \PHP_BINARY, __DIR__.'/Fixtures/errors/leak-output.php'));
$output = exec(sprintf('%s %s debug', \PHP_BINARY, escapeshellarg(__DIR__.'/Fixtures/errors/leak-output.php')));
$this->assertSame('Hello OOPS', $output);
}
public function testDoesNotTwigLeakOutput()
{
$output = exec(sprintf('%s %s', \PHP_BINARY, __DIR__.'/Fixtures/errors/leak-output.php'));
$output = exec(sprintf('%s %s', \PHP_BINARY, escapeshellarg(__DIR__.'/Fixtures/errors/leak-output.php')));
$this->assertSame('', $output);
}