diff --git a/docs/en/reference/inheritance-mapping.rst b/docs/en/reference/inheritance-mapping.rst index 58cae459df9..9ef96d9da68 100644 --- a/docs/en/reference/inheritance-mapping.rst +++ b/docs/en/reference/inheritance-mapping.rst @@ -15,22 +15,32 @@ is common to multiple entity classes. Mapped superclasses, just as regular, non-mapped classes, can appear in the middle of an otherwise mapped inheritance hierarchy -(through Single Table Inheritance or Class Table Inheritance). +(through Single Table Inheritance or Class Table Inheritance). They +are not query-able, and need not have an ``#[Id]`` property. No database table will be created for a mapped superclass itself, -only for entity classes inheriting from it. Also, a mapped superclass -need not have an ``#[Id]`` property. +only for entity classes inheriting from it. That implies that a +mapped superclass cannot be the ``targetEntity`` in associations. + +In other words, a mapped superclass can use unidirectional One-To-One +and Many-To-One associations where it is the owning side. +Many-To-Many associations are only possible if the mapped +superclass is only used in exactly one entity at the moment. For further +support of inheritance, the single or joined table inheritance features +have to be used. .. note:: - A mapped superclass cannot be an entity, it is not query-able and - persistent relationships defined by a mapped superclass must be - unidirectional (with an owning side only). This means that One-To-Many - associations are not possible on a mapped superclass at all. - Furthermore Many-To-Many associations are only possible if the - mapped superclass is only used in exactly one entity at the moment. - For further support of inheritance, the single or - joined table inheritance features have to be used. + One-To-Many associations are not generally possible on a mapped + superclass, since they require the "many" side to hold the foreign + key. + + It is, however, possible to use the :doc:```ResolveTargetEntityListener`` ` + to replace references to a mapped superclass with an entity class at runtime. + As long as there is only one entity subclass inheriting from the mapped + superclass and all references to the mapped superclass are resolved to that + entity class at runtime, the mapped superclass *can* use One-To-Many associations + and be named as the ``targetEntity`` on the owning sides. .. note:: diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php index 3c58433ffae..b9120fbecbf 100644 --- a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php +++ b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php @@ -270,6 +270,7 @@ protected function validateRuntimeMetadata($class, $parent) $class->validateIdentifier(); $class->validateAssociations(); + $this->validateAssociationTargets($class); $class->validateLifecycleCallbacks($this->getReflectionService()); // verify inheritance @@ -303,6 +304,16 @@ protected function validateRuntimeMetadata($class, $parent) } } + private function validateAssociationTargets(ClassMetadata $class): void + { + foreach ($class->getAssociationMappings() as $mapping) { + $targetEntity = $mapping['targetEntity']; + if ($this->driver->isTransient($targetEntity) || $this->peekIfIsMappedSuperclass($targetEntity)) { + throw MappingException::associationTargetIsNotAnEntity($targetEntity, $class->name, $mapping['fieldName']); + } + } + } + /** * {@inheritDoc} */ @@ -468,10 +479,6 @@ private function addInheritedRelations(ClassMetadata $subClass, ClassMetadata $p // According to the definitions given in https://github.com/doctrine/orm/pull/10396/, // this is the case <=> ! isset($mapping['inherited']). if (! isset($mapping['inherited'])) { - if ($mapping['type'] & ClassMetadata::TO_MANY && ! $mapping['isOwningSide']) { - throw MappingException::illegalToManyAssociationOnMappedSuperclass($parentClass->name, $field); - } - $mapping['sourceEntity'] = $subClass->name; } diff --git a/lib/Doctrine/ORM/Mapping/MappingException.php b/lib/Doctrine/ORM/Mapping/MappingException.php index 9fd3f032eda..c93da10ad1a 100644 --- a/lib/Doctrine/ORM/Mapping/MappingException.php +++ b/lib/Doctrine/ORM/Mapping/MappingException.php @@ -847,6 +847,15 @@ public static function invalidTargetEntityClass($targetEntity, $sourceEntity, $a return new self('The target-entity ' . $targetEntity . " cannot be found in '" . $sourceEntity . '#' . $associationName . "'."); } + /** + * @param class-string $targetEntity + * @param class-string $sourceEntity + */ + public static function associationTargetIsNotAnEntity(string $targetEntity, string $sourceEntity, string $associationName): self + { + return new self(sprintf('The target entity class %s specified for %s::$%s is not an entity class.', $targetEntity, $sourceEntity, $associationName)); + } + /** * @param string[] $cascades * @param string $className diff --git a/tests/Doctrine/Tests/Models/Cache/Attraction.php b/tests/Doctrine/Tests/Models/Cache/Attraction.php index 980bd3b0dcc..6115d552118 100644 --- a/tests/Doctrine/Tests/Models/Cache/Attraction.php +++ b/tests/Doctrine/Tests/Models/Cache/Attraction.php @@ -7,6 +7,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ORM\Mapping\Cache; +use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\Mapping\Column; use Doctrine\ORM\Mapping\DiscriminatorMap; use Doctrine\ORM\Mapping\Entity; @@ -29,6 +30,7 @@ * 3 = "Bar" * }) */ +#[Entity] abstract class Attraction { /** @@ -109,4 +111,8 @@ public function addInfo(AttractionInfo $info): void $this->infos->add($info); } } + + public static function loadMetadata(ClassMetadata $metadata): void + { + } } diff --git a/tests/Doctrine/Tests/Models/Cache/State.php b/tests/Doctrine/Tests/Models/Cache/State.php index 7fa13f4b5b8..23087c8eb4f 100644 --- a/tests/Doctrine/Tests/Models/Cache/State.php +++ b/tests/Doctrine/Tests/Models/Cache/State.php @@ -7,6 +7,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ORM\Mapping\Cache; +use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\Mapping\Column; use Doctrine\ORM\Mapping\Entity; use Doctrine\ORM\Mapping\GeneratedValue; @@ -21,6 +22,7 @@ * @Table("cache_state") * @Cache("NONSTRICT_READ_WRITE") */ +#[Entity] class State { /** @@ -105,4 +107,8 @@ public function addCity(City $city): void { $this->cities[] = $city; } + + public static function loadMetadata(ClassMetadata $metadata): void + { + } } diff --git a/tests/Doctrine/Tests/Models/Cache/Travel.php b/tests/Doctrine/Tests/Models/Cache/Travel.php index e98d06f0dd3..6d074a3b917 100644 --- a/tests/Doctrine/Tests/Models/Cache/Travel.php +++ b/tests/Doctrine/Tests/Models/Cache/Travel.php @@ -8,6 +8,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ORM\Mapping\Cache; +use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\Mapping\Column; use Doctrine\ORM\Mapping\Entity; use Doctrine\ORM\Mapping\GeneratedValue; @@ -23,6 +24,7 @@ * @Entity * @Table("cache_travel") */ +#[Entity] class Travel { /** @@ -104,4 +106,8 @@ public function getCreatedAt(): DateTime { return $this->createdAt; } + + public static function loadMetadata(ClassMetadata $metadata): void + { + } } diff --git a/tests/Doctrine/Tests/Models/DDC3579/DDC3579Group.php b/tests/Doctrine/Tests/Models/DDC3579/DDC3579Group.php index 868d74e156c..8f55091bf4c 100644 --- a/tests/Doctrine/Tests/Models/DDC3579/DDC3579Group.php +++ b/tests/Doctrine/Tests/Models/DDC3579/DDC3579Group.php @@ -6,6 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; +use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\Mapping\Column; use Doctrine\ORM\Mapping\Entity; use Doctrine\ORM\Mapping\GeneratedValue; @@ -67,4 +68,8 @@ public function getAdmins(): Collection { return $this->admins; } + + public static function loadMetadata(ClassMetadata $metadata): void + { + } } diff --git a/tests/Doctrine/Tests/Models/DDC5934/DDC5934Member.php b/tests/Doctrine/Tests/Models/DDC5934/DDC5934Member.php index 3e8af0d865c..21e2300a6c4 100644 --- a/tests/Doctrine/Tests/Models/DDC5934/DDC5934Member.php +++ b/tests/Doctrine/Tests/Models/DDC5934/DDC5934Member.php @@ -6,6 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\ORM\Mapping as ORM; +use Doctrine\ORM\Mapping\ClassMetadata; /** @ORM\Entity() */ #[ORM\Entity] @@ -23,4 +24,8 @@ public function __construct() { $this->contracts = new ArrayCollection(); } + + public static function loadMetadata(ClassMetadata $metadata): void + { + } } diff --git a/tests/Doctrine/Tests/Models/DDC964/DDC964Address.php b/tests/Doctrine/Tests/Models/DDC964/DDC964Address.php index 56e3153e7f8..2039abab594 100644 --- a/tests/Doctrine/Tests/Models/DDC964/DDC964Address.php +++ b/tests/Doctrine/Tests/Models/DDC964/DDC964Address.php @@ -4,12 +4,14 @@ namespace Doctrine\Tests\Models\DDC964; +use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\Mapping\Column; use Doctrine\ORM\Mapping\Entity; use Doctrine\ORM\Mapping\GeneratedValue; use Doctrine\ORM\Mapping\Id; /** @Entity */ +#[Entity] class DDC964Address { /** @@ -100,4 +102,8 @@ public function setStreet(string $street): void { $this->street = $street; } + + public static function loadMetadata(ClassMetadata $metadata): void + { + } } diff --git a/tests/Doctrine/Tests/Models/DDC964/DDC964Group.php b/tests/Doctrine/Tests/Models/DDC964/DDC964Group.php index ca7d72f12a4..82e47065a00 100644 --- a/tests/Doctrine/Tests/Models/DDC964/DDC964Group.php +++ b/tests/Doctrine/Tests/Models/DDC964/DDC964Group.php @@ -5,6 +5,7 @@ namespace Doctrine\Tests\Models\DDC964; use Doctrine\Common\Collections\ArrayCollection; +use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\Mapping\Column; use Doctrine\ORM\Mapping\Entity; use Doctrine\ORM\Mapping\GeneratedValue; @@ -12,6 +13,7 @@ use Doctrine\ORM\Mapping\ManyToMany; /** @Entity */ +#[Entity] class DDC964Group { /** @@ -60,4 +62,8 @@ public function getUsers(): ArrayCollection { return $this->users; } + + public static function loadMetadata(ClassMetadata $metadata): void + { + } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH10473Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH10473Test.php new file mode 100644 index 00000000000..a08805f066a --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH10473Test.php @@ -0,0 +1,130 @@ +getTestEntityManager(); + + $resolveTargetEntity = new ResolveTargetEntityListener(); + + $resolveTargetEntity->addResolveTargetEntity( + GH10473BaseUser::class, + GH10473UserImplementation::class, + [] + ); + + $em->getEventManager()->addEventSubscriber($resolveTargetEntity); + + $userMetadata = $em->getClassMetadata(GH10473UserImplementation::class); + + self::assertFalse($userMetadata->isMappedSuperclass); + self::assertTrue($userMetadata->isInheritanceTypeNone()); + + $socialMediaAccountsMapping = $userMetadata->getAssociationMapping('socialMediaAccounts'); + self::assertArrayNotHasKey('inherited', $socialMediaAccountsMapping); + self::assertTrue((bool) ($socialMediaAccountsMapping['type'] & ClassMetadata::TO_MANY)); + self::assertFalse($socialMediaAccountsMapping['isOwningSide']); + self::assertSame(GH10473SocialMediaAccount::class, $socialMediaAccountsMapping['targetEntity']); + self::assertSame('user', $socialMediaAccountsMapping['mappedBy']); + + $createdByMapping = $userMetadata->getAssociationMapping('createdBy'); + self::assertArrayNotHasKey('inherited', $createdByMapping); + self::assertTrue((bool) ($createdByMapping['type'] & ClassMetadata::TO_ONE)); + self::assertTrue($createdByMapping['isOwningSide']); + self::assertSame(GH10473UserImplementation::class, $createdByMapping['targetEntity']); + self::assertSame('createdUsers', $createdByMapping['inversedBy']); + + $createdUsersMapping = $userMetadata->getAssociationMapping('createdUsers'); + self::assertArrayNotHasKey('inherited', $createdUsersMapping); + self::assertTrue((bool) ($createdUsersMapping['type'] & ClassMetadata::TO_MANY)); + self::assertFalse($createdUsersMapping['isOwningSide']); + self::assertSame(GH10473UserImplementation::class, $createdUsersMapping['targetEntity']); + self::assertSame('createdBy', $createdUsersMapping['mappedBy']); + + $socialMediaAccountMetadata = $em->getClassMetadata(GH10473SocialMediaAccount::class); + + self::assertFalse($socialMediaAccountMetadata->isMappedSuperclass); + self::assertTrue($socialMediaAccountMetadata->isInheritanceTypeNone()); + + $userMapping = $socialMediaAccountMetadata->getAssociationMapping('user'); + self::assertArrayNotHasKey('inherited', $userMapping); + self::assertTrue((bool) ($userMapping['type'] & ClassMetadata::TO_ONE)); + self::assertTrue($userMapping['isOwningSide']); + self::assertSame(GH10473UserImplementation::class, $userMapping['targetEntity']); + self::assertSame('socialMediaAccounts', $userMapping['inversedBy']); + } +} + +/** + * @ORM\MappedSuperclass + */ +abstract class GH10473BaseUser +{ + /** + * @ORM\Id + * @ORM\Column(type="integer") + * + * @var int + */ + private $id; + + /** + * @ORM\OneToMany(targetEntity="GH10473SocialMediaAccount", mappedBy="user") + * + * @var Collection + */ + private $socialMediaAccounts; + + /** + * @ORM\ManyToOne(targetEntity="GH10473BaseUser", inversedBy="createdUsers") + * + * @var GH10473BaseUser + */ + private $createdBy; + + /** + * @ORM\OneToMany(targetEntity="GH10473BaseUser", mappedBy="createdBy") + * + * @var Collection + */ + private $createdUsers; +} + +/** + * @ORM\Entity + */ +class GH10473SocialMediaAccount +{ + /** + * @ORM\Id + * @ORM\Column(type="integer") + * + * @var int + */ + private $id; + + /** + * @ORM\ManyToOne(targetEntity="GH10473BaseUser", inversedBy="socialMediaAccounts") + * + * @var GH10473BaseUser + */ + private $user; +} + +/** + * @ORM\Entity + */ +class GH10473UserImplementation extends GH10473BaseUser +{ +} diff --git a/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php index c8c93d16700..2829853482f 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php @@ -175,11 +175,10 @@ public function testInvalidMappedSuperClassWithManyToManyAssociation(): void $this->expectException(MappingException::class); $this->expectExceptionMessage( - 'It is illegal to put an inverse side one-to-many or many-to-many association on ' . - "mapped superclass 'Doctrine\Tests\ORM\Mapping\InvalidMappedSuperClass#users'" + 'The target entity class Doctrine\Tests\ORM\Mapping\InvalidMappedSuperClass specified for Doctrine\Tests\ORM\Mapping\InvalidMappedSuperClass::$selfWhatever is not an entity class.' ); - $factory->getMetadataFor(UsingInvalidMappedSuperClass::class); + $factory->getMetadataFor(InvalidMappedSuperClass::class); } /** @group DDC-1050 */ @@ -309,22 +308,10 @@ class ColumnWithoutType class InvalidMappedSuperClass { /** - * @psalm-var Collection - * @ManyToMany(targetEntity="Doctrine\Tests\Models\CMS\CmsUser", mappedBy="invalid") + * @psalm-var Collection + * @ManyToMany(targetEntity="InvalidMappedSuperClass", mappedBy="invalid") */ - private $users; -} - -/** @Entity */ -class UsingInvalidMappedSuperClass extends InvalidMappedSuperClass -{ - /** - * @var int - * @Id - * @Column(type="integer") - * @GeneratedValue - */ - private $id; + private $selfWhatever; } /** diff --git a/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php b/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php index f7106736c64..2af8751035e 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php @@ -304,6 +304,7 @@ class MappedSuperclassBase private $transient; } +/** @Entity */ class MappedSuperclassRelated1 { } diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Cache.Attraction.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Cache.Attraction.php new file mode 100644 index 00000000000..174d7fd709f --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.Cache.Attraction.php @@ -0,0 +1,3 @@ + + + + diff --git a/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.Cache.State.dcm.xml b/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.Cache.State.dcm.xml new file mode 100644 index 00000000000..8ca6cfa062c --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.Cache.State.dcm.xml @@ -0,0 +1,4 @@ + + + + diff --git a/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.Cache.Travel.dcm.xml b/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.Cache.Travel.dcm.xml new file mode 100644 index 00000000000..8d464857c62 --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.Cache.Travel.dcm.xml @@ -0,0 +1,4 @@ + + + + diff --git a/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC117.DDC117Article.dcm.xml b/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC117.DDC117Article.dcm.xml new file mode 100644 index 00000000000..49cd337f88c --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC117.DDC117Article.dcm.xml @@ -0,0 +1,9 @@ + + + + + + diff --git a/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC117.DDC117Editor.dcm.xml b/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC117.DDC117Editor.dcm.xml new file mode 100644 index 00000000000..5553d76e8d1 --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC117.DDC117Editor.dcm.xml @@ -0,0 +1,9 @@ + + + + + + diff --git a/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC3579.DDC3579Group.dcm.xml b/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC3579.DDC3579Group.dcm.xml new file mode 100644 index 00000000000..008389360a7 --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC3579.DDC3579Group.dcm.xml @@ -0,0 +1,9 @@ + + + + + + diff --git a/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC5934.DDC5934Member.dcm.xml b/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC5934.DDC5934Member.dcm.xml new file mode 100644 index 00000000000..b84e1c07ab6 --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC5934.DDC5934Member.dcm.xml @@ -0,0 +1,9 @@ + + + + + + diff --git a/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC964.DDC964Address.dcm.xml b/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC964.DDC964Address.dcm.xml new file mode 100644 index 00000000000..67feec45953 --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC964.DDC964Address.dcm.xml @@ -0,0 +1,9 @@ + + + + + + diff --git a/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC964.DDC964Group.dcm.xml b/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC964.DDC964Group.dcm.xml new file mode 100644 index 00000000000..461c26e2a98 --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC964.DDC964Group.dcm.xml @@ -0,0 +1,9 @@ + + + + + + diff --git a/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.Cache.Attraction.dcm.yml b/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.Cache.Attraction.dcm.yml new file mode 100644 index 00000000000..da4bf42d9bd --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.Cache.Attraction.dcm.yml @@ -0,0 +1,2 @@ +Doctrine\Tests\Models\Cache\Attraction: + type: entity diff --git a/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.Cache.State.dcm.yml b/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.Cache.State.dcm.yml new file mode 100644 index 00000000000..27008d68900 --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.Cache.State.dcm.yml @@ -0,0 +1,2 @@ +Doctrine\Tests\Models\Cache\State: + type: entity diff --git a/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.Cache.Travel.dcm.yml b/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.Cache.Travel.dcm.yml new file mode 100644 index 00000000000..999e0da5089 --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.Cache.Travel.dcm.yml @@ -0,0 +1,2 @@ +Doctrine\Tests\Models\Cache\Travel: + type: entity diff --git a/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.DDC3579.DDC3579Group.dcm.yml b/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.DDC3579.DDC3579Group.dcm.yml new file mode 100644 index 00000000000..c3472af4b85 --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.DDC3579.DDC3579Group.dcm.yml @@ -0,0 +1,2 @@ +Doctrine\Tests\Models\DDC3579\DDC3579Group: + type: entity diff --git a/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.DDC5934.DDC5934Member.dcm.yml b/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.DDC5934.DDC5934Member.dcm.yml new file mode 100644 index 00000000000..1ba2f981df2 --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.DDC5934.DDC5934Member.dcm.yml @@ -0,0 +1,2 @@ +Doctrine\Tests\Models\DDC5934\DDC5934Member: + type: entity diff --git a/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.DDC964.DDC964Address.dcm.yml b/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.DDC964.DDC964Address.dcm.yml new file mode 100644 index 00000000000..47abca39d11 --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.DDC964.DDC964Address.dcm.yml @@ -0,0 +1,2 @@ +Doctrine\Tests\Models\DDC964\DDC964Address: + type: entity diff --git a/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.DDC964.DDC964Group.dcm.yml b/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.DDC964.DDC964Group.dcm.yml new file mode 100644 index 00000000000..d0a90834fda --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.DDC964.DDC964Group.dcm.yml @@ -0,0 +1,2 @@ +Doctrine\Tests\Models\DDC964\DDC964Group: + type: entity diff --git a/tests/Doctrine/Tests/ORM/Tools/Export/ClassMetadataExporterTestCase.php b/tests/Doctrine/Tests/ORM/Tools/Export/ClassMetadataExporterTestCase.php index 8f1cad3c453..e52539f0986 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Export/ClassMetadataExporterTestCase.php +++ b/tests/Doctrine/Tests/ORM/Tools/Export/ClassMetadataExporterTestCase.php @@ -15,6 +15,7 @@ use Doctrine\ORM\Mapping\Driver\AnnotationDriver; use Doctrine\ORM\Mapping\Driver\XmlDriver; use Doctrine\ORM\Mapping\Driver\YamlDriver; +use Doctrine\ORM\Mapping\Entity; use Doctrine\ORM\Tools\DisconnectedClassMetadataFactory; use Doctrine\ORM\Tools\EntityGenerator; use Doctrine\ORM\Tools\Export\ClassMetadataExporter; @@ -25,8 +26,9 @@ use Doctrine\Tests\TestUtil; use Symfony\Component\Yaml\Parser; +use function array_filter; +use function array_values; use function count; -use function current; use function file_get_contents; use function glob; use function is_array; @@ -106,7 +108,9 @@ public function testExportDirectoryAndFilesAreCreated(): void $metadataDriver = $this->createMetadataDriver($type, __DIR__ . '/' . $type); $em = $this->createEntityManager($metadataDriver); $cmf = $this->createClassMetadataFactory($em, $type); - $metadata = $cmf->getAllMetadata(); + $metadata = array_values(array_filter($cmf->getAllMetadata(), static function (ClassMetadata $class): bool { + return $class->name === User::class; + })); $metadata[0]->name = ExportedUser::class; @@ -142,15 +146,15 @@ public function testExportedMetadataCanBeReadBackIn(): ClassMetadata $metadataDriver = $this->createMetadataDriver($type, __DIR__ . '/export/' . $type); $em = $this->createEntityManager($metadataDriver); $cmf = $this->createClassMetadataFactory($em, $type); - $metadata = $cmf->getAllMetadata(); + $metadatas = $cmf->getAllMetadata(); - self::assertCount(1, $metadata); - - $class = current($metadata); - - self::assertEquals(ExportedUser::class, $class->name); + foreach ($metadatas as $metadata) { + if ($metadata->name === ExportedUser::class) { + return $metadata; + } + } - return $class; + $this->fail('Expected metadata not found'); } /** @depends testExportedMetadataCanBeReadBackIn */ @@ -388,12 +392,11 @@ protected function deleteDirectory(string $path): void } } -class Address -{ -} +/** @Entity */ class Phonenumber { } +/** @Entity */ class Group { } diff --git a/tests/Doctrine/Tests/ORM/Tools/Export/annotation/Doctrine.Tests.ORM.Tools.Export.Address.php b/tests/Doctrine/Tests/ORM/Tools/Export/annotation/Doctrine.Tests.ORM.Tools.Export.Address.php new file mode 100644 index 00000000000..1cb644b9117 --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Tools/Export/annotation/Doctrine.Tests.ORM.Tools.Export.Address.php @@ -0,0 +1,24 @@ + + + + + + + diff --git a/tests/Doctrine/Tests/ORM/Tools/Export/yaml/Doctrine.Tests.ORM.Tools.Export.Address.dcm.yml b/tests/Doctrine/Tests/ORM/Tools/Export/yaml/Doctrine.Tests.ORM.Tools.Export.Address.dcm.yml new file mode 100644 index 00000000000..a768699938f --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Tools/Export/yaml/Doctrine.Tests.ORM.Tools.Export.Address.dcm.yml @@ -0,0 +1,2 @@ +Doctrine\Tests\ORM\Tools\Export\Address: + type: entity