Merge branch '1.x' into 2.x

* 1.x: Escape __DIR__ in the test suite
twigphp · Jun 18, 2019 · 14e2f42 · 14e2f42
2 parents 1107684 + 8c4b748
commit 14e2f42
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/test/Twig/Tests/ErrorTest.php b/test/Twig/Tests/ErrorTest.php
@@ -203,14 +203,14 @@ public function getErroredTemplates()
 
     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);
     }