simplify TypeSpecifierComparisonContext

phpstan · Jun 25, 2024 · 40bb131 · 40bb131
1 parent 22ea0a9
commit 40bb131
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 12 deletions.
diff --git a/src/Analyser/TypeSpecifier.php b/src/Analyser/TypeSpecifier.php
@@ -1883,18 +1883,17 @@ private function specifyWithComparisonAwareTypeSpecifyingExtensions(
  if (!$this->reflectionProvider->hasFunction($callLike->name, $scope)) {
  return null;
  }
+ $functionReflection = $this->reflectionProvider->getFunction($callLike->name, $scope);
 
  $comparisonContext = TypeSpecifierContext::createComparison(
  new TypeSpecifierComparisonContext(
  $binaryOp,
  $callExpr,
- $callLike,
  $comparisonType,
  $context,
  $rootExpr,
  ),
  );
- $functionReflection = $this->reflectionProvider->getFunction($callLike->name, $scope);
  foreach ($this->getFunctionTypeSpecifyingExtensions() as $extension) {
  if (!$extension instanceof ComparisonAwareTypeSpecifyingExtension) {
  continue;
@@ -1946,7 +1945,8 @@ public function resolveEqual(Expr\BinaryOp\Equal $expr, Scope $scope, TypeSpecif
  }
 
  if (
- $exprNode instanceof Expr\CallLike
+ $context->true()
+ && $exprNode instanceof Expr\CallLike
  ) {
  $specifiedTypes = $this->specifyWithComparisonAwareTypeSpecifyingExtensions(
  $expr,
@@ -2051,7 +2051,8 @@ public function resolveIdentical(Expr\BinaryOp\Identical $expr, Scope $scope, Ty
  $rightType = $scope->getType($rightExpr);
 
  if (
- $unwrappedLeftExpr instanceof FuncCall
+ $context->true()
+ && $unwrappedLeftExpr instanceof FuncCall
  && $unwrappedLeftExpr->name instanceof Name
  ) {
  $specifiedTypes = $this->specifyWithComparisonAwareTypeSpecifyingExtensions(

diff --git a/src/Analyser/TypeSpecifierComparisonContext.php b/src/Analyser/TypeSpecifierComparisonContext.php
@@ -4,7 +4,6 @@
 
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\BinaryOp;
-use PhpParser\Node\Expr\CallLike;
 use PHPStan\Type\Type;
 
 /** @api */
@@ -14,7 +13,6 @@ final class TypeSpecifierComparisonContext
  public function __construct(
  private BinaryOp $binaryOp,
  private Expr $callExpr,
- private CallLike $callLike,
  private Type $comparisonType,
  private TypeSpecifierContext $context,
  private ?Expr $rootExpr,
@@ -32,11 +30,6 @@ public function getCallExpr(): Expr
  return $this->callExpr;
  }
 
- public function getCallLike(): CallLike
- {
- return $this->callLike;
- }
-
  public function getComparisonType(): Type
  {
  return $this->comparisonType;

diff --git a/tests/PHPStan/Analyser/TypeSpecifierContextTest.php b/tests/PHPStan/Analyser/TypeSpecifierContextTest.php
@@ -121,7 +121,6 @@ private function createComparisonContext(): TypeSpecifierContext
  new TypeSpecifierComparisonContext(
  new Equal(new String_('dummy'), new String_('dummy2')),
  new FuncCall('dummyFunc'),
- new FuncCall('dummyFunc'),
  new NullType(),
  TypeSpecifierContext::createNull(),
  null,