Commit 58ebacf

schlndhondrejmirtes

authored and

committed

fix fn() => __FUNCTION__ and __METHOD__

1 parent a06d509 commit 58ebacfCopy full SHA for 58ebacf

File tree

+35

-1

lines changed

+35

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3181,7 +3181,7 @@ private function enterArrowFunctionWithoutReflection(Expr\ArrowFunction $arrowFu`
`3181`	`3181`	`$arrowFunctionScope->nativeExpressionTypes,`
`3182`	`3182`	`$arrowFunctionScope->conditionalExpressions,`
`3183`	`3183`	`$arrowFunctionScope->inClosureBindScopeClasses,`
`3184`		`- null,`
	`3184`	`+ newTrivialParametersAcceptor(),`
`3185`	`3185`	`true,`
`3186`	`3186`	`[],`
`3187`	`3187`	`[],`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1123,6 +1123,7 @@ public function dataFileAsserts(): iterable`
`1123`	`1123`
`1124`	`1124`	`if (PHP_VERSION_ID >= 70400) {`
`1125`	`1125`	`yield from $this->gatherAssertTypes(__DIR__ . '/data/arrow-function-argument-type.php');`
	`1126`	`+ yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Functions/data/bug-anonymous-function-method-constant.php');`
`1126`	`1127`	`}`
`1127`	`1128`
`1128`	`1129`	`yield from $this->gatherAssertTypes(__DIR__ . '/data/closure-argument-type.php');`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -65,4 +65,13 @@ public function testBugSpaceship(): void`
`65`	`65`	`$this->analyse([__DIR__ . '/data/bug-spaceship.php'], []);`
`66`	`66`	`}`
`67`	`67`
	`68`	`+ public function testBugFunctionMethodConstants(): void`
	`69`	`+ {`
	`70`	`+ if (PHP_VERSION_ID < 70400) {`
	`71`	`+ $this->markTestSkipped('Test requires PHP 7.4.');`
	`72`	`+ }`
	`73`	`+`
	`74`	`+ $this->analyse([__DIR__ . '/data/bug-anonymous-function-method-constant.php'], []);`
	`75`	`+ }`
	`76`	`+`
`68`	`77`	`}`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`use PHPStan\Rules\Rule;`
`7`	`7`	`use PHPStan\Rules\RuleLevelHelper;`
`8`	`8`	`use PHPStan\Testing\RuleTestCase;`
	`9`	`+use const PHP_VERSION_ID;`
`9`	`10`
`10`	`11`	`/**`
`11`	`12`	`* @extends RuleTestCase<ClosureReturnTypeRule>`
`@@ -128,4 +129,13 @@ public function testBug7220(): void`
`128`	`129`	`$this->analyse([__DIR__ . '/data/bug-7220.php'], []);`
`129`	`130`	`}`
`130`	`131`
	`132`	`+ public function testBugFunctionMethodConstants(): void`
	`133`	`+ {`
	`134`	`+ if (PHP_VERSION_ID < 70400) {`
	`135`	`+ $this->markTestSkipped('Test requires PHP 7.4.');`
	`136`	`+ }`
	`137`	`+`
	`138`	`+ $this->analyse([__DIR__ . '/data/bug-anonymous-function-method-constant.php'], []);`
	`139`	`+ }`
	`140`	`+`
`131`	`141`	`}`

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,14 @@`
	`1`	`+<?php declare(strict_types = 1); // lint >= 7.4`
	`2`	`+`
	`3`	`+namespace BugAnonymousFunctionMethodConstant;`
	`4`	`+`
	`5`	`+$a = fn() => __FUNCTION__;`
	`6`	`+$b = fn() => __METHOD__;`
	`7`	`+`
	`8`	`+$c = function() { return __FUNCTION__; };`
	`9`	`+$d = function() { return __METHOD__; };`
	`10`	`+`
	`11`	`+\PHPStan\Testing\assertType("'{closure}'", $a());`
	`12`	`+\PHPStan\Testing\assertType("'{closure}'", $b());`
	`13`	`+\PHPStan\Testing\assertType("'{closure}'", $c());`
	`14`	`+\PHPStan\Testing\assertType("'{closure}'", $d());`

Comments

(0)