fixes after rebase

Author: canvural

src/Analyser/MutatingScope.php

@@ -3684,7 +3684,7 @@ public function addTypeToExpression(Expr $expr, Type $type): self
 
 	public function removeTypeFromExpression(Expr $expr, Type $typeToRemove): self
 	{
-		if ($typeToRemove instanceof NeverType) {
+		if ($typeToRemove->isNever()->yes()) {
 			return $this;
 		}
 

src/Analyser/NodeScopeResolver.php

@@ -4396,7 +4396,7 @@ function (MutatingScope $scope) use ($stmt, $expr, $nodeCallback, $context, $sto
 			$isExhaustive = $hasDefaultCond || $hasAlwaysTrueCond;
 			if (!$isExhaustive) {
 				$remainingType = $matchScope->getType($expr->cond);
-				if ($remainingType->isNever()->no()) {
+				if ($remainingType->isNever()->yes()) {
 					$isExhaustive = true;
 				}
 			}
@@ -7675,7 +7675,7 @@ private function scopeHasNeverVariable(MutatingScope $scope, array $varNames): b
 	{
 		foreach ($varNames as $varName) {
 			$type = $scope->getVariableType($varName);
-			if ($type instanceof NeverType) {
+			if ($type->isNever()->yes()) {
 				return true;
 			}
 		}

src/Type/Generic/GenericClassStringType.php

@@ -226,7 +226,7 @@ public function tryRemove(Type $typeToRemove): ?Type
 					$classReflection = $reflectionProvider->getClass($typeToRemove->getValue());
 					if ($classReflection->isFinal()) {
 						$remainingType = TypeCombinator::remove($generic, $objectTypeToRemove);
-						if ($remainingType instanceof NeverType) {
+						if ($remainingType->isNever()->yes()) {
 							return new NeverType();
 						}
 

src/Type/TypehintHelper.php

@@ -122,7 +122,7 @@ public static function decideType(
 			if (
 				($type->isCallable()->yes() && $phpDocType->isCallable()->yes())
 				|| (
-					(!$phpDocType->isNever()->yes() || ($type instanceof MixedType && !$type->isExplicitMixed()))
+					($phpDocType->isNever()->no() || ($type instanceof MixedType && !$type->isExplicitMixed()))
 					&& $type->isSuperTypeOf(TemplateTypeHelper::resolveToBounds($phpDocType))->yes()
 				)
 			) {