Fix string representation when using callables inside Condition

Author: thekid

src/main/php/test/verify/Condition.class.php

@@ -9,6 +9,7 @@
  * 
  * - `Condition('self::processExecutionEnabled()')`
  * - `Condition(assert: 'function_exists("bcadd")')`
+ * - `Condition(assert: fn() => PHP_VERSION_ID >= 80500)`
  *
  * @test  test.unittest.ConditionTest
  */
@@ -27,14 +28,17 @@ public function __construct($assert) {
    * @return iterable
    */
   public function assertions(Context $context) {
-    $assertion= $this->assert instanceof Closure
-      ? $this->assert
-      : $context->type->evaluate("fn() => {$this->assert};")
-    ;
+    if ($this->assert instanceof Closure) {
+      $string= '<function()>';
+      $assertion= $this->assert;
+    } else {
+      $string= (string)$this->assert;
+      $assertion= $context->type->evaluate("fn() => {$this->assert};");
+    }
 
     yield new Assertion(
-      $assertion->bindTo($context->instance, $context->type->literal())->__invoke(),
-      new Verify($this->assert)
+      $assertion->bindTo($context->instance, $context->type->literal())(),
+      new Verify($string)
     );
   }
 }

src/test/php/test/unittest/ConditionTest.class.php

@@ -3,7 +3,7 @@
 use lang\Reflection;
 use test\execution\Context;
 use test\verify\Condition;
-use test\{Assert, Test, Values};
+use test\{Assert, Test};
 
 class ConditionTest {
 
@@ -29,11 +29,13 @@ public function can_create() {
   }
 
   #[Test]
-  public function success() {
-    Assert::that(new Condition('true'))
-      ->mappedBy([$this, 'failures'])
-      ->isNull()
-    ;
+  public function success_string() {
+    Assert::that(new Condition('true'))->mappedBy([$this, 'failures'])->isNull();
+  }
+
+  #[Test]
+  public function success_closure() {
+    Assert::that(new Condition(fn() => true))->mappedBy([$this, 'failures'])->isNull();
   }
 
   #[Test]
@@ -44,6 +46,14 @@ public function failure_includes_assertion_expression() {
     ;
   }
 
+  #[Test]
+  public function failure_includes_assertion_string() {
+    Assert::that(new Condition(fn() => false))
+      ->mappedBy([$this, 'failures'])
+      ->isEqualTo('Failed verifying <function()>')
+    ;
+  }
+
   #[Test]
   public function failure_can_access_context_scope() {
     Assert::that(new Condition('self::verify()'))