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

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/EntityManagerFactory.php

@@ -116,7 +116,7 @@ public function create()
         }
 
         $this->emitBeforeDoctrineEntityManagerCreation($connection, $config, $eventManager);
-        $entityManager = EntityManager::create($connection, $config, $eventManager);
+        $entityManager = new EntityManager($connection, $config, $eventManager);
         $flowAnnotationDriver->setEntityManager($entityManager);
         $this->emitAfterDoctrineEntityManagerCreation($config, $entityManager);
 

Neos.Flow/Classes/Persistence/Doctrine/Mapping/Driver/FlowAnnotationDriver.php

@@ -26,6 +26,7 @@
 use Neos\Flow\Aop\Pointcut\PointcutFilterInterface;
 use Neos\Flow\ObjectManagement\Proxy\Compiler;
 use Neos\Flow\Persistence\Doctrine\Mapping\Exception\ClassSchemaNotFoundException;
+use Neos\Flow\Persistence\Exception;
 use Neos\Flow\Reflection\ClassSchema;
 use Neos\Flow\Reflection\ReflectionService;
 
@@ -426,7 +427,7 @@ public function loadMetadataForClass($className, ClassMetadata $metadata)
             if (array_diff($idProperties, $metadata->getIdentifierFieldNames()) !== []) {
                 $uniqueIndexName = $this->truncateIdentifier('flow_identity_' . $primaryTable['name']);
                 foreach ($idProperties as $idProperty) {
-                    $primaryTable['uniqueConstraints'][$uniqueIndexName]['columns'][] = isset($metadata->columnNames[$idProperty]) ? $metadata->columnNames[$idProperty] : strtolower($idProperty);
+                    $primaryTable['uniqueConstraints'][$uniqueIndexName]['columns'][] = $metadata->fieldMappings[$idProperty]['columnName'] ?? strtolower($idProperty);
                 }
             }
         }
@@ -811,7 +812,7 @@ protected function evaluatePropertyAnnotations(ORM\ClassMetadataInfo $metadata)
                                     throw ORM\MappingException::missingRequiredOption($property->getName(), 'OneToOne', sprintf('The property "%s" in class "%s" has a non standard data type and doesn\'t define the type of the relation. You have to use one of these annotations: @OneToOne, @OneToMany, @ManyToOne, @ManyToMany', $property->getName(), $className));
                                 }
                             } else {
-                                throw ORM\MappingException::propertyTypeIsRequired($className, $property->getName());
+                                throw new Exception(sprintf('Property Type is required for %s::%s', $className, $property->getName()), 1720281797);
                             }
                     }
                 }

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

@@ -14,14 +14,14 @@
 
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Event\OnFlushEventArgs;
+use Doctrine\ORM\Event\PrePersistEventArgs;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Persistence\Exception\ObjectValidationFailedException;
 use Neos\Flow\Reflection\ClassSchema;
 use Neos\Flow\Reflection\ReflectionService;
 use Neos\Flow\Validation\ValidatorResolver;
 use Neos\Utility\ObjectAccess;
 use Neos\Utility\TypeHandling;
-use Doctrine\ORM\Event\LifecycleEventArgs;
 
 /**
  * An onFlush listener for Flow's Doctrine PersistenceManager.
@@ -62,10 +62,10 @@ class ObjectValidationAndDeDuplicationListener
      * This removes all existing value objects in doctrines identity map. This is needed as doctrine handles their
      * identity based on the object and not based on the
      *
-     * @param LifecycleEventArgs $eventArgs
+     * @param PrePersistEventArgs $eventArgs
      * @return void
      */
-    public function prePersist(LifecycleEventArgs $eventArgs)
+    public function prePersist(PrePersistEventArgs $eventArgs)
     {
         $entityManager = $eventArgs->getObjectManager();
         $unitOfWork = $entityManager->getUnitOfWork();
@@ -95,7 +95,7 @@ public function prePersist(LifecycleEventArgs $eventArgs)
      */
     public function onFlush(OnFlushEventArgs $eventArgs)
     {
-        $this->entityManager = $eventArgs->getEntityManager();
+        $this->entityManager = $eventArgs->getObjectManager();
         $validatedInstancesContainer = new \SplObjectStorage();
 
         $this->deduplicateValueObjectInsertions();

Neos.Flow/Classes/Reflection/ReflectionService.php

@@ -1387,7 +1387,7 @@ protected function expandType(ClassReflection $class, string $type): string
         // and then we try to find "use" statements for the class.
         $className = $class->getName();
         if (!isset($this->useStatementsForClassCache[$className])) {
-            $this->useStatementsForClassCache[$className] = $this->getDoctrinePhpParser()->parseClass($class);
+            $this->useStatementsForClassCache[$className] = $this->getDoctrinePhpParser()->parseUseStatements($class);
         }
         $useStatementsForClass = $this->useStatementsForClassCache[$className];
 

Neos.Flow/Tests/Functional/Reflection/Fixtures/BrokenClassImplementingDoctrineProxy.php

@@ -33,6 +33,6 @@ class BrokenClassImplementingDoctrineProxy
  * result in an exception.
  *
  */
-abstract class FakePackageDomainModelBrokenClassProxy implements \Doctrine\ORM\Proxy\Proxy
+abstract class FakePackageDomainModelBrokenClassProxy implements \Doctrine\Persistence\Proxy
 {
 }