feat: Foundry v3 🎉

Author: nikophil

.env

@@ -8,9 +8,6 @@ DATABASE_URL="sqlite:///%kernel.project_dir%/var/data.db"
 MONGO_URL="mongodb://127.0.0.1:27018/dbName?compressors=disabled&gssapiServiceName=mongodb"
 
 USE_DAMA_DOCTRINE_TEST_BUNDLE="0"
-USE_FOUNDRY_PHPUNIT_EXTENSION="0"
-USE_PHP_84_LAZY_OBJECTS="0"
-PHPUNIT_VERSION="13" # allowed values: 9, 10, 11, 12, 13
 
 # Only relevant for "reset-database" testsuite
 DATABASE_RESET_MODE="schema" # allowed values: schema, migrate

.github/workflows/phpunit.yml

@@ -21,66 +21,37 @@ concurrency:
 
 jobs:
   tests:
-    name: P:${{ matrix.php }}, S:${{ matrix.symfony }}, D:${{ matrix.database }}, PU:${{ matrix.phpunit }}${{ matrix.deps == 'lowest' && ' (lowest)' || '' }}${{ matrix.use-phpunit-extension != 1 && ' (no phpunit extension)' || '' }}${{ (matrix.use-php-84-lazy-objects != 1 || matrix.php != '8.4') && ' (legacy proxy)' || '' }}${{ matrix.no-dama == 1 && ' (no dama)' || '' }}
+    name: P:${{ matrix.php }}, S:${{ matrix.symfony }}, D:${{ matrix.database }}${{ matrix.deps == 'lowest' && ' (lowest)' || '' }}${{ matrix.no-dama == 1 && ' (no dama)' || '' }}
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         php: [ 8.4, 8.5 ]
-        symfony: [ 6.4.*, 7.4.*, 8.0.* ]
+        symfony: [ 8.0.* ]
         database: [ mysql|mongo ]
-        phpunit: [ 13 ]
-        use-phpunit-extension: [ 1 ]
-        use-php-84-lazy-objects: [ 1 ]
         deps: [ highest ]
 
         include:
-          # old php versions
-          - {php: 8.1, symfony: 6.4.*, phpunit: 9, database: mysql, use-phpunit-extension: 0}
-          - {php: 8.2, symfony: 6.4.*, phpunit: 9, database: mysql, use-phpunit-extension: 0}
-
-          # old PHPUnit versions
-          - {php: 8.3, symfony: 7.4.*, phpunit: 9, database: mysql, use-phpunit-extension: 0}
-          - {php: 8.4, symfony: 7.4.*, phpunit: 10, database: mysql, use-phpunit-extension: 0}
-          - {php: 8.4, symfony: 7.4.*, phpunit: 11, database: mysql, use-phpunit-extension: 0}
-          - {php: 8.4, symfony: 7.4.*, phpunit: 11, database: mysql}
-          - {php: 8.4, symfony: 7.4.*, phpunit: 12, database: mysql, use-phpunit-extension: 0}
-          - {php: 8.4, symfony: 7.4.*, phpunit: 12, database: mysql}
-
-          # test with no database (PHPUnit 9 is used to prevent some problems with empty data providers)
-          - {php: 8.3, symfony: 7.4.*, phpunit: 9, database: none, use-phpunit-extension: 0}
-          - {php: 8.3, symfony: 7.4.*, phpunit: 9, database: none, deps: lowest, use-phpunit-extension: 0}
-
           # One permutation per DBMS
-          - {php: 8.4, symfony: 7.4.*, phpunit: 13, database: mongo}
-          - {php: 8.4, symfony: 7.4.*, phpunit: 13, database: pgsql}
-          - {php: 8.4, symfony: 7.4.*, phpunit: 13, database: sqlite}
-          - {php: 8.4, symfony: 7.4.*, phpunit: 13, database: mysql}
+          - {php: 8.4, symfony: 8.0.*, database: mongo}
+          - {php: 8.4, symfony: 8.0.*, database: pgsql}
+          - {php: 8.4, symfony: 8.0.*, database: sqlite}
+          - {php: 8.4, symfony: 8.0.*, database: mysql}
+
+          # test with no database
+          - {php: 8.4, symfony: 8.0.*, database: none}
+          - {php: 8.4, symfony: 8.0.*, database: none, deps: lowest}
 
           # lowest deps (one per DBMS)
-          - {php: 8.3, symfony: 6.4.*, phpunit: 9, database: mysql|mongo, deps: lowest, use-phpunit-extension: 0}
-          - {php: 8.3, symfony: 6.4.*, phpunit: 9, database: mongo, deps: lowest, use-phpunit-extension: 0}
-          - {php: 8.3, symfony: 6.4.*, phpunit: 9, database: pgsql, deps: lowest, use-phpunit-extension: 0}
-          - {php: 8.3, symfony: 6.4.*, phpunit: 9, database: sqlite, deps: lowest, use-phpunit-extension: 0}
-          - {php: 8.3, symfony: 6.4.*, phpunit: 9, database: mysql, deps: lowest, use-phpunit-extension: 0}
-
-          # Lowest deps with PHP 8.4 & lazy objects
-          - {php: 8.4, symfony: 6.4.*, phpunit: 13, database: mysql|mongo, deps: lowest}
-
-          # Disable Foundry's PHPUnit extension and/or dama
-          - {php: 8.4, symfony: 7.4.*, phpunit: 13, database: mysql|mongo, use-phpunit-extension: 0}
-          - {php: 8.4, symfony: 7.4.*, phpunit: 13, database: mysql, use-phpunit-extension: 0, no-dama: 1}
-          - {php: 8.4, symfony: 7.4.*, phpunit: 13, database: mysql, no-dama: 1}
-
-          # disable lazy objects in PHP 8.4
-          - {php: 8.4, symfony: 7.4.*, phpunit: 13, database: mysql|mongo, use-php-84-lazy-objects: 0}
+          - {php: 8.4, symfony: 8.0.*, database: mysql|mongo, deps: lowest}
+
+          # Test without dama
+          - {php: 8.4, symfony: 8.0.*, database: mysql, no-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: ${{ contains(matrix.database, 'sql') && matrix.no-dama != 1 && 1 || 0 }}
-      USE_FOUNDRY_PHPUNIT_EXTENSION: ${{ matrix.use-phpunit-extension || 0 }}
-      USE_PHP_84_LAZY_OBJECTS: ${{ matrix.use-php-84-lazy-objects }}
-      PHPUNIT_VERSION: ${{ matrix.phpunit }}
+      PHPUNIT_VERSION: 13
       WITH_LOWEST_DEPENDENCIES: ${{ matrix.deps == 'lowest' && 1 || 0 }}
     services:
       postgres:
@@ -111,11 +82,6 @@ jobs:
           coverage: none
           tools: flex
 
-      - name: Add the polyfill compatible with Doctrine ^2.16
-        if: ${{ matrix.deps == 'lowest' }}
-        shell: bash
-        run: composer require --dev symfony/polyfill-php80:^1.16 --no-update
-
       - name: Install dependencies
         uses: ramsey/composer-install@v2
         with:
@@ -134,7 +100,7 @@ jobs:
           SYMFONY_REQUIRE: ${{ matrix.symfony }}
 
   test-reset-database:
-    name: Reset DB - D:${{ matrix.database }} ${{ matrix.use-dama == 1 && ' (dama)' || '' }} ${{ matrix.reset-database-mode == 'migrate' && ' (migrate)' || '' }} ${{ contains(matrix.with-migration-configuration-file, 'transactional') && '(configuration file transactional)' || contains(matrix.with-migration-configuration-file, 'configuration') && '(configuration file)' || '' }}${{ matrix.deps == 'lowest' && ' (lowest)' || '' }}${{ matrix.use-phpunit-extension == 0 && ' (no phpunit extension)' || '' }}
+    name: Reset DB - D:${{ matrix.database }} ${{ matrix.use-dama == 1 && ' (dama)' || '' }} ${{ matrix.reset-database-mode == 'migrate' && ' (migrate)' || '' }} ${{ contains(matrix.with-migration-configuration-file, 'transactional') && '(configuration file transactional)' || contains(matrix.with-migration-configuration-file, 'configuration') && '(configuration file)' || '' }}${{ matrix.deps == 'lowest' && ' (lowest)' || '' }}
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -144,13 +110,10 @@ jobs:
         reset-database-mode: [ schema, migrate ]
         migration-configuration-file: ['no']
         deps: [ highest, lowest ]
-        use-phpunit-extension: [ 1 ]
         include:
-          - { database: mongo, use-dama: 0, reset-database-mode: schema, use-phpunit-extension: 1 }
-          - { database: pgsql, use-dama: 1, reset-database-mode: schema, use-phpunit-extension: 0 }
-          - { database: pgsql, use-dama: 0, reset-database-mode: schema, use-phpunit-extension: 0 }
-          - { database: pgsql, migration-configuration-file: 'migration-configuration', use-dama: 0, reset-database-mode: migration, use-phpunit-extension: 1 }
-          - { database: pgsql, migration-configuration-file: 'migration-configuration-transactional', use-dama: 0, reset-database-mode: migration, use-phpunit-extension: 1 }
+          - { database: mongo, use-dama: 0, reset-database-mode: schema }
+          - { database: pgsql, migration-configuration-file: 'migration-configuration', use-dama: 0, reset-database-mode: migration }
+          - { database: pgsql, migration-configuration-file: 'migration-configuration-transactional', use-dama: 0, reset-database-mode: migration }
     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' || 'sqlite:///%kernel.project_dir%/var/data.db' }}
       MONGO_URL: ${{ contains(matrix.database, 'mongo') && 'mongodb://127.0.0.1:27017/dbName?compressors=disabled&gssapiServiceName=mongodb' || '' }}
@@ -159,7 +122,6 @@ jobs:
       MIGRATION_CONFIGURATION_FILE: ${{ matrix.migration-configuration-file == 'no' && '' || format('tests/Fixture/MigrationTests/configs/{0}.php', matrix.migration-configuration-file) }}
       PHPUNIT_VERSION: 13
       WITH_LOWEST_DEPENDENCIES: ${{ matrix.deps == 'lowest' && 1 || 0 }}
-      USE_FOUNDRY_PHPUNIT_EXTENSION: ${{ matrix.use-phpunit-extension }}
     services:
       postgres:
         image: ${{ contains(matrix.database, 'pgsql') && 'postgres:15' || '' }}
@@ -195,7 +157,7 @@ jobs:
           dependency-versions: ${{ matrix.deps }}
           composer-options: --prefer-dist
         env:
-          SYMFONY_REQUIRE: 7.4.*
+          SYMFONY_REQUIRE: 8.0.*
 
       - name: Set up MySQL
         if: contains(matrix.database, 'mysql')
@@ -210,15 +172,15 @@ jobs:
           ./phpunit --testsuite reset-database --bootstrap tests/bootstrap-reset-database.php
         shell: bash
         env:
-          SYMFONY_REQUIRE: 7.4.*
+          SYMFONY_REQUIRE: 8.0.*
 
   test-no-framework:
     name: No framework - PHP${{ matrix.php }}
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        php: [ 8.3, 8.4, 8.5 ]
+        php: [ 8.4, 8.5 ]
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -299,8 +261,6 @@ jobs:
       DATABASE_URL: postgresql://root:root@localhost:5432/foundry?serverVersion=15
       MONGO_URL: mongodb://127.0.0.1:27017/dbName?compressors=disabled&gssapiServiceName=mongodb
       USE_DAMA_DOCTRINE_TEST_BUNDLE: 1
-      USE_FOUNDRY_PHPUNIT_EXTENSION: 1
-      USE_PHP_84_LAZY_OBJECTS: 1
       PHPUNIT_VERSION: 13
       FOUNDRY_FAKER_SEED: 1234
     services:
@@ -350,4 +310,3 @@ jobs:
         uses: codecov/codecov-action@v3
         with:
           file: ./coverage.xml
-

.php-cs-fixer.dist.php

@@ -11,11 +11,14 @@
 $csFixerConfig = require $file;
 $csFixerConfig->setFinder(
     $csFixerConfig->getFinder()
-        ->notName('WebTestCaseWithBothTraitsInWrongOrderTest.php')
         ->in(__DIR__.'/utils')
         ->in(__DIR__.'/config')
 );
 
+$csFixerConfig->setRules(\array_merge($csFixerConfig->getRules(), [
+    'php_unit_test_annotation' => false,
+]));
+
 try {
     return $csFixerConfig;
 } finally {

composer.json

@@ -16,42 +16,41 @@
         }
     ],
     "require": {
-        "php": ">=8.1",
+        "php": ">=8.4",
         "fakerphp/faker": "^1.24",
         "symfony/deprecation-contracts": "^2.2|^3.0",
-        "symfony/polyfill-php84": "^1.32",
         "symfony/polyfill-php85": "^1.33",
-        "symfony/property-access": "^6.4|^7.0|^8.0",
-        "symfony/property-info": "^6.4|^7.0|^8.0",
-        "symfony/var-exporter": "^6.4.9|~7.0.9|^7.1.2|^8.0",
+        "symfony/property-access": "^8.0",
+        "symfony/property-info": "^8.0",
+        "symfony/var-exporter": "^8.0",
         "zenstruck/assert": "^1.4"
     },
     "require-dev": {
         "bamarni/composer-bin-plugin": "^1.8",
         "dama/doctrine-test-bundle": "^8.0",
-        "doctrine/collections": "^1.7|^2.0",
+        "doctrine/collections": "^2.0|^3.0",
         "doctrine/common": "^3.2.2",
-        "doctrine/doctrine-bundle": "^2.10|^3.0",
-        "doctrine/doctrine-migrations-bundle": "^2.2|^3.0",
-        "doctrine/mongodb-odm": "^2.4",
-        "doctrine/mongodb-odm-bundle": "^4.6|^5.0",
-        "doctrine/orm": "^2.16|^3.0",
-        "doctrine/persistence": "^2.0|^3.0|^4.0",
-        "phpunit/phpunit": "^9.5.0 || ^10.0 || ^11.0 || ^12.0 || ^13.0",
-        "symfony/browser-kit": "^6.4|^7.0|^8.0",
-        "symfony/console": "^6.4|^7.0|^8.0",
-        "symfony/dotenv": "^6.4|^7.0|^8.0",
-        "symfony/event-dispatcher": "^6.4|^7.0|^8.0",
+        "doctrine/doctrine-bundle": "^3.0",
+        "doctrine/doctrine-migrations-bundle": "^3.0",
+        "doctrine/mongodb-odm": "^2.16",
+        "doctrine/mongodb-odm-bundle": "^5.6",
+        "doctrine/orm": "^3.0",
+        "doctrine/persistence": "^3.3.1|^4.0",
+        "phpunit/phpunit": "^13.0",
+        "symfony/browser-kit": "^8.0",
+        "symfony/console": "^8.0",
+        "symfony/dotenv": "^8.0",
+        "symfony/event-dispatcher": "^8.0",
         "symfony/flex": "^2.10",
-        "symfony/framework-bundle": "^6.4|^7.0|^8.0",
+        "symfony/framework-bundle": "^8.0",
         "symfony/maker-bundle": "^1.55",
-        "symfony/phpunit-bridge": "^6.4.26|^7.0|^8.0",
-        "symfony/routing": "^6.4|^7.0|^8.0",
-        "symfony/runtime": "^6.4|^7.0|^8.0",
+        "symfony/phpunit-bridge": "^8.0",
+        "symfony/routing": "^8.0",
+        "symfony/runtime": "^8.0",
         "symfony/translation-contracts": "^3.4",
-        "symfony/uid": "^6.4|^7.0|^8.0",
-        "symfony/var-dumper": "^6.4|^7.0|^8.0",
-        "symfony/yaml": "^6.4|^7.0|^8.0",
+        "symfony/uid": "^8.0",
+        "symfony/var-dumper": "^8.0",
+        "symfony/yaml": "^8.0",
         "webmozart/assert": "^1.11"
     },
     "autoload": {
@@ -84,10 +83,7 @@
             "symfony/runtime": false
         }
     },
-    "conflict": {
-        "doctrine/persistence": "<2.0",
-        "doctrine/cache": "<1.12.1"
-    },
+    "conflict": {},
     "extra": {
         "bamarni-bin": {
             "target-directory": "bin/tools",

config/makers.php

@@ -15,15 +15,13 @@
 use Zenstruck\Foundry\Maker\Factory\FactoryCandidatesClassesExtractor;
 use Zenstruck\Foundry\Maker\Factory\FactoryClassMap;
 use Zenstruck\Foundry\Maker\Factory\FactoryGenerator;
-use Zenstruck\Foundry\Maker\Factory\LegacyORMDefaultPropertiesGuesser;
 use Zenstruck\Foundry\Maker\Factory\NoPersistenceObjectsAutoCompleter;
 use Zenstruck\Foundry\Maker\Factory\ObjectDefaultPropertiesGuesser;
 use Zenstruck\Foundry\Maker\Factory\ODMDefaultPropertiesGuesser;
 use Zenstruck\Foundry\Maker\Factory\ORMDefaultPropertiesGuesser;
 use Zenstruck\Foundry\Maker\MakeFactory;
 use Zenstruck\Foundry\Maker\MakeStory;
 use Zenstruck\Foundry\Maker\NamespaceGuesser;
-use Zenstruck\Foundry\ORM\DoctrineOrmVersionGuesser;
 
 return static function(ContainerConfigurator $container): void {
     $container->services()
@@ -42,7 +40,7 @@
             ])
             ->tag('maker.command')
 
-        ->set('.zenstruck_foundry.maker.factory.orm_default_properties_guesser', DoctrineOrmVersionGuesser::isOrmV3() ? ORMDefaultPropertiesGuesser::class : LegacyORMDefaultPropertiesGuesser::class)
+        ->set('.zenstruck_foundry.maker.factory.orm_default_properties_guesser', ORMDefaultPropertiesGuesser::class)
             ->args([
                 service('.zenstruck_foundry.persistence_manager')->nullOnInvalid(),
                 service('.zenstruck_foundry.maker.factory.factory_class_map'),

config/orm.php

@@ -12,16 +12,14 @@
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
 use DAMA\DoctrineTestBundle\Doctrine\DBAL\StaticDriver;
-use Zenstruck\Foundry\ORM\DoctrineOrmVersionGuesser;
-use Zenstruck\Foundry\ORM\OrmV2PersistenceStrategy;
-use Zenstruck\Foundry\ORM\OrmV3PersistenceStrategy;
+use Zenstruck\Foundry\ORM\OrmPersistenceStrategy;
 use Zenstruck\Foundry\ORM\ResetDatabase\BaseOrmResetter;
 use Zenstruck\Foundry\ORM\ResetDatabase\DamaDatabaseResetter;
 use Zenstruck\Foundry\ORM\ResetDatabase\OrmResetter;
 
 return static function(ContainerConfigurator $container): void {
     $container->services()
-        ->set('.zenstruck_foundry.persistence_strategy.orm', DoctrineOrmVersionGuesser::isOrmV3() ? OrmV3PersistenceStrategy::class : OrmV2PersistenceStrategy::class)
+        ->set('.zenstruck_foundry.persistence_strategy.orm', OrmPersistenceStrategy::class)
             ->args([
                 service('doctrine'),
             ])

config/persistence.php

@@ -42,13 +42,11 @@
             ])
     ;
 
-    if (\PHP_VERSION_ID >= 80400) {
-        $container->services()->set('.foundry.persistence.objects_tracker', PersistedObjectsTracker::class)
-            ->tag('kernel.reset', ['method' => 'refresh'])
-            ->tag('kernel.event_listener', ['event' => TerminateEvent::class, 'method' => 'refresh'])
-            ->tag('kernel.event_listener', ['event' => ConsoleTerminateEvent::class, 'method' => 'refresh'])
-            ->tag('kernel.event_listener', ['event' => WorkerMessageHandledEvent::class, 'method' => 'refresh']) // @phpstan-ignore class.notFound
-            ->tag('foundry.hook', ['class' => null, 'method' => 'afterPersistHook', 'event' => AfterPersist::class])
-        ;
-    }
+    $container->services()->set('.foundry.persistence.objects_tracker', PersistedObjectsTracker::class)
+        ->tag('kernel.reset', ['method' => 'refresh'])
+        ->tag('kernel.event_listener', ['event' => TerminateEvent::class, 'method' => 'refresh'])
+        ->tag('kernel.event_listener', ['event' => ConsoleTerminateEvent::class, 'method' => 'refresh'])
+        ->tag('kernel.event_listener', ['event' => WorkerMessageHandledEvent::class, 'method' => 'refresh']) // @phpstan-ignore class.notFound
+        ->tag('foundry.hook', ['class' => null, 'method' => 'afterPersistHook', 'event' => AfterPersist::class])
+    ;
 };

phpstan.neon

@@ -22,17 +22,10 @@ parameters:
         - bin/tools/phpbench/vendor/autoload.php
 
     ignoreErrors:
-        # suppress strange behavior of PHPStan where it considers proxy() return type as *NEVER*
-        - message: '#Return type of call to function Zenstruck\\Foundry\\Persistence\\proxy contains unresolvable type#'
-          path: src/Persistence/ProxyRepositoryDecorator.php
-
         # prevent PHPStan to force to type data providers
         - identifier: missingType.iterableValue
           path: tests/
 
-        # PHPStan does not understand PHP version checks
-        - message: '#Comparison operation "(<|>|<=|>=)" between int<80\d+, 80\d+> and 80\d+ is always (false|true).#'
-
         # Hydrator and Factory are annotated @immutable
         - identifier: property.readOnlyByPhpDocDefaultValue
           paths:
@@ -53,10 +46,6 @@ parameters:
         - identifier: missingType.generics
           path: src/Maker/Factory/
 
-        # not relevant for factories generated by maker
-        - identifier: missingType.callable
-          path: tests/Fixture/Maker/expected/
-
         # not relevant for files outside from Foundry's namespace
         - identifier: classConstant.internalClass
           path: config/
@@ -65,13 +54,11 @@ parameters:
 
     excludePaths:
         - config/reference.php (?)
+        - src/Test/Behat (?)
 
         - tests/Fixture/Maker/expected/can_create_factory_with_auto_activated_not_persisted_option.php
         - tests/Fixture/Maker/expected/can_create_factory_interactively.php
         - tests/Fixture/Maker/expected/can_create_factory_with_embeddable_with_data_set_odm.php
         - tests/Fixture/Maker/expected/can_create_factory_with_embeddable_with_data_set_orm.php
 
-        # phpstan runs with orm 3 - there are too many failures in these files which are compatible with orm 2
-        - ./src/Maker/Factory/LegacyORMDefaultPropertiesGuesser.php
         - ./src/Maker/Factory/DoctrineScalarFieldsDefaultPropertiesGuesser.php
-        - ./src/ORM/OrmV2PersistenceStrategy.php