Revert "Revert "PHPUnit 6""

This reverts commit 05d95cf.

Author: ademarco

composer.json

@@ -13,7 +13,6 @@
         }
     ],
      "require": {
-        "php": ">=5.6.0",
         "silex/silex": "~2.0",
         "guzzle/guzzle": "*",
         "symfony/process": "~3",
@@ -23,7 +22,7 @@
     "require-dev": {
         "internations/kodierungsregelwerksammlung": "~0.23.0",
         "internations/testing-component": "1.0.1",
-        "phpunit/phpunit": "~5"
+        "phpunit/phpunit": "~6"
     },
     "autoload": {
         "psr-4": {"InterNations\\Component\\HttpMock\\": "src/"}

tests/MockBuilderIntegrationTest.php

@@ -6,7 +6,7 @@
 use InterNations\Component\HttpMock\Matcher\MatcherFactory;
 use InterNations\Component\HttpMock\MockBuilder;
 use InterNations\Component\HttpMock\Server;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use DateTime;
 use DateTimeZone;
 use InterNations\Component\HttpMock\Tests\Fixtures\Request as TestRequest;

tests/PHPUnit/HttpMockMultiPHPUnitIntegrationTest.php

@@ -3,7 +3,9 @@
 
 use InterNations\Component\Testing\AbstractTestCase;
 use InterNations\Component\HttpMock\PHPUnit\HttpMockTrait;
+use PHPUnit\Framework\ExpectationFailedException;
 use Symfony\Component\HttpFoundation\Response;
+use PHPUnit\Framework\TestCase;
 
 /** @large */
 class HttpMockMultiPHPUnitIntegrationTest extends AbstractTestCase
@@ -80,10 +82,9 @@ public function testSimpleRequest($path)
         $this->assertSame('GET', $request->getMethod());
         $this->assertSame($path, $request->getPath());
 
-        $this->setExpectedException(
-            'UnexpectedValueException',
-            'Expected status code 200 from "/_request/last", got 404'
-        );
+        $this->expectException('UnexpectedValueException');
+
+        $this->expectExceptionMessage('Expected status code 200 from "/_request/last", got 404');
         $this->http['firstNamedServer']->requests->pop();
     }
 
@@ -102,7 +103,7 @@ public function testErrorLogOutput()
         try {
             $this->tearDown();
             $this->fail('Exception expected');
-        } catch (\PHPUnit_Framework_ExpectationFailedException $e) {
+        } catch (ExpectationFailedException $e) {
             $this->assertContains('HTTP mock server standard error output should be empty', $e->getMessage());
         }
     }

tests/PHPUnit/HttpMockPHPUnitIntegrationTest.php

@@ -3,8 +3,10 @@
 
 use InterNations\Component\HttpMock\PHPUnit\HttpMockTrait;
 use InterNations\Component\Testing\AbstractTestCase;
+use PHPUnit\Framework\ExpectationFailedException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use PHPUnit\Framework\TestCase;
 
 /** @large */
 class HttpMockPHPUnitIntegrationTest extends AbstractTestCase
@@ -80,10 +82,9 @@ public function testSimpleRequest($path)
         $this->assertSame('GET', $request->getMethod());
         $this->assertSame($path, $request->getPath());
 
-        $this->setExpectedException(
-            'UnexpectedValueException',
-            'Expected status code 200 from "/_request/last", got 404'
-        );
+        $this->expectException('UnexpectedValueException');
+
+        $this->expectExceptionMessage('Expected status code 200 from "/_request/last", got 404');
         $this->http->requests->pop();
     }
 
@@ -102,7 +103,7 @@ public function testErrorLogOutput()
         try {
             $this->tearDown();
             $this->fail('Exception expected');
-        } catch (\PHPUnit_Framework_ExpectationFailedException $e) {
+        } catch (ExpectationFailedException $e) {
             $this->assertContains('HTTP mock server standard error output should be empty', $e->getMessage());
         }
     }

tests/Request/UnifiedRequestTest.php

@@ -112,12 +112,15 @@ public function testEntityEnclosingInterfaceMethods($method, array $params = [])
             ->method('getPath')
             ->will($this->returnValue('/foo'));
 
-        $this->setExpectedException(
-            'BadMethodCallException',
+        $this->expectException('BadMethodCallException');
+
+        $this->expectExceptionMessage(
+
             sprintf(
                 'Cannot call method "%s" on a request that does not enclose an entity. Did you expect a POST/PUT request instead of METHOD /foo?',
                 $method
             )
+
         );
         call_user_func_array([$this->unifiedRequest, $method], $params);
     }

tests/RequestCollectionFacadeTest.php

@@ -74,10 +74,9 @@ public function testRequestResponse_InvalidStatusCode($method, $path, array $arg
     {
         $this->mockClient($path, $this->createResponseWithInvalidStatusCode(), $httpMethod);
 
-        $this->setExpectedException(
-            'UnexpectedValueException',
-            'Expected status code 200 from "' . $path . '", got 404'
-        );
+        $this->expectException('UnexpectedValueException');
+
+        $this->expectExceptionMessage('Expected status code 200 from "' . $path . '", got 404');
         call_user_func_array([$this->facade, $method], $args);
     }
 
@@ -86,10 +85,9 @@ public function testRequestResponse_EmptyContentType($method, $path, array $args
     {
         $this->mockClient($path, $this->createResponseWithEmptyContentType(), $httpMethod);
 
-        $this->setExpectedException(
-            'UnexpectedValueException',
-            'Expected content type "text/plain" from "' . $path . '", got ""'
-        );
+        $this->expectException('UnexpectedValueException');
+
+        $this->expectExceptionMessage('Expected content type "text/plain" from "' . $path . '", got ""');
         call_user_func_array([$this->facade, $method], $args);
     }
 
@@ -98,10 +96,9 @@ public function testRequestResponse_InvalidContentType($method, $path, array $ar
     {
         $this->mockClient($path, $this->createResponseWithInvalidContentType(), $httpMethod);
 
-        $this->setExpectedException(
-            'UnexpectedValueException',
-            'Expected content type "text/plain" from "' . $path . '", got "text/html"'
-        );
+        $this->expectException('UnexpectedValueException');
+
+        $this->expectExceptionMessage('Expected content type "text/plain" from "' . $path . '", got "text/html"');
         call_user_func_array([$this->facade, $method], $args);
     }
 
@@ -110,10 +107,9 @@ public function testRequestResponse_DeserializationError($method, $path, array $
     {
         $this->mockClient($path, $this->createResponseThatCannotBeDeserialized(), $httpMethod);
 
-        $this->setExpectedException(
-            'UnexpectedValueException',
-            'Cannot deserialize response from "' . $path . '": "invalid response"'
-        );
+        $this->expectException('UnexpectedValueException');
+
+        $this->expectExceptionMessage('Cannot deserialize response from "' . $path . '": "invalid response"');
         call_user_func_array([$this->facade, $method], $args);
     }