Merge branch 'luispabon-phpunit7'

Author: martin-helmich

.travis.yml

@@ -1,8 +1,8 @@
 language: php
 sudo: false
 php:
+  - 7.2
   - 7.1
-  - 7.0
 install:
   - composer install --prefer-dist
 script:

README.md

@@ -13,7 +13,7 @@ This library is [MIT-licensed](LICENSE.txt).
 
     $ composer require helmich/phpunit-psr7-assert
 
-**Compatibility notice**: [Version 1](https://github.com/martin-helmich/phpunit-psr7-assert/tree/v1) (the `v1` branch) of this library is compatible with PHPUnit 4.8 to 5. [Version 2](https://github.com/martin-helmich/phpunit-psr7-assert/tree/master) (the `master` branch) is compatible with PHPUnit 6 and later. When using `composer require`, Composer should automatically pick the correct version for you.
+**Compatibility notice**: [Version 1](https://github.com/martin-helmich/phpunit-psr7-assert/tree/v1) (the `v1` branch) of this library is compatible with PHPUnit 4.8 to 5. [Version 2](https://github.com/martin-helmich/phpunit-psr7-assert/tree/v2) (the `v2` branch) is compatible with PHPUnit 6. [Version 3](https://github.com/martin-helmich/phpunit-psr7-assert/tree/master) (the `master` branch) is compatible with PHPUnit 7. When using `composer require`, Composer should automatically pick the correct version for you.
 
 ## Usage
 

composer.json

@@ -10,9 +10,9 @@
     ],
     "require": {
         "psr/http-message": "^1.0",
-        "phpunit/phpunit": "^6.0",
+        "phpunit/phpunit": "^7.0",
         "helmich/phpunit-json-assert": "^2.0",
-        "php": ">=7.0"
+        "php": ">=7.1"
     },
     "require-dev": {
         "guzzlehttp/psr7": "^1.2",

src/Constraint/HasStatusConstraint.php

@@ -42,10 +42,10 @@ protected function matches($other): bool
         return $this->status->evaluate($other->getStatusCode(), '', true);
     }
 
-    protected function additionalFailureDescription($other)
+    protected function additionalFailureDescription($other): string
     {
         if ($other instanceof ResponseInterface) {
-            return 'Actual status is ' . $other->getStatusCode() . " and the body contains: " . $other->getBody();
+            return 'Actual status is ' . $other->getStatusCode() . ' and the body contains: ' . $other->getBody();
         }
         return '';
     }