Widen Doctrine constraints for ORM 3 / DBAL 4 and drop dead ORM 2 lef…

composer.json

@@ -35,20 +35,21 @@
         "symfony/validator": "^7.0",
         "phpstan/phpstan-symfony": "^2",
         "assoconnect/php-quality-config": "^2.2",
-        "symfony/security-core": "^7.0"
+        "symfony/security-core": "^7.0",
+        "symfony/var-exporter": "^7.0"
     },
     "require": {
         "php": "^8.4",
         "symfony/framework-bundle": "^7.0",
-        "doctrine/dbal": "^2.10|^3.0",
+        "doctrine/dbal": "^3.6|^4.0",
         "symfony/serializer": "^7.0",
         "symfony/property-access": "^7.0",
-        "doctrine/doctrine-bundle": "^2.11",
-        "doctrine/orm": "^2.9",
+        "doctrine/doctrine-bundle": "^2.12",
+        "doctrine/orm": "^2.20|^3.0",
         "moneyphp/money": "^3.2|^4.0",
         "ext-json": "*",
         "ramsey/uuid": "^4.3",
-        "ramsey/uuid-doctrine": "^1.4",
+        "ramsey/uuid-doctrine": "^1.4|^2.0",
         "thecodingmachine/safe": "^3.4"
     },
     "config": {

phpstan.neon.dist

@@ -7,6 +7,12 @@ parameters:
             - 'Doctrine\Persistence\Mapping\MappingException'
             - 'ReflectionException'
 
+    # doctrine/common (ClassUtils) ships with ORM 2 only (^2.20|^3.0 are both supported),
+    # so each analysis run only matches part of the errors around it.
+    reportUnmatchedIgnoredErrors: false
+    ignoreErrors:
+        - '#unknown class Doctrine\\Common\\Util\\ClassUtils#'
+
 includes:
     - vendor/assoconnect/php-quality-config/phpstan.extension.neon
     - vendor/phpstan/phpstan-symfony/extension.neon

rector.php

@@ -14,4 +14,9 @@
     ->withTypeCoverageLevel(0)
     ->withSets([
         __DIR__ . '/vendor/assoconnect/php-quality-config/src/Rector/rules.php',
+    ])
+    // Registered by php-quality-config but deprecated: rector >= 2.5.7 aborts when they match
+    ->withSkip([
+        \Rector\CodingStyle\Rector\ArrowFunction\StaticArrowFunctionRector::class,
+        \Rector\CodingStyle\Rector\Closure\StaticClosureRector::class,
     ]);

src/Entity/Log.php

@@ -7,6 +7,7 @@
 use DateTimeImmutable;
 use Doctrine\Common\Util\ClassUtils;
 use Doctrine\ORM\Mapping as ORM;
+use Doctrine\Persistence\Proxy;
 use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Validator\Constraints as Assert;
@@ -22,7 +23,7 @@ public function __construct(
         ?string $entityOldValue,
         string $requestTrace,
     ) {
-        $this->entityClass = ClassUtils::getRealClass($entity::class);
+        $this->entityClass = self::getRealClass($entity);
         $this->entityColumn = $entityColumn;
         $this->entityOldValue = $entityOldValue !== null ? mb_substr($entityOldValue, 0, Log::MAX_STRING_LENGTH) : null;
         $this->requestTrace = $requestTrace;
@@ -127,4 +128,28 @@ public function getCreatedAt(): DateTimeImmutable
     {
         return $this->createdAt;
     }
+
+    /**
+     * doctrine/common (ClassUtils) is no longer installed with ORM 3: its proxies implement
+     * Persistence\Proxy, and native lazy objects (ORM 3.5+) already report the real class.
+     * Excluded from coverage: only one branch can run for a given installed ORM major.
+     *
+     * @codeCoverageIgnore
+     * @return class-string
+     */
+    private static function getRealClass(object $entity): string
+    {
+        if (class_exists(ClassUtils::class)) {
+            return ClassUtils::getRealClass($entity::class);
+        }
+
+        if ($entity instanceof Proxy) {
+            $parent = get_parent_class($entity);
+            if (false !== $parent) {
+                return $parent;
+            }
+        }
+
+        return $entity::class;
+    }
 }

src/LogBundle.php

@@ -5,22 +5,10 @@
 namespace AssoConnect\LogBundle;
 
 use AssoConnect\LogBundle\DependencyInjection\LogExtension;
-use Doctrine\Common\EventSubscriber;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 class LogBundle extends Bundle
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function build(ContainerBuilder $container): void
-    {
-        parent::build($container);
-        $container->registerForAutoconfiguration(EventSubscriber::class)
-            ->addTag('doctrine.event_subscriber');
-    }
-
     public function getContainerExtension(): LogExtension
     {
         return new LogExtension();

tests/Factory/LogDataFactoryTest.php

@@ -70,7 +70,7 @@ public function testUpdatedEntityIsLogged(): void
             ->willReturn([$updatedAuthor = new Author()]);
         $unitOfWork->expects(self::once())->method('getScheduledEntityDeletions')->willReturn([]);
 
-        $unitOfWork->method('getEntityChangeSet')->with($updatedAuthor)->willReturn(
+        $unitOfWork->expects(self::once())->method('getEntityChangeSet')->with($updatedAuthor)->willReturn(
             [
                 'email' => ['test@gmail.com'],
                 'registeredAt' => [new \DateTimeImmutable('2020-10-06')],

tests/Serializer/LogSerializerTest.php

@@ -17,7 +17,8 @@
 use Doctrine\ORM\EntityManagerInterface;
 use Money\Currency;
 use Money\Money;
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase as KernelTestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 class LogSerializerTest extends KernelTestCase
 {
@@ -76,9 +77,7 @@ public function helperFormatEntity(AbstractEntity $entity): array
         ];
     }
 
-    /**
-     * @dataProvider providerFormatValueAsString
-     */
+    #[DataProvider('providerFormatValueAsString')]
     public function testFormatValueAsStringWorks(mixed $value, string $formatted): void
     {
         $formatter = new LogSerializer();