Merge branch '2.7' into 2.8

xabbuh · xabbuh · commit ff413a83b526 · 2018-01-10T12:05:18.000+01:00
* 2.7:
  [Serializer] Fixed throwing exception with option JSON_PARTIAL_OUTPUT_ON_ERROR
  [Security] Fail gracefully if the security token cannot be unserialized from the session
  [Form] AbstractLayoutTest - fix DOMDocument casing
  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
diff --git a/Tests/AbstractLayoutTest.php b/Tests/AbstractLayoutTest.php
@@ -58,7 +58,7 @@ protected function assertXpathNodeValue(\DOMElement $element, $expression, $node
 
     protected function assertMatchesXpath($html, $expression, $count = 1)
     {
-        $dom = new \DomDocument('UTF-8');
+        $dom = new \DOMDocument('UTF-8');
         try {
             // Wrap in <root> node so we can load HTML with multiple tags at
             // the top level

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ protected function assertXpathNodeValue(\DOMElement $element, $expression, $node`
`58`	`58`
`59`	`59`	`protected function assertMatchesXpath($html, $expression, $count = 1)`
`60`	`60`	`{`
`61`		`- $dom = new \DomDocument('UTF-8');`
	`61`	`+ $dom = new \DOMDocument('UTF-8');`
`62`	`62`	`try {`
`63`	`63`	`// Wrap in <root> node so we can load HTML with multiple tags at`
`64`	`64`	`// the top level`