Merge release 2.19.6 into 2.20.x

docs/en/tutorials/getting-started.rst

@@ -144,7 +144,7 @@ step:
 
     // Create a simple "default" Doctrine ORM configuration for Attributes
     $config = ORMSetup::createAttributeMetadataConfiguration(
-        paths: array(__DIR__."/src"),
+        paths: [__DIR__ . '/src'],
         isDevMode: true,
     );
     // or if you prefer annotation, YAML or XML
@@ -153,7 +153,7 @@ step:
     //    isDevMode: true,
     // );
     // $config = ORMSetup::createXMLMetadataConfiguration(
-    //    paths: array(__DIR__."/config/xml"),
+    //    paths: [__DIR__ . '/config/xml'],
     //    isDevMode: true,
     //);
     // $config = ORMSetup::createYAMLMetadataConfiguration(

src/UnitOfWork.php

@@ -3053,10 +3053,7 @@ public function createEntity($className, array $data, &$hints = [])
                             } else {
                                 $associatedId[$targetClass->fieldNames[$targetColumn]] = $joinColumnValue;
                             }
-                        } elseif (
-                            $targetClass->containsForeignIdentifier
-                            && in_array($targetClass->getFieldForColumn($targetColumn), $targetClass->identifier, true)
-                        ) {
+                        } elseif (in_array($targetClass->getFieldForColumn($targetColumn), $targetClass->identifier, true)) {
                             // the missing key is part of target's entity primary key
                             $associatedId = [];
                             break;

tests/Tests/Models/CompositeKeyRelations/CustomerClass.php

@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\Models\CompositeKeyRelations;
+
+use Doctrine\ORM\Mapping\Column;
+use Doctrine\ORM\Mapping\Entity;
+use Doctrine\ORM\Mapping\Id;
+
+/** @Entity */
+class CustomerClass
+{
+    /**
+     * @var string
+     * @Id
+     * @Column(type="string")
+     */
+    public $companyCode;
+
+    /**
+     * @var string
+     * @Id
+     * @Column(type="string")
+     */
+    public $code;
+
+    /**
+     * @var string
+     * @Column(type="string")
+     */
+    public $name;
+}

tests/Tests/Models/CompositeKeyRelations/InvoiceClass.php

@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\Models\CompositeKeyRelations;
+
+use Doctrine\ORM\Mapping\Column;
+use Doctrine\ORM\Mapping\Entity;
+use Doctrine\ORM\Mapping\Id;
+use Doctrine\ORM\Mapping\JoinColumn;
+use Doctrine\ORM\Mapping\JoinColumns;
+use Doctrine\ORM\Mapping\ManyToOne;
+
+/** @Entity */
+class InvoiceClass
+{
+    /**
+     * @var string
+     * @Id
+     * @Column(type="string")
+     */
+    public $companyCode;
+
+    /**
+     * @var string
+     * @Id
+     * @Column(type="string")
+     */
+    public $invoiceNumber;
+
+    /**
+     * @var CustomerClass|null
+     * @ManyToOne(targetEntity="CustomerClass")
+     * @JoinColumns({
+     *     @JoinColumn(name="companyCode", referencedColumnName="companyCode"),
+     *     @JoinColumn(name="customerCode", referencedColumnName="code")
+     * })
+     */
+    public $customer;
+
+    /**
+     * @var string|null
+     * @Column(type="string", nullable=true)
+     */
+    public $customerCode;
+}

tests/Tests/ORM/Functional/CompositeKeyRelationsTest.php

@@ -0,0 +1,61 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\ORM\Functional;
+
+use Doctrine\Tests\Models\CompositeKeyRelations\CustomerClass;
+use Doctrine\Tests\Models\CompositeKeyRelations\InvoiceClass;
+use Doctrine\Tests\OrmFunctionalTestCase;
+
+class CompositeKeyRelationsTest extends OrmFunctionalTestCase
+{
+    protected function setUp(): void
+    {
+        $this->useModelSet('compositekeyrelations');
+
+        parent::setUp();
+    }
+
+    public function testFindEntityWithNotNullRelation(): void
+    {
+        $this->_em->getConnection()->insert('CustomerClass', [
+            'companyCode' => 'AA',
+            'code' => 'CUST1',
+            'name' => 'Customer 1',
+        ]);
+
+        $this->_em->getConnection()->insert('InvoiceClass', [
+            'companyCode' => 'AA',
+            'invoiceNumber' => 'INV1',
+            'customerCode' => 'CUST1',
+        ]);
+
+        $entity = $this->findEntity('AA', 'INV1');
+        self::assertSame('AA', $entity->companyCode);
+        self::assertSame('INV1', $entity->invoiceNumber);
+        self::assertInstanceOf(CustomerClass::class, $entity->customer);
+        self::assertSame('Customer 1', $entity->customer->name);
+    }
+
+    public function testFindEntityWithNullRelation(): void
+    {
+        $this->_em->getConnection()->insert('InvoiceClass', [
+            'companyCode' => 'BB',
+            'invoiceNumber' => 'INV1',
+        ]);
+
+        $entity = $this->findEntity('BB', 'INV1');
+        self::assertSame('BB', $entity->companyCode);
+        self::assertSame('INV1', $entity->invoiceNumber);
+        self::assertNull($entity->customer);
+    }
+
+    private function findEntity(string $companyCode, string $invoiceNumber): InvoiceClass
+    {
+        return $this->_em->find(
+            InvoiceClass::class,
+            ['companyCode' => $companyCode, 'invoiceNumber' => $invoiceNumber]
+        );
+    }
+}

tests/Tests/OrmFunctionalTestCase.php

@@ -212,6 +212,10 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
             Models\CompositeKeyInheritance\SingleRootClass::class,
             Models\CompositeKeyInheritance\SingleChildClass::class,
         ],
+        'compositekeyrelations' => [
+            Models\CompositeKeyRelations\InvoiceClass::class,
+            Models\CompositeKeyRelations\CustomerClass::class,
+        ],
         'taxi' => [
             Models\Taxi\PaidRide::class,
             Models\Taxi\Ride::class,