Add support for doctrine/orm 3 (#415)

franmomu · web-flow · commit c808a0c85c38 · 2023-11-19T13:48:54.000+01:00
diff --git a/Tests/IntegrationTest.php b/Tests/IntegrationTest.php
@@ -27,6 +27,7 @@
 
 use function array_map;
 use function get_class;
+use function method_exists;
 
 class IntegrationTest extends TestCase
 {
@@ -455,8 +456,14 @@ public function testRunCommandWithPurgeMode(): void
     }
 }
 
-interface ForwardCompatibleEntityManager extends EntityManagerInterface
-{
-    /** @return mixed */
-    public function wrapInTransaction(callable $func);
+if (method_exists(EntityManagerInterface::class, 'wrapInTransaction')) {
+    interface ForwardCompatibleEntityManager extends EntityManagerInterface
+    {
+    }
+} else {
+    interface ForwardCompatibleEntityManager extends EntityManagerInterface
+    {
+        /** @return mixed */
+        public function wrapInTransaction(callable $func);
+    }
 }
diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
         "php": "^7.4 || ^8.0",
         "doctrine/data-fixtures": "^1.3",
         "doctrine/doctrine-bundle": "^2.2",
-        "doctrine/orm": "^2.14.0",
+        "doctrine/orm": "^2.14.0 || ^3.0",
         "doctrine/persistence": "^2.4|^3.0",
         "symfony/config": "^5.4|^6.0|^7.0",
         "symfony/console": "^5.4|^6.0|^7.0",
diff --git a/psalm.xml b/psalm.xml
@@ -28,6 +28,7 @@
         <DuplicateClass>
             <errorLevel type="suppress">
                 <file name="Command/CommandCompatibility.php"/>
+                <file name="Tests/IntegrationTest.php"/>
             </errorLevel>
         </DuplicateClass>
     </issueHandlers>

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@`
`27`	`27`
`28`	`28`	`use function array_map;`
`29`	`29`	`use function get_class;`
	`30`	`+use function method_exists;`
`30`	`31`
`31`	`32`	`class IntegrationTest extends TestCase`
`32`	`33`	`{`
`@@ -455,8 +456,14 @@ public function testRunCommandWithPurgeMode(): void`
`455`	`456`	`}`
`456`	`457`	`}`
`457`	`458`
`458`		`-interface ForwardCompatibleEntityManager extends EntityManagerInterface`
`459`		`-{`
`460`		`- /** @return mixed */`
`461`		`- public function wrapInTransaction(callable $func);`
	`459`	`+if (method_exists(EntityManagerInterface::class, 'wrapInTransaction')) {`
	`460`	`+ interface ForwardCompatibleEntityManager extends EntityManagerInterface`
	`461`	`+ {`
	`462`	`+ }`
	`463`	`+} else {`
	`464`	`+ interface ForwardCompatibleEntityManager extends EntityManagerInterface`
	`465`	`+ {`
	`466`	`+ /** @return mixed */`
	`467`	`+ public function wrapInTransaction(callable $func);`
	`468`	`+ }`
`462`	`469`	`}`