Merge branch refs/heads/1.10.x into 1.11.x

Author: phpstan-bot

src/Reflection/ClassReflection.php

@@ -688,7 +688,7 @@ public function isTrait(): bool
 	 */
 	public function isEnum(): bool
 	{
-		return $this->reflection->isEnum() && $this->reflection instanceof ReflectionEnum;
+		return $this->reflection instanceof ReflectionEnum && $this->reflection->isEnum();
 	}
 
 	/**
@@ -753,10 +753,11 @@ public function getEnumCases(): array
 		}
 
 		$cases = [];
+		$initializerExprContext = InitializerExprContext::fromClassReflection($this);
 		foreach ($this->reflection->getCases() as $case) {
 			$valueType = null;
 			if ($case instanceof ReflectionEnumBackedCase) {
-				$valueType = $this->initializerExprTypeResolver->getType($case->getValueExpression(), InitializerExprContext::fromClassReflection($this));
+				$valueType = $this->initializerExprTypeResolver->getType($case->getValueExpression(), $initializerExprContext);
 			}
 			/** @var string $caseName */
 			$caseName = $case->getName();
@@ -998,10 +999,10 @@ public function getTraits(bool $recursive = false): array
 	public function getParentClassesNames(): array
 	{
 		$parentNames = [];
-		$currentClassReflection = $this;
-		while ($currentClassReflection->getParentClass() !== null) {
-			$parentNames[] = $currentClassReflection->getParentClass()->getName();
-			$currentClassReflection = $currentClassReflection->getParentClass();
+		$parentClass = $this->getParentClass();
+		while ($parentClass !== null) {
+			$parentNames[] = $parentClass->getName();
+			$parentClass = $parentClass->getParentClass();
 		}
 
 		return $parentNames;

src/Type/ObjectType.php

@@ -1218,11 +1218,12 @@ public function getEnumCases(): array
 		}
 
 		$cases = [];
+		$className = $classReflection->getName();
 		foreach ($classReflection->getEnumCases() as $enumCase) {
 			if (array_key_exists($enumCase->getName(), $subtracted)) {
 				continue;
 			}
-			$cases[] = new EnumCaseObjectType($classReflection->getName(), $enumCase->getName(), $classReflection);
+			$cases[] = new EnumCaseObjectType($className, $enumCase->getName(), $classReflection);
 		}
 
 		return $cases;