Commit 487c7ca

committed

Add InAnyClassScope scope

1 parent 6db6c4b commit 487c7caCopy full SHA for 487c7ca

File tree

+47

-9

lines changed

+47

-9

lines changed

Lines changed: 44 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,44 @@`
	`1`	`+<?php declare(strict_types = 1);`
	`2`	`+`
	`3`	`+namespace PHPStan\Analyser;`
	`4`	`+`
	`5`	`+use PHPStan\Reflection\ClassMemberAccessAnswerer;`
	`6`	`+use PHPStan\Reflection\ClassReflection;`
	`7`	`+use PHPStan\Reflection\ConstantReflection;`
	`8`	`+use PHPStan\Reflection\MethodReflection;`
	`9`	`+use PHPStan\Reflection\PropertyReflection;`
	`10`	`+`
	`11`	`+class InAnyClassScope implements ClassMemberAccessAnswerer`
	`12`	`+{`
	`13`	`+`
	`14`	`+ /** @api */`
	`15`	`+ public function __construct()`
	`16`	`+ {`
	`17`	`+ }`
	`18`	`+`
	`19`	`+ public function isInClass(): bool`
	`20`	`+ {`
	`21`	`+ return true;`
	`22`	`+ }`
	`23`	`+`
	`24`	`+ public function getClassReflection(): ?ClassReflection`
	`25`	`+ {`
	`26`	`+ return null;`
	`27`	`+ }`
	`28`	`+`
	`29`	`+ public function canAccessProperty(PropertyReflection $propertyReflection): bool`
	`30`	`+ {`
	`31`	`+ return $propertyReflection->isPublic();`
	`32`	`+ }`
	`33`	`+`
	`34`	`+ public function canCallMethod(MethodReflection $methodReflection): bool`
	`35`	`+ {`
	`36`	`+ return $methodReflection->isPublic();`
	`37`	`+ }`
	`38`	`+`
	`39`	`+ public function canAccessConstant(ConstantReflection $constantReflection): bool`
	`40`	`+ {`
	`41`	`+ return $constantReflection->isPublic();`
	`42`	`+ }`
	`43`	`+`
	`44`	`+}`

Lines changed: 3 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace PHPStan\Type\Constant;`
`4`	`4`
`5`		`-use PHPStan\Analyser\OutOfClassScope;`
	`5`	`+use PHPStan\Analyser\InAnyClassScope;`
`6`	`6`	`use PHPStan\Reflection\ClassMemberAccessAnswerer;`
`7`	`7`	`use PHPStan\Reflection\InaccessibleMethod;`
`8`	`8`	`use PHPStan\Reflection\ParametersAcceptor;`
`@@ -316,13 +316,7 @@ public function equals(Type $type): bool`
`316`	`316`
`317`	`317`	`public function isCallable(): TrinaryLogic`
`318`	`318`	`{`
`319`		`- // @todo is there a way to fetch the full scope here.`
`320`		`- // An OutOfClassScope causes frivolous errors when checking if a`
`321`		`- // non-static method was invoked statically in its own class, which`
`322`		`- // is allowed per: https://3v4l.org/mTa9S.`
`323`		`- // Should add an optional scope parameter to isCallable and if null,`
`324`		`- // create a new OutOfClassScope instance.`
`325`		`- $typeAndMethod = $this->findTypeAndMethodName(new OutOfClassScope());`
	`319`	`+ $typeAndMethod = $this->findTypeAndMethodName(new InAnyClassScope());`
`326`	`320`	`if ($typeAndMethod === null) {`
`327`	`321`	`return TrinaryLogic::createNo();`
`328`	`322`	`}`
`@@ -397,7 +391,7 @@ public function findTypeAndMethodName(?ClassMemberAccessAnswerer $scope = null):`
`397`	`391`	`$has = $has->and(TrinaryLogic::createMaybe());`
`398`	`392`	`}`
`399`	`393`	`if ($scope === null) {`
`400`		`- $scope = new OutOfClassScope();`
	`394`	`+ $scope = new InAnyClassScope();`
`401`	`395`	`}`
`402`	`396`	`if (`
`403`	`397`	`$isClassString`

Comments

(0)