Skip to content

Commit 1232884

Browse files
committed
Merge branch '3.3' into 3.4
* 3.3: [Serializer] Fixed throwing exception with option JSON_PARTIAL_OUTPUT_ON_ERROR Tweaked some styles in the profiler tables Add type string to docblock for Process::setInput() [Security] Fail gracefully if the security token cannot be unserialized from the session [Form] AbstractLayoutTest - fix DOMDocument casing Run simple-phpunit with --no-suggest option [FrameworkBundle] Fix using "annotations.cached_reader" in after-removing passes bumped Symfony version to 3.3.16 updated VERSION for 3.3.15 updated CHANGELOG for 3.3.15 bumped Symfony version to 2.8.34 updated VERSION for 2.8.33 updated CHANGELOG for 2.8.33 bumped Symfony version to 2.7.41 updated VERSION for 2.7.40 update CONTRIBUTORS for 2.7.40 updated CHANGELOG for 2.7.40
2 parents 2bca3a8 + c29c7ff commit 1232884

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Tests/AbstractLayoutTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ protected function assertXpathNodeValue(\DOMElement $element, $expression, $node
5858

5959
protected function assertMatchesXpath($html, $expression, $count = 1)
6060
{
61-
$dom = new \DomDocument('UTF-8');
61+
$dom = new \DOMDocument('UTF-8');
6262
try {
6363
// Wrap in <root> node so we can load HTML with multiple tags at
6464
// the top level

0 commit comments

Comments
 (0)