typos

chevere · Dec 16, 2023 · 5aeafb9 · 5aeafb9
1 parent 529ad37
commit 5aeafb9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/src/Attributes/CallableAttr.php b/src/Attributes/CallableAttr.php
@@ -16,7 +16,6 @@
 use Attribute;
 use Chevere\Parameter\Interfaces\ParameterAttributeInterface;
 use Chevere\Parameter\Interfaces\ParameterInterface;
-use LogicException;
 use function Chevere\Parameter\object;
 
 #[Attribute(Attribute::TARGET_METHOD | Attribute::TARGET_FUNCTION)]
@@ -28,12 +27,6 @@ public function __construct(callable $callable)
     {
         $return = $callable();
         object(ParameterInterface::class)($return);
-        // if (!is_object($return)) {
-        //     throw new LogicException('DynamicAttr must return an object');
-        // }
-        // if (! $return instanceof ParameterInterface) {
-        //     throw new LogicException('DynamicAttr must return an object implementing ParameterInterface');
-        // }
         $this->parameter = $return;
     }
 

diff --git a/src/Attributes/functions.php b/src/Attributes/functions.php
@@ -14,8 +14,8 @@
 namespace Chevere\Parameter\Attributes;
 
 use Chevere\Parameter\Interfaces\ArgumentsInterface;
+use Chevere\Parameter\Interfaces\ParameterInterface;
 use LogicException;
-use ReflectionAttribute;
 use ReflectionFunction;
 use ReflectionMethod;
 use Throwable;
@@ -154,9 +154,18 @@ function validReturn(mixed $var): mixed
     $reflection = $class
         ? new ReflectionMethod($class, $method)
         : new ReflectionFunction($method);
-    /** @var ReflectionAttribute<ReturnAttr> $attribute */
-    $attribute = $reflection->getAttributes(ReturnAttr::class)[0]
-        ?? throw new LogicException('No return attribute found');
+    $attribute = $reflection->getAttributes(ReturnAttr::class)[0] ?? null;
+    if ($attribute === null) {
+        $function = "{$class}::return";
+        if (is_callable($function)) {
+            $parameter = $function($var);
+            if ($parameter instanceof ParameterInterface) {
+                return $parameter->__invoke($var);
+            }
+        }
+
+        throw new LogicException('No rules defined for return');
+    }
 
     try {
         return $attribute->newInstance()->__invoke($var);

diff --git a/tests/src/UsesParameterAttributes.php b/tests/src/UsesParameterAttributes.php
@@ -32,7 +32,7 @@
 final class UsesParameterAttributes
 {
     #[ReturnAttr(
-        new CallableAttr(__CLASS__ . '::acceptResponse')
+        new CallableAttr(__CLASS__ . '::return')
     )]
     public function __construct(
         #[StringAttr('/^[A-Za-z]+$/')]
@@ -61,7 +61,7 @@ public function __construct(
         validReturn($id);
     }
 
-    public static function acceptResponse(): ParameterInterface
+    public static function return(): ParameterInterface
     {
         return int();
     }