Add automatic type detection for Embedded.

docs/en/reference/annotations-reference.rst

@@ -350,7 +350,7 @@ in order to specify that it is an embedded class.
 
 Required attributes:
 
--  **class**: The embeddable class
+-  **class**: The embeddable class. You can omit this value if you use a PHP property type instead.
 
 
 .. code-block:: php

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

@@ -3593,9 +3593,16 @@ public function mapEmbedded(array $mapping)
     {
         $this->assertFieldNotMapped($mapping['fieldName']);
 
+        if (! isset($mapping['class']) && $this->isTypedProperty($mapping['fieldName'])) {
+            $type = $this->reflClass->getProperty($mapping['fieldName'])->getType();
+            if ($type instanceof ReflectionNamedType) {
+                $mapping['class'] = $type->getName();
+            }
+        }
+
         $this->embeddedClasses[$mapping['fieldName']] = [
             'class' => $this->fullyQualifiedClassName($mapping['class']),
-            'columnPrefix' => $mapping['columnPrefix'],
+            'columnPrefix' => $mapping['columnPrefix'] ?? null,
             'declaredField' => $mapping['declaredField'] ?? null,
             'originalField' => $mapping['originalField'] ?? null,
         ];

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

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

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);

lib/Doctrine/ORM/Mapping/Embedded.php

@@ -31,16 +31,13 @@
 #[Attribute(Attribute::TARGET_PROPERTY)]
 final class Embedded implements Annotation
 {
-    /**
-     * @Required
-     * @var string
-     */
+    /** @var string|null */
     public $class;
 
     /** @var string|bool|null */
     public $columnPrefix;
 
-    public function __construct(string $class, $columnPrefix = null)
+    public function __construct(?string $class = null, $columnPrefix = null)
     {
         $this->class        = $class;
         $this->columnPrefix = $columnPrefix;

phpstan-baseline.neon

@@ -557,7 +557,7 @@ parameters:
 
 		-
 			message: "#^Call to an undefined method ReflectionProperty\\:\\:getType\\(\\)\\.$#"
-			count: 2
+			count: 3
 			path: lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
 
 		-

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

@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\Models\TypedProperties;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Embeddable()
+ */
+#[ORM\Embeddable]
+class Contact
+{
+    /** @Column() */
+    #[ORM\Column]
+    public ?string $email = null;
+}

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 ?Contact $contact = null;
+
     public static function loadMetadata(ClassMetadataInfo $metadata): void
     {
         $metadata->setInheritanceType(ClassMetadataInfo::INHERITANCE_TYPE_NONE);
@@ -131,5 +136,7 @@ public static function loadMetadata(ClassMetadataInfo $metadata): void
         $metadata->mapManyToOne(
             ['fieldName' => 'mainEmail']
         );
+
+        $metadata->mapEmbedded(['fieldName' => 'contact']);
     }
 }

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

@@ -42,6 +42,7 @@
 use Doctrine\Tests\Models\DDC889\DDC889Entity;
 use Doctrine\Tests\Models\DDC964\DDC964Admin;
 use Doctrine\Tests\Models\DDC964\DDC964Guest;
+use Doctrine\Tests\Models\TypedProperties\Contact;
 use Doctrine\Tests\Models\TypedProperties\UserTyped;
 use Doctrine\Tests\OrmTestCase;
 
@@ -284,6 +285,7 @@ public function testFieldTypeFromReflection(): void
 
         $this->assertEquals(CmsEmail::class, $class->getAssociationMapping('email')['targetEntity']);
         $this->assertEquals(CmsEmail::class, $class->getAssociationMapping('mainEmail')['targetEntity']);
+        $this->assertEquals(Contact::class, $class->embeddedClasses['contact']['class']);
     }
 
     /**

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

@@ -125,6 +125,9 @@ public function testFieldIsNullableByType(): void
 
         $cm->mapManyToOne(['fieldName' => 'mainEmail']);
         $this->assertEquals(CmsEmail::class, $cm->getAssociationMapping('mainEmail')['targetEntity']);
+
+        $cm->mapEmbedded(['fieldName' => 'contact']);
+        $this->assertEquals(TypedProperties\Contact::class, $cm->embeddedClasses['contact']['class']);
     }
 
     public function testFieldTypeFromReflection(): void

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

@@ -61,3 +61,5 @@
 $metadata->mapManyToOne(
     ['fieldName' => 'mainEmail']
 );
+
+$metadata->mapEmbedded(['fieldName' => 'contact']);

tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.TypedProperties.UserTyped.dcm.xml

@@ -25,5 +25,7 @@
     </one-to-one>
 
     <many-to-one field="mainEmail"/>
+
+    <embedded name="contact" />
   </entity>
 </doctrine-mapping>

tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.TypedProperties.UserTyped.dcm.yml

@@ -24,3 +24,5 @@ Doctrine\Tests\Models\TypedProperties\UserTyped:
             joinColumn: []
     manyToOne:
         mainEmail: []
+    embedded:
+        contact: ~