Merge branch '2.8' into 3.2

nicolas-grekas · nicolas-grekas · commit c9b3e9bb141d · 2017-02-21T10:12:04.000+01:00
* 2.8:
  Refactored other PHPUnit method calls to work with namespaced PHPUnit 6
  Further refactorings to PHPUnit namespaces
  resolve parameters in definition classes
diff --git a/Tests/Encoder/XmlEncoderTest.php b/Tests/Encoder/XmlEncoderTest.php
@@ -450,7 +450,12 @@ public function testPreventsComplexExternalEntities()
 
     public function testDecodeEmptyXml()
     {
-        $this->setExpectedException('Symfony\Component\Serializer\Exception\UnexpectedValueException', 'Invalid XML data, it can not be empty.');
+        if (method_exists($this, 'expectException')) {
+            $this->expectException('Symfony\Component\Serializer\Exception\UnexpectedValueException');
+            $this->expectExceptionMessage('Invalid XML data, it can not be empty.');
+        } else {
+            $this->setExpectedException('Symfony\Component\Serializer\Exception\UnexpectedValueException', 'Invalid XML data, it can not be empty.');
+        }
         $this->encoder->decode(' ', 'xml');
     }
 

Original file line number	Diff line number	Diff line change
`@@ -450,7 +450,12 @@ public function testPreventsComplexExternalEntities()`
`450`	`450`
`451`	`451`	`public function testDecodeEmptyXml()`
`452`	`452`	`{`
`453`		`- $this->setExpectedException('Symfony\Component\Serializer\Exception\UnexpectedValueException', 'Invalid XML data, it can not be empty.');`
	`453`	`+ if (method_exists($this, 'expectException')) {`
	`454`	`+ $this->expectException('Symfony\Component\Serializer\Exception\UnexpectedValueException');`
	`455`	`+ $this->expectExceptionMessage('Invalid XML data, it can not be empty.');`
	`456`	`+ } else {`
	`457`	`+ $this->setExpectedException('Symfony\Component\Serializer\Exception\UnexpectedValueException', 'Invalid XML data, it can not be empty.');`
	`458`	`+ }`
`454`	`459`	`$this->encoder->decode(' ', 'xml');`
`455`	`460`	`}`
`456`	`461`