Merge branch '2.8' into 3.2

nicolas-grekas · nicolas-grekas · commit 3c15bf6f8b2d · 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/Config/FileLocatorTest.php b/Tests/Config/FileLocatorTest.php
@@ -30,7 +30,7 @@ public function testLocate()
         $kernel
             ->expects($this->never())
             ->method('locateResource');
-        $this->setExpectedException('LogicException');
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('LogicException');
         $locator->locate('/some/path');
     }
 

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public function testLocate()`
`30`	`30`	`$kernel`
`31`	`31`	`->expects($this->never())`
`32`	`32`	`->method('locateResource');`
`33`		`- $this->setExpectedException('LogicException');`
	`33`	`+ $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('LogicException');`
`34`	`34`	`$locator->locate('/some/path');`
`35`	`35`	`}`
`36`	`36`