symfony · lemoinem · Dec 12, 2015 · Dec 12, 2015 · Dec 12, 2015 · Dec 12, 2015
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
@@ -26,3 +26,9 @@ Yaml
 
  * The `!!php/object` tag to indicate dumped PHP objects was removed in favor of
    the `!php/object` tag.
+
+Doctrine Bridge
+---
+
+ * The `UniqueEntity` constraints now requires a `target` property when loaded
+   with the `StaticMethodLoader`.
diff --git a/src/Symfony/Bridge/Doctrine/CHANGELOG.md b/src/Symfony/Bridge/Doctrine/CHANGELOG.md
@@ -1,6 +1,13 @@
 CHANGELOG
 =========
 
+3.2.0
+-----
+
+ * fixed `UniqueEntity` interaction with inheritance
+ * deprecated `UniqueEntity` constraints without a target (possible only if
+   `StaticMethodLoader` or a custom constraint loader is used)
+
 3.1.0
 -----
 

diff --git a/src/Symfony/Bridge/Doctrine/Tests/Fixtures/ChildEntity.php b/src/Symfony/Bridge/Doctrine/Tests/Fixtures/ChildEntity.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\Tests\Fixtures;
+
+use Doctrine\ORM\Mapping\Id;
+use Doctrine\ORM\Mapping\Column;
+use Doctrine\ORM\Mapping\Entity;
+
+/** @Entity */
+class ChildEntity extends SingleIntIdEntity
+{
+}
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Fixtures/HighestEntity/GoodEntity.php b/src/Symfony/Bridge/Doctrine/Tests/Fixtures/HighestEntity/GoodEntity.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\Tests\Fixtures\HighestEntity;
+
+use Doctrine\ORM\Mapping\Entity;
+
+/**
+ * @Entity
+ */
+class GoodEntity extends UpperTransient
+{
+}
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Fixtures/HighestEntity/InstanceEntity.php b/src/Symfony/Bridge/Doctrine/Tests/Fixtures/HighestEntity/InstanceEntity.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\Tests\Fixtures\HighestEntity;
+
+use Doctrine\ORM\Mapping\Entity;
+
+/**
+ * @Entity
+ */
+class InstanceEntity extends LowerEntity
+{
+}
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Fixtures/HighestEntity/LowerEntity.php b/src/Symfony/Bridge/Doctrine/Tests/Fixtures/HighestEntity/LowerEntity.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\Tests\Fixtures\HighestEntity;
+
+use Doctrine\ORM\Mapping\Entity;
+
+/**
+ * @Entity
+ */
+class LowerEntity extends LowerTransient
+{
+}
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Fixtures/HighestEntity/LowerMappedSuperClass.php b/src/Symfony/Bridge/Doctrine/Tests/Fixtures/HighestEntity/LowerMappedSuperClass.php
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\Tests\Fixtures\HighestEntity;
+
+use Doctrine\ORM\Mapping\MappedSuperclass;
+
+/** @MappedSuperclass */
+class LowerMappedSuperClass extends GoodEntity
+{
+}
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Fixtures/HighestEntity/LowerTransient.php b/src/Symfony/Bridge/Doctrine/Tests/Fixtures/HighestEntity/LowerTransient.php
@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\Tests\Fixtures\HighestEntity;
+
+class LowerTransient extends LowerMappedSuperClass
+{
+}
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Fixtures/HighestEntity/SideEntity.php b/src/Symfony/Bridge/Doctrine/Tests/Fixtures/HighestEntity/SideEntity.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\Tests\Fixtures\HighestEntity;
+
+use Doctrine\ORM\Mapping\Entity;
+
+/**
+ * @Entity
+ */
+class SideEntity extends SideTransient
+{
+}
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Fixtures/HighestEntity/SideMappedSuperClass.php b/src/Symfony/Bridge/Doctrine/Tests/Fixtures/HighestEntity/SideMappedSuperClass.php
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\Tests\Fixtures\HighestEntity;
+
+use Doctrine\ORM\Mapping\MappedSuperclass;
+
+/** @MappedSuperclass */
+class SideMappedSuperClass extends GoodEntity
+{
+}
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Fixtures/HighestEntity/SideTransient.php b/src/Symfony/Bridge/Doctrine/Tests/Fixtures/HighestEntity/SideTransient.php
@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\Tests\Fixtures\HighestEntity;
+
+class SideTransient extends SideMappedSuperClass
+{
+}
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Fixtures/HighestEntity/TargetMappedSuperClass.php b/src/Symfony/Bridge/Doctrine/Tests/Fixtures/HighestEntity/TargetMappedSuperClass.php
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\Tests\Fixtures\HighestEntity;
+
+use Doctrine\ORM\Mapping\MappedSuperclass;
+
+/** @MappedSuperclass */
+class TargetMappedSuperClass extends TopEntity
+{
+}
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Fixtures/HighestEntity/TargetTransient.php b/src/Symfony/Bridge/Doctrine/Tests/Fixtures/HighestEntity/TargetTransient.php
@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\Tests\Fixtures\HighestEntity;
+
+class TargetTransient extends TargetMappedSuperClass
+{
+}
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Fixtures/HighestEntity/TopEntity.php b/src/Symfony/Bridge/Doctrine/Tests/Fixtures/HighestEntity/TopEntity.php
@@ -0,0 +1,57 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\Tests\Fixtures\HighestEntity;
+
+use Doctrine\ORM\Mapping\Id;
+use Doctrine\ORM\Mapping\Column;
+use Doctrine\ORM\Mapping\DiscriminatorColumn;
+use Doctrine\ORM\Mapping\DiscriminatorMap;
+use Doctrine\ORM\Mapping\Entity;
+use Doctrine\ORM\Mapping\InheritanceType;
+
+/**
+ * @Entity
+ * @InheritanceType("SINGLE_TABLE")
+ * @DiscriminatorColumn(name="discr", type="string")
+ * @DiscriminatorMap({
+ *     "top"  = "TopEntity",
+ *     "good" = "GoodEntity",
+ *     "low"  = "LowEntity",
+ *     "side" = "SideEntity",
+ *     "inst" = "InstanceEntity",
+ * })
+ *
+ * The point of this hierarchy is to test the selection of the repository
+ * by the UniqueEntityValidator. This hierarchy provides:
+ *  - A top entity which is too high in the inheritance chain to be selected
+ *  - Both a transient and a mapped super class targets
+ *  - Upper mapped super and transient classes which should not be selected
+ *  - A good Entity which is intended to provide the repo
+ *  - A side branch including one of each Entity, Mapped Super and Transient
+ *  - A lower part including one of each Entity, Mapped Super and Transient
+ *    which are not intended to be selected since they lower than the GoodEntity
+ *  - An InstanceEntity which is intended to be validated
+ */
+class TopEntity
+{
+    /** @Id @Column(type="integer") */
+    protected $id;
+
+    /** @Column(type="string", nullable=true) */
+    public $name;
+
+    public function __construct($id, $name)
+    {
+        $this->id = $id;
+        $this->name = $name;
+    }
+}
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Fixtures/HighestEntity/UpperMappedSuperClass.php b/src/Symfony/Bridge/Doctrine/Tests/Fixtures/HighestEntity/UpperMappedSuperClass.php
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\Tests\Fixtures\HighestEntity;
+
+use Doctrine\ORM\Mapping\MappedSuperclass;
+
+/** @MappedSuperclass */
+class UpperMappedSuperClass extends TargetTransient
+{
+}
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Fixtures/HighestEntity/UpperTransient.php b/src/Symfony/Bridge/Doctrine/Tests/Fixtures/HighestEntity/UpperTransient.php
@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\Tests\Fixtures\HighestEntity;
+
+class UpperTransient extends UpperMappedSuperClass
+{
+}
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Fixtures/SingleIntIdEntity.php b/src/Symfony/Bridge/Doctrine/Tests/Fixtures/SingleIntIdEntity.php
@@ -13,9 +13,17 @@
 
 use Doctrine\ORM\Mapping\Id;
 use Doctrine\ORM\Mapping\Column;
+use Doctrine\ORM\Mapping\DiscriminatorColumn;
+use Doctrine\ORM\Mapping\DiscriminatorMap;
 use Doctrine\ORM\Mapping\Entity;
+use Doctrine\ORM\Mapping\InheritanceType;
 
-/** @Entity */
+/**
+ * @Entity
+ * @InheritanceType("SINGLE_TABLE")
+ * @DiscriminatorColumn(name="discr", type="string")
+ * @DiscriminatorMap({"parent" = "SingleIntIdEntity", "child" = "ChildEntity"})
+ */
 class SingleIntIdEntity
 {
     /** @Id @Column(type="integer") */