PhpParameterReflection - prevent more reflection errors

phpstan · Jun 12, 2020 · ce3d231 · ce3d231
1 parent 57a6585
commit ce3d231
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/src/Reflection/Php/PhpParameterReflection.php b/src/Reflection/Php/PhpParameterReflection.php
@@ -47,8 +47,14 @@ public function getType(): Type
 	{
 		if ($this->type === null) {
 			$phpDocType = $this->phpDocType;
-			if ($phpDocType !== null && $this->reflection->isDefaultValueAvailable() && $this->reflection->getDefaultValue() === null) {
-				$phpDocType = \PHPStan\Type\TypeCombinator::addNull($phpDocType);
+			if ($phpDocType !== null) {
+				try {
+					if ($this->reflection->isDefaultValueAvailable() && $this->reflection->getDefaultValue() === null) {
+						$phpDocType = \PHPStan\Type\TypeCombinator::addNull($phpDocType);
+					}
+				} catch (\Throwable $e) {
+					// pass
+				}
 			}
 
 			$this->type = TypehintHelper::decideTypeFromReflection(
@@ -99,14 +105,13 @@ public function getNativeType(): Type
 
 	public function getDefaultValue(): ?Type
 	{
-		if ($this->reflection->isDefaultValueAvailable()) {
-			try {
+		try {
+			if ($this->reflection->isDefaultValueAvailable()) {
 				$defaultValue = $this->reflection->getDefaultValue();
-			} catch (\Throwable $e) {
-				return null;
+				return ConstantTypeHelper::getTypeFromValue($defaultValue);
 			}
-
-			return ConstantTypeHelper::getTypeFromValue($defaultValue);
+		} catch (\Throwable $e) {
+			return null;
 		}
 
 		return null;