Higher Order Tests now resolve callable expectations. The tap method now always returns the test case.

src/Support/HigherOrderCallables.php

@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace Pest\Support;
 
+use Pest\Expectation;
+
 /**
  * @internal
  */
@@ -19,6 +21,34 @@ final class HigherOrderCallables
         $this->target = $target;
     }
 
+    /**
+     * @template TValue
+     *
+     * Create a new expectation. Callable values will be executed prior to returning the new expectation.
+     *
+     * @param callable|TValue $value
+     *
+     * @return Expectation<TValue>
+     */
+    public function expect($value)
+    {
+        return new Expectation(is_callable($value) ? Reflection::bindCallable($value) : $value);
+    }
+
+    /**
+     * @template TValue
+     *
+     * Create a new expectation. Callable values will be executed prior to returning the new expectation.
+     *
+     * @param callable|TValue $value
+     *
+     * @return Expectation<TValue>
+     */
+    public function and($value)
+    {
+        return $this->expect($value);
+    }
+
     /**
      * @template TValue
      *
@@ -28,6 +58,8 @@ final class HigherOrderCallables
      */
     public function tap(callable $callable)
     {
-        return Reflection::bindCallable($callable) ?? $this->target;
+        Reflection::bindCallable($callable);
+
+        return $this->target;
     }
 }