Merge release 2.18.1 into 2.19.x

.github/workflows/coding-standards.yml

@@ -26,6 +26,6 @@ on:
 jobs:
   coding-standards:
     name: "Coding Standards"
-    uses: "doctrine/.github/.github/workflows/coding-standards.yml@8.0.0"
+    uses: "doctrine/.github/.github/workflows/coding-standards.yml@v12.2.0"
     with:
       composer-options: "--prefer-dist --prefer-stable"

.github/workflows/composer-lint.yml

@@ -17,4 +17,4 @@ on:
 jobs:
   composer-lint:
     name: "Composer Lint"
-    uses: "doctrine/.github/.github/workflows/composer-lint.yml@8.0.0"
+    uses: "doctrine/.github/.github/workflows/composer-lint.yml@v12.2.0"

.github/workflows/continuous-integration.yml

@@ -115,7 +115,7 @@ jobs:
         run: "vendor/bin/phpunit --coverage-clover=coverage.xml"
 
       - name: "Upload coverage file"
-        uses: "actions/upload-artifact@v4"
+        uses: "actions/upload-artifact@v5"
         with:
           name: "phpunit-${{ matrix.php-version }}-${{ matrix.dependencies }}-${{ hashFiles('composer.lock') }}.coverage"
           path: "coverage.xml"
@@ -135,7 +135,7 @@ jobs:
           fetch-depth: 2
 
       - name: "Download coverage files"
-        uses: "actions/download-artifact@v5"
+        uses: "actions/download-artifact@v6"
         with:
           path: "reports"
 

.github/workflows/documentation.yml

@@ -17,4 +17,4 @@ on:
 jobs:
   documentation:
     name: "Documentation"
-    uses: "doctrine/.github/.github/workflows/documentation.yml@8.0.0"
+    uses: "doctrine/.github/.github/workflows/documentation.yml@v12.2.0"

.github/workflows/release-on-milestone-closed.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   release:
     name: "Git tag, release & create merge-up PR"
-    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@8.0.0"
+    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@v12.2.0"
     secrets:
       GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
       GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}

.github/workflows/static-analysis.yml

@@ -26,4 +26,4 @@ on:
 jobs:
   static-analysis:
     name: "Static Analysis"
-    uses: "doctrine/.github/.github/workflows/phpstan.yml@8.0.0"
+    uses: "doctrine/.github/.github/workflows/phpstan.yml@v12.2.0"

.github/workflows/website-schema.yml

@@ -18,4 +18,4 @@ on:
 jobs:
   json-validate:
     name: "Validate JSON schema"
-    uses: "doctrine/.github/.github/workflows/website-schema.yml@8.0.0"
+    uses: "doctrine/.github/.github/workflows/website-schema.yml@v12.2.0"

docs/composer.json

@@ -0,0 +1,8 @@
+{
+    "require-dev": {
+        "doctrine/docs-builder": "^1.0"
+    },
+    "config": {
+        "sort-packages": true
+    }
+}

phpstan.neon.dist

@@ -4,8 +4,7 @@ parameters:
       - config
       - src
       - tests
-   scanFiles:
-      - vendor/symfony/dependency-injection/Loader/Configurator/functions.php
+
    excludePaths:
       - src/Command/Proxy/ConvertMappingDoctrineCommand.php
       - src/Command/Proxy/EnsureProductionSettingsDoctrineCommand.php

src/DependencyInjection/Configuration.php

@@ -714,7 +714,7 @@ private function getOrmEntityManagersNode(): ArrayNodeDefinition
                             ->thenInvalid('The setting "report_fields_where_declared" cannot be disabled for ORM 3.')
                         ->end()
                     ->end()
-                    ->booleanNode('validate_xml_mapping')->defaultFalse()->info('Set to "true" to opt-in to the new mapping driver mode that was added in Doctrine ORM 2.14 and will be mandatory in ORM 3.0. See https://github.com/doctrine/orm/pull/6728.')->end()
+                    ->booleanNode('validate_xml_mapping')->defaultFalse()->info('Set to "true" to opt-in to the new mapping driver mode that was added in Doctrine ORM 2.14. See https://github.com/doctrine/orm/pull/6728.')->end()
                 ->end()
                 ->children()
                     ->arrayNode('second_level_cache')

src/DependencyInjection/DoctrineExtension.php

@@ -427,8 +427,8 @@ private function detectMappingType(string $directory, ContainerBuilder $containe
             }
 
             if (
-                preg_match('/^(?: \*|\/\*\*) @.*' . $quotedMappingObjectName . '\b/m', $content)
-                || preg_match('/^(?: \*|\/\*\*) @.*Embeddable\b/m', $content)
+                self::textContainsAnnotation($quotedMappingObjectName, $content)
+                || self::textContainsAnnotation('Embeddable', $content)
             ) {
                 $type = 'annotation';
                 break;
@@ -438,6 +438,21 @@ private function detectMappingType(string $directory, ContainerBuilder $containe
         return $type;
     }
 
+    /**
+     * Check if the file content contains a class-like annotation
+     *
+     * @internal
+     */
+    public static function textContainsAnnotation(string $quotedMappingObjectName, string $content): bool
+    {
+        return preg_match('/^(?:[ ]\*|\/\*\*)[ ]@               # Match phpdoc start or line with an at
+            \\\\?                                               # Can start with antislash
+            ([a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]*\\\\)*     # Match namespace components ending with antislash
+            ' . $quotedMappingObjectName . '                    # The target class
+            \b                                                  # Match word boundary
+            /mx', $content) === 1;
+    }
+
     /**
      * Returns a modified version of $managerConfigs.
      *

tests/CacheSchemaSubscriberTest.php

@@ -32,8 +32,10 @@ public function testSchemaSubscriberWiring(): void
             'kernel.build_dir' => sys_get_temp_dir(),
             'kernel.environment' => 'test',
             'kernel.runtime_environment' => '%%env(default:kernel.environment:APP_RUNTIME_ENV)%%',
+            'kernel.runtime_mode.web' => false,
             'kernel.root_dir' => __DIR__ . '/../../../../', // src dir
             'kernel.project_dir' => __DIR__ . '/../../../../', // src dir
+            'kernel.share_dir' => sys_get_temp_dir(),
             'kernel.bundles_metadata' => [],
             'kernel.charset' => 'UTF-8',
             'kernel.container_class' => ContainerBuilder::class,

tests/Command/CreateDatabaseDoctrineTest.php

@@ -11,7 +11,7 @@
 use Doctrine\DBAL\DriverManager;
 use Doctrine\DBAL\Schema\SchemaManagerFactory;
 use Doctrine\Persistence\ManagerRegistry;
-use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\MockObject\Stub;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Tester\CommandTester;
 use Symfony\Component\DependencyInjection\Container;
@@ -59,25 +59,23 @@ public function testExecute(): void
      * @param mixed[]|null $params Connection parameters
      * @psalm-param Params $params
      *
-     * @return MockObject&Container
+     * @return Stub&Container
      */
-    private function getMockContainer(string $connectionName, array|null $params = null): MockObject
+    private function getMockContainer(string $connectionName, array|null $params = null): Stub
     {
         // Mock the container and everything you'll need here
         $mockDoctrine = $this->createStub(ManagerRegistry::class);
 
         $mockDoctrine->method('getDefaultConnectionName')->willReturn($connectionName);
 
-        $config = (new Configuration())->setSchemaManagerFactory($this->createMock(SchemaManagerFactory::class));
+        $config = (new Configuration())->setSchemaManagerFactory($this->createStub(SchemaManagerFactory::class));
 
         $mockConnection = $this->createStub(Connection::class);
         $mockConnection->method('getConfiguration')->willReturn($config);
         $mockConnection->method('getParams')->willReturn($params);
         $mockDoctrine->method('getConnection')->willReturn($mockConnection);
 
-        $mockContainer = $this->getMockBuilder(Container::class)
-            ->onlyMethods(['get'])
-            ->getMock();
+        $mockContainer = $this->createStub(Container::class);
 
         $mockContainer->method('get')->with('doctrine')->willReturn($mockDoctrine);
 

tests/Command/DropDatabaseDoctrineTest.php

@@ -14,7 +14,7 @@
 use Doctrine\Persistence\ManagerRegistry;
 use Generator;
 use PHPUnit\Framework\Attributes\DataProvider;
-use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\MockObject\Stub;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Tester\CommandTester;
 use Symfony\Component\DependencyInjection\Container;
@@ -137,9 +137,9 @@ public static function provideIncompatibleDriverOptions(): Generator
      * @param list<mixed> $params Connection parameters
      * @psalm-param Params $params
      *
-     * @return MockObject&Container
+     * @return Stub&Container
      */
-    private function getMockContainer(string $connectionName, array $params): MockObject
+    private function getMockContainer(string $connectionName, array $params): Stub
     {
         // Mock the container and everything you'll need here
         $mockDoctrine = $this->createStub(ManagerRegistry::class);
@@ -148,18 +148,16 @@ private function getMockContainer(string $connectionName, array $params): MockOb
 
         $config = (new Configuration())->setSchemaManagerFactory(new DefaultSchemaManagerFactory());
 
-        $mockConnection = $this->createMock(Connection::class);
+        $mockConnection = $this->createStub(Connection::class);
         $mockConnection->method('getConfiguration')->willReturn($config);
         $mockConnection->method('getParams')->willReturn($params);
         $mockDoctrine->method('getConnection')->willReturn($mockConnection);
 
-        $mockContainer = $this->getMockBuilder(Container::class)
-            ->onlyMethods(['get'])
-            ->getMock();
+        $mockContainer = $this->createStub(Container::class);
 
         $mockContainer->method('get')
-            ->with('doctrine')
-            ->willReturn($mockDoctrine);
+           ->with('doctrine')
+           ->willReturn($mockDoctrine);
 
         return $mockContainer;
     }

tests/DataCollector/DoctrineDataCollectorTest.php

@@ -35,8 +35,8 @@ public function testCollectEntities(): void
         $manager    = $this->createStub(EntityManagerInterface::class);
         $config     = $this->createMock(Configuration::class);
         $factory    = $this->createMock(ClassMetadataFactory::class);
-        $collector  = $this->createCollector(['default' => $manager], true, $this->createMock(DebugDataHolder::class));
-        $unitOfWork = $this->createMock(UnitOfWork::class);
+        $collector  = $this->createCollector(['default' => $manager], true, $this->createStub(DebugDataHolder::class));
+        $unitOfWork = $this->createStub(UnitOfWork::class);
 
         $manager->method('getMetadataFactory')->willReturn($factory);
         $manager->method('getConfiguration')->willReturn($config);
@@ -74,8 +74,8 @@ public function testDoesNotCollectEntities(): void
         }
 
         $manager    = $this->createMock(EntityManager::class);
-        $config     = $this->createMock(Configuration::class);
-        $collector  = $this->createCollector(['default' => $manager], false, $this->createMock(DebugDataHolder::class));
+        $config     = $this->createStub(Configuration::class);
+        $collector  = $this->createCollector(['default' => $manager], false, $this->createStub(DebugDataHolder::class));
         $unitOfWork = $this->createStub(UnitOfWork::class);
 
         $manager->expects($this->never())->method('getMetadataFactory');
@@ -91,7 +91,7 @@ public function testDoesNotCollectEntities(): void
 
     public function testGetGroupedQueries(): void
     {
-        $debugDataHolder = $this->createMock(DebugDataHolder::class);
+        $debugDataHolder = $this->createStub(DebugDataHolder::class);
 
         $queries = [
             'default' => [

tests/DependencyInjection/Compiler/IdGeneratorPassTest.php

@@ -50,8 +50,10 @@ public function testRepositoryServiceWiring(): void
             'kernel.bundles' => $bundles,
             'kernel.cache_dir' => sys_get_temp_dir(),
             'kernel.build_dir' => sys_get_temp_dir(),
+            'kernel.share_dir' => sys_get_temp_dir(),
             'kernel.environment' => 'test',
             'kernel.runtime_environment' => '%%env(default:kernel.environment:APP_RUNTIME_ENV)%%',
+            'kernel.runtime_mode.web' => false,
             'kernel.root_dir' => __DIR__ . '/../../../../', // src dir
             'kernel.project_dir' => __DIR__ . '/../../../../', // src dir
             'kernel.bundles_metadata' => [],

tests/DependencyInjection/DoctrineExtensionTest.php

@@ -1507,6 +1507,71 @@ public function testControllerResolver(bool $simpleEntityManagerConfig): void
         $this->assertEquals(new MapEntity(null, null, null, [], null, null, null, true, true), $container->get('controller_resolver_defaults'));
     }
 
+    #[TestWith(['AnnotationsBundle', 'attribute', 'Vendor'], 'Bundle without anything')]
+    #[TestWith(['AttributesBundle', 'attribute'], 'Bundle with attributes')]
+    #[TestWith(['RepositoryServiceBundle', 'attribute'], 'Bundle with both')]
+    #[TestWith(['AnnotationsBundle', 'annotation'], 'Bundle with annotations')]
+    #[TestWith(['AttributesWithPackageBundle', 'attribute'], 'Bundle with attributes and @package')]
+    public function testDetectMappingType(string $bundle, string $expectedType, string $vendor = '')
+    {
+        if (! interface_exists(EntityManagerInterface::class)) {
+            self::markTestSkipped('This test requires ORM');
+        }
+
+        $container = $this->getContainer([$bundle], $vendor);
+        $extension = new DoctrineExtension();
+
+        $config = BundleConfigurationBuilder::createBuilder()
+            ->addBaseConnection()
+            ->addEntityManager([
+                'default_entity_manager' => 'default',
+                'entity_managers' => [
+                    'default' => [
+                        'mappings' => [
+                            $bundle => [],
+                        ],
+                    ],
+                ],
+            ])
+            ->build();
+
+        if (! class_exists(AnnotationDriver::class) && $expectedType === 'annotation') {
+            $this->expectException(LogicException::class);
+            $this->expectExceptionMessage('The annotation driver is only available in doctrine/orm v2.');
+        }
+
+        $extension->load([$config], $container);
+
+        $calls = $container->getDefinition('doctrine.orm.default_metadata_driver')->getMethodCalls();
+        $this->assertEquals(
+            sprintf('doctrine.orm.default_%s_metadata_driver', $expectedType),
+            (string) $calls[0][1][0],
+        );
+    }
+
+    #[TestWith([' * @Mapping\\Entity', true], 'Using the namespace without alias')]
+    #[TestWith([' * @ORM\\Entity', true], 'Using the namespace with alias')]
+    #[TestWith([' * @\\Doctrine\\ORM\\Mapping\\Entity', true], 'Complete namespace with starting slash')]
+    #[TestWith([' * @Doctrine\\ORM\\Mapping\\Entity', true], 'Complete namespace without starting slash')]
+    #[TestWith([' * @Entity', true], 'Use of the class')]
+    #[TestWith([' * @Entity()', true], 'With parentheses')]
+    #[TestWith(['/** @Entity */', true], 'Comment start')]
+    #[TestWith(["/**\n * @Entity\n */", true], 'Multiline phpdoc')]
+    #[TestWith([' * @orm\\Entity', true], 'namespace can start with lowercase')]
+    #[TestWith([' * @_ORM\\Entity', true], 'namespace can start with underscore')]
+    #[TestWith([" * @\x80ORM\\Entity", true], 'namespace can start with char from x80-Xff')]
+    #[TestWith([" * @orm0_\x80\\Entity", true], 'namespace can contain number, underscore and char from x80-Xff')]
+    #[TestWith([' * @ORMEntity', false], 'Use of the class with prefix')]
+    #[TestWith([' * @EntityORM', false], 'Use of the class with suffix')]
+    #[TestWith([' * @package testEntity', false], 'Annotation with Entity as value')]
+    #[TestWith([' * @entity', false], 'Lowercase use of the class')]
+    #[TestWith([' * @1ORMEntity', false], 'namespace can\'t start with number')]
+    #[TestWith([' * @extend<Entity>', false], 'The Entity is used inside < and >')]
+    public function testTextContainsAnnotation(string $input, bool $expected): void
+    {
+        self::assertEquals($expected, DoctrineExtension::textContainsAnnotation('Entity', $input));
+    }
+
     /** @param list<string> $bundles */
     private static function getContainer(array $bundles = ['XmlBundle'], string $vendor = ''): ContainerBuilder
     {

tests/DependencyInjection/Fixtures/Bundles/AnnotationsBundle/AnnotationsBundle.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Fixtures\Bundles\AnnotationsBundle;
+
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+class AnnotationsBundle extends Bundle
+{
+}

tests/DependencyInjection/Fixtures/Bundles/AnnotationsBundle/Entity/TestAnnotationEntity.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Fixtures\Bundles\AnnotationsBundle\Entity;
+
+/** @ORM\Entity() */
+class TestAnnotationEntity
+{
+    /**
+     * @ORM\Id
+     * @ORM\GeneratedValue(strategy="AUTO")
+     * @ORM\Column(type="integer")
+     */
+    public int|null $id = null;
+}

tests/DependencyInjection/Fixtures/Bundles/AttributesWithPackageBundle/AttributesWithPackageBundle.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Fixtures\Bundles\AttributesWithPackageBundle;
+
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+class AttributesWithPackageBundle extends Bundle
+{
+}

tests/DependencyInjection/Fixtures/Bundles/AttributesWithPackageBundle/Entity/TestInterface.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Fixtures\Bundles\AttributesWithPackageBundle\Entity;
+
+/** @testUnrelatedAnnotation Fixtures\Bundles\AttributesWithPackageBundle\Entity */
+interface TestInterface
+{
+}

tests/LockStoreSchemaListenerTest.php

@@ -31,8 +31,10 @@ public function testLockStoreSchemaSubscriberWiring(array $config, int $expected
             'kernel.bundles' => [],
             'kernel.cache_dir' => sys_get_temp_dir(),
             'kernel.build_dir' => sys_get_temp_dir(),
+            'kernel.share_dir' => sys_get_temp_dir(),
             'kernel.environment' => 'test',
             'kernel.runtime_environment' => '%%env(default:kernel.environment:APP_RUNTIME_ENV)%%',
+            'kernel.runtime_mode.web' => false,
             'kernel.root_dir' => __DIR__ . '/../../../../', // src dir
             'kernel.project_dir' => __DIR__ . '/../../../../', // src dir
             'kernel.bundles_metadata' => [],