Skip to content
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

BUGFIX: Make Subtree immutable and remove Subtrees #4536

Merged
merged 4 commits into from
Oct 19, 2023
Merged

BUGFIX: Make Subtree immutable and remove Subtrees #4536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
73a4768
BUGFIX: Make `Subtree` immutable and remove `Subtrees`
bwaidelich Sep 19, 2023
4161b7f
Tweaks and fixes
bwaidelich Sep 19, 2023
84480db
TASK: Subtree fix type hint
mhsdesign Oct 17, 2023
9a3726a
Merge remote-tracking branch 'origin/9.0' into bugfix/4535-cleanup-su…
mhsdesign Oct 17, 2023
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
28 changes: 15 additions & 13 deletions Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/ContentSubgraph.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@
use Neos\ContentRepository\Core\Projection\ContentGraph\References;
use Neos\ContentRepository\Core\Projection\ContentGraph\SearchTerm;
use Neos\ContentRepository\Core\Projection\ContentGraph\Subtree;
use Neos\ContentRepository\Core\Projection\ContentGraph\Subtrees;
use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints;
use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateClassification;
use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId;
Expand Down Expand Up @@ -304,19 +303,22 @@ public function findSubtree(NodeAggregateId $entryNodeAggregateId, FindSubtreeFi
->setParameter('entryNodeAggregateId', $entryNodeAggregateId->value);

$result = $this->fetchCteResults($queryBuilderInitial, $queryBuilderRecursive, $queryBuilderCte, 'tree');
$subtreesByNodeId = [];
$rootSubtrees = $subtreesByNodeId['ROOT'] = Subtrees::createEmpty();
foreach ($result as $nodeData) {
$node = $this->nodeFactory->mapNodeRowToNode(
$nodeData,
$this->dimensionSpacePoint,
$this->visibilityConstraints
);
$subtree = new Subtree((int)$nodeData['level'], $node);
$subtreesByNodeId[$nodeData['parentNodeAggregateId']]->add($subtree);
$subtreesByNodeId[$nodeData['nodeaggregateid']] = $subtree;
/** @var array<string, Subtree[]> $subtreesByParentNodeId */
$subtreesByParentNodeId = [];
foreach (array_reverse($result) as $nodeData) {
$nodeAggregateId = $nodeData['nodeaggregateid'];
$parentNodeAggregateId = $nodeData['parentNodeAggregateId'];
$node = $this->nodeFactory->mapNodeRowToNode($nodeData, $this->dimensionSpacePoint, $this->visibilityConstraints);
$subtree = new Subtree((int)$nodeData['level'], $node, array_key_exists($nodeAggregateId, $subtreesByParentNodeId) ? array_reverse($subtreesByParentNodeId[$nodeAggregateId]) : []);
if ($subtree->level === 0) {
return $subtree;
}
if (!array_key_exists($parentNodeAggregateId, $subtreesByParentNodeId)) {
$subtreesByParentNodeId[$parentNodeAggregateId] = [];
}
$subtreesByParentNodeId[$parentNodeAggregateId][] = $subtree;
}
return $rootSubtrees->first();
return null;
}

public function findAncestorNodes(NodeAggregateId $entryNodeAggregateId, FindAncestorNodesFilter $filter): Nodes
Expand Down
30 changes: 15 additions & 15 deletions Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/NodeFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
use Neos\ContentRepository\Core\Projection\ContentGraph\Reference;
use Neos\ContentRepository\Core\Projection\ContentGraph\References;
use Neos\ContentRepository\Core\Projection\ContentGraph\Subtree;
use Neos\ContentRepository\Core\Projection\ContentGraph\Subtrees;
use Neos\ContentRepository\Core\Projection\ContentGraph\Timestamps;
use Neos\ContentRepository\Core\SharedModel\Exception\NodeTypeNotFoundException;
use Neos\ContentRepository\Core\SharedModel\Node\ReferenceName;
Expand Down Expand Up @@ -161,21 +160,22 @@ public function mapNodeRowsToSubtree(
array $nodeRows,
VisibilityConstraints $visibilityConstraints
): ?Subtree {
$subtreesByParentNodeAggregateId = [];
foreach ($nodeRows as $nodeRow) {
$node = $this->mapNodeRowToNode(
$nodeRow,
$visibilityConstraints
);

$subtreesByParentNodeAggregateId[$nodeRow['parentnodeaggregateid']][] = new Subtree(
(int)$nodeRow['level'],
$node,
$subtreesByParentNodeAggregateId[$nodeRow['nodeaggregateid']] ?? []
);
/** @var array<string, Subtree[]> $subtreesByParentNodeId */
$subtreesByParentNodeId = [];
foreach (array_reverse($nodeRows) as $nodeRow) {
$nodeAggregateId = $nodeRow['nodeaggregateid'];
$parentNodeAggregateId = $nodeRow['parentnodeaggregateid'];
$node = $this->mapNodeRowToNode($nodeRow, $visibilityConstraints);
$subtree = new Subtree((int)$nodeRow['level'], $node, array_key_exists($nodeAggregateId, $subtreesByParentNodeId) ? array_reverse($subtreesByParentNodeId[$nodeAggregateId]) : []);
if ($subtree->level === 0) {
return $subtree;
}
if (!array_key_exists($parentNodeAggregateId, $subtreesByParentNodeId)) {
$subtreesByParentNodeId[$parentNodeAggregateId] = [];
}
$subtreesByParentNodeId[$parentNodeAggregateId][] = $subtree;
}

return Subtrees::fromArray($subtreesByParentNodeAggregateId['ROOT'])->first();
return null;
}

/**
Expand Down
12 changes: 2 additions & 10 deletions Neos.ContentRepository.Core/Classes/Projection/ContentGraph/Subtree.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,12 @@
final class Subtree
{
/**
* @param Subtree[] $children
* @param array<int,Subtree> $children
*/
public function __construct(
public readonly int $level,
public readonly Node $node,
public array $children = []
public readonly array $children
) {
}

/**
* @internal
*/
public function add(Subtree $subtree): void
{
$this->children[] = $subtree;
}
}
84 changes: 0 additions & 84 deletions Neos.ContentRepository.Core/Classes/Projection/ContentGraph/Subtrees.php
View file
Open in desktop

This file was deleted.

Loading