Merge 4.x into 5.x

Author: SonataCI

composer.json

@@ -44,7 +44,7 @@
         "dama/doctrine-test-bundle": "^8.0.1",
         "doctrine/doctrine-bundle": "^2.7",
         "doctrine/mongodb-odm": "^2.4",
-        "doctrine/orm": "^2.14",
+        "doctrine/orm": "^2.14 || ^3.0",
         "friendsofphp/php-cs-fixer": "^3.4",
         "knplabs/knp-menu": "^3.0",
         "knplabs/knp-menu-bundle": "^3.0",

src/DependencyInjection/SonataClassificationExtension.php

@@ -13,6 +13,8 @@
 
 namespace Sonata\ClassificationBundle\DependencyInjection;
 
+use Doctrine\ORM\EntityManager;
+use Sonata\ClassificationBundle\Entity\BaseCategory;
 use Sonata\Doctrine\Mapper\Builder\OptionsBuilder;
 use Sonata\Doctrine\Mapper\DoctrineCollector;
 use Symfony\Component\Config\Definition\Processor;
@@ -133,11 +135,16 @@ private function registerSonataDoctrineMapping(array $config): void
                 ->addOrder('position', 'ASC')
         );
 
+        $categoryCascade = ['persist', 'refresh', 'merge', 'detach'];
+        $categoryIsEntity = \in_array(BaseCategory::class, class_parents($config['class']['category']), true);
+        if ($categoryIsEntity && class_exists(EntityManager::class) && !method_exists(EntityManager::class, 'merge')) { // @phpstan-ignore-line
+            unset($categoryCascade[array_search('merge', $categoryCascade, true)]);
+        }
         $collector->addAssociation(
             $config['class']['category'],
             'mapManyToOne',
             OptionsBuilder::createManyToOne('parent', $config['class']['category'])
-                ->cascade(['persist', 'refresh', 'merge', 'detach'])
+                ->cascade(array_values($categoryCascade))
                 ->inversedBy('children')
                 ->addJoin([
                     'name' => 'parent_id',