Do not trigger PhpDocInheritanceResolver if we do not need the PHPDoc…

… type when resolving the type of ClassConstFetch
phpstan · Sep 29, 2023 · dcfa3b1 · dcfa3b1
1 parent 25f4e5e
commit dcfa3b1
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 10 deletions.
diff --git a/build/phpstan.neon b/build/phpstan.neon
@@ -88,6 +88,7 @@ parameters:
  count: 1
  path: ../src/Command/CommandHelper.php
  - '#^Parameter \#1 \$offsetType of class PHPStan\\Type\\Accessory\\HasOffsetType constructor expects PHPStan\\Type\\Constant\\ConstantIntegerType\|PHPStan\\Type\\Constant\\ConstantStringType#'
+ - '#^Short ternary operator is not allowed#'
  reportStaticMethodSignatures: true
  tmpDir: %rootDir%/tmp
  stubFiles:

diff --git a/src/PhpDoc/TypeNodeResolver.php b/src/PhpDoc/TypeNodeResolver.php
@@ -1046,9 +1046,13 @@ private function resolveConstTypeNode(ConstTypeNode $typeNode, NameScope $nameSc
  return new EnumCaseObjectType($classReflection->getName(), $constantName);
  }
 
- $reflectionConstant = $classReflection->getConstant($constantName);
+ $reflectionConstant = $classReflection->getNativeReflection()->getReflectionConstant($constantName);
+ if ($reflectionConstant === false) {
+ return new ErrorType();
+ }
+ $declaringClass = $reflectionConstant->getDeclaringClass();
 
- return $this->initializerExprTypeResolver->getType($reflectionConstant->getValueExpr(), InitializerExprContext::fromClassReflection($reflectionConstant->getDeclaringClass()));
+ return $this->initializerExprTypeResolver->getType($reflectionConstant->getValueExpression(), InitializerExprContext::fromClass($declaringClass->getName(), $declaringClass->getFileName() ?: null));
  }
 
  if ($constExpr instanceof ConstExprFloatNode) {

diff --git a/src/Reflection/InitializerExprContext.php b/src/Reflection/InitializerExprContext.php
@@ -55,10 +55,13 @@ private static function parseNamespace(string $name): ?string
 
  public static function fromClassReflection(ClassReflection $classReflection): self
  {
- $className = $classReflection->getName();
+ return self::fromClass($classReflection->getName(), $classReflection->getFileName());
+ }
 
+ public static function fromClass(string $className, ?string $fileName): self
+ {
  return new self(
- $classReflection->getFileName(),
+ $fileName,
  self::parseNamespace($className),
  $className,
  null,

diff --git a/src/Reflection/InitializerExprTypeResolver.php b/src/Reflection/InitializerExprTypeResolver.php
@@ -1876,22 +1876,32 @@ function (Type $type, callable $traverse): Type {
  continue;
  }
 
+ if (!$isObject) {
+ $reflectionConstant = $constantClassReflection->getNativeReflection()->getReflectionConstant($constantName);
+ if ($reflectionConstant === false) {
+ continue;
+ }
+ $reflectionConstantDeclaringClass = $reflectionConstant->getDeclaringClass();
+ $constantType = $this->getType($reflectionConstant->getValueExpression(), InitializerExprContext::fromClass($reflectionConstantDeclaringClass->getName(), $reflectionConstantDeclaringClass->getFileName() ?: null));
+ $types[] = $this->constantResolver->resolveConstantType(
+ sprintf('%s::%s', $constantClassReflection->getName(), $constantName),
+ $constantType,
+ );
+ continue;
+ }
+
  $constantReflection = $constantClassReflection->getConstant($constantName);
  if (
  $constantReflection instanceof ClassConstantReflection
- && $isObject
  && !$constantClassReflection->isFinal()
  && !$constantReflection->hasPhpDocType()
  ) {
  return new MixedType();
  }
 
  if (
- $isObject
- && (
- !$constantReflection instanceof ClassConstantReflection
- || !$constantClassReflection->isFinal()
- )
+ !$constantReflection instanceof ClassConstantReflection
+ || !$constantClassReflection->isFinal()
  ) {
  $constantType = $constantReflection->getValueType();
  } else {

diff --git a/tests/PHPStan/Analyser/AnalyserIntegrationTest.php b/tests/PHPStan/Analyser/AnalyserIntegrationTest.php
@@ -1191,6 +1191,13 @@ public function testBug9459(): void
  $this->assertSame(10, $errors[0]->getLine());
  }
 
+ public function testBug9039(): void
+ {
+ $errors = $this->runAnalyse(__DIR__ . '/data/bug-9039.php');
+ $this->assertCount(1, $errors);
+ $this->assertSame('Constant Bug9039\Test::RULES is unused.', $errors[0]->getMessage());
+ }
+
  public function testDiscussion9053(): void
  {
  if (PHP_VERSION_ID < 80000) {

diff --git a/tests/PHPStan/Analyser/data/bug-9039.php b/tests/PHPStan/Analyser/data/bug-9039.php
@@ -0,0 +1,19 @@
+<?php declare(strict_types = 1);
+
+namespace Bug9039;
+
+/**
+ * @template T
+ */
+class Voter
+{
+}
+
+/**
+ * @template-extends Voter<self::*>
+ */
+class Test extends Voter
+{
+ public const FOO = 'Foo';
+ private const RULES = [self::FOO];
+}