Allow multiple order critieria in NestedTreeRepository::reorder and NestedTreeRepository:reorderAll

Author: Christoph Weygand

src/Tree/Entity/Repository/NestedTreeRepository.php

@@ -801,11 +801,11 @@ public function removeFromTree($node)
      * Reorders $node's child nodes,
      * according to the $sortByField and $direction specified
      *
-     * @param object|null $node        node from which to start reordering the tree; null will reorder everything
-     * @param string      $sortByField field name to sort by
-     * @param string      $direction   sort direction : "ASC" or "DESC"
-     * @param bool        $verify      true to verify tree first
-     * @param bool        $recursive   true to also reorder further descendants, not just the direct children
+     * @param object|null          $node        node from which to start reordering the tree; null will reorder everything
+     * @param string|string[]|null $sortByField Field name or array of fields names to sort by
+     * @param string|string[]      $direction   Sort order ('asc'|'desc'|'ASC'|'DESC'). If $sortByField is an array, this may also be an array with matching number of elements
+     * @param bool                 $verify      true to verify tree first
+     * @param bool                 $recursive   true to also reorder further descendants, not just the direct children
      *
      * @return void
      */
@@ -836,9 +836,9 @@ public function reorder($node, $sortByField = null, $direction = 'ASC', $verify
     /**
      * Reorders all nodes in the tree according to the $sortByField and $direction specified.
      *
-     * @param string $sortByField field name to sort by
-     * @param string $direction   sort direction : "ASC" or "DESC"
-     * @param bool   $verify      true to verify tree first
+     * @param string|string[]|null $sortByField Field name or array of fields names to sort by
+     * @param string|string[]      $direction   Sort order ('asc'|'desc'|'ASC'|'DESC'). If $sortByField is an array, this may also be an array with matching number of elements
+     * @param bool                 $verify      true to verify tree first
      *
      * @return void
      */

tests/Gedmo/Tree/NestedTreeRootRepositoryTest.php

@@ -420,6 +420,31 @@ public function testShouldHandleAdvancedRepositoryFunctions(): void
         static::assertSame(9, $node->getLeft());
         static::assertSame(10, $node->getRight());
 
+        // reorder (multiple order critieria)
+
+        $node = $repo->findOneBy(['title' => 'Vegitables']);
+        $repo->reorder($node, ['level', 'title'], ['ASC', 'DESC'], false, false);
+
+        $node = $repo->findOneBy(['title' => 'Cabbages']);
+
+        static::assertSame(9, $node->getLeft());
+        static::assertSame(10, $node->getRight());
+
+        $node = $repo->findOneBy(['title' => 'Carrots']);
+
+        static::assertSame(7, $node->getLeft());
+        static::assertSame(8, $node->getRight());
+
+        $node = $repo->findOneBy(['title' => 'Onions']);
+
+        static::assertSame(5, $node->getLeft());
+        static::assertSame(6, $node->getRight());
+
+        $node = $repo->findOneBy(['title' => 'Potatoes']);
+
+        static::assertSame(3, $node->getLeft());
+        static::assertSame(4, $node->getRight());
+
         // reorder
 
         $node = $repo->findOneBy(['title' => 'Food']);