Cleanup

Author: ondrejmirtes

src/Analyser/MutatingScope.php

@@ -1882,8 +1882,8 @@ private function resolveType(Expr $node): Type
 					$this->getType($node->var),
 					$node->name->name,
 					$node
-				) ?? new NeverType();
-				if ($returnType instanceof NeverType && !$returnType->isExplicit()) {
+				);
+				if ($returnType === null) {
 					return new ErrorType();
 				}
 				return $returnType;
@@ -1915,8 +1915,8 @@ private function resolveType(Expr $node): Type
 					$staticMethodCalledOnType,
 					$node->name->toString(),
 					$node
-				) ?? new NeverType();
-				if ($returnType instanceof NeverType && !$returnType->isExplicit()) {
+				);
+				if ($returnType === null) {
 					return new ErrorType();
 				}
 				return $returnType;
@@ -1936,8 +1936,8 @@ private function resolveType(Expr $node): Type
 					$this->getType($node->var),
 					$node->name->name,
 					$node
-				) ?? new NeverType();
-				if ($returnType instanceof NeverType) {
+				);
+				if ($returnType === null) {
 					return new ErrorType();
 				}
 				return $returnType;
@@ -1972,8 +1972,8 @@ private function resolveType(Expr $node): Type
 					$staticPropertyFetchedOnType,
 					$node->name->toString(),
 					$node
-				) ?? new NeverType();
-				if ($returnType instanceof NeverType) {
+				);
+				if ($returnType === null) {
 					return new ErrorType();
 				}
 				return $returnType;