Fix tests

Author: dunglas

composer.json

@@ -36,8 +36,8 @@
         "doctrine/data-fixtures": "^1.2.2",
         "doctrine/doctrine-bundle": "^1.8",
         "doctrine/doctrine-cache-bundle": "^1.3.5",
-        "doctrine/mongodb-odm": "^2.0@beta",
-        "doctrine/mongodb-odm-bundle": "^4.0@beta",
+        "doctrine/mongodb-odm": "^2.0@rc",
+        "doctrine/mongodb-odm-bundle": "^4.0@rc",
         "doctrine/orm": "^2.6.3",
         "elasticsearch/elasticsearch": "^6.0",
         "friendsofsymfony/user-bundle": "^2.2@dev",
@@ -53,7 +53,7 @@
         "phpstan/phpstan-doctrine": "^0.11",
         "phpstan/phpstan-phpunit": "^0.11",
         "phpstan/phpstan-symfony": "^0.11",
-        "phpunit/phpunit": "^8.0.0",
+        "phpunit/phpunit": "^7.5.2 || ^8.0.0",
         "psr/log": "^1.0",
         "ramsey/uuid": "^3.7",
         "ramsey/uuid-doctrine": "^1.4",
@@ -71,7 +71,7 @@
         "symfony/expression-language": "^3.4 || ^4.0",
         "symfony/finder": "^3.4 || ^4.0",
         "symfony/form": "^3.4 || ^4.0",
-        "symfony/framework-bundle": "^4.3",
+        "symfony/framework-bundle": "^4.3.2",
         "symfony/http-client": "^4.3",
         "symfony/mercure-bundle": "*",
         "symfony/messenger": "^4.3",

tests/Bridge/Symfony/Bundle/Test/ApiTestCaseTest.php

@@ -15,11 +15,16 @@
 
 use ApiPlatform\Core\Bridge\Symfony\Bundle\Test\ApiTestCase;
 use PHPUnit\Framework\ExpectationFailedException;
+use PHPUnit\Runner\Version;
 
 class ApiTestCaseTest extends ApiTestCase
 {
     public function testAssertJsonContains(): void
     {
+        if (version_compare(Version::id(), '8.0.0', '<')) {
+            $this->markTestSkipped('Requires PHPUnit 8');
+        }
+
         self::createClient()->request('GET', '/');
         $this->assertJsonContains(['@context' => '/contexts/Entrypoint']);
     }
@@ -61,12 +66,20 @@ public function testAssertMatchesJsonSchema(): void
 
     public function testAssertArraySubsetPassesStrictConfig(): void
     {
+        if (version_compare(Version::id(), '8.0.0', '<')) {
+            $this->markTestSkipped('Requires PHPUnit 8');
+        }
+
         $this->expectException(ExpectationFailedException::class);
         $this->assertArraySubset(['bar' => 0], ['bar' => '0'], true);
     }
 
     public function testAssertArraySubsetDoesNothingForValidScenario(): void
     {
+        if (version_compare(Version::id(), '8.0.0', '<')) {
+            $this->markTestSkipped('Requires PHPUnit 8');
+        }
+
         $this->assertArraySubset([1, 2], [1, 2, 3]);
     }
 }

tests/Bridge/Symfony/Bundle/Test/ClientTest.php

@@ -17,6 +17,7 @@
 use ApiPlatform\Core\Bridge\Symfony\Bundle\Test\Response;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Tools\SchemaTool;
+use PHPUnit\Runner\Version;
 use Symfony\Component\HttpKernel\Profiler\Profile;
 
 class ClientTest extends ApiTestCase
@@ -86,6 +87,10 @@ public function authBasicProvider(): iterable
 
     public function testComplexScenario(): void
     {
+        if (version_compare(Version::id(), '8.0.0', '<')) {
+            $this->markTestSkipped('Requires PHPUnit 8');
+        }
+
         self::createClient()->request('GET', '/secured_dummies', ['auth_basic' => ['dunglas', 'kevin']]);
         $this->assertResponseIsSuccessful();
         $this->assertResponseHeaderSame('content-type', 'application/ld+json; charset=utf-8');

tests/Bridge/Symfony/Bundle/Test/Constraint/ArraySubsetTest.php

@@ -20,6 +20,7 @@
 use PHPUnit\Framework\ExpectationFailedException;
 use PHPUnit\Framework\SelfDescribing;
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Runner\Version;
 use ReflectionClass;
 use SebastianBergmann\RecursionContext\InvalidArgumentException;
 use Traversable;
@@ -33,8 +34,15 @@
  *
  * @see https://github.com/sebastianbergmann/phpunit/issues/3494
  */
-final class ArraySubsetTest extends TestCase
+class ArraySubsetTest extends TestCase
 {
+    protected function setUp(): void
+    {
+        if (version_compare(Version::id(), '8.0.0', '<')) {
+            $this->markTestSkipped('Requires PHPUnit 8');
+        }
+    }
+
     /**
      * @return mixed[]
      */

tests/Bridge/Symfony/Bundle/Test/Constraint/MatchesJsonSchemaTest.php

@@ -16,9 +16,17 @@
 use ApiPlatform\Core\Bridge\Symfony\Bundle\Test\Constraint\MatchesJsonSchema;
 use PHPUnit\Framework\ExpectationFailedException;
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Runner\Version;
 
 class MatchesJsonSchemaTest extends TestCase
 {
+    protected function setUp(): void
+    {
+        if (version_compare(Version::id(), '8.0.0', '<')) {
+            $this->markTestSkipped('Requires PHPUnit 8');
+        }
+    }
+
     public function testAdditionalFailureDescription(): void
     {
         $jsonSchema = <<<JSON