DX: Allow PHPUnit 7 (#294)

php-coveralls · Sep 24, 2020 · 7d872a9 · 7d872a9
1 parent 1c7f906
commit 7d872a9
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 13 deletions.
diff --git a/composer.json b/composer.json
@@ -41,7 +41,7 @@
         "symfony/yaml": "^2.0.5 || ^3.0 || ^4.0 || ^5.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8.35 || ^5.4.3 || ^6.0"
+        "phpunit/phpunit": "^4.8.35 || ^5.4.3 || ^6.0 || ^7.0"
     },
     "suggest": {
         "symfony/http-kernel": "Allows Symfony integration"

diff --git a/tests/ProjectTestCase.php b/tests/ProjectTestCase.php
@@ -150,29 +150,40 @@ protected function normalizePath($path)
     }
 
     /**
-     * @param string $expected
-     * @param string $input
-     * @param string $msg
+     * @param string      $expected
+     * @param string      $input
+     * @param null|string $msg
      */
     protected function assertSamePath($expected, $input, $msg = null)
     {
-        $this->assertSame(
-            $this->normalizePath($expected),
-            $this->normalizePath($input),
-            $msg
-        );
+        if ($msg !== null) {
+            $this->assertSame(
+                $this->normalizePath($expected),
+                $this->normalizePath($input),
+                $msg
+            );
+        } else {
+            $this->assertSame(
+                $this->normalizePath($expected),
+                $this->normalizePath($input)
+            );
+        }
     }
 
     /**
-     * @param string[] $expected
-     * @param string[] $input
-     * @param string   $msg
+     * @param string[]    $expected
+     * @param string[]    $input
+     * @param null|string $msg
      */
     protected function assertSamePaths(array $expected, array $input, $msg = null)
     {
         $expected = array_map(function ($path) { return $this->normalizePath($path); }, $expected);
         $input = array_map(function ($path) { return $this->normalizePath($path); }, $input);
 
-        $this->assertSame($expected, $input, $msg);
+        if ($msg !== null) {
+            $this->assertSame($expected, $input, $msg);
+        } else {
+            $this->assertSame($expected, $input);
+        }
     }
 }