Merge branch '5.4' into 6.0

* 5.4:
  [DoctrineBridge] Fix auto mapping for bundles that contain only embeddables
  [String] Update wcswidth data with Unicode 15
  [Messenger] Fix default serializer not handling DateTime objects properly

Author: derrabus

DependencyInjection/AbstractDoctrineExtension.php

@@ -294,10 +294,16 @@ private function detectMappingType(string $directory, ContainerBuilder $containe
         foreach ($glob as $file) {
             $content = file_get_contents($file);
 
-            if (preg_match('/^#\[.*'.$quotedMappingObjectName.'\b/m', $content)) {
+            if (
+                preg_match('/^#\[.*'.$quotedMappingObjectName.'\b/m', $content) ||
+                preg_match('/^#\[.*Embeddable\b/m', $content)
+            ) {
                 break;
             }
-            if (preg_match('/^ \* @.*'.$quotedMappingObjectName.'\b/m', $content)) {
+            if (
+                preg_match('/^ \* @.*'.$quotedMappingObjectName.'\b/m', $content) ||
+                preg_match('/^ \* @.*Embeddable\b/m', $content)
+            ) {
                 $type = 'annotation';
                 break;
             }

Tests/DependencyInjection/DoctrineExtensionTest.php

@@ -279,7 +279,9 @@ public function testUnrecognizedCacheDriverException()
     public function providerBundles()
     {
         yield ['AnnotationsBundle', 'annotation', '/Entity'];
+        yield ['FullEmbeddableAnnotationsBundle', 'annotation', '/Entity'];
         yield ['AttributesBundle', 'attribute', '/Entity'];
+        yield ['FullEmbeddableAttributesBundle', 'attribute', '/Entity'];
         yield ['XmlBundle', 'xml', '/Resources/config/doctrine'];
         yield ['PhpBundle', 'php', '/Resources/config/doctrine'];
         yield ['YamlBundle', 'yml', '/Resources/config/doctrine'];

Tests/Fixtures/Bundles/FullEmbeddableAnnotationsBundle/Entity/Address.php

@@ -0,0 +1,44 @@
+<?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 Fixtures\Bundles\FullEmbeddableAnnotationsBundle\Entity;
+
+use Doctrine\ORM\Mapping\Column;
+use Doctrine\ORM\Mapping\Embeddable;
+use Doctrine\ORM\Mapping\Id;
+
+/**
+ * @Embeddable
+ */
+class Address
+{
+
+    /** @Column(type="string") */
+    public $street;
+
+    /** @Column(type="string") */
+    public $zipCode;
+
+    /** @Column(type="string") */
+    public $city;
+
+    public function __construct($street, $zipCode, $city)
+    {
+        $this->street = $street;
+        $this->zipCode = $zipCode;
+        $this->city = $city;
+    }
+
+    public function __toString(): string
+    {
+        return sprintf('%s %s %s', $this->street, $this->zipCode, $this->city);
+    }
+}

Tests/Fixtures/Bundles/FullEmbeddableAnnotationsBundle/FullEmbeddableAnnotationsBundle.php

@@ -0,0 +1,18 @@
+<?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 Fixtures\Bundles\FullEmbeddableAnnotationsBundle;
+
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+class FullEmbeddableAnnotationsBundle extends Bundle
+{
+}

Tests/Fixtures/Bundles/FullEmbeddableAttributesBundle/Entity/Address.php

@@ -0,0 +1,42 @@
+<?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 Fixtures\Bundles\FullEmbeddableAttributesBundle\Entity;
+
+use Doctrine\ORM\Mapping\Column;
+use Doctrine\ORM\Mapping\Embeddable;
+use Doctrine\ORM\Mapping\Id;
+
+#[Embeddable]
+class Address
+{
+
+    #[Column(type: 'string')]
+    public $street;
+
+    #[Column(type: 'string')]
+    public $zipCode;
+
+    #[Column(type: 'string')]
+    public $city;
+
+    public function __construct($street, $zipCode, $city)
+    {
+        $this->street = $street;
+        $this->zipCode = $zipCode;
+        $this->city = $city;
+    }
+
+    public function __toString(): string
+    {
+        return sprintf('%s %s %s', $this->street, $this->zipCode, $this->city);
+    }
+}

Tests/Fixtures/Bundles/FullEmbeddableAttributesBundle/FullEmbeddableAttributesBundle.php

@@ -0,0 +1,18 @@
+<?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 Fixtures\Bundles\FullEmbeddableAttributesBundle;
+
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+class FullEmbeddableAttributesBundle extends Bundle
+{
+}