Allow autodetecting mapping type for any object

Author: franmomu

DependencyInjection/AbstractDoctrineExtension.php

@@ -290,13 +290,15 @@ private function detectMappingType(string $directory, ContainerBuilder $containe
         $glob = new GlobResource($directory, '*', true);
         $container->addResource($glob);
 
+        $quotedMappingObjectName = preg_quote($this->getMappingObjectDefaultName(), '/');
+
         foreach ($glob as $file) {
             $content = file_get_contents($file);
 
-            if (preg_match('/^#\[.*Entity\b/m', $content)) {
+            if (preg_match('/^#\[.*'.$quotedMappingObjectName.'\b/m', $content)) {
                 break;
             }
-            if (preg_match('/^ \* @.*Entity\b/m', $content)) {
+            if (preg_match('/^ \* @.*'.$quotedMappingObjectName.'\b/m', $content)) {
                 $type = 'annotation';
                 break;
             }

Tests/DependencyInjection/DoctrineExtensionTest.php

@@ -49,6 +49,10 @@ protected function setUp(): void
             ->willReturnCallback(function ($name) {
                 return 'doctrine.orm.'.$name;
             });
+
+        $this->extension
+            ->method('getMappingObjectDefaultName')
+            ->willReturn('Entity');
     }
 
     public function testFixManagersAutoMappingsWithTwoAutomappings()