Merge branch '6.13' into 7.2

ezpublishlegacy · Sep 14, 2018 · d2cec4a · d2cec4a
2 parents 7e78b6b + 878d09d
commit d2cec4a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...sh/Core/MVC/Symfony/Templating/Tests/Twig/Extension/FileSystemTwigIntegrationTestCase.php b/...sh/Core/MVC/Symfony/Templating/Tests/Twig/Extension/FileSystemTwigIntegrationTestCase.php
@@ -29,7 +29,7 @@ abstract class FileSystemTwigIntegrationTestCase extends Twig_Test_IntegrationTe
      * Overrides the default implementation to use the chain loader so that
      * templates used internally are correctly loaded.
      */
-    protected function doIntegrationTest($file, $message, $condition, $templates, $exception, $outputs)
+    protected function doIntegrationTest($file, $message, $condition, $templates, $exception, $outputs, $deprecation = '')
     {
         if ($condition) {
             eval('$ret = ' . $condition . ';');