Merge pull request #469 from goba/patch-1

mglaman · web-flow · commit c99f2e0414bd · 2022-12-22T08:25:38.000-06:00
Update rule messages to use full Drupal messages
diff --git a/src/Rules/Drupal/EntityQuery/EntityQueryHasAccessCheckRule.php b/src/Rules/Drupal/EntityQuery/EntityQueryHasAccessCheckRule.php
@@ -40,7 +40,7 @@ public function processNode(Node $node, Scope $scope): array
 
         return [
             RuleErrorBuilder::message(
-                'Missing explicit access check on entity query.'
+                'Relying on entity queries to check access by default is deprecated in drupal:9.2.0 and an error will be thrown from drupal:10.0.0. Call \Drupal\Core\Entity\Query\QueryInterface::accessCheck() with TRUE or FALSE to specify whether access should be checked.'
             )->tip('See https://www.drupal.org/node/3201242')->build(),
         ];
     }
diff --git a/tests/src/Rules/EntityQueryHasAccessCheckRuleTest.php b/tests/src/Rules/EntityQueryHasAccessCheckRuleTest.php
@@ -33,12 +33,12 @@ public function cases(): \Generator
             [__DIR__.'/../../fixtures/drupal/modules/phpstan_fixtures/src/EntityQueryWithoutAccessRule.php'],
             [
                 [
-                    'Missing explicit access check on entity query.',
+                    'Relying on entity queries to check access by default is deprecated in drupal:9.2.0 and an error will be thrown from drupal:10.0.0. Call \Drupal\Core\Entity\Query\QueryInterface::accessCheck() with TRUE or FALSE to specify whether access should be checked.',
                     11,
                     'See https://www.drupal.org/node/3201242',
                 ],
                 [
-                    'Missing explicit access check on entity query.',
+                    'Relying on entity queries to check access by default is deprecated in drupal:9.2.0 and an error will be thrown from drupal:10.0.0. Call \Drupal\Core\Entity\Query\QueryInterface::accessCheck() with TRUE or FALSE to specify whether access should be checked.',
                     19,
                     'See https://www.drupal.org/node/3201242',
                 ],
@@ -53,7 +53,7 @@ public function cases(): \Generator
             [__DIR__.'/data/bug-396a1.php'],
             [
                 [
-                    'Missing explicit access check on entity query.',
+                    'Relying on entity queries to check access by default is deprecated in drupal:9.2.0 and an error will be thrown from drupal:10.0.0. Call \Drupal\Core\Entity\Query\QueryInterface::accessCheck() with TRUE or FALSE to specify whether access should be checked.',
                     27,
                     'See https://www.drupal.org/node/3201242',
                 ]

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public function processNode(Node $node, Scope $scope): array`
`40`	`40`
`41`	`41`	`return [`
`42`	`42`	`RuleErrorBuilder::message(`
`43`		`- 'Missing explicit access check on entity query.'`
	`43`	`+ 'Relying on entity queries to check access by default is deprecated in drupal:9.2.0 and an error will be thrown from drupal:10.0.0. Call \Drupal\Core\Entity\Query\QueryInterface::accessCheck() with TRUE or FALSE to specify whether access should be checked.'`
`44`	`44`	`)->tip('See https://www.drupal.org/node/3201242')->build(),`
`45`	`45`	`];`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,12 +33,12 @@ public function cases(): \Generator`
`33`	`33`	`[__DIR__.'/../../fixtures/drupal/modules/phpstan_fixtures/src/EntityQueryWithoutAccessRule.php'],`
`34`	`34`	`[`
`35`	`35`	`[`
`36`		`- 'Missing explicit access check on entity query.',`
	`36`	`+ 'Relying on entity queries to check access by default is deprecated in drupal:9.2.0 and an error will be thrown from drupal:10.0.0. Call \Drupal\Core\Entity\Query\QueryInterface::accessCheck() with TRUE or FALSE to specify whether access should be checked.',`
`37`	`37`	`11,`
`38`	`38`	`'See https://www.drupal.org/node/3201242',`
`39`	`39`	`],`
`40`	`40`	`[`
`41`		`- 'Missing explicit access check on entity query.',`
	`41`	`+ 'Relying on entity queries to check access by default is deprecated in drupal:9.2.0 and an error will be thrown from drupal:10.0.0. Call \Drupal\Core\Entity\Query\QueryInterface::accessCheck() with TRUE or FALSE to specify whether access should be checked.',`
`42`	`42`	`19,`
`43`	`43`	`'See https://www.drupal.org/node/3201242',`
`44`	`44`	`],`
`@@ -53,7 +53,7 @@ public function cases(): \Generator`
`53`	`53`	`[__DIR__.'/data/bug-396a1.php'],`
`54`	`54`	`[`
`55`	`55`	`[`
`56`		`- 'Missing explicit access check on entity query.',`
	`56`	`+ 'Relying on entity queries to check access by default is deprecated in drupal:9.2.0 and an error will be thrown from drupal:10.0.0. Call \Drupal\Core\Entity\Query\QueryInterface::accessCheck() with TRUE or FALSE to specify whether access should be checked.',`
`57`	`57`	`27,`
`58`	`58`	`'See https://www.drupal.org/node/3201242',`
`59`	`59`	`]`