Merge branch '3.4' into 4.4

nicolas-grekas · nicolas-grekas · commit 36e7f0bdb09f · 2020-06-30T19:59:39.000+02:00
* 3.4:
  [Bridge/Twig] Relax tests
diff --git a/Tests/Extension/DumpExtensionTest.php b/Tests/Extension/DumpExtensionTest.php
@@ -82,6 +82,7 @@ public function testDump($context, $args, $expectedOutput, $debug = true)
             $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);
     }

Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,7 @@ public function testDump($context, $args, $expectedOutput, $debug = true)`
`82`	`82`	`$this->assertStringStartsWith('<script>', $dump);`
`83`	`83`	`$dump = preg_replace('/^.*?<pre/', '<pre', $dump);`
`84`	`84`	`$dump = preg_replace('/sf-dump-\d+/', 'sf-dump', $dump);`
	`85`	`+ $dump = preg_replace('/<samp [^>]++>/', '<samp>', $dump);`
`85`	`86`	`}`
`86`	`87`	`$this->assertEquals($expectedOutput, $dump);`
`87`	`88`	`}`