chore(ci): remove some permutations not needed

Author: nikophil

.github/workflows/ci.yml

@@ -8,40 +8,54 @@ on:
 
 jobs:
   tests:
-    name: P:${{ matrix.php }}, S:${{ matrix.symfony }}, D:${{ matrix.database }}, PU:${{ matrix.phpunit }}${{ matrix.deps == 'lowest' && ' (lowest)' || '' }}${{ matrix.without-dama == 0 && contains(matrix.database, 'sql') && ' (dama)' || '' }}${{ matrix.use-phpunit-extension == 1 && ' (phpunit extension)' || '' }}
+    name: P:${{ matrix.php }}, S:${{ matrix.symfony }}, D:${{ matrix.database }}, PU:${{ matrix.phpunit }}${{ matrix.deps == 'lowest' && ' (lowest)' || '' }}${{ matrix.use-phpunit-extension == 1 && ' (phpunit extension)' || '' }}
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        php: [ 8.1, 8.2, 8.3, 8.4 ]
+        php: [ 8.2, 8.3, 8.4 ]
         symfony: [ 6.4.*, 7.1.*, 7.2.* ]
-        database: [ mysql, mongo ]
-        phpunit: [ 9, 11 ]
+        database: [ mysql|mongo ]
+        phpunit: [ 11 ]
 
         # default values:
         # deps: [ highest ]
-        # without-dama: [ 0 ]
         # use-phpunit-extension: [ 0 ]
 
         exclude:
           - {php: 8.1, symfony: 7.1.*}
           - {php: 8.1, symfony: 7.2.*}
-          - {php: 8.1, phpunit: 11 }
         include:
+          # php 8.1
+          - {php: 8.1, symfony: 6.4.*, phpunit: 9, database: mysql}
+
+          # old PHPUnit versions
+          - {php: 8.3, symfony: '*', phpunit: 9, database: mysql}
+          - {php: 8.3, symfony: '*', phpunit: 10, database: mysql}
+
+          # test with no database (PHPUnit 9 is used to prevent some problems with empty data providers)
           - {php: 8.3, symfony: '*', phpunit: 9, database: none}
-          - {php: 8.3, symfony: '*', phpunit: 11, database: mysql|mongo}
-          - {php: 8.3, symfony: '*', phpunit: 11, database: pgsql|mongo}
-          - {php: 8.3, symfony: '*', phpunit: 11, database: pgsql, without-dama: 1}
-          - {php: 8.3, symfony: '*', phpunit: 11, database: sqlite, without-dama: 1}
-          - {php: 8.3, symfony: '*', phpunit: 9, database: sqlite, without-dama: 1, deps: lowest}
+          - {php: 8.3, symfony: '*', phpunit: 9, database: none, deps: lowest}
+
+          # One permutation per DBMS
+          - {php: 8.3, symfony: '*', phpunit: 11, database: mongo}
+          - {php: 8.3, symfony: '*', phpunit: 11, database: pgsql}
+          - {php: 8.3, symfony: '*', phpunit: 11, database: sqlite}
+          - {php: 8.3, symfony: '*', phpunit: 11, database: mysql}
+
+          # lowest deps (one per DBMS)
+          - {php: 8.3, symfony: '*', phpunit: 9, database: mysql|mongo, deps: lowest}
+          - {php: 8.3, symfony: '*', phpunit: 9, database: mongo, deps: lowest}
+          - {php: 8.3, symfony: '*', phpunit: 9, database: pgsql, deps: lowest}
+          - {php: 8.3, symfony: '*', phpunit: 9, database: sqlite, deps: lowest}
           - {php: 8.3, symfony: '*', phpunit: 9, database: mysql, deps: lowest}
-          - {php: 8.3, symfony: '*', phpunit: 10, database: mysql|mongo}
+
+          # using Foundry's PHPUnit extension
           - {php: 8.3, symfony: '*', phpunit: 11, database: mysql|mongo, use-phpunit-extension: 1}
-          - {php: 8.3, symfony: '*', phpunit: 11, database: mysql|mongo, use-phpunit-extension: 1, without-dama: 1}
     env:
       DATABASE_URL: ${{ contains(matrix.database, 'mysql') && 'mysql://root:root@localhost:3306/foundry?serverVersion=5.7.42' || contains(matrix.database, 'pgsql') && 'postgresql://root:root@localhost:5432/foundry?serverVersion=15' || contains(matrix.database, 'sqlite') && 'sqlite:///%kernel.project_dir%/var/data.db' || '' }}
       MONGO_URL: ${{ contains(matrix.database, 'mongo') && 'mongodb://127.0.0.1:27017/dbName?compressors=disabled&gssapiServiceName=mongodb' || '' }}
-      USE_DAMA_DOCTRINE_TEST_BUNDLE: ${{ matrix.without-dama == 0 && contains(matrix.database, 'sql') && 1 || 0 }}
+      USE_DAMA_DOCTRINE_TEST_BUNDLE: ${{ contains(matrix.database, 'sql') && 1 || 0 }}
       USE_FOUNDRY_PHPUNIT_EXTENSION: ${{ matrix.use-phpunit-extension || 0 }}
       PHPUNIT_VERSION: ${{ matrix.phpunit }}
     services:

composer.json

@@ -28,14 +28,15 @@
     "require-dev": {
         "bamarni/composer-bin-plugin": "^1.8",
         "brianium/paratest": "^6|^7",
-        "dama/doctrine-test-bundle": "^7.0|^8.0",
+        "dama/doctrine-test-bundle": "^8.0",
         "doctrine/collections": "^1.7|^2.0",
-        "doctrine/common": "^2|^3",
+        "doctrine/common": "^3.2.2",
         "doctrine/doctrine-bundle": "^2.10",
         "doctrine/doctrine-migrations-bundle": "^2.2|^3.0",
         "doctrine/mongodb-odm-bundle": "^4.6|^5.0",
+        "doctrine/mongodb-odm": "^2.4",
         "doctrine/orm": "^2.16|^3.0",
-        "phpunit/phpunit": "^9.5.0 || ^10.0 || ^11.0",
+        "phpunit/phpunit": "^9.5.0",
         "symfony/console": "^6.4|^7.0",
         "symfony/dotenv": "^6.4|^7.0",
         "symfony/maker-bundle": "^1.55",

src/Exception/FactoriesTraitNotUsed.php

@@ -41,7 +41,6 @@ public static function throwIfComingFromKernelTestCaseWithoutFactoriesTrait(): v
                 && isset($trace['class'])
                 && KernelTestCase::class !== $trace['class']
                 && \is_a($trace['class'], KernelTestCase::class, allow_string: true)
-                && !(new \ReflectionClass($trace['class']))->hasMethod('_bootFoundry')
             ) {
                 self::throwIfClassDoesNotHaveFactoriesTrait($trace['class']);
             }