Use NonAcceptingNeverType in more places

ondrejmirtes · ondrejmirtes · commit 3e03e9d7c15f · 2023-08-31T10:14:10.000+02:00
diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
@@ -96,6 +96,7 @@
 use PHPStan\Type\IntersectionType;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\NeverType;
+use PHPStan\Type\NonAcceptingNeverType;
 use PHPStan\Type\NonexistentParentClassType;
 use PHPStan\Type\NullType;
 use PHPStan\Type\ObjectShapeType;
@@ -676,7 +677,7 @@ private function getNodeKey(Expr $node): string
 	private function resolveType(string $exprString, Expr $node): Type
 	{
 		if ($node instanceof Expr\Exit_ || $node instanceof Expr\Throw_) {
-			return new NeverType(true);
+			return new NonAcceptingNeverType();
 		}
 
 		if (!$node instanceof Variable && $this->hasExpressionType($node)->yes()) {
@@ -1281,13 +1282,13 @@ private function resolveType(string $exprString, Expr $node): Type
 
 				if (count($returnTypes) === 0) {
 					if (count($closureExecutionEnds) > 0 && !$hasNull) {
-						$returnType = new NeverType(true);
+						$returnType = new NonAcceptingNeverType();
 					} else {
 						$returnType = new VoidType();
 					}
 				} else {
 					if (count($closureExecutionEnds) > 0) {
-						$returnTypes[] = new NeverType(true);
+						$returnTypes[] = new NonAcceptingNeverType();
 					}
 					if ($hasNull) {
 						$returnTypes[] = new NullType();
diff --git a/tests/PHPStan/Analyser/data/closure-return-type.php b/tests/PHPStan/Analyser/data/closure-return-type.php
@@ -111,12 +111,12 @@ public function doBaz(): void
 		$f = function() {
 			$this->returnNever();
 		};
-		assertType('*NEVER*', $f());
+		assertType('never', $f());
 
 		$f = function(): void {
 			$this->returnNever();
 		};
-		assertType('*NEVER*', $f());
+		assertType('never', $f());
 
 		$f = function() {
 			if (rand(0, 1)) {
@@ -134,7 +134,7 @@ public function doBaz(): void
 
 			$this->returnNever();
 		};
-		assertType('*NEVER*', $f([]));
+		assertType('never', $f([]));
 
 		$f = function(array $a) {
 			foreach ($a as $v) {
@@ -148,12 +148,12 @@ public function doBaz(): void
 				$this->returnNever();
 			}
 		};
-		assertType('*NEVER*', $f());
+		assertType('never', $f());
 
 		$f = function (): \stdClass {
 			throw new \Exception();
 		};
-		assertType('*NEVER*', $f());
+		assertType('never', $f());
 	}
 
 }
diff --git a/tests/PHPStan/Analyser/data/throw-expr.php b/tests/PHPStan/Analyser/data/throw-expr.php
@@ -15,7 +15,7 @@ public function doFoo(bool $b): void
 
 	public function doBar(): void
 	{
-		assertType('*NEVER*', throw new \Exception());
+		assertType('never', throw new \Exception());
 	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public function doFoo(bool $b): void`
`15`	`15`
`16`	`16`	`public function doBar(): void`
`17`	`17`	`{`
`18`		`- assertType('NEVER', throw new \Exception());`
	`18`	`+ assertType('never', throw new \Exception());`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`}`