!!! FEATURE: update to doctrine/dbal version 3

Neos.Flow/Classes/Cache/CacheManager.php

@@ -218,6 +218,7 @@ public function getSimpleCache(string $identifier): CacheInterface
      *
      * @param string $identifier
      * @return CacheItemPoolInterface
+     * @throws NoSuchCacheException
      */
     public function getCacheItemPool(string $identifier): CacheItemPoolInterface
     {

Neos.Flow/Classes/Command/DatabaseCommandController.php

@@ -124,7 +124,7 @@ protected function convertToCharacterSetAndCollation(string $characterSet, strin
 
         $statements[] = 'ALTER DATABASE ' . $this->connection->quoteIdentifier($this->persistenceSettings['backendOptions']['dbname']) . ' CHARACTER SET ' . $characterSet . ' COLLATE ' . $collation;
 
-        $tableNames = $this->connection->getSchemaManager()?->listTableNames() ?? [];
+        $tableNames = $this->connection->createSchemaManager()->listTableNames() ?? [];
         foreach ($tableNames as $tableName) {
             $statements[] = 'ALTER TABLE ' . $this->connection->quoteIdentifier($tableName) . ' DEFAULT CHARACTER SET ' . $characterSet . ' COLLATE ' . $collation;
             $statements[] = 'ALTER TABLE ' . $this->connection->quoteIdentifier($tableName) . ' CONVERT TO CHARACTER SET ' . $characterSet . ' COLLATE ' . $collation;

Neos.Flow/Classes/Command/DoctrineCommandController.php

@@ -14,6 +14,7 @@
 use Doctrine\Common\Util\Debug;
 use Doctrine\DBAL\Exception as DBALException;
 use Doctrine\Migrations\Exception\MigrationException;
+use Doctrine\ORM\ORMException;
 use Doctrine\ORM\Tools\ToolsException;
 use Doctrine\Persistence\Mapping\ClassMetadata;
 use Neos\Flow\Annotations as Flow;
@@ -200,7 +201,7 @@ public function updateCommand(bool $unsafeMode = false, string $output = null):
      * @param boolean $dumpMappingData If set, the mapping data will be output
      * @param string|null $entityClassName If given, the mapping data for just this class will be output
      * @return void
-     * @throws \Doctrine\ORM\ORMException
+     * @throws ORMException
      * @see neos.flow:doctrine:validate
      */
     public function entityStatusCommand(bool $dumpMappingData = false, string $entityClassName = null): void
@@ -496,8 +497,8 @@ public function migrationGenerateCommand(bool $diffAgainstCurrent = true, string
             $this->outputLine();
 
             if ($selectedPackage !== $choices[0]) {
-                /** @var Package $selectedPackage */
                 $selectedPackage = $packages[$selectedPackage];
+                /** @var Package $selectedPackage */
                 $targetPathAndFilename = Files::concatenatePaths([$selectedPackage->getPackagePath(), 'Migrations', $this->doctrineService->getDatabasePlatformName(), basename($migrationClassPathAndFilename)]);
                 Files::createDirectoryRecursively(dirname($targetPathAndFilename));
                 rename($migrationClassPathAndFilename, $targetPathAndFilename);

Neos.Flow/Classes/Persistence/Doctrine/AllowedObjectsListener.php

@@ -67,9 +67,9 @@ class AllowedObjectsListener
      * @param OnFlushEventArgs $args
      * @throws PersistenceException
      */
-    public function onFlush(OnFlushEventArgs $args)
+    public function onFlush(OnFlushEventArgs $args): void
     {
-        $unitOfWork = $args->getEntityManager()->getUnitOfWork();
+        $unitOfWork = $args->getObjectManager()->getUnitOfWork();
         if ($unitOfWork->getScheduledEntityInsertions() === []
             && $unitOfWork->getScheduledEntityUpdates() === []
             && $unitOfWork->getScheduledEntityDeletions() === []
@@ -87,7 +87,7 @@ public function onFlush(OnFlushEventArgs $args)
             }
         }
 
-        $connection = $args->getEntityManager()->getConnection();
+        $connection = $args->getObjectManager()->getConnection();
         try {
             if ($this->ping($connection) === false) {
                 $this->logger->info('Reconnecting the Doctrine EntityManager to the persistence backend.', LogEnvironment::fromMethodName(__METHOD__));
@@ -120,7 +120,7 @@ protected function ping(Connection $connection): bool
      * @return void
      * @throws \Neos\Flow\Persistence\Exception
      */
-    protected function throwExceptionIfObjectIsNotAllowed($object)
+    protected function throwExceptionIfObjectIsNotAllowed($object): void
     {
         if (!$this->allowedObjects->contains($object)) {
             $message = 'Detected modified or new objects (' . get_class($object) . ', uuid:' . $this->persistenceManager->getIdentifierByObject($object) . ') to be persisted which is not allowed for "safe requests"' . chr(10) .

Neos.Flow/Classes/Persistence/Doctrine/CachePool.php

@@ -0,0 +1,50 @@
+<?php
+namespace Neos\Flow\Persistence\Doctrine;
+
+use Neos\Cache\Psr\Cache\CacheItem;
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Security\Context;
+use Psr\Cache\CacheItemInterface;
+
+/**
+ * Extended PSR cache pool to include security context hash into cache key
+ */
+class CachePool extends \Neos\Cache\Psr\Cache\CachePool
+{
+    #[Flow\Inject]
+    protected Context $securityContext;
+
+    public function getItem(string $key): CacheItemInterface
+    {
+        return parent::getItem($this->enrichCacheItemKey($key));
+    }
+
+    public function hasItem(string $key): bool
+    {
+        return parent::hasItem($this->enrichCacheItemKey($key));
+    }
+
+    public function deleteItem(string $key): bool
+    {
+        return parent::deleteItem($this->enrichCacheItemKey($key));
+    }
+
+    public function save(CacheItemInterface $item): bool
+    {
+        $newKey = $this->enrichCacheItemKey($item->getKey());
+        $newItem = new CacheItem($newKey, true, $item->get());
+        if ($item instanceof CacheItem) {
+            $expiresAt = $item->getExpirationDate();
+            $newItem->expiresAt($expiresAt);
+        }
+        if ($item instanceof \Doctrine\Common\Cache\Psr6\CacheItem) {
+            $newItem->expiresAt($item->getExpiry() !== null ? new \DateTime('@' . $item->getExpiry()) : null);
+        }
+        return parent::save($item);
+    }
+
+    protected function enrichCacheItemKey(string $key): string
+    {
+        return md5($key . '|' . $this->securityContext->getContextHash());
+    }
+}

Neos.Flow/Classes/Persistence/Doctrine/CountWalker.php

@@ -33,7 +33,7 @@ public function walkSelectStatement(SelectStatement $AST)
     {
         $parent = null;
         $parentName = null;
-        foreach ($this->_getQueryComponents() as $dqlAlias => $qComp) {
+        foreach ($this->getQueryComponents() as $dqlAlias => $qComp) {
             if ($qComp['parent'] === null && $qComp['nestingLevel'] === 0) {
                 $parent = $qComp;
                 $parentName = $dqlAlias;

Neos.Flow/Classes/Persistence/Doctrine/DataTypes/JsonArrayType.php

@@ -5,9 +5,8 @@
 
 use Doctrine\Common\Collections\Collection;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
-use Doctrine\DBAL\Platforms\PostgreSQL94Platform;
 use Doctrine\DBAL\Types\ConversionException;
-use Doctrine\DBAL\Types\JsonType;
+use Doctrine\DBAL\Types\JsonType as DoctrineJsonType;
 use Doctrine\ORM\Mapping\Entity as ORMEntity;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Core\Bootstrap;
@@ -23,7 +22,7 @@
  *
  * @Flow\Proxy(false)
  */
-class JsonArrayType extends JsonType
+class JsonArrayType extends DoctrineJsonType
 {
     public const FLOW_JSON_ARRAY = 'flow_json_array';
     protected ?PersistenceManagerInterface $persistenceManager = null;
@@ -44,9 +43,6 @@ public function getName(): string
      */
     public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
     {
-        if ($platform instanceof PostgreSQL94Platform) {
-            return 'jsonb';
-        }
         return $platform->getJsonTypeDeclarationSQL($column);
     }