Merge pull request #389 from kalyabin/2.x

fixes #387 into 2.x branch
alexislefebvre · Feb 3, 2018 · 66ad216 · 66ad216
2 parents eca86d6 + 672b8f6
commit 66ad216
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -27,7 +27,7 @@
         "symfony/monolog-bundle": "^3.1",
         "doctrine/doctrine-fixtures-bundle": "^3.0",
         "doctrine/doctrine-bundle": "^1.8",
-        "phpunit/phpunit": "^6.1",
+        "phpunit/phpunit": "^6.1|^7.0",
         "twig/twig": "^2.0",
         "theofidry/alice-data-fixtures": "^1.0.1",
         "jackalope/jackalope-doctrine-dbal": "^1.3",

diff --git a/src/Utils/HttpAssertions.php b/src/Utils/HttpAssertions.php
@@ -60,7 +60,7 @@ public static function isSuccessful(Response $response, bool $success = true, st
      */
     public static function assertStatusCode(int $expectedStatusCode, Client $client): void
     {
-        $helpfulErrorMessage = null;
+        $helpfulErrorMessage = '';
 
         if ($expectedStatusCode !== $client->getResponse()->getStatusCode()) {
             // Get a more useful error message, if available