From b26373f81e7c60238e23e9e9f5a94c3d807ef996 Mon Sep 17 00:00:00 2001 From: Ondrej Mirtes Date: Mon, 2 May 2022 11:53:19 +0200 Subject: [PATCH] Require PHPStan 1.7 --- composer.json | 2 +- .../Nette/NetteObjectClassReflectionExtension.php | 13 +++++++------ src/Rule/Nette/DoNotExtendNetteObjectRule.php | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index f73d6dc..3862a7d 100644 --- a/composer.json +++ b/composer.json @@ -7,7 +7,7 @@ ], "require": { "php": "^7.2 || ^8.0", - "phpstan/phpstan": "^1.5" + "phpstan/phpstan": "^1.7" }, "conflict": { "nette/application": "<2.3.0", diff --git a/src/Reflection/Nette/NetteObjectClassReflectionExtension.php b/src/Reflection/Nette/NetteObjectClassReflectionExtension.php index dc4baa7..2e6465a 100644 --- a/src/Reflection/Nette/NetteObjectClassReflectionExtension.php +++ b/src/Reflection/Nette/NetteObjectClassReflectionExtension.php @@ -2,13 +2,14 @@ namespace PHPStan\Reflection\Nette; +use PHPStan\BetterReflection\Reflection\Adapter\ReflectionClass; +use PHPStan\BetterReflection\Reflection\Adapter\ReflectionEnum; use PHPStan\Reflection\ClassReflection; use PHPStan\Reflection\MethodReflection; use PHPStan\Reflection\MethodsClassReflectionExtension; use PHPStan\Reflection\ParametersAcceptorSelector; use PHPStan\Reflection\PropertiesClassReflectionExtension; use PHPStan\Reflection\PropertyReflection; -use ReflectionClass; use function array_merge; use function array_unique; use function array_values; @@ -75,10 +76,10 @@ public function getMethod(ClassReflection $classReflection, string $methodName): } /** - * @param ReflectionClass $class + * @param ReflectionClass|ReflectionEnum $class * @return string[] */ - private function getTraitNames(ReflectionClass $class): array + private function getTraitNames($class): array { $traitNames = $class->getTraitNames(); while ($class->getParentClass() !== false) { @@ -90,13 +91,13 @@ private function getTraitNames(ReflectionClass $class): array } /** - * @param ReflectionClass $class + * @param ReflectionClass|ReflectionEnum $class */ - private function inheritsFromNetteObject(ReflectionClass $class): bool + private function inheritsFromNetteObject($class): bool { $class = $class->getParentClass(); while ($class !== false) { - if (in_array($class->getName(), [ + if (in_array($class->getName(), [ // @phpstan-ignore-line 'Nette\Object', 'Nette\LegacyObject', ], true)) { diff --git a/src/Rule/Nette/DoNotExtendNetteObjectRule.php b/src/Rule/Nette/DoNotExtendNetteObjectRule.php index f914c32..f0703ba 100644 --- a/src/Rule/Nette/DoNotExtendNetteObjectRule.php +++ b/src/Rule/Nette/DoNotExtendNetteObjectRule.php @@ -45,7 +45,7 @@ public function processNode(Node $node, Scope $scope): array $classReflection = $this->broker->getClass($className); $parentClass = $classReflection->getNativeReflection()->getParentClass(); - if ($parentClass !== false && in_array($parentClass->getName(), [ + if ($parentClass !== false && in_array($parentClass->getName(), [ // @phpstan-ignore-line 'Nette\Object', 'Nette\LegacyObject', ], true)) {