Improve memoizing reflectors

lookyman · ondrejmirtes · commit 9be18dfb3940 · 2020-01-03T18:58:45.000+01:00
diff --git a/src/Reflection/BetterReflection/Reflector/MemoizingClassReflector.php b/src/Reflection/BetterReflection/Reflector/MemoizingClassReflector.php
@@ -4,11 +4,12 @@
 
 use Roave\BetterReflection\Reflection\Reflection;
 use Roave\BetterReflection\Reflector\ClassReflector;
+use Throwable;
 
 final class MemoizingClassReflector extends ClassReflector
 {
 
-	/** @var array<string, \Roave\BetterReflection\Reflection\ReflectionClass> */
+	/** @var array<string, \Roave\BetterReflection\Reflection\ReflectionClass|\Throwable> */
 	private $reflections = [];
 
 	/**
@@ -21,9 +22,18 @@ final class MemoizingClassReflector extends ClassReflector
 	public function reflect(string $className): Reflection
 	{
 		if (isset($this->reflections[$className])) {
+			if ($this->reflections[$className] instanceof Throwable) {
+				throw $this->reflections[$className];
+			}
 			return $this->reflections[$className];
 		}
-		return $this->reflections[$className] = parent::reflect($className);
+
+		try {
+			return $this->reflections[$className] = parent::reflect($className);
+		} catch (Throwable $e) {
+			$this->reflections[$className] = $e;
+			throw $e;
+		}
 	}
 
 }
diff --git a/src/Reflection/BetterReflection/Reflector/MemoizingConstantReflector.php b/src/Reflection/BetterReflection/Reflector/MemoizingConstantReflector.php
@@ -4,11 +4,12 @@
 
 use Roave\BetterReflection\Reflection\Reflection;
 use Roave\BetterReflection\Reflector\ConstantReflector;
+use Throwable;
 
 final class MemoizingConstantReflector extends ConstantReflector
 {
 
-	/** @var array<string, \Roave\BetterReflection\Reflection\ReflectionConstant> */
+	/** @var array<string, \Roave\BetterReflection\Reflection\ReflectionConstant|\Throwable> */
 	private $reflections = [];
 
 	/**
@@ -21,9 +22,18 @@ 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];
 		}
-		return $this->reflections[$constantName] = parent::reflect($constantName);
+
+		try {
+			return $this->reflections[$constantName] = parent::reflect($constantName);
+		} catch (Throwable $e) {
+			$this->reflections[$constantName] = $e;
+			throw $e;
+		}
 	}
 
 }
diff --git a/src/Reflection/BetterReflection/Reflector/MemoizingFunctionReflector.php b/src/Reflection/BetterReflection/Reflector/MemoizingFunctionReflector.php
@@ -4,11 +4,12 @@
 
 use Roave\BetterReflection\Reflection\Reflection;
 use Roave\BetterReflection\Reflector\FunctionReflector;
+use Throwable;
 
 final class MemoizingFunctionReflector extends FunctionReflector
 {
 
-	/** @var array<string, \Roave\BetterReflection\Reflection\ReflectionFunction> */
+	/** @var array<string, \Roave\BetterReflection\Reflection\ReflectionFunction|\Throwable> */
 	private $reflections = [];
 
 	/**
@@ -21,9 +22,18 @@ final class MemoizingFunctionReflector extends FunctionReflector
 	public function reflect(string $functionName): Reflection
 	{
 		if (isset($this->reflections[$functionName])) {
+			if ($this->reflections[$functionName] instanceof Throwable) {
+				throw $this->reflections[$functionName];
+			}
 			return $this->reflections[$functionName];
 		}
-		return $this->reflections[$functionName] = parent::reflect($functionName);
+
+		try {
+			return $this->reflections[$functionName] = parent::reflect($functionName);
+		} catch (Throwable $e) {
+			$this->reflections[$functionName] = $e;
+			throw $e;
+		}
 	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -4,11 +4,12 @@`
`4`	`4`
`5`	`5`	`use Roave\BetterReflection\Reflection\Reflection;`
`6`	`6`	`use Roave\BetterReflection\Reflector\ClassReflector;`
	`7`	`+use Throwable;`
`7`	`8`
`8`	`9`	`final class MemoizingClassReflector extends ClassReflector`
`9`	`10`	`{`
`10`	`11`
`11`		`- /** @var array<string, \Roave\BetterReflection\Reflection\ReflectionClass> */`
	`12`	`+ /** @var array<string, \Roave\BetterReflection\Reflection\ReflectionClass\|\Throwable> */`
`12`	`13`	`private $reflections = [];`
`13`	`14`
`14`	`15`	`/**`
`@@ -21,9 +22,18 @@ final class MemoizingClassReflector extends ClassReflector`
`21`	`22`	`public function reflect(string $className): Reflection`
`22`	`23`	`{`
`23`	`24`	`if (isset($this->reflections[$className])) {`
	`25`	`+ if ($this->reflections[$className] instanceof Throwable) {`
	`26`	`+ throw $this->reflections[$className];`
	`27`	`+ }`
`24`	`28`	`return $this->reflections[$className];`
`25`	`29`	`}`
`26`		`- return $this->reflections[$className] = parent::reflect($className);`
	`30`	`+`
	`31`	`+ try {`
	`32`	`+ return $this->reflections[$className] = parent::reflect($className);`
	`33`	`+ } catch (Throwable $e) {`
	`34`	`+ $this->reflections[$className] = $e;`
	`35`	`+ throw $e;`
	`36`	`+ }`
`27`	`37`	`}`
`28`	`38`
`29`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,11 +4,12 @@`
`4`	`4`
`5`	`5`	`use Roave\BetterReflection\Reflection\Reflection;`
`6`	`6`	`use Roave\BetterReflection\Reflector\ConstantReflector;`
	`7`	`+use Throwable;`
`7`	`8`
`8`	`9`	`final class MemoizingConstantReflector extends ConstantReflector`
`9`	`10`	`{`
`10`	`11`
`11`		`- /** @var array<string, \Roave\BetterReflection\Reflection\ReflectionConstant> */`
	`12`	`+ /** @var array<string, \Roave\BetterReflection\Reflection\ReflectionConstant\|\Throwable> */`
`12`	`13`	`private $reflections = [];`
`13`	`14`
`14`	`15`	`/**`
`@@ -21,9 +22,18 @@ final class MemoizingConstantReflector extends ConstantReflector`
`21`	`22`	`public function reflect(string $constantName): Reflection`
`22`	`23`	`{`
`23`	`24`	`if (isset($this->reflections[$constantName])) {`
	`25`	`+ if ($this->reflections[$constantName] instanceof Throwable) {`
	`26`	`+ throw $this->reflections[$constantName];`
	`27`	`+ }`
`24`	`28`	`return $this->reflections[$constantName];`
`25`	`29`	`}`
`26`		`- return $this->reflections[$constantName] = parent::reflect($constantName);`
	`30`	`+`
	`31`	`+ try {`
	`32`	`+ return $this->reflections[$constantName] = parent::reflect($constantName);`
	`33`	`+ } catch (Throwable $e) {`
	`34`	`+ $this->reflections[$constantName] = $e;`
	`35`	`+ throw $e;`
	`36`	`+ }`
`27`	`37`	`}`
`28`	`38`
`29`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,11 +4,12 @@`
`4`	`4`
`5`	`5`	`use Roave\BetterReflection\Reflection\Reflection;`
`6`	`6`	`use Roave\BetterReflection\Reflector\FunctionReflector;`
	`7`	`+use Throwable;`
`7`	`8`
`8`	`9`	`final class MemoizingFunctionReflector extends FunctionReflector`
`9`	`10`	`{`
`10`	`11`
`11`		`- /** @var array<string, \Roave\BetterReflection\Reflection\ReflectionFunction> */`
	`12`	`+ /** @var array<string, \Roave\BetterReflection\Reflection\ReflectionFunction\|\Throwable> */`
`12`	`13`	`private $reflections = [];`
`13`	`14`
`14`	`15`	`/**`
`@@ -21,9 +22,18 @@ final class MemoizingFunctionReflector extends FunctionReflector`
`21`	`22`	`public function reflect(string $functionName): Reflection`
`22`	`23`	`{`
`23`	`24`	`if (isset($this->reflections[$functionName])) {`
	`25`	`+ if ($this->reflections[$functionName] instanceof Throwable) {`
	`26`	`+ throw $this->reflections[$functionName];`
	`27`	`+ }`
`24`	`28`	`return $this->reflections[$functionName];`
`25`	`29`	`}`
`26`		`- return $this->reflections[$functionName] = parent::reflect($functionName);`
	`30`	`+`
	`31`	`+ try {`
	`32`	`+ return $this->reflections[$functionName] = parent::reflect($functionName);`
	`33`	`+ } catch (Throwable $e) {`
	`34`	`+ $this->reflections[$functionName] = $e;`
	`35`	`+ throw $e;`
	`36`	`+ }`
`27`	`37`	`}`
`28`	`38`
`29`	`39`	`}`