Increase doctrine/doctrine-bundle range to ^4.0

Author: Kocal

src/Autocomplete/composer.json

@@ -33,7 +33,7 @@
     },
     "require-dev": {
         "doctrine/collections": "^1.6.8|^2.0",
-        "doctrine/doctrine-bundle": "^2.4.3|^3.0.0",
+        "doctrine/doctrine-bundle": "^2.4.3|^3.0|^4.0",
         "doctrine/orm": "^2.9.4|^3.0",
         "fakerphp/faker": "^1.22",
         "mtdowling/jmespath.php": "^2.6",

src/Autocomplete/tests/Fixtures/Kernel.php

@@ -138,7 +138,8 @@ protected function configureContainer(ContainerConfigurator $c): void
                     $doctrineConfig['orm']['controller_resolver']['auto_mapping'] = true;
                 }
             }
-            if (\PHP_VERSION_ID >= 80400 && version_compare($doctrineBundleVersion, '2.15.0', '>=')) {
+
+            if (\PHP_VERSION_ID >= 80400 && version_compare($doctrineBundleVersion, '2.15.0', '>=') && version_compare($doctrineBundleVersion, '4.0.0', '<')) {
                 $doctrineConfig['orm']['enable_native_lazy_objects'] = true;
             }
         }

src/LiveComponent/composer.json

@@ -37,9 +37,9 @@
     "require-dev": {
         "doctrine/annotations": "^1.0|^2.0",
         "doctrine/collections": "^1.6.8|^2.0",
-        "doctrine/doctrine-bundle": "^2.4.3|^3.0.0",
+        "doctrine/doctrine-bundle": "^2.4.3|^3.0|^4.0",
         "doctrine/orm": "^2.9.4|^3.0",
-        "doctrine/persistence": "^2.5.2|^3.0",
+        "doctrine/persistence": "^2.5.2|^3.0|^4.0",
         "phpdocumentor/reflection-docblock": "5.x-dev",
         "symfony/dependency-injection": "^5.4|^6.0|^7.0|^8.0",
         "symfony/expression-language": "^5.4|^6.0|^7.0|^8.0",

src/LiveComponent/tests/Fixtures/Kernel.php

@@ -190,18 +190,28 @@ protected function configureContainer(ContainerConfigurator $c): void
                 if (version_compare($doctrineBundleVersion, '2.8.0', '>=')) {
                     $doctrineConfig['orm']['enable_lazy_ghost_objects'] = true;
                 }
+
+                // https://github.com/doctrine/DoctrineBundle/pull/1661
+                if (version_compare($doctrineBundleVersion, '2.9.0', '>=')) {
+                    $doctrineConfig['orm']['report_fields_where_declared'] = true;
+                }
+
                 if (version_compare($doctrineBundleVersion, '2.12.0', '>=')) {
                     $doctrineConfig['orm']['controller_resolver']['auto_mapping'] = false;
                 }
             }
 
             // https://github.com/doctrine/DoctrineBundle/pull/1661
             if (version_compare($doctrineBundleVersion, '2.9.0', '>=')) {
-                $doctrineConfig['orm']['report_fields_where_declared'] = true;
                 $doctrineConfig['orm']['validate_xml_mapping'] = true;
                 $doctrineConfig['dbal']['schema_manager_factory'] = 'doctrine.dbal.default_schema_manager_factory';
+
+                if (version_compare($doctrineBundleVersion, '3.0.0', '<')) {
+                    $doctrineConfig['orm']['report_fields_where_declared'] = true;
+                }
             }
-            if (\PHP_VERSION_ID >= 80400 && version_compare($doctrineBundleVersion, '2.15.0', '>=')) {
+
+            if (\PHP_VERSION_ID >= 80400 && version_compare($doctrineBundleVersion, '2.15.0', '>=') && version_compare($doctrineBundleVersion, '4.0.0', '<')) {
                 $doctrineConfig['orm']['enable_native_lazy_objects'] = true;
             }
         }

src/Turbo/composer.json

@@ -38,7 +38,7 @@
         "symfony/stimulus-bundle": "^2.9.1"
     },
     "require-dev": {
-        "doctrine/doctrine-bundle": "^2.4.3|^3.0.0",
+        "doctrine/doctrine-bundle": "^2.4.3|^3.0|^4.0",
         "doctrine/orm": "^2.8|^3.0",
         "phpstan/phpstan": "^2.1.17",
         "symfony/asset-mapper": "^6.4|^7.0|^8.0",

src/Turbo/tests/app/Kernel.php

@@ -111,7 +111,7 @@ protected function configureContainer(ContainerConfigurator $container): void
                 }
             }
 
-            if (\PHP_VERSION_ID >= 80400 && version_compare($doctrineBundleVersion, '2.15.0', '>=')) {
+            if (\PHP_VERSION_ID >= 80400 && version_compare($doctrineBundleVersion, '2.15.0', '>=') && version_compare($doctrineBundleVersion, '4.0.0', '<')) {
                 $doctrineConfig['orm']['enable_native_lazy_objects'] = true;
             }
         }