Merge pull request #3643 from morozov/phpunit-83

Bumped PHPUnit requrement to ^8.3.3, removed dependency on symfony/phpunit-bridge

composer.json

@@ -41,9 +41,8 @@
         "doctrine/coding-standard": "^6.0",
         "jetbrains/phpstorm-stubs": "^2019.1",
         "phpstan/phpstan": "^0.11.3",
-        "phpunit/phpunit": "^8.2.1",
-        "symfony/console": "^2.0.5|^3.0|^4.0|^5.0",
-        "symfony/phpunit-bridge": "^3.4.5|^4.0.5|^5.0"
+        "phpunit/phpunit": "^8.3.3",
+        "symfony/console": "^2.0.5|^3.0|^4.0|^5.0"
     },
     "suggest": {
         "symfony/console": "For helpful console commands such as SQL execution and import of files."

phpunit.xml.dist

@@ -60,7 +60,6 @@
 
     <listeners>
         <listener class="Doctrine\Tests\DbalPerformanceTestListener"/>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
     </listeners>
 
     <groups>

tests/Doctrine/Tests/DBAL/Schema/ColumnTest.php

@@ -66,6 +66,8 @@ class ColumnTest extends TestCase
      */
     public function testSettingUnknownOptionIsStillSupported() : void
     {
+        $this->expectNotToPerformAssertions();
+
         new Column('foo', $this->createMock(Type::class), ['unknown_option' => 'bar']);
     }
 

tests/appveyor/mssql.sql2008r2sp2.sqlsrv.appveyor.xml

@@ -37,10 +37,6 @@
         </whitelist>
     </filter>
 
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
-    </listeners>
-
     <groups>
         <exclude>
             <group>performance</group>

tests/appveyor/mssql.sql2012sp1.sqlsrv.appveyor.xml

@@ -37,10 +37,6 @@
         </whitelist>
     </filter>
 
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
-    </listeners>
-
     <groups>
         <exclude>
             <group>performance</group>

tests/appveyor/mssql.sql2017.pdo_sqlsrv.appveyor.xml

@@ -37,10 +37,6 @@
         </whitelist>
     </filter>
 
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
-    </listeners>
-
     <groups>
         <exclude>
             <group>performance</group>

tests/appveyor/mssql.sql2017.sqlsrv.appveyor.xml

@@ -37,10 +37,6 @@
         </whitelist>
     </filter>
 
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
-    </listeners>
-
     <groups>
         <exclude>
             <group>performance</group>

tests/continuousphp/oci8.phpunit.continuousphp.xml

@@ -39,10 +39,6 @@
     </whitelist>
   </filter>
 
-  <listeners>
-      <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
-  </listeners>
-
   <groups>
     <exclude>
       <group>performance</group>

tests/continuousphp/pdo-oci.phpunit.xml

@@ -37,8 +37,4 @@
     </whitelist>
   </filter>
 
-  <listeners>
-      <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
-  </listeners>
-
 </phpunit>

tests/travis/ibm_db2.travis.xml

@@ -37,10 +37,6 @@
         </whitelist>
     </filter>
 
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
-    </listeners>
-
     <groups>
         <exclude>
             <group>performance</group>

tests/travis/mariadb.mysqli.travis.xml

@@ -37,10 +37,6 @@
         </whitelist>
     </filter>
 
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
-    </listeners>
-
     <groups>
         <exclude>
             <group>performance</group>

tests/travis/mariadb.travis.xml

@@ -36,10 +36,6 @@
         </whitelist>
     </filter>
 
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
-    </listeners>
-
     <groups>
         <exclude>
             <group>performance</group>

tests/travis/mysql.docker.travis.xml

@@ -36,10 +36,6 @@
         </whitelist>
     </filter>
 
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
-    </listeners>
-
     <groups>
         <exclude>
             <group>performance</group>

tests/travis/mysql.travis.xml

@@ -36,10 +36,6 @@
         </whitelist>
     </filter>
 
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
-    </listeners>
-
     <groups>
         <exclude>
             <group>performance</group>

tests/travis/mysqli.docker.travis.xml

@@ -36,10 +36,6 @@
         </whitelist>
     </filter>
 
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
-    </listeners>
-
     <groups>
         <exclude>
             <group>performance</group>

tests/travis/mysqli.travis.xml

@@ -36,10 +36,6 @@
         </whitelist>
     </filter>
 
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
-    </listeners>
-
     <groups>
         <exclude>
             <group>performance</group>

tests/travis/pdo_sqlsrv.travis.xml

@@ -36,10 +36,6 @@
         </whitelist>
     </filter>
 
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
-    </listeners>
-
     <groups>
         <exclude>
             <group>performance</group>

tests/travis/pgsql.travis.xml

@@ -36,10 +36,6 @@
         </whitelist>
     </filter>
 
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
-    </listeners>
-
     <groups>
         <exclude>
             <group>performance</group>

tests/travis/sqlite.travis.xml

@@ -23,10 +23,6 @@
         </whitelist>
     </filter>
 
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
-    </listeners>
-
     <groups>
         <exclude>
             <group>performance</group>

tests/travis/sqlsrv.travis.xml

@@ -36,10 +36,6 @@
         </whitelist>
     </filter>
 
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
-    </listeners>
-
     <groups>
         <exclude>
             <group>performance</group>