Commit 19b8d7a

committed

fix: issue in defined variable rule instead of isset

1 parent 4782556 commit 19b8d7aCopy full SHA for 19b8d7a

File tree

+15

-16

lines changed

+15

-16

lines changed

Lines changed: 0 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -41,14 +41,6 @@ public function __construct(`
`41`	`41`	`*/`
`42`	`42`	`public function check(Expr $expr, Scope $scope, string $operatorDescription, string $identifier, callable $typeMessageCallback, ?IdentifierRuleError $error = null): ?IdentifierRuleError`
`43`	`43`	`{`
`44`		`- // [FIX] Ignore isset($$foo): dynamic variable`
`45`		`- if (`
`46`		`- $expr instanceof Node\Expr\Variable &&`
`47`		`- $expr->name instanceof Node\Expr\Variable`
`48`		`- ) {`
`49`		`- return null;`
`50`		`- }`
`51`		`-`
`52`	`44`	`// mirrored in PHPStan\Analyser\MutatingScope::issetCheck()`
`53`	`45`	`if ($expr instanceof Node\Expr\Variable && is_string($expr->name)) {`
`54`	`46`	`$hasVariable = $scope->hasVariableType($expr->name);`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,11 @@ public function getNodeType(): string`
`41`	`41`	`public function processNode(Node $node, Scope $scope): array`
`42`	`42`	`{`
`43`	`43`	`$errors = [];`
	`44`	`+`
	`45`	`+ if ($scope->isUndefinedExpressionAllowed($node)) {`
	`46`	`+ return [];`
	`47`	`+ }`
	`48`	`+`
`44`	`49`	`if (is_string($node->name)) {`
`45`	`50`	`$variableNameScopes = [$node->name => $scope];`
`46`	`51`	`} else {`
`@@ -78,7 +83,7 @@ private function processSingleVariable(Scope $scope, Variable $node, string $var`
`78`	`83`	`}`
`79`	`84`	`}`
`80`	`85`
`81`		`- if ($scope->isInExpressionAssign($node) \|\| $scope->isUndefinedExpressionAllowed($node)) {`
	`86`	`+ if ($scope->isInExpressionAssign($node)) {`
`82`	`87`	`return [];`
`83`	`88`	`}`
`84`	`89`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1169,4 +1169,13 @@ public function testBug8719(): void`
`1169`	`1169`	`$this->analyse([__DIR__ . '/data/bug-8719.php'], []);`
`1170`	`1170`	`}`
`1171`	`1171`
	`1172`	`+ public function testDynamicVariable(): void`
	`1173`	`+ {`
	`1174`	`+ $this->cliArgumentsVariablesRegistered = true;`
	`1175`	`+ $this->polluteScopeWithLoopInitialAssignments = true;`
	`1176`	`+ $this->checkMaybeUndefinedVariables = true;`
	`1177`	`+ $this->polluteScopeWithAlwaysIterableForeach = true;`
	`1178`	`+`
	`1179`	`+ $this->analyse([__DIR__ . '/data/dynamic-variable.php'], []);`
	`1180`	`+ }`
`1172`	`1181`	`}`

Lines changed: 0 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -484,11 +484,4 @@ public function testIssetAfterRememberedConstructor(): void`
`484`	`484`	`],`
`485`	`485`	`]);`
`486`	`486`	`}`
`487`		`-`
`488`		`- public function testDynamicVariable(): void`
`489`		`- {`
`490`		`- $this->treatPhpDocTypesAsCertain = true;`
`491`		`-`
`492`		`- $this->analyse([__DIR__ . '/data/dynamic-variable.php'], []);`
`493`		`- }`
`494`	`487`	`}`

Comments

(0)