Skip to content

[Tree] Nested set treeRootNode option - fix tricky and improve performance #3045

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wilfi00 wants to merge 2 commits into
base: main
Choose a base branch
from
+13 −24
Open

[Tree] Nested set treeRootNode option - fix tricky and improve performance #3045

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87c702f
Nested set treeRootNode option - fix tricky and improve performance
wilfi00 Mar 26, 2026
3c6c35d
Update verify method to do the same
wilfi00 Mar 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 13 additions & 24 deletions src/Tree/Entity/Repository/NestedTreeRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -879,12 +879,10 @@ public function verify(/* array $options = [] */) // @phpstan-ignore-line
$meta = $this->getClassMetadata();
$config = $this->listener->getConfiguration($this->getEntityManager(), $meta->getName());
if (isset($config['root'])) {
$trees = $this->getRootNodes();
$trees = null !== $options['treeRootNode']
? [$options['treeRootNode']] // if a root node is specified, verify only it
: $this->getRootNodes();
foreach ($trees as $tree) {
// if a root node is specified, verify only it
if (null !== $options['treeRootNode'] && $options['treeRootNode'] !== $tree) {
continue;
}
$this->verifyTree($errors, $tree);
}
} else {
Expand Down Expand Up @@ -1034,29 +1032,20 @@ public function recover(/* array $options = [] */) // @phpstan-ignore-line

// if it's a forest
if (isset($config['root'])) {
foreach ($this->getRootNodes($options['sortByField'], $options['sortDirection']) as $root) {
// if a root node is specified, recover only it
if (null !== $options['treeRootNode'] && $options['treeRootNode'] !== $root) {
continue;
}

$count = 1; // reset on every root node
$lvl = $config['level_base'] ?? 0;
$doRecover($root, $count, $lvl);

if ($options['flush']) {
$em->flush();
}
}
$roots = null !== $options['treeRootNode']
? [$options['treeRootNode']]
: $this->getRootNodes($options['sortByField'], $options['sortDirection']);
} else {
$roots = $this->getChildren(null, true, $options['sortByField'], $options['sortDirection']);
}

foreach ($roots as $root) {
$count = 1;
$lvl = $config['level_base'] ?? 0;
foreach ($this->getChildren(null, true, $options['sortByField'], $options['sortDirection']) as $root) {
$doRecover($root, $count, $lvl);
$doRecover($root, $count, $lvl);

Comment on lines +1042 to 1046
if ($options['flush']) {
$em->flush();
}
if ($options['flush']) {
$em->flush();
}
}
}
Expand Down