Commit 96d29e0

committed

Limit rule to package configs and models only

1 parent 542275a commit 96d29e0Copy full SHA for 96d29e0

File tree

+21

-9

lines changed

+21

-9

lines changed

Lines changed: 16 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,14 @@`
`26`	`26`	`*/`
`27`	`27`	`final class NoClassConstFetchOnFactoriesFunctions implements Rule`
`28`	`28`	`{`
	`29`	`+ /**`
	`30`	`+ * @var array<string, string>`
	`31`	`+ */`
	`32`	`+ private static array $namespaceMap = [`
	`33`	`+ 'config' => 'Config',`
	`34`	`+ 'model' => 'App\\Models',`
	`35`	`+ ];`
	`36`	`+`
`29`	`37`	`public function __construct(`
`30`	`38`	`private readonly ReflectionProvider $reflectionProvider,`
`31`	`39`	`private readonly FactoriesReturnTypeHelper $factoriesReturnTypeHelper`
`@@ -92,15 +100,21 @@ public function processNode(Node $node, Scope $scope): array`
`92`	`100`	`return [];`
`93`	`101`	`}`
`94`	`102`
	`103`	`+ $reflection = $reflections[0];`
	`104`	`+`
	`105`	`+ if ($reflection->getNativeReflection()->getNamespaceName() === self::$namespaceMap[$function]) {`
	`106`	`+ return [];`
	`107`	`+ }`
	`108`	`+`
`95`	`109`	`return [`
`96`	`110`	`RuleErrorBuilder::message(sprintf(`
`97`	`111`	`'Call to function %s with %s::class is discouraged.',`
`98`	`112`	`$function,`
`99`		`- $reflections[0]->getDisplayName()`
	`113`	`+ $reflection->getDisplayName()`
`100`	`114`	`))->tip(sprintf(`
`101`	`115`	`'Use %s(\'%s\') instead to allow overriding.',`
`102`	`116`	`$function,`
`103`		`- $reflections[0]->getNativeReflection()->getShortName()`
	`117`	`+ $reflection->getNativeReflection()->getShortName()`
`104`	`118`	`))->identifier('codeigniter.factoriesClassConstFetch')->build(),`
`105`	`119`	`];`
`106`	`120`	`}`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,3 +34,5 @@ function bar(string $name): void`
`34`	`34`
`35`	`35`	`assertType('null', config($name));`
`36`	`36`	`}`
	`37`	`+`
	`38`	`+assertType('CodeIgniter\Shield\Config\AuthJWT', config(\CodeIgniter\Shield\Config\AuthJWT::class));`

Lines changed: 3 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -46,14 +46,10 @@ public function testRule(): void`
`46`	`46`	`__DIR__ . '/../../Fixtures/Type/model.php',`
`47`	`47`	`], [`
`48`	`48`	`[`
`49`		`- 'Call to function config with Config\App::class is discouraged.',`
`50`		`- 26,`
`51`		`- 'Use config(\'App\') instead to allow overriding.',`
	`49`	`+ 'Call to function config with CodeIgniter\Shield\Config\AuthJWT::class is discouraged.',`
	`50`	`+ 38,`
	`51`	`+ 'Use config(\'AuthJWT\') instead to allow overriding.',`
`52`	`52`	`],`
`53`		`- [`
`54`		`- 'Call to function config with Config\Cache::class is discouraged.',`
`55`		`- 19,`
`56`		`- 'Use config(\'Cache\') instead to allow overriding.', ],`
`57`	`53`	`[`
`58`	`54`	`'Call to function model with stdClass::class is discouraged.',`
`59`	`55`	`19,`

Comments

(0)