PHPStan: infer targetEntity from property type for ManyToOne associations (#38)

Previously, when using associations without explicit targetEntity attribute,
PHPStan would only infer the target entity from the property type for
OneToOne associations. This left ManyToOne associations without targetEntity
attribute incorrectly reported as "not a valid Doctrine association".

This change extends type inference to also work for ManyToOne associations,
matching the behavior users expect when not using phpstan-doctrine.

Fixes #37

Author: JanTvrdik

src/PHPStan/EntityPreloaderCore.php

@@ -21,6 +21,7 @@
 use ReflectionNamedType;
 use ReflectionProperty;
 use function count;
+use function in_array;
 use function is_string;
 
 abstract class EntityPreloaderCore
@@ -214,14 +215,17 @@ private function getAssociationTargetTypeFromPropertyReflection(
             ManyToMany::class,
         ];
 
+        $toOneAssociations = [OneToOne::class, ManyToOne::class];
+
         foreach ($associationAttributes as $attributeClass) {
             foreach ($propertyReflection->getAttributes($attributeClass) as $attributeReflection) {
                 $attribute = $attributeReflection->newInstance();
 
                 if ($attribute->targetEntity !== null) {
                     return new ObjectType($attribute->targetEntity);
+                }
 
-                } elseif ($attributeClass === OneToOne::class && $propertyReflection->getType() instanceof ReflectionNamedType) {
+                if (in_array($attributeClass, $toOneAssociations, true) && $propertyReflection->getType() instanceof ReflectionNamedType) {
                     return new ObjectType($propertyReflection->getType()->getName());
                 }
             }

tests/Fixtures/Issue37/Employee.php

@@ -0,0 +1,50 @@
+<?php declare(strict_types = 1);
+
+namespace ShipMonkTests\DoctrineEntityPreloader\Fixtures\Issue37;
+
+use Doctrine\ORM\Mapping\Entity;
+use Doctrine\ORM\Mapping\ManyToOne;
+use Doctrine\ORM\Mapping\OneToOne;
+use ShipMonkTests\DoctrineEntityPreloader\Fixtures\Synthetic\TestEntityWithId;
+
+/**
+ * @see https://github.com/shipmonk-rnd/doctrine-entity-preloader/issues/37
+ */
+#[Entity]
+class Employee extends TestEntityWithId
+{
+
+    /**
+     * ManyToOne WITHOUT explicit targetEntity
+     */
+    #[ManyToOne]
+    private ?Employee $supervisor;
+
+    /**
+     * OneToOne WITHOUT explicit targetEntity
+     */
+    #[OneToOne]
+    private ?EmployeeSettings $settings;
+
+    public function __construct(
+        ?int $number,
+        ?Employee $supervisor = null,
+        ?EmployeeSettings $settings = null,
+    )
+    {
+        $this->number = $number;
+        $this->supervisor = $supervisor;
+        $this->settings = $settings;
+    }
+
+    public function getSupervisor(): ?Employee
+    {
+        return $this->supervisor;
+    }
+
+    public function getSettings(): ?EmployeeSettings
+    {
+        return $this->settings;
+    }
+
+}

tests/Fixtures/Issue37/EmployeeSettings.php

@@ -0,0 +1,20 @@
+<?php declare(strict_types = 1);
+
+namespace ShipMonkTests\DoctrineEntityPreloader\Fixtures\Issue37;
+
+use Doctrine\ORM\Mapping\Entity;
+use ShipMonkTests\DoctrineEntityPreloader\Fixtures\Synthetic\TestEntityWithId;
+
+/**
+ * @see https://github.com/shipmonk-rnd/doctrine-entity-preloader/issues/37
+ */
+#[Entity]
+class EmployeeSettings extends TestEntityWithId
+{
+
+    public function __construct(?int $number)
+    {
+        $this->number = $number;
+    }
+
+}

tests/PHPStan/Data/EntityPreloaderRuleTestData.php

@@ -13,6 +13,7 @@
 use ShipMonkTests\DoctrineEntityPreloader\Fixtures\Blog\PasswordVerifier;
 use ShipMonkTests\DoctrineEntityPreloader\Fixtures\Blog\Tag;
 use ShipMonkTests\DoctrineEntityPreloader\Fixtures\Blog\User;
+use ShipMonkTests\DoctrineEntityPreloader\Fixtures\Issue37\Employee;
 use function PHPStan\Testing\assertType;
 
 final class EntityPreloaderRuleTestData
@@ -114,4 +115,18 @@ public function preloadWithObject(array $entities): void
         assertType('list<object>', $this->entityPreloader->preload($entities, 'foo')); // error: Property 'object::$foo' not found.
     }
 
+    /**
+     * @see https://github.com/shipmonk-rnd/doctrine-entity-preloader/issues/37
+     */
+    public function preloadWithoutExplicitTargetEntity(): void
+    {
+        $employees = $this->entityManager->getRepository(Employee::class)->findAll();
+
+        // ManyToOne WITHOUT targetEntity attribute
+        assertType('list<ShipMonkTests\DoctrineEntityPreloader\Fixtures\Issue37\Employee>', $this->entityPreloader->preload($employees, 'supervisor'));
+
+        // OneToOne WITHOUT targetEntity attribute
+        assertType('list<ShipMonkTests\DoctrineEntityPreloader\Fixtures\Issue37\EmployeeSettings>', $this->entityPreloader->preload($employees, 'settings'));
+    }
+
 }