chevere/action 2.0

Author: rodber

src/Controller.php

@@ -15,7 +15,6 @@
 
 use BadMethodCallException;
 use Chevere\Action\Controller as BaseController;
-use Chevere\Action\Interfaces\ReflectionActionInterface;
 use Chevere\DataStructure\Interfaces\MapInterface;
 use Chevere\DataStructure\Map;
 use Chevere\Http\Exceptions\ControllerException;
@@ -228,7 +227,7 @@ final public function status(): StatusInterface
     /**
      * @infection-ignore-all
      */
-    protected function assertRuntime(ReflectionActionInterface $reflection): void
+    public function acceptRulesRuntime(): void
     {
         if (! isset($this->_query, $this->_bodyParsed, $this->_files)) {
             throw new LogicException('Server request not set. Did you forget to call withServerRequest() method?');

src/Exceptions/ControllerException.php

@@ -29,25 +29,21 @@
  * translate them to ControllerException with appropriate HTTP status codes.
  *
  * Example:
+ *
  * ```php
  * try {
  *     $user = $this->userService->findById($id);
  * } catch (UserNotFoundException $e) {
  *     throw new ControllerException('User not found', 404);
  * }
  * ```
- *
- * @param mixed $return Return value compatible with the definition at Controller's `return()` method
  */
 class ControllerException extends Exception
 {
-    public readonly mixed $return;
-
     public function __construct(
         string $message = '',
         int $code = 0,
-        mixed $return = null,
-        ?Throwable $previous = null
+        ?Throwable $previous = null,
     ) {
         /** @infection-ignore-all */
         $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
@@ -69,24 +65,6 @@ interface: ControllerInterface::class
                 $line
             );
         }
-        if ($return !== null) {
-            try {
-                $this->return = $controllerName->__toString()::return()->__invoke($return);
-            } catch (Throwable $e) {
-                throw new ActionException(
-                    (string) message(
-                        'Argument `%argument%` value is not compatible with return type defined in %controller%::return() method',
-                        argument: '$return',
-                        controller: $controllerName
-                    ),
-                    $e,
-                    $file,
-                    $line
-                );
-            }
-        } else {
-            $this->return = null;
-        }
 
         parent::__construct($message, $code, $previous);
     }

tests/ControllerExceptionTest.php

@@ -17,12 +17,10 @@
 use Chevere\Http\Exceptions\ControllerException;
 use Chevere\Tests\src\ControllerThrowsControllerException;
 use Chevere\Tests\src\ControllerThrowsControllerExceptionDefault;
-use Chevere\Tests\src\ControllerWrongReturnControllerException;
 use Exception;
 use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
 use Throwable;
-use TypeError;
 
 final class ControllerExceptionTest extends TestCase
 {
@@ -52,7 +50,6 @@ public function testThrowsDefaults(): void
             $this->assertSame('', $e->getMessage());
             $this->assertSame(0, $e->getCode());
             $this->assertNull($e->getPrevious());
-            $this->assertNull($e->return);
         }
     }
 
@@ -66,26 +63,6 @@ public function testThrows(): void
             $this->assertSame(123, $e->getCode());
             $this->assertInstanceOf(Exception::class, $e->getPrevious());
             $this->assertSame('previous', $e->getPrevious()->getMessage());
-            $this->assertSame(1.5, $e->return);
-        }
-    }
-
-    public function testWrongReturn(): void
-    {
-        try {
-            new ControllerWrongReturnControllerException();
-        } catch (Throwable $e) {
-            $this->assertInstanceOf(ActionException::class, $e);
-            $this->assertSame(
-                'Argument `$return` value is not compatible with return type defined in Chevere\Tests\src\ControllerWrongReturnControllerException::return() method',
-                $e->getMessage()
-            );
-            $this->assertSame(TypeError::class, $e->getPrevious()::class);
-            $this->assertSame(
-                __DIR__ . '/src/ControllerWrongReturnControllerException.php',
-                $e->getFile()
-            );
-            $this->assertSame(25, $e->getLine());
         }
     }
 }

tests/src/ControllerThrowsControllerException.php

@@ -21,6 +21,6 @@ class ControllerThrowsControllerException extends Controller
 {
     public function __construct()
     {
-        throw new ControllerException('test', 123, 1.5, new Exception('previous'));
+        throw new ControllerException('test', 123, new Exception('previous'));
     }
 }

tests/src/ControllerWrongReturnControllerException.php

@@ -25,7 +25,7 @@ public function __construct()
         throw new ControllerException(return: false);
     }
 
-    public static function return(): IntParameterInterface
+    public static function acceptReturn(): IntParameterInterface
     {
         return int(min: 1);
     }