improve validated callable support

Author: rodber

src/functions.php

@@ -38,8 +38,10 @@
 use Iterator;
 use LogicException;
 use ReflectionAttribute;
+use ReflectionClass;
 use ReflectionFunction;
 use ReflectionMethod;
+use ReflectionObject;
 use ReflectionParameter;
 use ReflectionProperty;
 use SebastianBergmann\Type\Parameter;
@@ -533,8 +535,13 @@ function reflectedParameterAttribute(
 
 function validated(callable $callable, mixed ...$args): mixed
 {
-    // @phpstan-ignore-next-line
-    $reflection = new ReflectionFunction($callable);
+    $reflection = match (true) {
+        is_object($callable) => (new ReflectionObject($callable))->getMethod('__invoke'),
+        // @phpstan-ignore-next-line
+        is_array($callable) => (new ReflectionClass($callable[0]))->getMethod($callable[1]),
+        // @phpstan-ignore-next-line
+        default => new ReflectionFunction($callable),
+    };
 
     try {
         $parameters = reflectionToParameters($reflection);
@@ -564,7 +571,7 @@ function validated(callable $callable, mixed ...$args): mixed
 /**
  * @return array{0: string, 1: Throwable, 2: string, 3: int}
  */
-function getExceptionArguments(Throwable $e, ReflectionFunction $reflection): array
+function getExceptionArguments(Throwable $e, ReflectionFunction|ReflectionMethod $reflection): array
 {
     // @infection-ignore-all
     $caller = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2)[1];

tests/FunctionsTest.php

@@ -14,10 +14,12 @@
 namespace Chevere\Tests;
 
 use BadMethodCallException;
+use Chevere\Parameter\Attributes\_int;
 use Chevere\Parameter\Exceptions\ParameterException;
 use Chevere\Parameter\Exceptions\ReturnException;
 use Chevere\Parameter\Interfaces\ParametersAccessInterface;
 use Chevere\Parameter\Interfaces\ParametersInterface;
+use Chevere\Tests\src\CallableClassMethod;
 use InvalidArgumentException;
 use LogicException;
 use OutOfBoundsException;
@@ -480,6 +482,41 @@ public function testValidatedFunction(): void
         validated($function, 100, 1, 'Test'); // base, times, name
     }
 
+    public static function dataProviderValidatedCallables(): array
+    {
+        $object = new class() {
+            public function main(#[_int(min: 10)] int $base): void
+            {
+            }
+        };
+
+        return [
+            [
+                fn (#[_int(min: 10)] int $base) => null,
+            ],
+            ['Chevere\Tests\src\intMin10'],
+            [[CallableClassMethod::class, 'main']],
+            [[$object, 'main']],
+            [new class() {
+                public function __invoke(#[_int(min: 10)] int $base): void
+                {
+                }
+            }],
+        ];
+    }
+
+    #[DataProvider('dataProviderValidatedCallables')]
+    public function testValidatedCallables(callable $callable): void
+    {
+        $this->expectException(ParameterException::class);
+        $this->expectExceptionMessage(
+            <<<PLAIN
+            InvalidArgumentException → [base]: Argument value provided `9` is less than `10`
+            PLAIN
+        );
+        validated($callable, 9);
+    }
+
     #[DataProvider('dataProviderValMd')]
     public function testValMd(mixed $value, string $expects): void
     {

tests/src/CallableClassMethod.php

@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * This file is part of Chevere.
+ *
+ * (c) Rodolfo Berrios <rodolfo@chevere.org>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chevere\Tests\src;
+
+use Chevere\Parameter\Attributes\_int;
+
+class CallableClassMethod
+{
+    public static function main(#[_int(min: 10)] int $base): void
+    {
+    }
+}

tests/src/functions.php

@@ -83,3 +83,9 @@ function usesSensitiveParameterAttr(
 ): void {
     assertArguments();
 }
+
+function intMin10(
+    #[_int(min: 10)]
+    int $base
+): void {
+}