Fix filtering with first class callable

axlon · Sep 26, 2024 · 6aff6fe · 6aff6fe
1 parent 7689d95
commit 6aff6fe
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/src/Type/PhpOption/FilterReturnTypeExtension.php b/src/Type/PhpOption/FilterReturnTypeExtension.php
@@ -9,6 +9,7 @@
 use PhpParser\Node\Expr\Closure;
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Expr\MethodCall;
+use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Name;
 use PhpParser\Node\Name\FullyQualified;
@@ -69,6 +70,17 @@ public function getTypeFromMethodCall(
                 },
                 [new Arg($var)],
             );
+        } elseif (
+            (
+                $callbackArg instanceof FuncCall
+                || $callbackArg instanceof MethodCall
+                || $callbackArg instanceof StaticCall
+            )
+            && $callbackArg->isFirstClassCallable()
+        ) {
+            $var = new Variable('value');
+            $expr = clone $callbackArg;
+            $expr->args = [new Arg($var)];
         } else {
             return null;
         }

diff --git a/tests/Type/PhpOption/data/option-filter-not.php b/tests/Type/PhpOption/data/option-filter-not.php
@@ -7,5 +7,6 @@
 /**
  * @var \PhpOption\Option<string|null> $option
  */
-assertType('PhpOption\Option<null>', $option->filterNot('is_string'));
-assertType('PhpOption\Option<null>', $option->filterNot(static fn ($value) => is_string($value)));
+assertType('PhpOption\Option<string>', $option->filterNot('is_null'));
+assertType('PhpOption\Option<string>', $option->filterNot(static fn ($value) => is_null($value)));
+assertType('PhpOption\Option<string>', $option->filterNot(is_null(...)));
diff --git a/tests/Type/PhpOption/data/option-filter.php b/tests/Type/PhpOption/data/option-filter.php
@@ -9,3 +9,4 @@
  */
 assertType('PhpOption\Option<string>', $option->filter('is_string'));
 assertType('PhpOption\Option<string>', $option->filter(static fn ($value) => is_string($value)));
+assertType('PhpOption\Option<string>', $option->filter(is_string(...)));