Skip to content

QueryBuilderDqlRule: mention DQL for BranchingQueryBuilderType #568

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
merged 3 commits into from
May 30, 2024
Merged

QueryBuilderDqlRule: mention DQL for BranchingQueryBuilderType #568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d983ea2
DqlRule: mention DQL for BranchingQueryBuilderType
janedbal May 21, 2024
a73e84b
Move it to QueryBuilderDqlRule
janedbal May 21, 2024
3373423
Fix tests
janedbal May 21, 2024
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
11 changes: 8 additions & 3 deletions src/Rules/Doctrine/ORM/QueryBuilderDqlRule.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,15 @@ public function processNode(Node $node, Scope $scope): array
$message .= sprintf("\nDQL: %s", $dql->getValue());
}

$builder = RuleErrorBuilder::message($message)
->identifier('doctrine.dql');

if (count($dqls) > 1) {
$builder->addTip('Detected from DQL branch: ' . $dql->getValue());
}

// Use message as index to prevent duplicate
$messages[$message] = RuleErrorBuilder::message($message)
->identifier('doctrine.dql')
->build();
$messages[$message] = $builder->build();
} catch (AssertionError $e) {
continue;
}
Expand Down
4 changes: 4 additions & 0 deletions tests/Rules/Doctrine/ORM/QueryBuilderDqlRuleSlowTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,18 +112,22 @@ public function testRuleBranches(): void
[
'QueryBuilder: [Semantical Error] line 0, col 58 near \'p.id = 1\': Error: \'p\' is not defined.',
59,
'Detected from DQL branch: SELECT e FROM PHPStan\Rules\Doctrine\ORM\MyEntity e WHERE p.id = 1',
],
[
'QueryBuilder: [Semantical Error] line 0, col 93 near \'t.id = 1\': Error: \'t\' is not defined.',
90,
'Detected from DQL branch: SELECT e FROM PHPStan\Rules\Doctrine\ORM\MyEntity e INNER JOIN e.parent p WHERE p.id = 1 AND t.id = 1',
],
[
'QueryBuilder: [Semantical Error] line 0, col 95 near \'foo = 1\': Error: Class PHPStan\Rules\Doctrine\ORM\MyEntity has no field or association named foo',
107,
'Detected from DQL branch: SELECT e FROM PHPStan\Rules\Doctrine\ORM\MyEntity e INNER JOIN e.parent p WHERE p.id = 1 AND e.foo = 1',
],
[
'QueryBuilder: [Semantical Error] line 0, col 93 near \'t.id = 1\': Error: \'t\' is not defined.',
107,
'Detected from DQL branch: SELECT e FROM PHPStan\Rules\Doctrine\ORM\MyEntity e INNER JOIN e.parent p WHERE p.id = 1 AND t.id = 1',
],
];
$this->analyse([__DIR__ . '/data/query-builder-branches-dql.php'], $errors);
Expand Down
5 changes: 5 additions & 0 deletions tests/Rules/Doctrine/ORM/QueryBuilderDqlRuleTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,18 +113,22 @@ public function testRuleBranches(): void
[
'QueryBuilder: [Semantical Error] line 0, col 58 near \'p.id = 1\': Error: \'p\' is not defined.',
59,
'Detected from DQL branch: SELECT e FROM PHPStan\Rules\Doctrine\ORM\MyEntity e WHERE p.id = 1',
],
[
'QueryBuilder: [Semantical Error] line 0, col 93 near \'t.id = 1\': Error: \'t\' is not defined.',
90,
'Detected from DQL branch: SELECT e FROM PHPStan\Rules\Doctrine\ORM\MyEntity e INNER JOIN e.parent p WHERE p.id = 1 AND t.id = 1',
],
[
'QueryBuilder: [Semantical Error] line 0, col 95 near \'foo = 1\': Error: Class PHPStan\Rules\Doctrine\ORM\MyEntity has no field or association named foo',
107,
'Detected from DQL branch: SELECT e FROM PHPStan\Rules\Doctrine\ORM\MyEntity e INNER JOIN e.parent p WHERE p.id = 1 AND e.foo = 1',
],
[
'QueryBuilder: [Semantical Error] line 0, col 93 near \'t.id = 1\': Error: \'t\' is not defined.',
107,
'Detected from DQL branch: SELECT e FROM PHPStan\Rules\Doctrine\ORM\MyEntity e INNER JOIN e.parent p WHERE p.id = 1 AND t.id = 1',
],
];
$this->analyse([__DIR__ . '/data/query-builder-branches-dql.php'], $errors);
Expand All @@ -151,6 +155,7 @@ public function testBranchingPerformance(): void
[
'QueryBuilder: [Semantical Error] line 0, col 58 near \'p.id = 1 AND\': Error: \'p\' is not defined.',
121,
'Detected from DQL branch: SELECT e FROM PHPStan\Rules\Doctrine\ORM\MyEntity e WHERE p.id = 1 AND p.id = 3 AND p.id = 5 AND p.id = 7 AND p.id = 9 AND p.id = 11 AND p.id = 13 AND p.id = 15 AND p.id = 15 AND p.id = 15 AND p.id = 15 AND p.id = 15 AND p.id = 15 AND p.id = 15 AND p.id = 15 AND p.id = 15 AND p.id = 15 AND p.id = 15',
],
]);
}
Expand Down