Merge remote-tracking branch 'upstream/2.3' into 2.4

ezecosystem · Jan 15, 2019 · 533d99d · 533d99d
2 parents 2ec86a5 + 4b407c2
commit 533d99d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/tests/RepositoryForms/Twig/LimitationValueRenderingExtensionTest.php b/tests/RepositoryForms/Twig/LimitationValueRenderingExtensionTest.php
@@ -78,7 +78,7 @@ public function getLimitation($identifier, array $values)
     /**
      * @see \eZ\Publish\Core\MVC\Symfony\Templating\Tests\Twig\Extension\FileSystemTwigIntegrationTestCase::doIntegrationTest
      */
-    protected function doIntegrationTest($file, $message, $condition, $templates, $exception, $outputs)
+    protected function doIntegrationTest($file, $message, $condition, $templates, $exception, $outputs, $deprecation = '')
     {
         if (!$outputs) {
             $this->markTestSkipped('no legacy tests to run');