Merge pull request #718 from snapshotpl/allow-persistence-v3

Allow persistence v3

Author: driehle

composer.json

@@ -57,7 +57,7 @@
         "doctrine/doctrine-module": "^5.1.0",
         "doctrine/event-manager": "^1.1.1",
         "doctrine/orm": "^2.11.1",
-        "doctrine/persistence": "^2.3.0",
+        "doctrine/persistence": "^2.3.0 || ^3.0.0",
         "laminas/laminas-eventmanager": "^3.4.0",
         "laminas/laminas-modulemanager": "^2.11.0",
         "laminas/laminas-mvc": "^3.3.2",

phpstan.neon

@@ -6,9 +6,6 @@ parameters:
     checkGenericClassInNonGenericObjectType: false
     treatPhpDocTypesAsCertain: false
     ignoreErrors:
-        -
-            message: '#Method .*EntityBasedFormBuilder::createForm\(\) .* iterable type .*FormInterface#'
-            path: src/Form/Annotation/EntityBasedFormBuilder.php
         -
             message: '#Offset class-string<object> on array\{\} in isset\(\) does not exist#'
             path: src/Yuml/MetadataGrapher.php

tests/Form/Annotation/DoctrineAnnotationListenerTest.php

@@ -59,8 +59,11 @@ public function testToOne(): void
 
     public function testToOneMergesOptions(): void
     {
-        $listener                              = $this->listener;
-        $event                                 = $this->getMetadataEvent();
+        $listener = $this->listener;
+        $event    = $this->getMetadataEvent();
+        /**
+         * @var ArrayObject<string, array<mixed>>
+         */
         $elementSpec                           = new ArrayObject();
         $elementSpec['spec']['options']['foo'] = 'bar';
 
@@ -119,8 +122,11 @@ public function testToMany(): void
 
     public function testToManyMergesOptions(): void
     {
-        $listener                              = $this->listener;
-        $event                                 = $this->getMetadataEvent();
+        $listener = $this->listener;
+        $event    = $this->getMetadataEvent();
+        /**
+         * @var ArrayObject<string, array<mixed>>
+         */
         $elementSpec                           = new ArrayObject();
         $elementSpec['spec']['options']['foo'] = 'bar';