Merged branch '4.6' into main

Author: alongosz

.github/workflows/ci.yaml

@@ -90,9 +90,6 @@ jobs:
             matrix:
                 php:
                     - '8.3'
-                doctrine-persistence:
-                    - 'doctrine/persistence:^2.0'
-                    - 'doctrine/persistence:^3.0'
                 image:
                     - 'postgres:14'
                     - 'postgres:18'
@@ -106,7 +103,6 @@ jobs:
                     gh-client-secret: ${{ secrets.AUTOMATION_CLIENT_SECRET }}
                     satis-network-key: ${{ secrets.SATIS_NETWORK_KEY }}
                     satis-network-token: ${{ secrets.SATIS_NETWORK_TOKEN }}
-                    composer-options: "--with ${{ matrix.doctrine-persistence }}"
 
             -   name: Setup problem matchers for PHPUnit
                 run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
@@ -145,9 +141,6 @@ jobs:
             matrix:
                 php:
                     - '8.3'
-                doctrine-persistence:
-                    - 'doctrine/persistence:^2.0'
-                    - 'doctrine/persistence:^3.0'
                 image:
                     - 'mysql:8.0'
                     - 'mysql:8.4'
@@ -161,7 +154,6 @@ jobs:
                     gh-client-secret: ${{ secrets.AUTOMATION_CLIENT_SECRET }}
                     satis-network-key: ${{ secrets.SATIS_NETWORK_KEY }}
                     satis-network-token: ${{ secrets.SATIS_NETWORK_TOKEN }}
-                    composer-options: "--with ${{ matrix.doctrine-persistence }}"
 
             -   name: Setup problem matchers for PHPUnit
                 run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"

composer.json

@@ -24,6 +24,7 @@
         "doctrine/dbal": "^3.7.0",
         "doctrine/doctrine-bundle": "^2.11.0",
         "doctrine/orm": "^2.7",
+        "doctrine/persistence": "^3.0",
         "friendsofphp/proxy-manager-lts": "^1.0",
         "friendsofsymfony/http-cache-bundle": "^3.0",
         "friendsofsymfony/jsrouting-bundle": "^3.5",

phpstan-baseline-doctrine-persistence-v2.neon

@@ -10554,12 +10554,6 @@ parameters:
 			count: 1
 			path: src/lib/Persistence/Cache/UserPreferenceHandler.php
 
-		-
-			message: '#^Return type \(Doctrine\\ORM\\Mapping\\ClassMetadataFactory\) of method Ibexa\\Core\\Persistence\\Doctrine\\SiteAccessAwareEntityManager\:\:getMetadataFactory\(\) should be compatible with return type \(Doctrine\\Persistence\\Mapping\\ClassMetadataFactory\<Doctrine\\Persistence\\Mapping\\ClassMetadata\<object\>\>\) of method Doctrine\\Persistence\\ObjectManager\:\:getMetadataFactory\(\)$#'
-			identifier: method.childReturnType
-			count: 2
-			path: src/lib/Persistence/Doctrine/SiteAccessAwareEntityManager.php
-
 		-
 			message: '#^Property Ibexa\\Core\\Persistence\\FieldTypeRegistry\:\:\$coreFieldTypes \(array\<Ibexa\\Contracts\\Core\\FieldType\\FieldType\>\) does not accept array\<Ibexa\\Core\\Persistence\\FieldType\>\.$#'
 			identifier: assign.propertyType

phpstan-baseline-doctrine-persistence-v3.neon

@@ -8,14 +8,14 @@
 
 namespace Ibexa\Core\Persistence\Doctrine;
 
+use Doctrine\Common\EventManager;
 use Doctrine\DBAL\Connection;
 use Doctrine\ORM\Cache;
 use Doctrine\ORM\Configuration;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Internal\Hydration\AbstractHydrator;
 use Doctrine\ORM\Mapping\ClassMetadata;
-use Doctrine\ORM\Mapping\ClassMetadataFactory;
 use Doctrine\ORM\NativeQuery;
 use Doctrine\ORM\Proxy\ProxyFactory;
 use Doctrine\ORM\Query;
@@ -24,15 +24,14 @@
 use Doctrine\ORM\Query\ResultSetMapping;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\ORM\UnitOfWork;
+use Doctrine\Persistence\Mapping\ClassMetadataFactory;
 use Ibexa\Bundle\Core\Entity\EntityManagerFactory;
 use Ibexa\Contracts\Core\MVC\EventSubscriber\ConfigScopeChangeSubscriber;
 use Ibexa\Core\MVC\Symfony\Event\ScopeChangeEvent;
 use Symfony\Contracts\Service\ResetInterface;
 
 /**
  * @internal
- *
- * SiteAccessAwareEntityManager is a cross-compatible class supporting doctrine/persistence v2 and v3.
  */
 final class SiteAccessAwareEntityManager implements EntityManagerInterface, ConfigScopeChangeSubscriber, ResetInterface
 {
@@ -80,10 +79,7 @@ public function transactional($func)
         return $this->getWrapped()->transactional($func);
     }
 
-    /**
-     * @return mixed
-     */
-    public function wrapInTransaction(callable $func)
+    public function wrapInTransaction(callable $func): mixed
     {
         return $this->getWrapped()->wrapInTransaction($func);
     }
@@ -129,6 +125,8 @@ public function createQueryBuilder(): QueryBuilder
      * @param class-string<T> $entityName
      *
      * @return T|null
+     *
+     * @throws \Doctrine\ORM\Exception\ORMException
      */
     public function getReference($entityName, $id): ?object
     {
@@ -171,7 +169,7 @@ public function lock($entity, $lockMode, $lockVersion = null): void
         $this->getWrapped()->lock($entity, $lockMode, $lockVersion);
     }
 
-    public function getEventManager(): \Doctrine\Common\EventManager
+    public function getEventManager(): EventManager
     {
         return $this->getWrapped()->getEventManager();
     }
@@ -231,36 +229,27 @@ public function find($className, $id): ?object
         return $this->getWrapped()->find($className, $id);
     }
 
-    /**
-     * @param object $object
-     */
-    public function persist($object): void
+    public function persist(object $object): void
     {
         $this->getWrapped()->persist($object);
     }
 
-    public function remove($object): void
+    public function remove(object $object): void
     {
         $this->getWrapped()->remove($object);
     }
 
-    /**
-     * @param string|null $objectName
-     */
-    public function clear($objectName = null): void
+    public function clear(): void
     {
-        $this->getWrapped()->clear($objectName);
+        $this->getWrapped()->clear();
     }
 
-    /**
-     * @param object $object
-     */
-    public function detach($object): void
+    public function detach(object $object): void
     {
         $this->getWrapped()->detach($object);
     }
 
-    public function refresh($object, ?int $lockMode = null): void
+    public function refresh(object $object, ?int $lockMode = null): void
     {
         $this->getWrapped()->refresh($object, $lockMode);
     }
@@ -270,62 +259,48 @@ public function flush(): void
         $this->getWrapped()->flush();
     }
 
+    /**
+     * @template T of object
+     *
+     * @param class-string<T> $className
+     *
+     * @return EntityRepository<T>
+     */
     public function getRepository($className): EntityRepository
     {
         return $this->getWrapped()->getRepository($className);
     }
 
+    /**
+     * @template T of object
+     *
+     * @param class-string<T> $className
+     *
+     * @return ClassMetadata<T>
+     */
     public function getClassMetadata($className): ClassMetadata
     {
         return $this->getWrapped()->getClassMetadata($className);
     }
 
     public function getMetadataFactory(): ClassMetadataFactory
     {
+        /** @phpstan-var ClassMetadataFactory<\Doctrine\Persistence\Mapping\ClassMetadata<object>> */
         return $this->getWrapped()->getMetadataFactory();
     }
 
-    /**
-     * @param object $obj
-     */
-    public function initializeObject($obj): void
+    public function initializeObject(object $obj): void
     {
         $this->getWrapped()->initializeObject($obj);
     }
 
-    /**
-     * @param mixed $value
-     */
-    public function isUninitializedObject($value): bool
+    public function isUninitializedObject(mixed $value): bool
     {
-        $entityManager = $this->getWrapped();
-
-        // workaround for doctrine/persistence v2 and v3 cross-compatibility
-        return method_exists($entityManager, 'isUninitializedObject')
-            ? $entityManager->isUninitializedObject($value)
-            : false;
+        return $this->getWrapped()->isUninitializedObject($value);
     }
 
-    /**
-     * @param object $object
-     */
-    public function contains($object): bool
+    public function contains(object $object): bool
     {
         return $this->getWrapped()->contains($object);
     }
-
-    /**
-     * @param object $object
-     *
-     * @return object|null
-     */
-    public function merge($object)
-    {
-        $entityManager = $this->getWrapped();
-
-        // workaround for doctrine/persistence v2 and v3 cross-compatibility
-        return method_exists($entityManager, 'merge')
-            ? $entityManager->merge($object)
-            : null;
-    }
 }