This caused bad memory leak

phpstan · Oct 4, 2021 · 25cb765 · 25cb765
1 parent c1812e7
commit 25cb765
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 30 deletions.
diff --git a/src/Reflection/BetterReflection/Reflector/MemoizingClassReflector.php b/src/Reflection/BetterReflection/Reflector/MemoizingClassReflector.php
@@ -8,7 +8,7 @@
 final class MemoizingClassReflector extends ClassReflector
 {
 
-	/** @var array<string, \PHPStan\BetterReflection\Reflection\ReflectionClass|\Throwable> */
+	/** @var array<string, \PHPStan\BetterReflection\Reflection\ReflectionClass> */
 	private array $reflections = [];
 
 	/**
@@ -22,18 +22,10 @@ public function reflect(string $className): Reflection
 	{
 		$lowerClassName = strtolower($className);
 		if (isset($this->reflections[$lowerClassName])) {
-			if ($this->reflections[$lowerClassName] instanceof \Throwable) {
-				throw $this->reflections[$lowerClassName];
-			}
 			return $this->reflections[$lowerClassName];
 		}
 
-		try {
-			return $this->reflections[$lowerClassName] = parent::reflect($className);
-		} catch (\Throwable $e) {
-			$this->reflections[$lowerClassName] = $e;
-			throw $e;
-		}
+		return $this->reflections[$lowerClassName] = parent::reflect($className);
 	}
 
 }
diff --git a/src/Reflection/BetterReflection/Reflector/MemoizingConstantReflector.php b/src/Reflection/BetterReflection/Reflector/MemoizingConstantReflector.php
@@ -8,7 +8,7 @@
 final class MemoizingConstantReflector extends ConstantReflector
 {
 
-	/** @var array<string, \PHPStan\BetterReflection\Reflection\ReflectionConstant|\Throwable> */
+	/** @var array<string, \PHPStan\BetterReflection\Reflection\ReflectionConstant> */
 	private array $reflections = [];
 
 	/**
@@ -21,18 +21,10 @@ final class MemoizingConstantReflector extends ConstantReflector
 	public function reflect(string $constantName): Reflection
 	{
 		if (isset($this->reflections[$constantName])) {
-			if ($this->reflections[$constantName] instanceof \Throwable) {
-				throw $this->reflections[$constantName];
-			}
 			return $this->reflections[$constantName];
 		}
 
-		try {
-			return $this->reflections[$constantName] = parent::reflect($constantName);
-		} catch (\Throwable $e) {
-			$this->reflections[$constantName] = $e;
-			throw $e;
-		}
+		return $this->reflections[$constantName] = parent::reflect($constantName);
 	}
 
 }
diff --git a/src/Reflection/BetterReflection/Reflector/MemoizingFunctionReflector.php b/src/Reflection/BetterReflection/Reflector/MemoizingFunctionReflector.php
@@ -8,7 +8,7 @@
 final class MemoizingFunctionReflector extends FunctionReflector
 {
 
-	/** @var array<string, \PHPStan\BetterReflection\Reflection\ReflectionFunction|\Throwable> */
+	/** @var array<string, \PHPStan\BetterReflection\Reflection\ReflectionFunction> */
 	private array $reflections = [];
 
 	/**
@@ -22,18 +22,10 @@ public function reflect(string $functionName): Reflection
 	{
 		$lowerFunctionName = strtolower($functionName);
 		if (isset($this->reflections[$lowerFunctionName])) {
-			if ($this->reflections[$lowerFunctionName] instanceof \Throwable) {
-				throw $this->reflections[$lowerFunctionName];
-			}
 			return $this->reflections[$lowerFunctionName];
 		}
 
-		try {
-			return $this->reflections[$lowerFunctionName] = parent::reflect($functionName);
-		} catch (\Throwable $e) {
-			$this->reflections[$lowerFunctionName] = $e;
-			throw $e;
-		}
+		return $this->reflections[$lowerFunctionName] = parent::reflect($functionName);
 	}
 
 }