Rename ClosureHandler to ClosureInvoker, update related methods, parameters, and tests for consistency.

Author: yceruto

src/Decorator/AbstractCallableDecorator.php

@@ -11,9 +11,9 @@ abstract class AbstractCallableDecorator implements CallableDecoratorInterface
     final public function decorate(\Closure $closure, CallableMetadata $metadata): \Closure
     {
         return function (mixed ...$args) use ($closure, $metadata): mixed {
-            return $this->invoke(new ClosureHandler($closure, $args), $metadata);
+            return $this->invoke(new ClosureInvoker($closure, $args), $metadata);
         };
     }
 
-    abstract protected function invoke(ClosureHandler $handler, CallableMetadata $metadata): mixed;
+    abstract protected function invoke(ClosureInvoker $invoker, CallableMetadata $metadata): mixed;
 }

src/Decorator/ClosureHandler.php src/Decorator/ClosureInvoker.phpsrc/Decorator/ClosureHandler.php renamed to src/Decorator/ClosureInvoker.php

@@ -4,7 +4,7 @@
 
 namespace OpenSolid\CallableInvoker\Decorator;
 
-final readonly class ClosureHandler
+final readonly class ClosureInvoker
 {
     /**
      * @param array<array-key, mixed> $arguments
@@ -15,7 +15,7 @@ public function __construct(
     ) {
     }
 
-    public function handle(): mixed
+    public function invoke(): mixed
     {
         return ($this->closure)(...$this->arguments);
     }

tests/Unit/Decorator/AbstractCallableDecoratorTest.php

@@ -4,7 +4,7 @@
 
 use OpenSolid\CallableInvoker\CallableMetadata;
 use OpenSolid\CallableInvoker\Decorator\AbstractCallableDecorator;
-use OpenSolid\CallableInvoker\Decorator\ClosureHandler;
+use OpenSolid\CallableInvoker\Decorator\ClosureInvoker;
 use OpenSolid\CallableInvoker\Tests\Unit\TestHelper;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
@@ -22,9 +22,9 @@ public function supports(CallableMetadata $metadata): bool
                 return true;
             }
 
-            protected function invoke(ClosureHandler $handler, CallableMetadata $metadata): mixed
+            protected function invoke(ClosureInvoker $invoker, CallableMetadata $metadata): mixed
             {
-                return $handler->handle();
+                return $invoker->invoke();
             }
         };
 
@@ -42,9 +42,9 @@ public function supports(CallableMetadata $metadata): bool
                 return true;
             }
 
-            protected function invoke(ClosureHandler $handler, CallableMetadata $metadata): mixed
+            protected function invoke(ClosureInvoker $invoker, CallableMetadata $metadata): mixed
             {
-                return $handler->handle();
+                return $invoker->invoke();
             }
         };
 
@@ -62,9 +62,9 @@ public function supports(CallableMetadata $metadata): bool
                 return true;
             }
 
-            protected function invoke(ClosureHandler $handler, CallableMetadata $metadata): string
+            protected function invoke(ClosureInvoker $invoker, CallableMetadata $metadata): string
             {
-                return '[wrapped] '.$handler->handle();
+                return '[wrapped] '.$invoker->invoke();
             }
         };
 
@@ -82,7 +82,7 @@ public function supports(CallableMetadata $metadata): bool
                 return true;
             }
 
-            protected function invoke(ClosureHandler $handler, CallableMetadata $metadata): string
+            protected function invoke(ClosureInvoker $invoker, CallableMetadata $metadata): string
             {
                 return 'short-circuited';
             }
@@ -96,10 +96,10 @@ protected function invoke(ClosureHandler $handler, CallableMetadata $metadata):
     #[Test]
     public function decorateExposesClosureAndArgumentsViaHandler(): void
     {
-        $capturedHandler = null;
+        $capturedInvoker = null;
 
-        $decorator = new class($capturedHandler) extends AbstractCallableDecorator {
-            public function __construct(private(set) ?ClosureHandler &$captured)
+        $decorator = new class($capturedInvoker) extends AbstractCallableDecorator {
+            public function __construct(private(set) ?ClosureInvoker &$captured)
             {
             }
 
@@ -108,11 +108,11 @@ public function supports(CallableMetadata $metadata): bool
                 return true;
             }
 
-            protected function invoke(ClosureHandler $handler, CallableMetadata $metadata): mixed
+            protected function invoke(ClosureInvoker $invoker, CallableMetadata $metadata): mixed
             {
-                $this->captured = $handler;
+                $this->captured = $invoker;
 
-                return $handler->handle();
+                return $invoker->invoke();
             }
         };
 
@@ -121,8 +121,8 @@ protected function invoke(ClosureHandler $handler, CallableMetadata $metadata):
         $result = $decorated(5);
 
         self::assertSame(10, $result);
-        self::assertNotNull($capturedHandler);
-        self::assertSame([5], $capturedHandler->arguments);
-        self::assertSame($result, ($capturedHandler->closure)(5));
+        self::assertNotNull($capturedInvoker);
+        self::assertSame([5], $capturedInvoker->arguments);
+        self::assertSame($result, ($capturedInvoker->closure)(5));
     }
 }