Added test with composite identifier with association and custom generators

Author: Majkl578

tests/Doctrine/Tests/Models/ValueGenerators/AssociationIdentifier.php

@@ -0,0 +1,58 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\Models\ValueGenerators;
+
+use Doctrine\ORM\Annotation as ORM;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table("vg_association_identifier")
+ */
+class AssociationIdentifier
+{
+    /**
+     * @ORM\Column(type="string")
+     * @ORM\Id
+     * @ORM\GeneratedValue("CUSTOM")
+     * @ORM\CustomIdGenerator("Doctrine\Tests\Models\ValueGenerators\FooGenerator")
+     * @var string|null
+     */
+    private $id;
+
+    /**
+     * @ORM\OneToOne(targetEntity="AssociationIdentifierTarget", cascade={"persist"})
+     * @ORM\Id
+     * @var AssociationIdentifierTarget
+     */
+    private $target;
+
+    /**
+     * @ORM\Column(type="string")
+     * @ORM\GeneratedValue("CUSTOM")
+     * @ORM\CustomIdGenerator("Doctrine\Tests\Models\ValueGenerators\BarGenerator")
+     * @var string|null
+     */
+    private $regular;
+
+    public function __construct()
+    {
+        $this->target = new AssociationIdentifierTarget();
+    }
+
+    public function getTarget() : AssociationIdentifierTarget
+    {
+        return $this->target;
+    }
+
+    public function getId() : ?string
+    {
+        return $this->id;
+    }
+
+    public function getRegular() : ?string
+    {
+        return $this->regular;
+    }
+}

tests/Doctrine/Tests/Models/ValueGenerators/AssociationIdentifierTarget.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\Models\ValueGenerators;
+
+use Doctrine\ORM\Annotation as ORM;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table("vg_association_identifier_target")
+ */
+class AssociationIdentifierTarget
+{
+    public const ID = 123;
+
+    /**
+     * @ORM\Column(type="integer")
+     * @ORM\Id
+     * @var int
+     */
+    private $id = self::ID;
+
+    public function getId() : int
+    {
+        return $this->id;
+    }
+}

tests/Doctrine/Tests/ORM/Functional/ValueGeneratorsTest.php

@@ -3,6 +3,8 @@
 
 namespace Doctrine\Tests\ORM\Functional;
 
+use Doctrine\Tests\Models\ValueGenerators\AssociationIdentifier;
+use Doctrine\Tests\Models\ValueGenerators\AssociationIdentifierTarget;
 use Doctrine\Tests\Models\ValueGenerators\BarGenerator;
 use Doctrine\Tests\Models\ValueGenerators\CompositeGeneratedIdentifier;
 use Doctrine\Tests\Models\ValueGenerators\FooGenerator;
@@ -82,4 +84,22 @@ public function testValueGeneratorsInInheritance() : void
         $this->assertSame(FooGenerator::VALUE, $childBEntity->getA());
         $this->assertSame(BarGenerator::VALUE, $childBEntity->getB());
     }
+
+    public function testGeneratorsWithAssociationInIdentifier() : void
+    {
+        $entity = new AssociationIdentifier();
+
+        $this->em->persist($entity);
+        $this->em->flush();
+
+        $this->assertSame(FooGenerator::VALUE, $entity->getId());
+        $this->assertSame(BarGenerator::VALUE, $entity->getRegular());
+
+        $entity = $this->em->find(
+            AssociationIdentifier::class,
+            ['id' => FooGenerator::VALUE, 'target' => AssociationIdentifierTarget::ID]
+        );
+
+        $this->assertNotNull($entity);
+    }
 }

tests/Doctrine/Tests/OrmFunctionalTestCase.php

@@ -321,6 +321,8 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
             Models\ValueGenerators\InheritanceGeneratorsRoot::class,
             Models\ValueGenerators\InheritanceGeneratorsChildA::class,
             Models\ValueGenerators\InheritanceGeneratorsChildB::class,
+            Models\ValueGenerators\AssociationIdentifier::class,
+            Models\ValueGenerators\AssociationIdentifierTarget::class,
         ],
     ];
 
@@ -611,6 +613,8 @@ protected function tearDown()
             $conn->executeUpdate('DELETE FROM vg_composite_generated_identifier');
             $conn->executeUpdate('DELETE FROM vg_non_identifier_generators');
             $conn->executeUpdate('DELETE FROM vg_inheritance_generators');
+            $conn->executeUpdate('DELETE FROM vg_association_identifier');
+            $conn->executeUpdate('DELETE FROM vg_association_identifier_target');
         }
 
         $this->em->clear();