Resolve embeded class by property type

docs/en/reference/annotations-reference.rst

@@ -348,9 +348,9 @@ annotation to establish the relationship between the two classes.
 The embedded annotation is required on an entity's member variable,
 in order to specify that it is an embedded class.
 
-Required attributes:
+Optional attributes:
 
--  **class**: The embeddable class
+-  **class**: The embeddable class, will be resolved automatically when using typed properties
 
 
 .. code-block:: php
@@ -361,9 +361,9 @@ Required attributes:
     class User
     {
         /**
-         * @Embedded(class = "Address")
+         * @Embedded()
          */
-        private $address;
+        private Address $address;
 
     /**
      * @Embeddable

doctrine-mapping.xsd

@@ -309,7 +309,7 @@
 
   <xs:complexType name="embedded">
     <xs:attribute name="name" type="xs:string" use="required" />
-    <xs:attribute name="class" type="orm:fqcn" use="required" />
+    <xs:attribute name="class" type="orm:fqcn" use="optional" />
     <xs:attribute name="column-prefix" type="xs:string" use="optional" />
     <xs:attribute name="use-column-prefix" type="xs:boolean" default="true" use="optional" />
   </xs:complexType>

lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php

@@ -3605,6 +3605,10 @@ public function mapEmbedded(array $mapping)
     {
         $this->assertFieldNotMapped($mapping['fieldName']);
 
+        if ($this->isTypedProperty($mapping['fieldName']) && ! $mapping['class']) {
+            $mapping = $this->validateAndCompleteEmbeddedMapping($mapping);
+        }
+
         $this->embeddedClasses[$mapping['fieldName']] = [
             'class' => $this->fullyQualifiedClassName($mapping['class']),
             'columnPrefix' => $mapping['columnPrefix'],
@@ -3613,6 +3617,22 @@ public function mapEmbedded(array $mapping)
         ];
     }
 
+    /**
+     * @param array<string, mixed> $mapping
+     *
+     * @return array<string, mixed>
+     */
+    private function validateAndCompleteEmbeddedMapping(array $mapping): array
+    {
+        $type = $this->reflClass->getProperty($mapping['fieldName'])->getType();
+
+        if ($type instanceof ReflectionNamedType && class_exists($type->getName())) {
+            $mapping['class'] = $type->getName();
+        }
+
+        return $mapping;
+    }
+
     /**
      * Inline the embeddable class
      *

lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php

@@ -324,10 +324,13 @@ public function loadMetadataForClass($className, ClassMetadata $metadata)
 
                 $mapping = [
                     'fieldName' => (string) $embeddedMapping['name'],
-                    'class' => (string) $embeddedMapping['class'],
                     'columnPrefix' => $useColumnPrefix ? $columnPrefix : false,
                 ];
 
+                if (isset($embeddedMapping['class'])) {
+                    $mapping['class'] = (string) $embeddedMapping['class'];
+                }
+
                 $metadata->mapEmbedded($mapping);
             }
         }

lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php

@@ -408,7 +408,7 @@ public function loadMetadataForClass($className, ClassMetadata $metadata)
             foreach ($element['embedded'] as $name => $embeddedMapping) {
                 $mapping = [
                     'fieldName' => $name,
-                    'class' => $embeddedMapping['class'],
+                    'class' => $embeddedMapping['class'] ?? null,
                     'columnPrefix' => $embeddedMapping['columnPrefix'] ?? null,
                 ];
                 $metadata->mapEmbedded($mapping);

tests/Doctrine/Tests/Models/TypedProperties/EmbeddableEntity.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\Models\TypedProperties;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Embeddable
+ */
+#[ORM\Embeddable]
+class EmbeddableEntity
+{
+    /**
+     * @ORM\Id
+     * @ORM\Column
+     * @ORM\GeneratedValue
+     */
+    #[ORM\Id, ORM\Column, ORM\GeneratedValue]
+    public int $id;
+}

tests/Doctrine/Tests/Models/TypedProperties/UserTyped.php

@@ -24,6 +24,7 @@ class UserTyped
      */
     #[ORM\Id, ORM\Column, ORM\GeneratedValue]
     public int $id;
+
     /** @Column(length=50) */
     #[ORM\Column(length: 50)]
     public ?string $status;
@@ -67,6 +68,10 @@ class UserTyped
     #[ORM\ManyToOne]
     public ?CmsEmail $mainEmail;
 
+    /** @Embedded */
+    #[ORM\Embedded]
+    public EmbeddableEntity $embeddableField;
+
     public static function loadMetadata(ClassMetadataInfo $metadata): void
     {
         $metadata->setInheritanceType(ClassMetadataInfo::INHERITANCE_TYPE_NONE);

tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php

@@ -133,6 +133,13 @@ public function testFieldIsNullableByType(): void
 
         $cm->mapManyToOne(['fieldName' => 'mainEmail']);
         $this->assertEquals(CmsEmail::class, $cm->getAssociationMapping('mainEmail')['targetEntity']);
+
+        $cm->mapEmbedded([
+            'fieldName' => 'embeddableField',
+            'class' => null,
+            'columnPrefix' => null,
+        ]);
+        $this->assertEquals(TypedProperties\EmbeddableEntity::class, $cm->embeddedClasses['embeddableField']['class']);
     }
 
     public function testFieldTypeFromReflection(): void