Commit 02277ce

committed

Merge remote-tracking branch 'origin/1.6.x' into 2.0.x

2 parents ed6fea0 + b564ca4 commit 02277ceCopy full SHA for 02277ce

File tree

+26

-2

lines changed

+26

-2

lines changed

Lines changed: 14 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`use PHPStan\Rules\Rule;`
`11`	`11`	`use PHPStan\Rules\RuleErrorBuilder;`
`12`	`12`	`use PHPStan\Type\VerbosityLevel;`
	`13`	`+use SimpleXMLElement;`
`13`	`14`	`use function sprintf;`
`14`	`15`
`15`	`16`	`/**`
`@@ -49,7 +50,11 @@ public function processNode(Node $node, Scope $scope): array`
`49`	`50`	`continue;`
`50`	`51`	`}`
`51`	`52`
`52`		`- if ($this->isUniversalObjectCrate($this->reflectionProvider->getClass($referencedClass))) {`
	`53`	`+ $classReflection = $this->reflectionProvider->getClass($referencedClass);`
	`54`	`+ if (`
	`55`	`+ $this->isUniversalObjectCrate($classReflection)`
	`56`	`+ \|\| $this->isSimpleXMLElement($classReflection)`
	`57`	`+ ) {`
`53`	`58`	`return [];`
`54`	`59`	`}`
`55`	`60`	`}`
`@@ -62,6 +67,14 @@ public function processNode(Node $node, Scope $scope): array`
`62`	`67`	`];`
`63`	`68`	`}`
`64`	`69`
	`70`	`+ private function isSimpleXMLElement(`
	`71`	`+ ClassReflection $classReflection`
	`72`	`+ ): bool`
	`73`	`+ {`
	`74`	`+ return $classReflection->getName() === SimpleXMLElement::class`
	`75`	`+ \|\| $classReflection->isSubclassOf(SimpleXMLElement::class);`
	`76`	`+ }`
	`77`	`+`
`65`	`78`	`private function isUniversalObjectCrate(`
`66`	`79`	`ClassReflection $classReflection`
`67`	`80`	`): bool`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@ protected function getRule(): Rule`
`15`	`15`	`{`
`16`	`16`	`return new VariablePropertyFetchRule($this->createReflectionProvider(), [`
`17`	`17`	`'stdClass',`
`18`		`- 'SimpleXMLElement',`
`19`	`18`	`]);`
`20`	`19`	`}`
`21`	`20`
`@@ -29,4 +28,9 @@ public function testRule(): void`
`29`	`28`	`]);`
`30`	`29`	`}`
`31`	`30`
	`31`	`+ public function testBug243(): void`
	`32`	`+ {`
	`33`	`+ $this->analyse([__DIR__ . '/data/bug243.php'], []);`
	`34`	`+ }`
	`35`	`+`
`32`	`36`	`}`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,7 @@`
	`1`	`+<?php`
	`2`	`+`
	`3`	`+namespace Bug243;`
	`4`	`+`
	`5`	`+function test(\SimpleXMLElement $xml) {`
	`6`	`+ $xml->{'foo-bar'};`
	`7`	`+};`

Comments

(0)