Test with Symfony 7.3 (#894)

* Test with Symfony 7.3

* Fix use statement ordering in config docs

Author: GromNaN

.github/workflows/continuous-integration.yml

@@ -32,6 +32,7 @@ jobs:
         symfony-version:
           - "6.4.*"
           - "7.2.*"
+          - "7.3.*"
         driver-version:
           - "stable"
         dependencies:
@@ -52,6 +53,8 @@ jobs:
         exclude:
           - php-version: "8.1"
             symfony-version: "7.2.*"
+          - php-version: "8.1"
+            symfony-version: "7.3.*"
 
     services:
       mongodb:

docs/config.rst

@@ -49,9 +49,9 @@ Sample Configuration
 
     .. code-block:: php
 
+        use Symfony\Config\DoctrineMongodbConfig;
         use function Symfony\Component\DependencyInjection\Loader\Configurator\env;
         use function Symfony\Component\DependencyInjection\Loader\Configurator\param;
-        use Symfony\Config\DoctrineMongodbConfig;
 
         return static function (DoctrineMongodbConfig $config): void {
             $config->connection('default')
@@ -142,9 +142,9 @@ If you wish to use memcached to cache your metadata, you need to configure the
 
     .. code-block:: php
 
-        use function Symfony\Component\DependencyInjection\Loader\Configurator\param;
         use Symfony\Component\Cache\Adapter\MemcachedAdapter;
         use Symfony\Config\DoctrineMongodbConfig;
+        use function Symfony\Component\DependencyInjection\Loader\Configurator\param;
 
         return static function (DoctrineMongodbConfig $config): void {
             $config->defaultDatabase('hello_' . param('kernel.environment'));
@@ -260,8 +260,8 @@ The following configuration shows a bunch of mapping examples:
 
     .. code-block:: php
 
-        use function Symfony\Component\DependencyInjection\Loader\Configurator\param;
         use Symfony\Config\DoctrineMongodbConfig;
+        use function Symfony\Component\DependencyInjection\Loader\Configurator\param;
 
         return static function (DoctrineMongodbConfig $config): void {
             $config->documentManager('default')
@@ -475,8 +475,8 @@ following syntax:
 
     .. code-block:: php
 
-        use function Symfony\Component\DependencyInjection\Loader\Configurator\param;
         use Symfony\Config\DoctrineMongodbConfig;
+        use function Symfony\Component\DependencyInjection\Loader\Configurator\param;
 
         return static function (DoctrineMongodbConfig $config): void {
             $config->defaultDatabase('hello_' . param('kernel.environment'));

src/DependencyInjection/DoctrineMongoDBExtension.php

@@ -158,22 +158,22 @@ public function load(array $configs, ContainerBuilder $container): void
 
         // Document classes are excluded from the container by default
         $container->registerAttributeForAutoconfiguration(Document::class, static function (ChildDefinition $definition): void {
-            $definition->addTag('container.excluded', ['source' => sprintf('with #[%s] attribute', Document::class)])->setAbstract(true);
+            $definition->addTag('container.excluded', ['source' => sprintf('with #[%s] attribute', Document::class)]);
         });
         $container->registerAttributeForAutoconfiguration(EmbeddedDocument::class, static function (ChildDefinition $definition): void {
-            $definition->addTag('container.excluded', ['source' => sprintf('with #[%s] attribute', EmbeddedDocument::class)])->setAbstract(true);
+            $definition->addTag('container.excluded', ['source' => sprintf('with #[%s] attribute', EmbeddedDocument::class)]);
         });
         $container->registerAttributeForAutoconfiguration(MappedSuperclass::class, static function (ChildDefinition $definition): void {
-            $definition->addTag('container.excluded', ['source' => sprintf('with #[%s] attribute', MappedSuperclass::class)])->setAbstract(true);
+            $definition->addTag('container.excluded', ['source' => sprintf('with #[%s] attribute', MappedSuperclass::class)]);
         });
         $container->registerAttributeForAutoconfiguration(View::class, static function (ChildDefinition $definition): void {
-            $definition->addTag('container.excluded', ['source' => sprintf('with #[%s] attribute', View::class)])->setAbstract(true);
+            $definition->addTag('container.excluded', ['source' => sprintf('with #[%s] attribute', View::class)]);
         });
         $container->registerAttributeForAutoconfiguration(QueryResultDocument::class, static function (ChildDefinition $definition): void {
-            $definition->addTag('container.excluded', ['source' => sprintf('with #[%s] attribute', QueryResultDocument::class)])->setAbstract(true);
+            $definition->addTag('container.excluded', ['source' => sprintf('with #[%s] attribute', QueryResultDocument::class)]);
         });
         $container->registerAttributeForAutoconfiguration(File::class, static function (ChildDefinition $definition): void {
-            $definition->addTag('container.excluded', ['source' => sprintf('with #[%s] attribute', File::class)])->setAbstract(true);
+            $definition->addTag('container.excluded', ['source' => sprintf('with #[%s] attribute', File::class)]);
         });
 
         $this->loadMessengerServices($container, $loader);

tests/DependencyInjection/DoctrineMongoDBExtensionTest.php

@@ -26,6 +26,7 @@
 use function class_exists;
 use function interface_exists;
 use function is_dir;
+use function method_exists;
 use function sprintf;
 use function sys_get_temp_dir;
 
@@ -126,14 +127,21 @@ public function testDocumentAttributeExcludesFromContainer(string $class): void
         $extension = new DoctrineMongoDBExtension();
         $extension->load($this->buildConfiguration(), $container);
 
-        $attributes = $container->getAutoconfiguredAttributes();
-        $this->assertInstanceOf(Closure::class, $attributes[$class]);
+        // @phpstan-ignore function.alreadyNarrowedType
+        if (method_exists($container, 'getAttributeAutoconfigurators')) {
+            // Compatibility with Symfony 7.3 and later
+            $autoconfigurator = $container->getAttributeAutoconfigurators()[$class][0];
+        } else {
+            // Compatibility with Symfony 7.2 and earlier
+            $autoconfigurator = $container->getAutoconfiguredAttributes()[$class];
+        }
+
+        $this->assertInstanceOf(Closure::class, $autoconfigurator);
 
         $definition = new ChildDefinition('');
-        $attributes[$class]($definition);
+        $autoconfigurator($definition);
 
         $this->assertSame([['source' => sprintf('with #[%s] attribute', $class)]], $definition->getTag('container.excluded'));
-        $this->assertTrue($definition->isAbstract());
     }
 
     /** @param string|string[] $bundles */