moved description cache into ObjectType

phpstan · Jul 3, 2024 · 465dfa0 · 465dfa0
1 parent 5ae9484
commit 465dfa0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/src/Type/Enum/EnumCaseObjectType.php b/src/Type/Enum/EnumCaseObjectType.php
@@ -20,16 +20,12 @@
 use PHPStan\Type\SubtractableType;
 use PHPStan\Type\Type;
 use PHPStan\Type\VerbosityLevel;
-use function array_key_exists;
 use function sprintf;
 
 /** @api */
 class EnumCaseObjectType extends ObjectType
 {
 
-	/** @var array<int, string> */
-	private array $descriptions = [];
-
 	/** @api */
 	public function __construct(
 		string $className,
@@ -47,11 +43,9 @@ public function getEnumCaseName(): string
 
 	public function describe(VerbosityLevel $level): string
 	{
-		$value = $level->getLevelValue();
-		if (!array_key_exists($value, $this->descriptions)) {
-			$this->descriptions[$value] = sprintf('%s::%s', parent::describe($level), $this->enumCaseName);
-		}
-		return $this->descriptions[$value];
+		$parent = parent::describe($level);
+
+		return sprintf('%s::%s', $parent, $this->enumCaseName);
 	}
 
 	public function equals(Type $type): bool

diff --git a/src/Type/ObjectType.php b/src/Type/ObjectType.php
@@ -97,6 +97,9 @@ class ObjectType implements TypeWithClassName, SubtractableType
 	/** @var array<string, list<EnumCaseObjectType>> */
 	private static array $enumCases = [];
 
+	/** @var array<int, string> */
+	private array $descriptions = [];
+
 	/** @api */
 	public function __construct(
 		private string $className,
@@ -475,6 +478,11 @@ private function checkSubclassAcceptability(string $thatClass): AcceptsResult
 
 	public function describe(VerbosityLevel $level): string
 	{
+		$levelValue = $level->getLevelValue();
+		if (array_key_exists($levelValue, $this->descriptions)) {
+			return $this->descriptions[$levelValue];
+		}
+
 		$preciseNameCallback = function (): string {
 			$reflectionProvider = ReflectionProviderStaticAccessor::getInstance();
 			if (!$reflectionProvider->hasClass($this->className)) {
@@ -493,7 +501,7 @@ public function describe(VerbosityLevel $level): string
 			return $description;
 		};
 
-		return $level->handle(
+		return $this->descriptions[$levelValue] = $level->handle(
 			$preciseNameCallback,
 			$preciseNameCallback,
 			$preciseWithSubtracted,