Merge branch '5.4' into 6.0

* 5.4:
  [Console] replace method by const
  Determine attribute or annotation type for directories
  [FrameworkBundle] Backport type fixes
  [Finder] Add .gitignore nested negated patterns support

Author: derrabus

DependencyInjection/AbstractDoctrineExtension.php

@@ -89,25 +89,8 @@ protected function loadMappingInformation(array $objectManager, ContainerBuilder
                 if (!$mappingConfig) {
                     continue;
                 }
-            } elseif (!$mappingConfig['type'] && \PHP_VERSION_ID < 80000) {
-                $mappingConfig['type'] = 'annotation';
             } elseif (!$mappingConfig['type']) {
-                $mappingConfig['type'] = 'attribute';
-
-                $glob = new GlobResource($mappingConfig['dir'], '*', true);
-                $container->addResource($glob);
-
-                foreach ($glob as $file) {
-                    $content = file_get_contents($file);
-
-                    if (preg_match('/^#\[.*Entity\b/m', $content)) {
-                        break;
-                    }
-                    if (preg_match('/^ \* @.*Entity\b/m', $content)) {
-                        $mappingConfig['type'] = 'annotation';
-                        break;
-                    }
-                }
+                $mappingConfig['type'] = $this->detectMappingType($mappingConfig['dir'], $container);
             }
 
             $this->assertValidMappingConfiguration($mappingConfig, $objectManager['name']);
@@ -278,13 +261,44 @@ protected function detectMetadataDriver(string $dir, ContainerBuilder $container
             }
             $container->fileExists($resource, false);
 
-            return $container->fileExists($dir.'/'.$this->getMappingObjectDefaultName(), false) ? 'annotation' : null;
+            if ($container->fileExists($dir.'/'.$this->getMappingObjectDefaultName(), false)) {
+                return $this->detectMappingType($dir, $container);
+            }
+
+            return null;
         }
         $container->fileExists($dir.'/'.$configPath, false);
 
         return $driver;
     }
 
+    /**
+     * Detects what mapping type to use for the supplied directory.
+     *
+     * @return string A mapping type 'attribute' or 'annotation'
+     */
+    private function detectMappingType(string $directory, ContainerBuilder $container): string
+    {
+        $type = 'attribute';
+
+        $glob = new GlobResource($directory, '*', true);
+        $container->addResource($glob);
+
+        foreach ($glob as $file) {
+            $content = file_get_contents($file);
+
+            if (preg_match('/^#\[.*Entity\b/m', $content)) {
+                break;
+            }
+            if (preg_match('/^ \* @.*Entity\b/m', $content)) {
+                $type = 'annotation';
+                break;
+            }
+        }
+
+        return $type;
+    }
+
     /**
      * Loads a configured object manager metadata, query or result cache driver.
      *

Tests/DependencyInjection/DoctrineExtensionTest.php

@@ -171,6 +171,23 @@ public function testFixManagersAutoMappings(array $originalEm1, array $originalE
         ], $expectedEm2));
     }
 
+    public function testMappingTypeDetection()
+    {
+        $container = $this->createContainer();
+
+        $reflection = new \ReflectionClass(\get_class($this->extension));
+        $method = $reflection->getMethod('detectMappingType');
+        $method->setAccessible(true);
+
+        // The ordinary fixtures contain annotation
+        $mappingType = $method->invoke($this->extension, __DIR__.'/../Fixtures', $container);
+        $this->assertSame($mappingType, 'annotation');
+
+        // In the attribute folder, attributes are used
+        $mappingType = $method->invoke($this->extension, __DIR__.'/../Fixtures/Attribute', $container);
+        $this->assertSame($mappingType, 'attribute');
+    }
+
     public function providerBasicDrivers()
     {
         return [

Tests/Fixtures/Attribute/UuidIdEntity.php

@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\Tests\Fixtures\Attribute;
+
+use Doctrine\ORM\Mapping\Column;
+use Doctrine\ORM\Mapping\Entity;
+use Doctrine\ORM\Mapping\Id;
+
+#[Entity]
+class UuidIdEntity
+{
+    #[Id]
+    #[Column("uuid")]
+    protected $id;
+
+    public function __construct($id)
+    {
+        $this->id = $id;
+    }
+}