Merge branch '2.17.x' into 3.0.x

* 2.17.x:
  Allow creating mocks of the Query class (doctrine#10990)
  Add missing "deprecated" annotation on the annotation driver
  Deprecate EntityManager*::getPartialReference()

UPGRADE.md

@@ -629,6 +629,10 @@ Use `toIterable()` instead.
 
 # Upgrade to 2.17
 
+## Deprecate `EntityManagerInterface::getPartialReference()`
+
+This method does not have a replacement and will be removed in 3.0.
+
 ## Deprecate not-enabling lazy-ghosts
 
 Not enabling lazy ghost objects is deprecated. In ORM 3.0, they will be always enabled.

lib/Doctrine/ORM/Decorator/EntityManagerDecorator.php

@@ -8,6 +8,7 @@
 use Doctrine\Common\EventManager;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\LockMode;
+use Doctrine\Deprecations\Deprecation;
 use Doctrine\ORM\Cache;
 use Doctrine\ORM\Configuration;
 use Doctrine\ORM\EntityManagerInterface;
@@ -104,6 +105,13 @@ public function getReference(string $entityName, mixed $id): object|null
 
     public function getPartialReference(string $entityName, mixed $identifier): object|null
     {
+        Deprecation::trigger(
+            'doctrine/orm',
+            'https://github.com/doctrine/orm/pull/10987',
+            'Method %s is deprecated and will be removed in 3.0.',
+            __METHOD__,
+        );
+
         return $this->wrapped->getPartialReference($entityName, $identifier);
     }
 

lib/Doctrine/ORM/EntityManager.php

@@ -10,6 +10,7 @@
 use Doctrine\Common\Util\ClassUtils;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\LockMode;
+use Doctrine\Deprecations\Deprecation;
 use Doctrine\ORM\Exception\EntityManagerClosed;
 use Doctrine\ORM\Exception\InvalidHydrationMode;
 use Doctrine\ORM\Exception\MissingIdentifierField;
@@ -402,6 +403,12 @@ public function getReference(string $entityName, mixed $id): object|null
 
     public function getPartialReference(string $entityName, mixed $identifier): object|null
     {
+        Deprecation::trigger(
+            'doctrine/orm',
+            'https://github.com/doctrine/orm/pull/10987',
+            'Method %s is deprecated and will be removed in 3.0.',
+            __METHOD__,
+        );
         $class = $this->metadataFactory->getMetadataFor(ltrim($entityName, '\\'));
 
         $entity = $this->unitOfWork->tryGetById($identifier, $class->rootEntityName);

lib/Doctrine/ORM/EntityManagerInterface.php

@@ -178,6 +178,8 @@ public function getReference(string $entityName, mixed $id): object|null;
      * never be visible to the application (especially not event listeners) as it will
      * never be loaded in the first place.
      *
+     * @deprecated 2.7 This method is being removed from the ORM and won't have any replacement
+     *
      * @param string $entityName The name of the entity type.
      * @param mixed  $identifier The entity identifier.
      * @psalm-param class-string<T> $entityName

lib/Doctrine/ORM/NativeQuery.php

@@ -14,8 +14,10 @@
 
 /**
  * Represents a native SQL query.
+ *
+ * @final
  */
-final class NativeQuery extends AbstractQuery
+class NativeQuery extends AbstractQuery
 {
     private string $sql;
 

lib/Doctrine/ORM/Query.php

@@ -36,8 +36,10 @@
 
 /**
  * A Query object represents a DQL query.
+ *
+ * @final
  */
-final class Query extends AbstractQuery
+class Query extends AbstractQuery
 {
     /**
      * A query object is in CLEAN state when it has NO unparsed/unprocessed DQL parts.

psalm.xml

@@ -30,6 +30,7 @@
                 <referencedClass name="Doctrine\DBAL\Schema\Visitor\RemoveNamespacedAssets"/>
                 <referencedClass name="Doctrine\ORM\Event\LifecycleEventArgs"/>
                 <referencedClass name="Doctrine\ORM\Exception\UnknownEntityNamespace"/>
+                <referencedClass name="Doctrine\ORM\Mapping\Driver\AnnotationDriver"/>
                 <referencedClass name="Doctrine\ORM\Mapping\Driver\YamlDriver"/>
                 <referencedClass name="Doctrine\ORM\Query\AST\InExpression"/>
                 <referencedClass name="Doctrine\ORM\Tools\Console\Command\ConvertDoctrine1SchemaCommand"/>
@@ -47,6 +48,8 @@
                 <!-- Compatibility with DBAL 3 -->
                 <referencedMethod name="Doctrine\DBAL\Connection::getEventManager"/>
                 <referencedMethod name="Doctrine\DBAL\Schema\Schema::visit"/>
+                <referencedMethod name="Doctrine\ORM\EntityManagerInterface::getPartialReference"/>
+                <file name="lib/Doctrine/ORM/Query/TreeWalkerChain.php"/>
             </errorLevel>
         </DeprecatedMethod>
         <DocblockTypeContradiction>

tests/Doctrine/Tests/ORM/Decorator/EntityManagerDecoratorTest.php

@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\Tests\ORM\Decorator;
+
+use Doctrine\Deprecations\PHPUnit\VerifyDeprecations;
+use Doctrine\ORM\Decorator\EntityManagerDecorator;
+use Doctrine\ORM\EntityManagerInterface;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use stdClass;
+
+class EntityManagerDecoratorTest extends TestCase
+{
+    use VerifyDeprecations;
+
+    public const VOID_METHODS = [
+        'persist',
+        'remove',
+        'clear',
+        'detach',
+        'refresh',
+        'flush',
+        'initializeObject',
+        'beginTransaction',
+        'commit',
+        'rollback',
+        'close',
+        'lock',
+    ];
+
+    private EntityManagerInterface&MockObject $wrapped;
+
+    protected function setUp(): void
+    {
+        $this->wrapped = $this->createMock(EntityManagerInterface::class);
+    }
+
+    public function testGetPartialReferenceIsDeprecated(): void
+    {
+        $this->expectDeprecationWithIdentifier('https://github.com/doctrine/orm/pull/10987');
+        $decorator = new class ($this->wrapped) extends EntityManagerDecorator {
+        };
+        $decorator->getPartialReference(stdClass::class, 1);
+    }
+}

tests/Doctrine/Tests/ORM/EntityManagerTest.php

@@ -6,6 +6,7 @@
 
 use Doctrine\Common\EventManager;
 use Doctrine\DBAL\Connection;
+use Doctrine\Deprecations\PHPUnit\VerifyDeprecations;
 use Doctrine\ORM\Configuration;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Exception\EntityManagerClosed;
@@ -26,6 +27,8 @@
 
 class EntityManagerTest extends OrmTestCase
 {
+    use VerifyDeprecations;
+
     private EntityManagerMock $entityManager;
 
     protected function setUp(): void
@@ -107,6 +110,7 @@ public function testCreateQueryDqlIsOptional(): void
 
     public function testGetPartialReference(): void
     {
+        $this->expectDeprecationWithIdentifier('https://github.com/doctrine/orm/pull/10987');
         $user = $this->entityManager->getPartialReference(CmsUser::class, 42);
         self::assertTrue($this->entityManager->contains($user));
         self::assertEquals(42, $user->id);