Some handlers only need to reference truthy/falsey scope of the processed expression

ondrejmirtes · ondrejmirtes · commit bee17d3e64b2 · 2026-03-14T08:42:33.000+01:00
diff --git a/src/Analyser/ExprHandler/ArrayHandler.php b/src/Analyser/ExprHandler/ArrayHandler.php
@@ -75,8 +75,6 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 			isAlwaysTerminating: $isAlwaysTerminating,
 			throwPoints: $throwPoints,
 			impurePoints: $impurePoints,
-			truthyScopeCallback: static fn (): MutatingScope => $scope->filterByTruthyValue($expr),
-			falseyScopeCallback: static fn (): MutatingScope => $scope->filterByFalseyValue($expr),
 		);
 	}
 
diff --git a/src/Analyser/ExprHandler/BitwiseNotHandler.php b/src/Analyser/ExprHandler/BitwiseNotHandler.php
@@ -44,8 +44,6 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 			isAlwaysTerminating: $result->isAlwaysTerminating(),
 			throwPoints: $result->getThrowPoints(),
 			impurePoints: $result->getImpurePoints(),
-			truthyScopeCallback: static fn (): MutatingScope => $scope->filterByTruthyValue($expr),
-			falseyScopeCallback: static fn (): MutatingScope => $scope->filterByFalseyValue($expr),
 		);
 	}
 
diff --git a/src/Analyser/ExprHandler/CloneHandler.php b/src/Analyser/ExprHandler/CloneHandler.php
@@ -41,8 +41,6 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 			isAlwaysTerminating: $result->isAlwaysTerminating(),
 			throwPoints: $result->getThrowPoints(),
 			impurePoints: $result->getImpurePoints(),
-			truthyScopeCallback: static fn (): MutatingScope => $scope->filterByTruthyValue($expr),
-			falseyScopeCallback: static fn (): MutatingScope => $scope->filterByFalseyValue($expr),
 		);
 	}
 
diff --git a/src/Analyser/ExprHandler/ErrorSuppressHandler.php b/src/Analyser/ExprHandler/ErrorSuppressHandler.php
@@ -37,8 +37,8 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 			isAlwaysTerminating: $result->isAlwaysTerminating(),
 			throwPoints: $result->getThrowPoints(),
 			impurePoints: $result->getImpurePoints(),
-			truthyScopeCallback: static fn (): MutatingScope => $scope->filterByTruthyValue($expr),
-			falseyScopeCallback: static fn (): MutatingScope => $scope->filterByFalseyValue($expr),
+			truthyScopeCallback: static fn (): MutatingScope => $result->getTruthyScope(),
+			falseyScopeCallback: static fn (): MutatingScope => $result->getFalseyScope(),
 		);
 	}
 
diff --git a/src/Analyser/ExprHandler/EvalHandler.php b/src/Analyser/ExprHandler/EvalHandler.php
@@ -46,8 +46,6 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 			isAlwaysTerminating: $result->isAlwaysTerminating(),
 			throwPoints: array_merge($result->getThrowPoints(), [InternalThrowPoint::createImplicit($scope, $expr)]),
 			impurePoints: array_merge($result->getImpurePoints(), [new ImpurePoint($scope, $expr, 'eval', 'eval', true)]),
-			truthyScopeCallback: static fn (): MutatingScope => $scope->filterByTruthyValue($expr),
-			falseyScopeCallback: static fn (): MutatingScope => $scope->filterByFalseyValue($expr),
 		);
 	}
 
diff --git a/src/Analyser/ExprHandler/ExitHandler.php b/src/Analyser/ExprHandler/ExitHandler.php
@@ -53,8 +53,6 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 			isAlwaysTerminating: true,
 			throwPoints: $throwPoints,
 			impurePoints: $impurePoints,
-			truthyScopeCallback: static fn (): MutatingScope => $scope->filterByTruthyValue($expr),
-			falseyScopeCallback: static fn (): MutatingScope => $scope->filterByFalseyValue($expr),
 		);
 	}
 
diff --git a/src/Analyser/ExprHandler/IncludeHandler.php b/src/Analyser/ExprHandler/IncludeHandler.php
@@ -48,8 +48,6 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 			isAlwaysTerminating: $result->isAlwaysTerminating(),
 			throwPoints: array_merge($result->getThrowPoints(), [InternalThrowPoint::createImplicit($scope, $expr)]),
 			impurePoints: array_merge($result->getImpurePoints(), [new ImpurePoint($scope, $expr, $identifier, $identifier, true)]),
-			truthyScopeCallback: static fn (): MutatingScope => $scope->filterByTruthyValue($expr),
-			falseyScopeCallback: static fn (): MutatingScope => $scope->filterByFalseyValue($expr),
 		);
 	}
 
diff --git a/src/Analyser/ExprHandler/InterpolatedStringHandler.php b/src/Analyser/ExprHandler/InterpolatedStringHandler.php
@@ -60,8 +60,6 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 			isAlwaysTerminating: $isAlwaysTerminating,
 			throwPoints: $throwPoints,
 			impurePoints: $impurePoints,
-			truthyScopeCallback: static fn (): MutatingScope => $scope->filterByTruthyValue($expr),
-			falseyScopeCallback: static fn (): MutatingScope => $scope->filterByFalseyValue($expr),
 		);
 	}
 
diff --git a/src/Analyser/ExprHandler/NewHandler.php b/src/Analyser/ExprHandler/NewHandler.php
@@ -230,8 +230,6 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 			isAlwaysTerminating: $isAlwaysTerminating,
 			throwPoints: $throwPoints,
 			impurePoints: $impurePoints,
-			truthyScopeCallback: static fn (): MutatingScope => $scope->filterByTruthyValue($expr),
-			falseyScopeCallback: static fn (): MutatingScope => $scope->filterByFalseyValue($expr),
 		);
 	}
 
diff --git a/src/Analyser/ExprHandler/PipeHandler.php b/src/Analyser/ExprHandler/PipeHandler.php
@@ -87,8 +87,6 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 			isAlwaysTerminating: $exprResult->isAlwaysTerminating(),
 			throwPoints: $exprResult->getThrowPoints(),
 			impurePoints: $exprResult->getImpurePoints(),
-			truthyScopeCallback: static fn (): MutatingScope => $scope->filterByTruthyValue($expr),
-			falseyScopeCallback: static fn (): MutatingScope => $scope->filterByFalseyValue($expr),
 		);
 	}
 
diff --git a/src/Analyser/ExprHandler/PostDecHandler.php b/src/Analyser/ExprHandler/PostDecHandler.php
@@ -47,8 +47,6 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 			isAlwaysTerminating: $result->isAlwaysTerminating(),
 			throwPoints: $result->getThrowPoints(),
 			impurePoints: $result->getImpurePoints(),
-			truthyScopeCallback: static fn (): MutatingScope => $scope->filterByTruthyValue($expr),
-			falseyScopeCallback: static fn (): MutatingScope => $scope->filterByFalseyValue($expr),
 		);
 	}
 
diff --git a/src/Analyser/ExprHandler/PostIncHandler.php b/src/Analyser/ExprHandler/PostIncHandler.php
@@ -47,8 +47,6 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 			isAlwaysTerminating: $result->isAlwaysTerminating(),
 			throwPoints: $result->getThrowPoints(),
 			impurePoints: $result->getImpurePoints(),
-			truthyScopeCallback: static fn (): MutatingScope => $scope->filterByTruthyValue($expr),
-			falseyScopeCallback: static fn (): MutatingScope => $scope->filterByFalseyValue($expr),
 		);
 	}
 
diff --git a/src/Analyser/ExprHandler/PreDecHandler.php b/src/Analyser/ExprHandler/PreDecHandler.php
@@ -110,8 +110,6 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 			isAlwaysTerminating: $result->isAlwaysTerminating(),
 			throwPoints: $result->getThrowPoints(),
 			impurePoints: $result->getImpurePoints(),
-			truthyScopeCallback: static fn (): MutatingScope => $scope->filterByTruthyValue($expr),
-			falseyScopeCallback: static fn (): MutatingScope => $scope->filterByFalseyValue($expr),
 		);
 	}
 
diff --git a/src/Analyser/ExprHandler/PreIncHandler.php b/src/Analyser/ExprHandler/PreIncHandler.php
@@ -111,8 +111,6 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 			isAlwaysTerminating: $result->isAlwaysTerminating(),
 			throwPoints: $result->getThrowPoints(),
 			impurePoints: $result->getImpurePoints(),
-			truthyScopeCallback: static fn (): MutatingScope => $scope->filterByTruthyValue($expr),
-			falseyScopeCallback: static fn (): MutatingScope => $scope->filterByFalseyValue($expr),
 		);
 	}
 
diff --git a/src/Analyser/ExprHandler/PrintHandler.php b/src/Analyser/ExprHandler/PrintHandler.php
@@ -45,8 +45,6 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 			isAlwaysTerminating: $result->isAlwaysTerminating(),
 			throwPoints: $result->getThrowPoints(),
 			impurePoints: array_merge($result->getImpurePoints(), [new ImpurePoint($scope, $expr, 'print', 'print', true)]),
-			truthyScopeCallback: static fn (): MutatingScope => $scope->filterByTruthyValue($expr),
-			falseyScopeCallback: static fn (): MutatingScope => $scope->filterByFalseyValue($expr),
 		);
 	}
 
diff --git a/src/Analyser/ExprHandler/ScalarHandler.php b/src/Analyser/ExprHandler/ScalarHandler.php
@@ -43,8 +43,6 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 			isAlwaysTerminating: false,
 			throwPoints: [],
 			impurePoints: [],
-			truthyScopeCallback: static fn (): MutatingScope => $scope->filterByTruthyValue($expr),
-			falseyScopeCallback: static fn (): MutatingScope => $scope->filterByFalseyValue($expr),
 		);
 	}
 
diff --git a/src/Analyser/ExprHandler/ThrowHandler.php b/src/Analyser/ExprHandler/ThrowHandler.php
@@ -40,8 +40,6 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 			isAlwaysTerminating: $result->isAlwaysTerminating(),
 			throwPoints: $throwPoints,
 			impurePoints: $result->getImpurePoints(),
-			truthyScopeCallback: static fn (): MutatingScope => $scope->filterByTruthyValue($expr),
-			falseyScopeCallback: static fn (): MutatingScope => $scope->filterByFalseyValue($expr),
 		);
 	}
 
diff --git a/src/Analyser/ExprHandler/UnaryMinusHandler.php b/src/Analyser/ExprHandler/UnaryMinusHandler.php
@@ -44,8 +44,6 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 			isAlwaysTerminating: $result->isAlwaysTerminating(),
 			throwPoints: $result->getThrowPoints(),
 			impurePoints: $result->getImpurePoints(),
-			truthyScopeCallback: static fn (): MutatingScope => $scope->filterByTruthyValue($expr),
-			falseyScopeCallback: static fn (): MutatingScope => $scope->filterByFalseyValue($expr),
 		);
 	}
 
diff --git a/src/Analyser/ExprHandler/UnaryPlusHandler.php b/src/Analyser/ExprHandler/UnaryPlusHandler.php
@@ -37,8 +37,6 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 			isAlwaysTerminating: $result->isAlwaysTerminating(),
 			throwPoints: $result->getThrowPoints(),
 			impurePoints: $result->getImpurePoints(),
-			truthyScopeCallback: static fn (): MutatingScope => $scope->filterByTruthyValue($expr),
-			falseyScopeCallback: static fn (): MutatingScope => $scope->filterByFalseyValue($expr),
 		);
 	}
 
diff --git a/src/Analyser/ExprHandler/YieldFromHandler.php b/src/Analyser/ExprHandler/YieldFromHandler.php
@@ -54,8 +54,6 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 			isAlwaysTerminating: $result->isAlwaysTerminating(),
 			throwPoints: array_merge($result->getThrowPoints(), [InternalThrowPoint::createImplicit($scope, $expr)]),
 			impurePoints: array_merge($result->getImpurePoints(), [new ImpurePoint($scope, $expr, 'yieldFrom', 'yield from', true)]),
-			truthyScopeCallback: static fn (): MutatingScope => $scope->filterByTruthyValue($expr),
-			falseyScopeCallback: static fn (): MutatingScope => $scope->filterByFalseyValue($expr),
 		);
 	}
 
diff --git a/src/Analyser/ExprHandler/YieldHandler.php b/src/Analyser/ExprHandler/YieldHandler.php
@@ -84,8 +84,6 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 			isAlwaysTerminating: $isAlwaysTerminating,
 			throwPoints: $throwPoints,
 			impurePoints: $impurePoints,
-			truthyScopeCallback: static fn (): MutatingScope => $scope->filterByTruthyValue($expr),
-			falseyScopeCallback: static fn (): MutatingScope => $scope->filterByFalseyValue($expr),
 		);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -75,8 +75,6 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex`
`75`	`75`	`isAlwaysTerminating: $isAlwaysTerminating,`
`76`	`76`	`throwPoints: $throwPoints,`
`77`	`77`	`impurePoints: $impurePoints,`
`78`		`- truthyScopeCallback: static fn (): MutatingScope => $scope->filterByTruthyValue($expr),`
`79`		`- falseyScopeCallback: static fn (): MutatingScope => $scope->filterByFalseyValue($expr),`
`80`	`78`	`);`
`81`	`79`	`}`
`82`	`80`
Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,6 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex`
`44`	`44`	`isAlwaysTerminating: $result->isAlwaysTerminating(),`
`45`	`45`	`throwPoints: $result->getThrowPoints(),`
`46`	`46`	`impurePoints: $result->getImpurePoints(),`
`47`		`- truthyScopeCallback: static fn (): MutatingScope => $scope->filterByTruthyValue($expr),`
`48`		`- falseyScopeCallback: static fn (): MutatingScope => $scope->filterByFalseyValue($expr),`
`49`	`47`	`);`
`50`	`48`	`}`
`51`	`49`
Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,6 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex`
`41`	`41`	`isAlwaysTerminating: $result->isAlwaysTerminating(),`
`42`	`42`	`throwPoints: $result->getThrowPoints(),`
`43`	`43`	`impurePoints: $result->getImpurePoints(),`
`44`		`- truthyScopeCallback: static fn (): MutatingScope => $scope->filterByTruthyValue($expr),`
`45`		`- falseyScopeCallback: static fn (): MutatingScope => $scope->filterByFalseyValue($expr),`
`46`	`44`	`);`
`47`	`45`	`}`
`48`	`46`
Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,6 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex`
`46`	`46`	`isAlwaysTerminating: $result->isAlwaysTerminating(),`
`47`	`47`	`throwPoints: array_merge($result->getThrowPoints(), [InternalThrowPoint::createImplicit($scope, $expr)]),`
`48`	`48`	`impurePoints: array_merge($result->getImpurePoints(), [new ImpurePoint($scope, $expr, 'eval', 'eval', true)]),`
`49`		`- truthyScopeCallback: static fn (): MutatingScope => $scope->filterByTruthyValue($expr),`
`50`		`- falseyScopeCallback: static fn (): MutatingScope => $scope->filterByFalseyValue($expr),`
`51`	`49`	`);`
`52`	`50`	`}`
`53`	`51`
Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,6 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex`
`53`	`53`	`isAlwaysTerminating: true,`
`54`	`54`	`throwPoints: $throwPoints,`
`55`	`55`	`impurePoints: $impurePoints,`
`56`		`- truthyScopeCallback: static fn (): MutatingScope => $scope->filterByTruthyValue($expr),`
`57`		`- falseyScopeCallback: static fn (): MutatingScope => $scope->filterByFalseyValue($expr),`
`58`	`56`	`);`
`59`	`57`	`}`
`60`	`58`
Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,6 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex`
`48`	`48`	`isAlwaysTerminating: $result->isAlwaysTerminating(),`
`49`	`49`	`throwPoints: array_merge($result->getThrowPoints(), [InternalThrowPoint::createImplicit($scope, $expr)]),`
`50`	`50`	`impurePoints: array_merge($result->getImpurePoints(), [new ImpurePoint($scope, $expr, $identifier, $identifier, true)]),`
`51`		`- truthyScopeCallback: static fn (): MutatingScope => $scope->filterByTruthyValue($expr),`
`52`		`- falseyScopeCallback: static fn (): MutatingScope => $scope->filterByFalseyValue($expr),`
`53`	`51`	`);`
`54`	`52`	`}`
`55`	`53`
Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,6 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex`
`60`	`60`	`isAlwaysTerminating: $isAlwaysTerminating,`
`61`	`61`	`throwPoints: $throwPoints,`
`62`	`62`	`impurePoints: $impurePoints,`
`63`		`- truthyScopeCallback: static fn (): MutatingScope => $scope->filterByTruthyValue($expr),`
`64`		`- falseyScopeCallback: static fn (): MutatingScope => $scope->filterByFalseyValue($expr),`
`65`	`63`	`);`
`66`	`64`	`}`
`67`	`65`
Original file line number	Diff line number	Diff line change
`@@ -230,8 +230,6 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex`
`230`	`230`	`isAlwaysTerminating: $isAlwaysTerminating,`
`231`	`231`	`throwPoints: $throwPoints,`
`232`	`232`	`impurePoints: $impurePoints,`
`233`		`- truthyScopeCallback: static fn (): MutatingScope => $scope->filterByTruthyValue($expr),`
`234`		`- falseyScopeCallback: static fn (): MutatingScope => $scope->filterByFalseyValue($expr),`
`235`	`233`	`);`
`236`	`234`	`}`
`237`	`235`
Original file line number	Diff line number	Diff line change
`@@ -87,8 +87,6 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex`
`87`	`87`	`isAlwaysTerminating: $exprResult->isAlwaysTerminating(),`
`88`	`88`	`throwPoints: $exprResult->getThrowPoints(),`
`89`	`89`	`impurePoints: $exprResult->getImpurePoints(),`
`90`		`- truthyScopeCallback: static fn (): MutatingScope => $scope->filterByTruthyValue($expr),`
`91`		`- falseyScopeCallback: static fn (): MutatingScope => $scope->filterByFalseyValue($expr),`
`92`	`90`	`);`
`93`	`91`	`}`
`94`	`92`