Revert "Explicit NeverType: accept nothing"

This reverts commit 25c8312.
phpstan · Dec 15, 2022 · 42b015d · 42b015d
1 parent 25c8312
commit 42b015d
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 110 deletions.
diff --git a/src/Type/NeverType.php b/src/Type/NeverType.php
@@ -63,10 +63,6 @@ public function getConstantStrings(): array
 
 	public function accepts(Type $type, bool $strictTypes): TrinaryLogic
 	{
-		if ($this->isExplicit()) {
-			return $this->isSuperTypeOf($type);
-		}
-
 		return TrinaryLogic::createYes();
 	}
 

diff --git a/tests/PHPStan/Rules/Functions/CallCallablesRuleTest.php b/tests/PHPStan/Rules/Functions/CallCallablesRuleTest.php
@@ -262,14 +262,4 @@ public function testStaticCallInFunctions(): void
 		$this->analyse([__DIR__ . '/data/static-call-in-functions.php'], []);
 	}
 
-	public function testBug6485(): void
-	{
-		$this->analyse([__DIR__ . '/data/bug-6485.php'], [
-			[
-				'Parameter #1 $ of closure expects *NEVER*, TBlockType of Bug6485\\Block given.',
-				28,
-			],
-		]);
-	}
-
 }
diff --git a/tests/PHPStan/Rules/Functions/data/bug-6485.php b/tests/PHPStan/Rules/Functions/data/bug-6485.php
diff --git a/tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php b/tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php
@@ -2584,10 +2584,6 @@ public function testUnresolvableParameter(): void
 				'Parameter #2 $v of method UnresolvableParameter\HelloWorld::foo() contains unresolvable type.',
 				19,
 			],
-			[
-				'Parameter #2 $v of method UnresolvableParameter\HelloWorld::foo() expects *NEVER*, 0 given.',
-				20,
-			],
 		]);
 	}
 

diff --git a/tests/PHPStan/Type/NeverTypeTest.php b/tests/PHPStan/Type/NeverTypeTest.php