Skip to content

Commit a73e84b

Browse files
committed
Move it to QueryBuilderDqlRule
1 parent d983ea2 commit a73e84b

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

src/Rules/Doctrine/ORM/DqlRule.php

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,9 @@ public function processNode(Node $node, Scope $scope): array
7777
try {
7878
$query->getAST();
7979
} catch (QueryException $e) {
80-
$builder = RuleErrorBuilder::message(sprintf('DQL: %s', $e->getMessage()))
81-
->identifier('doctrine.dql');
82-
83-
if (count($dqls) > 1) {
84-
$builder->addTip('Detected from DQL branch: ' . $dql->getValue());
85-
}
86-
87-
$messages[] = $builder->build();
80+
$messages[] = RuleErrorBuilder::message(sprintf('DQL: %s', $e->getMessage()))
81+
->identifier('doctrine.dql')
82+
->build();
8883
} catch (AssertionError $e) {
8984
continue;
9085
}

src/Rules/Doctrine/ORM/QueryBuilderDqlRule.php

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,15 @@ public function processNode(Node $node, Scope $scope): array
118118
$message .= sprintf("\nDQL: %s", $dql->getValue());
119119
}
120120

121+
$builder = RuleErrorBuilder::message($message)
122+
->identifier('doctrine.dql');
123+
124+
if (count($dqls) > 1) {
125+
$builder->addTip('Detected from DQL branch: ' . $dql->getValue());
126+
}
127+
121128
// Use message as index to prevent duplicate
122-
$messages[$message] = RuleErrorBuilder::message($message)
123-
->identifier('doctrine.dql')
124-
->build();
129+
$messages[$message] = $builder->build();
125130
} catch (AssertionError $e) {
126131
continue;
127132
}

0 commit comments

Comments
 (0)