Commit 3a67365

committed

Merge branch '1.5.x' into 1.6.x

2 parents 50aab8d + 5ae7a3d commit 3a67365Copy full SHA for 3a67365

File tree

+38

-3

lines changed

+38

-3

lines changed

Lines changed: 11 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,9 @@`
`5`	`5`	`use PhpParser\Node;`
`6`	`6`	`use PhpParser\Node\Expr\FuncCall;`
`7`	`7`	`use PhpParser\Node\Name;`
	`8`	`+use PHPStan\Analyser\ArgumentsNormalizer;`
`8`	`9`	`use PHPStan\Analyser\Scope;`
	`10`	`+use PHPStan\Reflection\ParametersAcceptorSelector;`
`9`	`11`	`use PHPStan\Reflection\ReflectionProvider;`
`10`	`12`	`use PHPStan\Rules\Rule;`
`11`	`13`	`use PHPStan\Rules\RuleErrorBuilder;`
`@@ -47,11 +49,17 @@ public function processNode(Node $node, Scope $scope): array`
`47`	`49`	`return [];`
`48`	`50`	`}`
`49`	`51`
`50`		`- $functionName = $this->reflectionProvider->resolveFunctionName($node->name, $scope);`
`51`		`- if ($functionName === null) {`
	`52`	`+ if (!$this->reflectionProvider->hasFunction($node->name, $scope)) {`
`52`	`53`	`return [];`
`53`	`54`	`}`
`54`		`- $functionName = strtolower($functionName);`
	`55`	`+`
	`56`	`+ $function = $this->reflectionProvider->getFunction($node->name, $scope);`
	`57`	`+ $parametersAcceptor = ParametersAcceptorSelector::selectFromArgs($scope, $node->getArgs(), $function->getVariants());`
	`58`	`+ $node = ArgumentsNormalizer::reorderFuncArguments($parametersAcceptor, $node);`
	`59`	`+ if ($node === null) {`
	`60`	`+ return [];`
	`61`	`+ }`
	`62`	`+ $functionName = strtolower($function->getName());`
`55`	`63`	`if (!array_key_exists($functionName, $this->functionArguments)) {`
`56`	`64`	`return [];`
`57`	`65`	`}`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`use PHPStan\Rules\Rule;`
`6`	`6`	`use PHPStan\Testing\RuleTestCase;`
	`7`	`+use const PHP_VERSION_ID;`
`7`	`8`
`8`	`9`	`/**`
`9`	`10`	`* @extends RuleTestCase<StrictFunctionCallsRule>`
`@@ -74,4 +75,12 @@ public function testRule(): void`
`74`	`75`	`]);`
`75`	`76`	`}`
`76`	`77`
	`78`	`+ public function testBug231(): void`
	`79`	`+ {`
	`80`	`+ if (PHP_VERSION_ID < 80100) {`
	`81`	`+ $this->markTestSkipped('Test requires PHP 8.1.');`
	`82`	`+ }`
	`83`	`+ $this->analyse([__DIR__ . '/data/bug-231.php'], []);`
	`84`	`+ }`
	`85`	`+`
`77`	`86`	`}`

Lines changed: 18 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,18 @@`
	`1`	`+<?php // lint >= 8.1`
	`2`	`+`
	`3`	`+namespace Bug231;`
	`4`	`+`
	`5`	`+enum MyEnum: string`
	`6`	`+{`
	`7`	`+ case Foo = 'foo';`
	`8`	`+ case Bar = 'bar';`
	`9`	`+ case Baz = 'baz';`
	`10`	`+`
	`11`	`+ public function isB(): bool`
	`12`	`+ {`
	`13`	`+ return in_array($this, strict: true, haystack: [`
	`14`	`+ self::Bar,`
	`15`	`+ self::Baz,`
	`16`	`+ ]);`
	`17`	`+ }`
	`18`	`+}`

Comments

(0)