Merge branch '3.4' into 4.4

* 3.4: [Bridge/Twig] Relax tests
2020-06-30 19:59:39 +02:00 · 2020-06-30 19:59:39 +02:00 · b9354dc62f
parent 450034c986 91f30e0b62
commit b9354dc62f
1 changed files with 1 additions and 0 deletions
--- a/src/Symfony/Bridge/Twig/Tests/Extension/DumpExtensionTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/DumpExtensionTest.php
@ -82,6 +82,7 @@ class DumpExtensionTest extends TestCase
            $this->assertStringStartsWith('<script>', $dump);
            $dump = preg_replace('/^.*?<pre/', '<pre', $dump);
            $dump = preg_replace('/sf-dump-\d+/', 'sf-dump', $dump);
+            $dump = preg_replace('/<samp [^>]++>/', '<samp>', $dump);
        }
        $this->assertEquals($expectedOutput, $dump);
    }