From 6d11cfff4cf129adc87dfb10ae12891229ce68d7 Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Tue, 12 May 2020 19:15:27 +0200
Subject: [PATCH 1/3] Revert "Fix inherited embeddables and nesting after
AnnotationDriver change #8006 (#8036)"
This reverts commit a9b6b720175fae69e90247e6b7a0e34d7da2f1cc.
---
docs/en/tutorials/embeddables.rst | 4 +-
.../ORM/Mapping/ClassMetadataFactory.php | 12 +-
.../ORM/Mapping/Driver/AnnotationDriver.php | 2 -
.../ORM/Functional/Ticket/GH8031Test.php | 163 ------------------
4 files changed, 8 insertions(+), 173 deletions(-)
delete mode 100644 tests/Doctrine/Tests/ORM/Functional/Ticket/GH8031Test.php
diff --git a/docs/en/tutorials/embeddables.rst b/docs/en/tutorials/embeddables.rst
index c49bdfc65af..483e58d9da6 100644
--- a/docs/en/tutorials/embeddables.rst
+++ b/docs/en/tutorials/embeddables.rst
@@ -8,9 +8,7 @@ or address are the primary use case for this feature.
.. note::
- Embeddables can not contain references to entities. They can however compose
- other embeddables in addition to holding properties with basic ``@Column``
- mapping.
+ Embeddables can only contain properties with basic ``@Column`` mapping.
For the purposes of this tutorial, we will assume that you have a ``User``
class in your application and you would like to store an address in
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
index e75ae1f823d..5ca18308694 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
@@ -404,10 +404,10 @@ private function getShortName($className)
private function addInheritedFields(ClassMetadata $subClass, ClassMetadata $parentClass)
{
foreach ($parentClass->fieldMappings as $mapping) {
- if (! isset($mapping['inherited']) && ! $parentClass->isMappedSuperclass && ! $parentClass->isEmbeddedClass) {
+ if ( ! isset($mapping['inherited']) && ! $parentClass->isMappedSuperclass) {
$mapping['inherited'] = $parentClass->name;
}
- if (! isset($mapping['declared'])) {
+ if ( ! isset($mapping['declared'])) {
$mapping['declared'] = $parentClass->name;
}
$subClass->addInheritedFieldMapping($mapping);
@@ -472,6 +472,10 @@ private function addInheritedEmbeddedClasses(ClassMetadata $subClass, ClassMetad
private function addNestedEmbeddedClasses(ClassMetadata $subClass, ClassMetadata $parentClass, $prefix)
{
foreach ($subClass->embeddedClasses as $property => $embeddableClass) {
+ if (isset($embeddableClass['inherited'])) {
+ continue;
+ }
+
$embeddableMetadata = $this->getMetadataFor($embeddableClass['class']);
$parentClass->mapEmbedded(
@@ -779,9 +783,7 @@ protected function getDriver()
*/
protected function isEntity(ClassMetadataInterface $class)
{
- assert($class instanceof ClassMetadata);
-
- return $class->isMappedSuperclass === false && $class->isEmbeddedClass === false;
+ return isset($class->isMappedSuperclass) && $class->isMappedSuperclass === false;
}
/**
diff --git a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
index afa7ad614db..6c250a4f408 100644
--- a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
+++ b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
@@ -278,8 +278,6 @@ public function loadMetadataForClass($className, ClassMetadata $metadata)
/* @var $property \ReflectionProperty */
foreach ($class->getProperties() as $property) {
if ($metadata->isMappedSuperclass && ! $property->isPrivate()
- ||
- $metadata->isEmbeddedClass && $property->getDeclaringClass()->getName() !== $class->getName()
||
$metadata->isInheritedField($property->name)
||
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH8031Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH8031Test.php
deleted file mode 100644
index 7ae17d3f2f8..00000000000
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH8031Test.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Doctrine\Tests\ORM\Functional\Ticket;
-
-use Doctrine\Tests\OrmFunctionalTestCase;
-
-class GH8031Test extends OrmFunctionalTestCase
-{
- protected function setUp()
- {
- parent::setUp();
-
- $this->setUpEntitySchema([
- GH8031Invoice::class,
- ]);
- }
-
- public function testEntityIsFetched()
- {
- $entity = new GH8031Invoice(new GH8031InvoiceCode(1, 2020, new GH8031Nested(10)));
- $this->_em->persist($entity);
- $this->_em->flush();
- $this->_em->clear();
-
- /** @var GH8031Invoice $fetched */
- $fetched = $this->_em->find(GH8031Invoice::class, $entity->getId());
- $this->assertInstanceOf(GH8031Invoice::class, $fetched);
- $this->assertSame(1, $fetched->getCode()->getNumber());
- $this->assertSame(2020, $fetched->getCode()->getYear());
-
- $this->_em->clear();
- $this->assertCount(
- 1,
- $this->_em->getRepository(GH8031Invoice::class)->findBy([], ['code.number' => 'ASC'])
- );
- }
-
- public function testEmbeddableWithAssociationNotAllowed()
- {
- $cm = $this->_em->getClassMetadata(GH8031EmbeddableWithAssociation::class);
-
- $this->assertArrayHasKey('invoice', $cm->associationMappings);
-
- $cm = $this->_em->getClassMetadata(GH8031Invoice::class);
-
- $this->assertCount(0, $cm->associationMappings);
- }
-}
-
-/**
- * @Embeddable
- */
-class GH8031EmbeddableWithAssociation
-{
- /** @ManyToOne(targetEntity=GH8031Invoice::class) */
- public $invoice;
-}
-
-/**
- * @Embeddable
- */
-class GH8031Nested
-{
- /**
- * @Column(type="integer", name="number", length=6)
- * @var int
- */
- protected $number;
-
- public function __construct(int $number)
- {
- $this->number = $number;
- }
-
- public function getNumber() : int
- {
- return $this->number;
- }
-}
-
-/**
- * @Embeddable
- */
-class GH8031InvoiceCode extends GH8031AbstractYearSequenceValue
-{
-}
-
-/**
- * @Embeddable
- */
-abstract class GH8031AbstractYearSequenceValue
-{
- /**
- * @Column(type="integer", name="number", length=6)
- * @var int
- */
- protected $number;
-
- /**
- * @Column(type="smallint", name="year", length=4)
- * @var int
- */
- protected $year;
-
- /** @Embedded(class=GH8031Nested::class) */
- protected $nested;
-
- public function __construct(int $number, int $year, GH8031Nested $nested)
- {
- $this->number = $number;
- $this->year = $year;
- $this->nested = $nested;
- }
-
- public function getNumber() : int
- {
- return $this->number;
- }
-
- public function getYear() : int
- {
- return $this->year;
- }
-}
-
-/**
- * @Entity
- */
-class GH8031Invoice
-{
- /**
- * @Id
- * @GeneratedValue
- * @Column(type="integer")
- */
- private $id;
-
- /**
- * @Embedded(class=GH8031InvoiceCode::class)
- * @var GH8031InvoiceCode
- */
- private $code;
-
- /** @Embedded(class=GH8031EmbeddableWithAssociation::class) */
- private $embeddedAssoc;
-
- public function __construct(GH8031InvoiceCode $code)
- {
- $this->code = $code;
- }
-
- public function getId()
- {
- return $this->id;
- }
-
- public function getCode() : GH8031InvoiceCode
- {
- return $this->code;
- }
-}
From 5fb3be58c2110f29951a551871eadcb5871dd271 Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Tue, 12 May 2020 19:17:13 +0200
Subject: [PATCH 2/3] Revert "Make Embeddable not transient"
This reverts commit 58677c29b4bc97273da950f6312e43ff540a7407.
---
lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php | 1 -
tests/Doctrine/Tests/ORM/Functional/ValueObjectsTest.php | 5 -----
2 files changed, 6 deletions(-)
diff --git a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
index 6c250a4f408..6e93c6e03f8 100644
--- a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
+++ b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
@@ -45,7 +45,6 @@ class AnnotationDriver extends AbstractAnnotationDriver
protected $entityAnnotationClasses = [
Mapping\Entity::class => 1,
Mapping\MappedSuperclass::class => 2,
- Mapping\Embeddable::class => 3,
];
/**
diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueObjectsTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueObjectsTest.php
index f78b313e78d..7a483ebc783 100644
--- a/tests/Doctrine/Tests/ORM/Functional/ValueObjectsTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/ValueObjectsTest.php
@@ -328,11 +328,6 @@ public function getInfiniteEmbeddableNestingData()
['DDCNestingEmbeddable1', 'DDCNestingEmbeddable4'],
];
}
-
- public function testEmbeddableIsNotTransient()
- {
- $this->assertFalse($this->_em->getMetadataFactory()->isTransient(DDC93Address::class));
- }
}
From 84d4091b88bde51800d7ce43e5ebe57e1eb81e2f Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Tue, 12 May 2020 19:58:43 +0200
Subject: [PATCH 3/3] Housekeeping: CS fixes
---
lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
index 5ca18308694..d36ea308464 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
@@ -404,10 +404,10 @@ private function getShortName($className)
private function addInheritedFields(ClassMetadata $subClass, ClassMetadata $parentClass)
{
foreach ($parentClass->fieldMappings as $mapping) {
- if ( ! isset($mapping['inherited']) && ! $parentClass->isMappedSuperclass) {
+ if (! isset($mapping['inherited']) && ! $parentClass->isMappedSuperclass) {
$mapping['inherited'] = $parentClass->name;
}
- if ( ! isset($mapping['declared'])) {
+ if (! isset($mapping['declared'])) {
$mapping['declared'] = $parentClass->name;
}
$subClass->addInheritedFieldMapping($mapping);