feat: composer prefer-stable, doctrine/orm 3, doctrine/doctrine-bundle 3 (#353)

* feat: composer prefer-stable
dev allow doctrine/orm 3, doctrine/annotations 2 and doctrine/doctrine-bundle 3

* feat: composer prefer-stable
dev allow doctrine/orm 3, doctrine/annotations 2 and doctrine/doctrine-bundle 3

* feat: composer prefer-stable
dev allow doctrine/orm 3, doctrine/annotations 2 and doctrine/doctrine-bundle 3

* feat: composer prefer-stable
dev allow doctrine/orm 3, doctrine/annotations 2 and doctrine/doctrine-bundle 3

* feat: composer prefer-stable
dev allow doctrine/orm 3, doctrine/annotations 2 and doctrine/doctrine-bundle 3

* feat: composer prefer-stable
dev allow doctrine/orm 3, doctrine/annotations 2 and doctrine/doctrine-bundle 3

* feat: composer prefer-stable
dev allow doctrine/orm 3, doctrine/annotations 2 and doctrine/doctrine-bundle 3

* feat: composer prefer-stable
dev allow doctrine/orm 3, doctrine/annotations 2 and doctrine/doctrine-bundle 3

* feat: composer prefer-stable
dev allow doctrine/orm 3, doctrine/annotations 2 and doctrine/doctrine-bundle 3

* feat: composer prefer-stable
dev allow doctrine/orm 3, doctrine/annotations 2 and doctrine/doctrine-bundle 3

* feat: composer prefer-stable
dev allow doctrine/orm 3, doctrine/annotations 2 and doctrine/doctrine-bundle 3

* Update doctrine/doctrine-bundle version constraint

* Update doctrine/doctrine-bundle version requirement

---------

Co-authored-by: Christopher Georg <[email protected]>

Author: Chris53897

composer.json

@@ -4,6 +4,7 @@
     "type": "symfony-bundle",
     "license": "MIT",
     "minimum-stability": "dev",
+    "prefer-stable": true,
     "require": {
         "php": ">=8.1.10",
         "symfony/config": "^5.4 | ^6.0 | ^7.0 | ^8.0",
@@ -12,11 +13,11 @@
         "symfony/http-kernel": "^5.4 | ^6.0 | ^7.0 | ^8.0"
     },
     "require-dev": {
-        "doctrine/orm": "^2.13",
+        "doctrine/orm": "^2.20 | ^3.0",
         "symfony/framework-bundle": "^5.4 | ^6.0 | ^7.0 | ^8.0",
         "symfony/phpunit-bridge": "^5.4 | ^6.0 | ^7.0 | ^8.0",
-        "doctrine/doctrine-bundle": "^2.8",
-        "doctrine/annotations": "^1.0",
+        "doctrine/doctrine-bundle": "^2.13 | ^3.0",
+        "doctrine/annotations": "^1.0 | ^2.0",
         "symfony/process": "^6.4 | ^7.0 | ^8.0",
         "symfonycasts/internal-test-helpers": "dev-main"
     },

phpstan-baseline.neon

@@ -5,11 +5,6 @@ parameters:
 			count: 1
 			path: src/Command/ResetPasswordRemoveExpiredCommand.php
 
-		-
-			message: "#^Method SymfonyCasts\\\\Bundle\\\\ResetPassword\\\\DependencyInjection\\\\Configuration\\:\\:getConfigTreeBuilder\\(\\) return type with generic class Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\TreeBuilder does not specify its types\\: T$#"
-			count: 1
-			path: src/DependencyInjection/Configuration.php
-
 		-
 			message: "#^Property SymfonyCasts\\\\Bundle\\\\ResetPassword\\\\Exception\\\\TooManyPasswordRequestsException\\:\\:\\$availableAt has no type specified\\.$#"
 			count: 1

tests/ResetPasswordTestKernel.php

@@ -9,6 +9,7 @@
 
 namespace SymfonyCasts\Bundle\ResetPassword\Tests;
 
+use Composer\InstalledVersions;
 use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Component\Config\Loader\LoaderInterface;
@@ -80,24 +81,33 @@ public function registerContainerConfiguration(LoaderInterface $loader): void
                 ]
             );
 
+            $orm = [
+                'mappings' => [
+                    'App' => [
+                        'is_bundle' => false,
+                        'type' => self::shouldUseAttributes() ? 'attribute' : 'annotation',
+                        'dir' => 'tests/Fixtures/Entity/',
+                        'prefix' => 'SymfonyCasts\Bundle\ResetPassword\Tests\Fixtures\Entity',
+                        'alias' => 'App',
+                    ],
+                ],
+            ];
+
+            // doctrine-bundle
+            if (null !== $doctrineBundleVersion = InstalledVersions::getVersion('doctrine/doctrine-bundle')) {
+                // v2
+                if (version_compare($doctrineBundleVersion, '3.0.0', '<')) {
+                    $orm['auto_generate_proxy_classes'] = true;
+                    $orm['report_fields_where_declared'] = true;
+                }
+            }
+
             $container->loadFromExtension('doctrine', [
                 'dbal' => [
                     'driver' => 'pdo_sqlite',
                     'url' => 'sqlite:///'.$this->getCacheDir().'/app.db',
                 ],
-                'orm' => [
-                    'auto_generate_proxy_classes' => true,
-                    'auto_mapping' => true,
-                    'mappings' => [
-                        'App' => [
-                            'is_bundle' => false,
-                            'type' => self::shouldUseAttributes() ? 'attribute' : 'annotation',
-                            'dir' => 'tests/Fixtures/Entity/',
-                            'prefix' => 'SymfonyCasts\Bundle\ResetPassword\Tests\Fixtures\Entity',
-                            'alias' => 'App',
-                        ],
-                    ],
-                ],
+                'orm' => $orm,
             ]);
 
             $container->register(ResetPasswordTestFixtureRequestRepository::class)
@@ -144,6 +154,8 @@ public function getLogDir(): string
 
     public static function shouldUseAttributes(): bool
     {
-        return Kernel::VERSION_ID >= 70000;
+        $ormVersion = InstalledVersions::getVersion('doctrine/orm');
+
+        return Kernel::VERSION_ID >= 70000 || version_compare($ormVersion, '3.0.0', '>=');
     }
 }