Merge branch '5.4' into 6.0

* 5.4:
  [Tests] Remove some unused fixtures
  added missing translations for portuguese [#43726]
  [HttpClient][Mime] Add correct IDN flags for IDNA2008 compliance
  Prevent installation of incompatible mailer component versions
  properly parse quoted strings tagged with !!str
  do not merge label classes into expanded choice labels
  Bump Symfony version to 5.4.0
  Update VERSION for 5.4.0-BETA3
  Update CHANGELOG for 5.4.0-BETA3
  [Serializer] PropertyNormalizer - return unique (i.e. filter duplicate ) attributes in extractAttributes function
  Allow autodetecting mapping type for any object

Author: derrabus

DependencyInjection/AbstractDoctrineExtension.php

@@ -286,13 +286,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()