Refactored other PHPUnit method calls to work with namespaced PHPUnit 6

Author: peterrehm

Tests/ClientTest.php

@@ -74,6 +74,8 @@ public function testFilterResponseConvertsCookies()
         $domResponse = $m->invoke($client, $response);
         try {
             $this->assertEquals($expected31[0], $domResponse->getHeader('Set-Cookie'));
+        } catch (\PHPUnit\Framework\ExpectationFailedException $e) {
+            $this->assertEquals($expected33[0], $domResponse->getHeader('Set-Cookie'));
         } catch (\PHPUnit_Framework_ExpectationFailedException $e) {
             $this->assertEquals($expected33[0], $domResponse->getHeader('Set-Cookie'));
         }
@@ -84,11 +86,15 @@ public function testFilterResponseConvertsCookies()
         $domResponse = $m->invoke($client, $response);
         try {
             $this->assertEquals($expected31[0], $domResponse->getHeader('Set-Cookie'));
+        } catch (\PHPUnit\Framework\ExpectationFailedException $e) {
+            $this->assertEquals($expected33[0], $domResponse->getHeader('Set-Cookie'));
         } catch (\PHPUnit_Framework_ExpectationFailedException $e) {
             $this->assertEquals($expected33[0], $domResponse->getHeader('Set-Cookie'));
         }
         try {
             $this->assertEquals($expected31, $domResponse->getHeader('Set-Cookie', false));
+        } catch (\PHPUnit\Framework\ExpectationFailedException $e) {
+            $this->assertEquals($expected33, $domResponse->getHeader('Set-Cookie', false));
         } catch (\PHPUnit_Framework_ExpectationFailedException $e) {
             $this->assertEquals($expected33, $domResponse->getHeader('Set-Cookie', false));
         }

Tests/Controller/ControllerResolverTest.php

@@ -118,7 +118,12 @@ public function testGetControllerWithFunction()
     public function testGetControllerOnNonUndefinedFunction($controller, $exceptionName = null, $exceptionMessage = null)
     {
         $resolver = $this->createControllerResolver();
-        $this->setExpectedException($exceptionName, $exceptionMessage);
+        if (method_exists($this, 'expectException')) {
+            $this->expectException($exceptionName);
+            $this->expectExceptionMessage($exceptionMessage);
+        } else {
+            $this->setExpectedException($exceptionName, $exceptionMessage);
+        }
 
         $request = Request::create('/');
         $request->attributes->set('_controller', $controller);