feat: allow doctrine/doctrine-bundle 3

Author: Chris8934

composer.json

@@ -23,7 +23,7 @@
     "willdurand/geocoder": "^4.6|^5.0"
   },
   "require-dev": {
-    "doctrine/doctrine-bundle": "^2.3",
+    "doctrine/doctrine-bundle": "^2.18 || ^3.0",
     "doctrine/orm": "^2.20 || ^3.0",
     "fakerphp/faker": "^1.20",
     "friendsofphp/php-cs-fixer": "^3.13",

src/DependencyInjection/BazingaGeocoderExtension.php

@@ -41,10 +41,8 @@ class BazingaGeocoderExtension extends Extension
 {
     /**
      * @param array<mixed, mixed> $configs
-     *
-     * @return void
      */
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $processor = new Processor();
         $configuration = $this->getConfiguration($configs, $container);

src/DependencyInjection/Compiler/AddProvidersPass.php

@@ -25,10 +25,8 @@ class AddProvidersPass implements CompilerPassInterface
     /**
      * Get all providers based on their tag (`bazinga_geocoder.provider`) and
      * register them.
-     *
-     * @return void
      */
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         if (!$container->hasDefinition(ProviderAggregator::class)) {
             return;

src/DependencyInjection/Compiler/FactoryValidatorPass.php

@@ -28,10 +28,7 @@ class FactoryValidatorPass implements CompilerPassInterface
      */
     private static $factoryServiceIds = [];
 
-    /**
-     * @return void
-     */
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         foreach (self::$factoryServiceIds as $id) {
             if (!$container->hasAlias($id) && !$container->hasDefinition($id)) {

src/DependencyInjection/Compiler/ProfilerPass.php

@@ -24,10 +24,7 @@
  */
 class ProfilerPass implements CompilerPassInterface
 {
-    /**
-     * @return void
-     */
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         if (!$container->hasDefinition(GeocoderDataCollector::class)) {
             return;

src/Mapping/Driver/AttributeDriver.php

@@ -31,7 +31,7 @@ public function isGeocodeable(object $object): bool
     }
 
     /**
-     * @throws MappingException
+     * @throws MappingException|\ReflectionException
      */
     public function loadMetadataFromObject(object $object): ClassMetadata
     {
@@ -76,6 +76,8 @@ public function loadMetadataFromObject(object $object): ClassMetadata
      * @param T $object
      *
      * @return \ReflectionClass<T>
+     *
+     * @throws \ReflectionException
      */
     private static function getReflection(object $object): \ReflectionClass
     {
@@ -84,7 +86,12 @@ private static function getReflection(object $object): \ReflectionClass
             return ClassUtils::newReflectionObject($object);
         }
 
+        if (PHP_VERSION_ID < 80400) {
+            /** @var \ReflectionClass<T> */
+            return new \ReflectionClass(DefaultProxyClassNameResolver::getClass($object));
+        }
+
         /** @var \ReflectionClass<T> */
-        return new \ReflectionClass(DefaultProxyClassNameResolver::getClass($object));
+        return new \ReflectionClass($object);
     }
 }

tests/Functional/GeocoderListenerTest.php

@@ -71,14 +71,14 @@ public function process(ContainerBuilder $container): void
             $kernel->addTestConfig(static function (ContainerBuilder $container) {
                 $container->prependExtensionConfig('doctrine', [
                     'orm' => [
-                        'report_fields_where_declared' => true,
+                        //'report_fields_where_declared' => true,
                     ],
                 ]);
 
                 if (method_exists(Configuration::class, 'setLazyGhostObjectEnabled') && Kernel::VERSION_ID >= 60100) {
                     $container->prependExtensionConfig('doctrine', [
                         'orm' => [
-                            'enable_lazy_ghost_objects' => true,
+                            //'enable_lazy_ghost_objects' => true,
                         ],
                     ]);
                 }
@@ -87,7 +87,7 @@ public function process(ContainerBuilder $container): void
                     $container->prependExtensionConfig('doctrine', [
                         'orm' => [
                             'controller_resolver' => [
-                                'auto_mapping' => false,
+                                //'auto_mapping' => false,
                             ],
                         ],
                     ]);

tests/Functional/config/listener.yml

@@ -6,9 +6,9 @@ doctrine:
                 driver: pdo_sqlite
                 path: '%kernel.cache_dir%/test.sqlite'
     orm:
-        auto_generate_proxy_classes: true
+        #auto_generate_proxy_classes: true
         validate_xml_mapping: true
-        report_fields_where_declared: true
+        #report_fields_where_declared: true
         naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
         auto_mapping: false