Skip to content

Run cheap guards before expensive analysis calls #519

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
TomasVotruba merged 1 commit into from
Aug 29, 2026
Merged

Run cheap guards before expensive analysis calls #519

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
12 changes: 6 additions & 6 deletions rules/Dbal211/Rector/MethodCall/ExtractArrayArgOnQueryBuilderSelectRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,21 +67,21 @@ function query(\Doctrine\DBAL\Query\QueryBuilder $queryBuilder)
*/
public function refactor(Node $node): ?MethodCall
{
$varType = $this->nodeTypeResolver->getType($node->var);

if (! $varType instanceof ObjectType) {
if (! $this->isNames($node->name, ['select', 'addSelect', 'groupBy', 'addGroupBy'])) {
return null;
}

if (! $varType->isInstanceOf(DoctrineClass::DBAL_QUERY_BUILDER)->yes()) {
if ($node->isFirstClassCallable()) {
return null;
}

if (! $this->isNames($node->name, ['select', 'addSelect', 'groupBy', 'addGroupBy'])) {
$varType = $this->nodeTypeResolver->getType($node->var);

if (! $varType instanceof ObjectType) {
return null;
}

if ($node->isFirstClassCallable()) {
if (! $varType->isInstanceOf(DoctrineClass::DBAL_QUERY_BUILDER)->yes()) {
return null;
}

Expand Down
4 changes: 2 additions & 2 deletions rules/Dbal36/Rector/MethodCall/MigrateQueryBuilderResetQueryPartRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,11 @@ public function resetQueryPart(\Doctrine\DBAL\Query\QueryBuilder $queryBuilder)
*/
public function refactor(Node $node): ?Node
{
if (! $this->isObjectType($node->var, new ObjectType(DoctrineClass::DBAL_QUERY_BUILDER))) {
if (! $this->isName($node->name, 'resetQueryPart')) {
return null;
}

if (! $this->isName($node->name, 'resetQueryPart')) {
if (! $this->isObjectType($node->var, new ObjectType(DoctrineClass::DBAL_QUERY_BUILDER))) {
return null;
}

Expand Down
8 changes: 4 additions & 4 deletions rules/Dbal40/Rector/MethodCall/ChangeCompositeExpressionAddMultipleWithWithRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,17 +81,17 @@ public function refactor(Node $node): ?Node
return null;
}

if ($node->isFirstClassCallable()) {
return null;
}

if (! $this->nodeTypeResolver->isObjectType(
$node->var,
new ObjectType(DoctrineClass::COMPOSITE_EXPRESSION)
)) {
return null;
}

if ($node->isFirstClassCallable()) {
return null;
}

$node->name = new Identifier('with');

$firstArg = $node->getArgs()[0];
Expand Down
10 changes: 5 additions & 5 deletions rules/Orm28/Rector/MethodCall/IterateToToIterableRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,11 @@ public function refactor(Node $node): MethodCall|ClassMethod|Foreach_|null
return $this->refactorForeach($node);
}

// Change iterate() method calls to toIterable()
if (! $this->isName($node->name, 'iterate')) {
return null;
}

$varType = $this->nodeTypeResolver->getType($node->var);

if (! $varType instanceof ObjectType) {
Expand All @@ -106,11 +111,6 @@ public function refactor(Node $node): MethodCall|ClassMethod|Foreach_|null
return null;
}

// Change iterate() method calls to toIterable()
if (! $this->isName($node->name, 'iterate')) {
return null;
}

$node->name = new Identifier('toIterable');

return $node;
Expand Down
12 changes: 6 additions & 6 deletions rules/Orm30/Rector/MethodCall/SetParametersArrayToCollectionRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,21 +175,21 @@ private function getAffectedVariables(ClassMethod $classMethod): iterable

private function refactorMethodCall(MethodCall $methodCall): Node|null
{
$varType = $this->nodeTypeResolver->getType($methodCall->var);

if (! $varType instanceof ObjectType) {
if ($methodCall->isFirstClassCallable()) {
return null;
}

if (! $varType->isInstanceOf('Doctrine\\ORM\\QueryBuilder')->yes()) {
if (! $this->isNames($methodCall->name, ['setParameters'])) {
return null;
}

if ($methodCall->isFirstClassCallable()) {
$varType = $this->nodeTypeResolver->getType($methodCall->var);

if (! $varType instanceof ObjectType) {
return null;
}

if (! $this->isNames($methodCall->name, ['setParameters'])) {
if (! $varType->isInstanceOf('Doctrine\\ORM\\QueryBuilder')->yes()) {
return null;
}

Expand Down
Loading