EntityRelationRule - fix composite keys

Author: ondrejmirtes

src/Rules/Doctrine/ORM/EntityColumnRule.php

@@ -103,10 +103,10 @@ public function processNode(Node $node, Scope $scope): array
 			)] : [];
 		}
 
-		$identifier = null;
+		$identifiers = [];
 		if ($metadata->generatorType !== 5) { // ClassMetadataInfo::GENERATOR_TYPE_NONE
 			try {
-				$identifier = $metadata->getSingleIdentifierFieldName();
+				$identifiers = $metadata->getIdentifierFieldNames();
 			} catch (Throwable $e) {
 				$mappingException = 'Doctrine\ORM\Mapping\MappingException';
 				if (!$e instanceof $mappingException) {
@@ -148,7 +148,7 @@ public function processNode(Node $node, Scope $scope): array
 			);
 		}
 		$propertyReadableType = TypeTraverser::map($property->getReadableType(), $transformArrays);
-		if (!$writableToDatabaseType->isSuperTypeOf($identifier === $propertyName && !$nullable ? TypeCombinator::removeNull($propertyReadableType) : $propertyReadableType)->yes()) {
+		if (!$writableToDatabaseType->isSuperTypeOf(in_array($propertyName, $identifiers, true) && !$nullable ? TypeCombinator::removeNull($propertyReadableType) : $propertyReadableType)->yes()) {
 			$errors[] = sprintf(
 				'Property %s::$%s type mapping mismatch: property can contain %s but database expects %s.',
 				$className,

src/Rules/Doctrine/ORM/EntityRelationRule.php

@@ -74,9 +74,9 @@ public function processNode(Node $node, Scope $scope): array
 			return [];
 		}
 		$associationMapping = $metadata->associationMappings[$propertyName];
-		$identifier = null;
+		$identifiers = [];
 		try {
-			$identifier = $metadata->getSingleIdentifierFieldName();
+			$identifiers = $metadata->getIdentifierFieldNames();
 		} catch (\Throwable $e) {
 			$mappingException = 'Doctrine\ORM\Mapping\MappingException';
 			if (!$e instanceof $mappingException) {
@@ -88,7 +88,7 @@ public function processNode(Node $node, Scope $scope): array
 		$toMany = false;
 		if ((bool) ($associationMapping['type'] & 3)) { // ClassMetadataInfo::TO_ONE
 			$columnType = new ObjectType($associationMapping['targetEntity']);
-			if ($identifier !== null && $identifier === $propertyName) {
+			if (in_array($propertyName, $identifiers, true)) {
 				$nullable = false;
 			} else {
 				$nullable = $associationMapping['joinColumns'][0]['nullable'] ?? true;

tests/Rules/Doctrine/ORM/EntityColumnRuleTest.php

@@ -136,6 +136,7 @@ public function generatedIdsProvider(): Iterator
 		];
 		yield 'nullable property' => [__DIR__ . '/data/GeneratedIdEntity3.php', []];
 		yield 'nullable both' => [__DIR__ . '/data/GeneratedIdEntity4.php', []];
+		yield 'composite' => [__DIR__ . '/data/CompositePrimaryKeyEntity1.php', []];
 	}
 
 	public function testCustomType(): void

tests/Rules/Doctrine/ORM/EntityRelationRuleTest.php

@@ -147,6 +147,11 @@ public function ruleProvider(): Iterator
 				],
 			],
 		];
+
+		yield 'composite primary key' => [
+			__DIR__ . '/data/CompositePrimaryKeyEntity2.php',
+			[],
+		];
 	}
 
 }

tests/Rules/Doctrine/ORM/data/CompositePrimaryKeyEntity1.php

@@ -0,0 +1,28 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Rules\Doctrine\ORM;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Entity()
+ */
+class CompositePrimaryKeyEntity1
+{
+
+	/**
+	 * @ORM\Id()
+	 * @ORM\GeneratedValue()
+	 * @ORM\Column(type="bigint", nullable=true)
+	 * @var string
+	 */
+	private $id;
+
+	/**
+	 * @ORM\Id()
+	 * @ORM\Column(type="string")
+	 * @var string|null
+	 */
+	private $country;
+
+}

tests/Rules/Doctrine/ORM/data/CompositePrimaryKeyEntity2.php

@@ -0,0 +1,27 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Rules\Doctrine\ORM;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Entity()
+ */
+class CompositePrimaryKeyEntity2
+{
+
+	/**
+	 * @ORM\Id()
+	 * @ORM\ManyToOne(targetEntity="PHPStan\Rules\Doctrine\ORM\EntityWithRelations", inversedBy="countries")
+	 * @var EntityWithRelations
+	 */
+	private $post;
+
+	/**
+	 * @ORM\Id()
+	 * @ORM\Column(type="string")
+	 * @var string
+	 */
+	private $country;
+
+}