Add a compat trait to address B/C issues with EntityRepository

src/Tool/ORM/Repository/EntityRepositoryCompat.php

@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * This file is part of the Doctrine Behavioral Extensions package.
+ * (c) Gediminas Morkevicius <[email protected]> http://www.gediminasm.org
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Gedmo\Tool\ORM\Repository;
+
+use Doctrine\ORM\EntityRepository;
+
+if ((new \ReflectionClass(EntityRepository::class))->getMethod('__call')->hasReturnType()) {
+    // ORM 3.x
+    /**
+     * Helper trait to address compatibility issues between ORM 2.x and 3.x.
+     *
+     * @mixin EntityRepository
+     *
+     * @internal
+     */
+    trait EntityRepositoryCompat
+    {
+        public function __call(string $method, array $args): mixed
+        {
+            return $this->doCallWithCompat($method, $args);
+        }
+
+        abstract protected function doCallWithCompat($method, $args);
+    }
+} else {
+    // ORM 2.x
+    /**
+     * Helper trait to address compatibility issues between ORM 2.x and 3.x.
+     *
+     * @mixin EntityRepository
+     *
+     * @internal
+     */
+    trait EntityRepositoryCompat
+    {
+        public function __call($method, $args)
+        {
+            return $this->doCallWithCompat($method, $args);
+        }
+
+        abstract protected function doCallWithCompat($method, $args);
+    }
+}

src/Tree/Entity/Repository/NestedTreeRepository.php

@@ -16,6 +16,7 @@
 use Gedmo\Exception\InvalidArgumentException;
 use Gedmo\Exception\RuntimeException;
 use Gedmo\Exception\UnexpectedValueException;
+use Gedmo\Tool\ORM\Repository\EntityRepositoryCompat;
 use Gedmo\Tool\Wrapper\EntityWrapper;
 use Gedmo\Tree\Node;
 use Gedmo\Tree\Strategy;
@@ -43,6 +44,8 @@
  */
 class NestedTreeRepository extends AbstractTreeRepository
 {
+    use EntityRepositoryCompat;
+
     /**
      * Allows the following 'virtual' methods:
      * - persistAsFirstChild($node)
@@ -64,7 +67,7 @@ class NestedTreeRepository extends AbstractTreeRepository
      *
      * @return mixed TreeNestedRepository if persistAs* is called
      */
-    public function __call($method, $args)
+    protected function doCallWithCompat($method, $args)
     {
         if ('persistAs' === substr($method, 0, 9)) {
             if (!isset($args[0])) {