👌

Signed-off-by: Jérémy Marodon <[email protected]>
doctrine-extensions · Sep 16, 2024 · 1c3f3d2 · 1c3f3d2
1 parent 61faafd
commit 1c3f3d2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/src/Tree/Strategy/ORM/Nested.php b/src/Tree/Strategy/ORM/Nested.php
@@ -577,10 +577,10 @@ public function max(EntityManagerInterface $em, $class, $rootId = 0)
     /**
      * Shift tree left and right values by delta
      *
-     * @param string     $class
-     * @param int        $first
-     * @param int        $delta
-     * @param int|string $root
+     * @param string                 $class
+     * @param int                    $first
+     * @param int                    $delta
+     * @param int|string|object|null $root
      *
      * @phpstan-param class-string $class
      *
@@ -589,11 +589,11 @@ public function max(EntityManagerInterface $em, $class, $rootId = 0)
     public function shiftRL(EntityManagerInterface $em, $class, $first, $delta, $root = null)
     {
         $meta = $em->getClassMetadata($class);
+        $identifierField = $meta->getSingleIdentifierFieldName();
         $config = $this->listener->getConfiguration($em, $class);
 
-        if (isset($config['root']) && $root) {
-            $rootIdentifierField = $meta->getSingleIdentifierFieldName();
-            $rootId = AbstractWrapper::wrap($root, $em)->getIdentifier();
+        if (isset($config['root']) && is_object($root)) {
+            $root = AbstractWrapper::wrap($root, $em)->getIdentifier();
         }
 
         $sign = ($delta >= 0) ? ' + ' : ' - ';
@@ -605,7 +605,7 @@ public function shiftRL(EntityManagerInterface $em, $class, $first, $delta, $roo
         if (isset($config['root'])) {
             $qb->andWhere($qb->expr()->eq('node.'.$config['root'], ':rid'));
             $id = $meta->getIdentifier();
-            $qb->setParameter('rid', $rootId, $meta->getTypeOfField($rootIdentifierField));
+            $qb->setParameter('rid', $root, $meta->getTypeOfField($identifierField));
         }
         $qb->getQuery()->getSingleScalarResult();
 
@@ -615,7 +615,7 @@ public function shiftRL(EntityManagerInterface $em, $class, $first, $delta, $roo
             ->where($qb->expr()->gte('node.'.$config['right'], $first));
         if (isset($config['root'])) {
             $qb->andWhere($qb->expr()->eq('node.'.$config['root'], ':rid'));
-            $qb->setParameter('rid', $rootId, $meta->getTypeOfField($rootIdentifierField));
+            $qb->setParameter('rid', $root, $meta->getTypeOfField($identifierField));
         }
 
         $qb->getQuery()->getSingleScalarResult();

diff --git a/tests/Gedmo/Tree/Fixture/RootAssociationCategoryBinaryUuid.php b/tests/Gedmo/Tree/Fixture/RootAssociationCategoryBinaryUuid.php
@@ -53,7 +53,7 @@ class RootAssociationCategoryBinaryUuid
     private ?string $title = null;
 
     /**
-     * @var int|null
+     * @var int
      *
      * @Gedmo\TreeLeft
      *
@@ -64,7 +64,7 @@ class RootAssociationCategoryBinaryUuid
     private int $lft;
 
     /**
-     * @var int|null
+     * @var int
      *
      * @Gedmo\TreeRight
      *
@@ -100,10 +100,10 @@ class RootAssociationCategoryBinaryUuid
     #[ORM\ManyToOne(targetEntity: self::class)]
     #[ORM\JoinColumn(name: 'tree_root', referencedColumnName: 'id', onDelete: 'CASCADE')]
     #[Gedmo\TreeRoot]
-    private ?RootAssociationCategoryBinaryUuid$root;
+    private ?RootAssociationCategoryBinaryUuid $root = null;
 
     /**
-     * @var int|null
+     * @var int
      *
      * @Gedmo\TreeLevel
      *