Ditch phpunit groups in favor of skipping tests

Author: greg0ire

.github/workflows/continuous-integration.yml

@@ -40,14 +40,14 @@ jobs:
 
       - name: "Run PHPUnit"
         continue-on-error: true
-        run: "vendor/bin/phpunit -c ci/github/phpunit/sqlite.xml --coverage-clover=coverage-no-cache.xml --exclude-group performance,locking_functional,dbal2"
+        run: "vendor/bin/phpunit -c ci/github/phpunit/sqlite.xml --coverage-clover=coverage-no-cache.xml"
         env:
             ENABLE_SECOND_LEVEL_CACHE: 0
 
       - name: "Run PHPUnit with Second Level Cache"
         id: "phpunit-run-slc"
         continue-on-error: true
-        run: "vendor/bin/phpunit -c ci/github/phpunit/sqlite.xml --exclude-group performance,non-cacheable,locking_functional,dbal2 --coverage-clover=coverage-cache.xml"
+        run: "vendor/bin/phpunit -c ci/github/phpunit/sqlite.xml --exclude-group performance,non-cacheable,locking_functional --coverage-clover=coverage-cache.xml"
         env:
             ENABLE_SECOND_LEVEL_CACHE: 1
 
@@ -93,7 +93,7 @@ jobs:
             ENABLE_SECOND_LEVEL_CACHE: 0
 
       - name: "Run PHPUnit with Second Level Cache"
-        run: "vendor/bin/phpunit -c ci/github/phpunit/sqlite.xml --exclude-group performance,non-cacheable,locking_functional,dbal3 --coverage-clover=coverage-cache.xml"
+        run: "vendor/bin/phpunit -c ci/github/phpunit/sqlite.xml --exclude-group performance,non-cacheable,locking_functional --coverage-clover=coverage-cache.xml"
         env:
             ENABLE_SECOND_LEVEL_CACHE: 1
 
@@ -261,7 +261,7 @@ jobs:
             ENABLE_SECOND_LEVEL_CACHE: 0
 
       - name: "Run PHPUnit with Second Level Cache"
-        run: "vendor/bin/phpunit -c ci/github/phpunit/${{ matrix.extension }}.xml --exclude-group performance,non-cacheable,locking_functional,dbal3 --coverage-clover=coverage-no-cache.xml"
+        run: "vendor/bin/phpunit -c ci/github/phpunit/${{ matrix.extension }}.xml --exclude-group performance,non-cacheable,locking_functional --coverage-clover=coverage-no-cache.xml"
         env:
             ENABLE_SECOND_LEVEL_CACHE: 1
 

ci/github/phpunit/mysqli.xml

@@ -33,7 +33,6 @@
         <exclude>
             <group>performance</group>
             <group>locking_functional</group>
-            <group>dbal3</group>
         </exclude>
     </groups>
 </phpunit>

ci/github/phpunit/pdo_mysql.xml

@@ -34,7 +34,6 @@
         <exclude>
             <group>performance</group>
             <group>locking_functional</group>
-            <group>dbal3</group>
         </exclude>
     </groups>
 </phpunit>

ci/github/phpunit/pdo_pgsql.xml

@@ -33,7 +33,6 @@
         <exclude>
             <group>performance</group>
             <group>locking_functional</group>
-            <group>dbal3</group>
         </exclude>
     </groups>
 </phpunit>

ci/github/phpunit/sqlite.xml

@@ -31,7 +31,6 @@
         <exclude>
             <group>performance</group>
             <group>locking_functional</group>
-            <group>dbal3</group>
         </exclude>
     </groups>
 </phpunit>

phpunit.xml.dist

@@ -28,7 +28,6 @@
         <exclude>
             <group>performance</group>
             <group>locking_functional</group>
-            <group>dbal3</group>
         </exclude>
     </groups>
 

tests/Doctrine/Tests/ORM/Functional/UUIDGeneratorTest.php

@@ -5,6 +5,7 @@
 namespace Doctrine\Tests\ORM\Functional;
 
 use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\Deprecations\PHPUnit\VerifyDeprecations;
 use Doctrine\ORM\Exception\NotSupported;
 use Doctrine\ORM\Mapping\Column;
@@ -23,25 +24,23 @@ class UUIDGeneratorTest extends OrmFunctionalTestCase
 {
     use VerifyDeprecations;
 
-    /**
-     * @group dbal2
-     */
     public function testItIsDeprecated(): void
     {
+        if (! method_exists(AbstractPlatform::class, 'getGuidExpression')) {
+            self::markTestSkipped('Test valid for doctrine/dbal:2.x only.');
+        }
+
         $this->expectDeprecationWithIdentifier('https://github.com/doctrine/orm/issues/7312');
         $this->_em->getClassMetadata(UUIDEntity::class);
     }
 
-    /**
-     * @group dbal2
-     */
     public function testGenerateUUID(): void
     {
         if ($this->_em->getConnection()->getDatabasePlatform()->getName() !== 'mysql') {
             self::markTestSkipped('Currently restricted to MySQL platform.');
         }
 
-        if (! method_exists(Connection::class, 'getGuidExpression')) {
+        if (! method_exists(AbstractPlatform::class, 'getGuidExpression')) {
             self::markTestSkipped('Test valid for doctrine/dbal:2.x only.');
         }
 
@@ -55,11 +54,12 @@ public function testGenerateUUID(): void
         self::assertGreaterThan(0, strlen($entity->getId()));
     }
 
-    /**
-     * @group dbal3
-     */
     public function testItCannotBeInitialised(): void
     {
+        if (method_exists(AbstractPlatform::class, 'getGuidExpression')) {
+            self::markTestSkipped('Test valid for doctrine/dbal:3.x only.');
+        }
+
         $this->expectException(NotSupported::class);
         $this->_em->getClassMetadata(UUIDEntity::class);
     }