assert based on original-node

Author: staabm

src/Node/MethodCallableNode.php

@@ -39,15 +39,6 @@ public function getOriginalNode(): Expr\MethodCall|Expr\NullsafeMethodCall
 		return $this->originalNode;
 	}
 
-	/**
-	 * Whether the original expression combined the nullsafe operator with the
-	 * first-class callable syntax (`$foo?->bar(...)`), which is a fatal error in PHP.
-	 */
-	public function isNullsafe(): bool
-	{
-		return $this->originalNode instanceof Expr\NullsafeMethodCall;
-	}
-
 	#[Override]
 	public function getType(): string
 	{

src/Rules/Methods/MethodCallableRule.php

@@ -37,7 +37,7 @@ public function processNode(Node $node, Scope $scope): array
 			];
 		}
 
-		if ($node->isNullsafe()) {
+		if ($node->getOriginalNode() instanceof Node\Expr\NullsafeMethodCall) {
 			return [
 				RuleErrorBuilder::message('Cannot combine nullsafe operator with Closure creation.')
 					->nonIgnorable()

tests/PHPStan/Analyser/AnalyserIntegrationTest.php

@@ -1605,9 +1605,9 @@ public function testBug9746(): void
 		$errors = $this->runAnalyse(__DIR__ . '/data/bug-9746.php');
 		$this->assertCount(2, $errors);
 		$this->assertSame('Call to method Bug9746\HelloWorld::sayHello() on a separate line has no effect.', $errors[0]->getMessage());
-		$this->assertSame(9, $errors[0]->getLine());
+		$this->assertSame(11, $errors[0]->getLine());
 		$this->assertSame('Cannot combine nullsafe operator with Closure creation.', $errors[1]->getMessage());
-		$this->assertSame(9, $errors[1]->getLine());
+		$this->assertSame(11, $errors[1]->getLine());
 	}
 
 	/**

tests/PHPStan/Analyser/data/bug-9746.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types = 1);
+<?php // lint >= 8.1
+
+declare(strict_types = 1);
 
 namespace Bug9746;
 

tests/PHPStan/Rules/Methods/MethodCallableRuleTest.php

@@ -65,7 +65,7 @@ public function testNullsafe(): void
 		$this->analyse([__DIR__ . '/data/method-callable-nullsafe.php'], [
 			[
 				'Cannot combine nullsafe operator with Closure creation.',
-				18,
+				20,
 			],
 		]);
 	}

tests/PHPStan/Rules/Methods/data/method-callable-nullsafe.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types = 1);
+<?php // lint >= 8.1
+
+declare(strict_types = 1);
 
 namespace MethodCallableNullsafe;