Skip to content

BUGFIX: Apply rules also to occurrences in conditions #151

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

Merged
dlubitz merged 1 commit into from
Jan 6, 2026
Merged

BUGFIX: Apply rules also to occurrences in conditions #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 11 additions & 8 deletions src/ContentRepository90/Rules/ContentDimensionCombinatorGetAllAllowedCombinationsRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,6 @@ public function getNodeTypes(): array
*/
public function refactor(Node $node): ?array
{
if (!in_array('expr', $node->getSubNodeNames())) {
return null;
}

$traverser = new NodeTraverser();
$traverser->addVisitor(
$visitor = new class($this->nodeTypeResolver, $this->nodeFactory) extends NodeVisitorAbstract {
Expand Down Expand Up @@ -79,15 +75,22 @@ public function leaveNode(Node $node)
}
});

/** @var Node\Expr $newExpr */
$newExpr = $traverser->traverse([$node->expr])[0];
if (in_array('expr', $node->getSubNodeNames())) {
/** @var Node\Expr $newExpr */
$newExpr = $traverser->traverse([$node->expr])[0];
$node->expr = $newExpr;
} elseif (in_array('cond', $node->getSubNodeNames())) {
/** @var Node\Expr $newCond */
$newCond = $traverser->traverse([$node->cond])[0];
$node->cond = $newCond;
} else {
return null;
}

if (!$visitor->changed) {
return null;
}

$node->expr = $newExpr;

return [
self::assign('contentRepository', $this->this_contentRepositoryRegistry_get($this->contentRepositoryId_fromString('default'))),
self::assign('dimensionSpacePoints', $this->contentRepository_getVariationGraph_getDimensionSpacePoints()),
Expand Down
19 changes: 11 additions & 8 deletions src/ContentRepository90/Rules/ContextGetRootNodeRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,6 @@ public function getNodeTypes(): array
*/
public function refactor(Node $node): ?array
{
if (!in_array('expr', $node->getSubNodeNames())) {
return null;
}

$traverser = new NodeTraverser();
$traverser->addVisitor(
$visitor = new class($this->nodeTypeResolver, $this->nodeFactory) extends NodeVisitorAbstract {
Expand Down Expand Up @@ -84,15 +80,22 @@ public function leaveNode(Node $node)
}
});

/** @var Node\Expr $newExpr */
$newExpr = $traverser->traverse([$node->expr])[0];
if (in_array('expr', $node->getSubNodeNames())) {
/** @var Node\Expr $newExpr */
$newExpr = $traverser->traverse([$node->expr])[0];
$node->expr = $newExpr;
} elseif (in_array('cond', $node->getSubNodeNames())) {
/** @var Node\Expr $newCond */
$newCond = $traverser->traverse([$node->cond])[0];
$node->cond = $newCond;
} else {
return null;
}

if (!$visitor->changed) {
return null;
}

$node->expr = $newExpr;

return [
new Nop(), // Needed, to render the comment below
self::withTodoComment(
Expand Down
19 changes: 11 additions & 8 deletions src/ContentRepository90/Rules/NodeFindParentNodeRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,6 @@ public function getNodeTypes(): array
*/
public function refactor(Node $node): ?array
{
if (!in_array('expr', $node->getSubNodeNames())) {
return null;
}

$traverser = new NodeTraverser();
$traverser->addVisitor(
$visitor = new class($this->nodeTypeResolver, $this->nodeFactory) extends NodeVisitorAbstract {
Expand Down Expand Up @@ -78,15 +74,22 @@ public function leaveNode(Node $node)
}
});

/** @var Node\Expr $newExpr */
$newExpr = $traverser->traverse([$node->expr])[0];
if (in_array('expr', $node->getSubNodeNames())) {
/** @var Node\Expr $newExpr */
$newExpr = $traverser->traverse([$node->expr])[0];
$node->expr = $newExpr;
} elseif (in_array('cond', $node->getSubNodeNames())) {
/** @var Node\Expr $newCond */
$newCond = $traverser->traverse([$node->cond])[0];
$node->cond = $newCond;
} else {
return null;
}

if (!$visitor->changed) {
return null;
}

$node->expr = $newExpr;

return [
self::assign('subgraph', $this->this_contentRepositoryRegistry_subgraphForNode($visitor->nodeVar)),
$node
Expand Down
19 changes: 11 additions & 8 deletions src/ContentRepository90/Rules/NodeGetChildNodesRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,6 @@ public function getNodeTypes(): array
*/
public function refactor(Node $node): ?array
{
if (!in_array('expr', $node->getSubNodeNames())) {
return null;
}

$traverser = new NodeTraverser();
$traverser->addVisitor(
$visitor = new class($this->nodeTypeResolver, $this->nodeFactory) extends NodeVisitorAbstract {
Expand Down Expand Up @@ -104,15 +100,22 @@ public function leaveNode(Node $node)
}
});

/** @var Node\Expr $newExpr */
$newExpr = $traverser->traverse([$node->expr])[0];
if (in_array('expr', $node->getSubNodeNames())) {
/** @var Node\Expr $newExpr */
$newExpr = $traverser->traverse([$node->expr])[0];
$node->expr = $newExpr;
} elseif (in_array('cond', $node->getSubNodeNames())) {
/** @var Node\Expr $newCond */
$newCond = $traverser->traverse([$node->cond])[0];
$node->cond = $newCond;
} else {
return null;
}

if (!$visitor->changed) {
return null;
}

$node->expr = $newExpr;

return [
self::assign(
'subgraph',
Expand Down
18 changes: 11 additions & 7 deletions src/ContentRepository90/Rules/NodeGetContextGetWorkspaceRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,6 @@ public function getNodeTypes(): array
*/
public function refactor(Node $node): ?array
{
if (!in_array('expr', $node->getSubNodeNames())) {
return null;
}

$traverser = new NodeTraverser();
$traverser->addVisitor($visitor = new class($this->nodeTypeResolver, $this->nodeFactory) extends NodeVisitorAbstract {
use AllTraits;
Expand Down Expand Up @@ -84,11 +80,19 @@ public function leaveNode(Node $node)
}
});

$newExpr = $traverser->traverse([$node->expr])[0];

if ($visitor->changed) {
if (in_array('expr', $node->getSubNodeNames())) {
/** @var Node\Expr $newExpr */
$newExpr = $traverser->traverse([$node->expr])[0];
$node->expr = $newExpr;
} elseif (in_array('cond', $node->getSubNodeNames())) {
/** @var Node\Expr $newCond */
$newCond = $traverser->traverse([$node->cond])[0];
$node->cond = $newCond;
} else {
return null;
}

if ($visitor->changed) {
$contentRepository = self::assign(
'contentRepository',
$this->this_contentRepositoryRegistry_get(
Expand Down
19 changes: 11 additions & 8 deletions src/ContentRepository90/Rules/NodeGetDepthRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,6 @@ public function getNodeTypes(): array
*/
public function refactor(Node $node): ?array
{
if (!in_array('expr', $node->getSubNodeNames())) {
return null;
}

$traverser = new NodeTraverser();
$traverser->addVisitor(
$visitor = new class($this->nodeTypeResolver, $this->nodeFactory) extends NodeVisitorAbstract {
Expand Down Expand Up @@ -78,15 +74,22 @@ public function leaveNode(Node $node)
}
});

/** @var Node\Expr $newExpr */
$newExpr = $traverser->traverse([$node->expr])[0];
if (in_array('expr', $node->getSubNodeNames())) {
/** @var Node\Expr $newExpr */
$newExpr = $traverser->traverse([$node->expr])[0];
$node->expr = $newExpr;
} elseif (in_array('cond', $node->getSubNodeNames())) {
/** @var Node\Expr $newCond */
$newCond = $traverser->traverse([$node->cond])[0];
$node->cond = $newCond;
} else {
return null;
}

if (!$visitor->changed) {
return null;
}

$node->expr = $newExpr;

return [
self::assign('subgraph', $this->this_contentRepositoryRegistry_subgraphForNode($visitor->nodeVar)),
$node
Expand Down
17 changes: 11 additions & 6 deletions src/ContentRepository90/Rules/NodeGetDimensionsRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,6 @@ public function getNodeTypes(): array
*/
public function refactor(Node $node): ?Node
{
if (!in_array('expr', $node->getSubNodeNames())) {
return null;
}

$traverser = new NodeTraverser();
$traverser->addVisitor($visitor = new class($this->nodeTypeResolver, $this->nodeFactory) extends NodeVisitorAbstract {
use AllTraits;
Expand Down Expand Up @@ -78,10 +74,19 @@ public function leaveNode(Node $node)
}
});

$newExpr = $traverser->traverse([$node->expr])[0];
if (in_array('expr', $node->getSubNodeNames())) {
/** @var Node\Expr $newExpr */
$newExpr = $traverser->traverse([$node->expr])[0];
$node->expr = $newExpr;
} elseif (in_array('cond', $node->getSubNodeNames())) {
/** @var Node\Expr $newCond */
$newCond = $traverser->traverse([$node->cond])[0];
$node->cond = $newCond;
} else {
return null;
}

if ($visitor->changed) {
$node->expr = $newExpr;
self::withTodoComment('Try to remove the toLegacyDimensionArray() call and make your codebase more typesafe.', $node);
return $node;
}
Expand Down
19 changes: 11 additions & 8 deletions src/ContentRepository90/Rules/NodeGetHiddenBeforeAfterDateTimeRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,6 @@ public function getNodeTypes(): array
*/
public function refactor(Node $node): ?Node
{
if (!in_array('expr', $node->getSubNodeNames())) {
return null;
}

$traverser = new NodeTraverser();
$traverser->addVisitor(
$visitor = new class($this->nodeTypeResolver, $this->nodeFactory) extends NodeVisitorAbstract {
Expand Down Expand Up @@ -89,15 +85,22 @@ public function leaveNode(Node $node)
}
});

/** @var Node\Expr $newExpr */
$newExpr = $traverser->traverse([$node->expr])[0];
if (in_array('expr', $node->getSubNodeNames())) {
/** @var Node\Expr $newExpr */
$newExpr = $traverser->traverse([$node->expr])[0];
$node->expr = $newExpr;
} elseif (in_array('cond', $node->getSubNodeNames())) {
/** @var Node\Expr $newCond */
$newCond = $traverser->traverse([$node->cond])[0];
$node->cond = $newCond;
} else {
return null;
}

if (!$visitor->changed) {
return null;
}

$node->expr = $newExpr;

$comment = 'Timed publishing has been conceptually changed and has been extracted into a dedicated package. Please check https://github.com/neos/timeable-node-visibility for further details.';
if ($visitor->isGetter === false) {
$comment .= PHP_EOL . '// Use the "SetNodeProperties" command to change property values for "enableAfterDateTime" or "disableAfterDateTime".';
Expand Down
19 changes: 11 additions & 8 deletions src/ContentRepository90/Rules/NodeGetIdentifierRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,6 @@ public function getNodeTypes(): array
*/
public function refactor(Node $node): ?Node
{
if (!in_array('expr', $node->getSubNodeNames())) {
return null;
}

$traverser = new NodeTraverser();
$traverser->addVisitor(
$visitor = new class($this->nodeTypeResolver, $this->nodeFactory) extends NodeVisitorAbstract {
Expand Down Expand Up @@ -79,15 +75,22 @@ public function leaveNode(Node $node)
}
});

/** @var Node\Expr $newExpr */
$newExpr = $traverser->traverse([$node->expr])[0];
if (in_array('expr', $node->getSubNodeNames())) {
/** @var Node\Expr $newExpr */
$newExpr = $traverser->traverse([$node->expr])[0];
$node->expr = $newExpr;
} elseif (in_array('cond', $node->getSubNodeNames())) {
/** @var Node\Expr $newCond */
$newCond = $traverser->traverse([$node->cond])[0];
$node->cond = $newCond;
} else {
return null;
}

if (!$visitor->changed) {
return null;
}

$node->expr = $newExpr;

return
self::withTodoComment(
'Check if you could change your code to work with the NodeAggregateId value object instead.',
Expand Down
18 changes: 11 additions & 7 deletions src/ContentRepository90/Rules/NodeGetNodeTypeGetNameRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,6 @@ public function getNodeTypes(): array
*/
public function refactor(Node $node): ?Node
{
if (!in_array('expr', $node->getSubNodeNames())) {
return null;
}

$traverser = new NodeTraverser();
$traverser->addVisitor(
$visitor = new class($this->nodeTypeResolver, $this->nodeFactory) extends NodeVisitorAbstract {
Expand Down Expand Up @@ -87,14 +83,22 @@ public function leaveNode(Node $node)
}
);

/** @var Node\Expr $newExpr */
$newExpr = $traverser->traverse([$node->expr])[0];
if (in_array('expr', $node->getSubNodeNames())) {
/** @var Node\Expr $newExpr */
$newExpr = $traverser->traverse([$node->expr])[0];
$node->expr = $newExpr;
} elseif (in_array('cond', $node->getSubNodeNames())) {
/** @var Node\Expr $newCond */
$newCond = $traverser->traverse([$node->cond])[0];
$node->cond = $newCond;
} else {
return null;
}

if (!$visitor->changed) {
return null;
}

$node->expr = $newExpr;
return $node;
}
}
Loading