Refactored other PHPUnit method calls to work with namespaced PHPUnit 6

peterrehm · peterrehm · commit 284c23a90ca0 · 2017-02-21T10:00:26.000+01:00
diff --git a/Tests/Definition/ArrayNodeTest.php b/Tests/Definition/ArrayNodeTest.php
@@ -55,7 +55,12 @@ public function ignoreAndRemoveMatrixProvider()
     public function testIgnoreAndRemoveBehaviors($ignore, $remove, $expected, $message = '')
     {
         if ($expected instanceof \Exception) {
-            $this->setExpectedException(get_class($expected), $expected->getMessage());
+            if (method_exists($this, 'expectException')) {
+                $this->expectException(get_class($expected));
+                $this->expectExceptionMessage($expected->getMessage());
+            } else {
+                $this->setExpectedException(get_class($expected), $expected->getMessage());
+            }
         }
         $node = new ArrayNode('root');
         $node->setIgnoreExtraKeys($ignore, $remove);

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,12 @@ public function ignoreAndRemoveMatrixProvider()`
`55`	`55`	`public function testIgnoreAndRemoveBehaviors($ignore, $remove, $expected, $message = '')`
`56`	`56`	`{`
`57`	`57`	`if ($expected instanceof \Exception) {`
`58`		`- $this->setExpectedException(get_class($expected), $expected->getMessage());`
	`58`	`+ if (method_exists($this, 'expectException')) {`
	`59`	`+ $this->expectException(get_class($expected));`
	`60`	`+ $this->expectExceptionMessage($expected->getMessage());`
	`61`	`+ } else {`
	`62`	`+ $this->setExpectedException(get_class($expected), $expected->getMessage());`
	`63`	`+ }`
`59`	`64`	`}`
`60`	`65`	`$node = new ArrayNode('root');`
`61`	`66`	`$node->setIgnoreExtraKeys($ignore, $remove);`