v1.0 prerelease

Author: Asisyas

composer.json

@@ -34,7 +34,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Micro\\Plugin\\Http\\Tests\\": "tests/"
+            "Micro\\Plugin\\Http\\Test\\": "tests/"
         }
     },
     "config": {

src/Business/Executor/RouteExecutor.php

@@ -15,9 +15,10 @@
 
 use Micro\Component\DependencyInjection\ContainerRegistryInterface;
 use Micro\Plugin\Http\Business\Matcher\UrlMatcherInterface;
-use Micro\Plugin\Http\Business\Response\ResponseCallbackFactoryInterface;
+use Micro\Plugin\Http\Business\Response\Callback\ResponseCallbackFactoryInterface;
+use Micro\Plugin\Http\Business\Response\Transformer\ResponseTransformerFactoryInterface;
+use Micro\Plugin\Http\Exception\HttpException;
 use Micro\Plugin\Http\Exception\HttpInternalServerException;
-use Micro\Plugin\Http\Exception\ResponseInvalidException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -29,7 +30,8 @@
     public function __construct(
         private UrlMatcherInterface $urlMatcher,
         private ContainerRegistryInterface $containerRegistry,
-        private ResponseCallbackFactoryInterface $responseCallbackFactory
+        private ResponseCallbackFactoryInterface $responseCallbackFactory,
+        private ResponseTransformerFactoryInterface $responseTransformerFactory
     ) {
     }
 
@@ -40,12 +42,15 @@ public function execute(Request $request, bool $flush = true): Response
     {
         $route = $this->urlMatcher->match($request);
         $this->containerRegistry->register(Request::class, fn (): Request => $request);
-
         $callback = $this->responseCallbackFactory->create($route);
+
         try {
             $response = $callback();
-        } catch (ResponseInvalidException $exception) {
-            throw new HttpInternalServerException($request, $exception);
+            $response = $this->generateResponse($request, $response);
+        } catch (HttpException $exception) {
+            throw $exception;
+        } catch (\Throwable $exception) {
+            $response = $this->generateResponse($request, $exception, false);
         }
 
         if ($flush) {
@@ -54,4 +59,36 @@ public function execute(Request $request, bool $flush = true): Response
 
         return $response;
     }
+
+    protected function generateResponse(Request $request, mixed $responseData, bool $tryIfThrowNoHttpException = true): Response
+    {
+        if ($responseData instanceof Response) {
+            return $responseData;
+        }
+
+        $response = new Response();
+        try {
+            $transformed = $this->responseTransformerFactory
+                ->create()
+                ->transform(
+                    $request,
+                    $response,
+                    $responseData
+                );
+        } catch (HttpException $exception) {
+            throw $exception;
+        } catch (\Throwable $exception) {
+            if ($tryIfThrowNoHttpException) {
+                return $this->generateResponse($request, $exception, false);
+            }
+
+            throw new HttpInternalServerException('Internal Server Error.', $exception);
+        }
+
+        if (!$transformed) {
+            throw new HttpInternalServerException();
+        }
+
+        return $response;
+    }
 }

src/Business/Executor/RouteExecutorFactory.php

@@ -15,7 +15,8 @@
 
 use Micro\Component\DependencyInjection\ContainerRegistryInterface;
 use Micro\Plugin\Http\Business\Matcher\UrlMatcherFactoryInterface;
-use Micro\Plugin\Http\Business\Response\ResponseCallbackFactoryInterface;
+use Micro\Plugin\Http\Business\Response\Callback\ResponseCallbackFactoryInterface;
+use Micro\Plugin\Http\Business\Response\Transformer\ResponseTransformerFactoryInterface;
 
 /**
  * @author Stanislau Komar <[email protected]>
@@ -25,7 +26,8 @@
     public function __construct(
         private UrlMatcherFactoryInterface $urlMatcherFactory,
         private ContainerRegistryInterface $containerRegistry,
-        private ResponseCallbackFactoryInterface $responseCallbackFactory
+        private ResponseCallbackFactoryInterface $responseCallbackFactory,
+        private ResponseTransformerFactoryInterface $responseTransformerFactory
     ) {
     }
 
@@ -37,7 +39,8 @@ public function create(): RouteExecutorInterface
         return new RouteExecutor(
             $this->urlMatcherFactory->create(),
             $this->containerRegistry,
-            $this->responseCallbackFactory
+            $this->responseCallbackFactory,
+            $this->responseTransformerFactory
         );
     }
 }

src/Business/Matcher/UrlMatcher.php

@@ -43,6 +43,6 @@ public function match(Request $request): RouteInterface
             return $route;
         }
 
-        throw new HttpNotFoundException($request);
+        throw new HttpNotFoundException();
     }
 }

src/Business/Response/ResponseCallback.php renamed to src/Business/Response/Callback/ResponseCallback.php

@@ -11,13 +11,11 @@
  *  file that was distributed with this source code.
  */
 
-namespace Micro\Plugin\Http\Business\Response;
+namespace Micro\Plugin\Http\Business\Response\Callback;
 
 use Micro\Component\DependencyInjection\Autowire\AutowireHelperInterface;
 use Micro\Plugin\Http\Business\Route\RouteInterface;
-use Micro\Plugin\Http\Exception\ResponseInvalidException;
 use Micro\Plugin\Http\Exception\RouteInvalidConfigurationException;
-use Symfony\Component\HttpFoundation\Response;
 
 /**
  * @author Stanislau Komar <[email protected]>
@@ -33,9 +31,15 @@ public function __construct(
     /**
      * {@inheritDoc}
      */
-    public function __invoke(): Response
+    public function __invoke(): mixed
     {
         $controller = $this->route->getController();
+        if (\is_callable($controller)) {
+            $callback = $this->autowireHelper->autowire($controller);
+
+            return $callback();
+        }
+
         $classController = $controller;
         $classMethod = $this->route->getName();
 
@@ -59,13 +63,7 @@ public function __invoke(): Response
 
         $controller = [$classController, $classMethod];
 
-        $response = \call_user_func($this->autowireHelper->autowire($controller));
-
-        if ($response instanceof Response) {
-            return $response;
-        }
-
-        throw new ResponseInvalidException($response);
+        return \call_user_func($this->autowireHelper->autowire($controller));
     }
 
     protected function snakeToCamel(string $str): string

src/Business/Response/ResponseCallbackFactory.php renamed to src/Business/Response/Callback/ResponseCallbackFactory.php

@@ -11,7 +11,7 @@
  *  file that was distributed with this source code.
  */
 
-namespace Micro\Plugin\Http\Business\Response;
+namespace Micro\Plugin\Http\Business\Response\Callback;
 
 use Micro\Component\DependencyInjection\Autowire\AutowireHelperFactoryInterface;
 use Micro\Plugin\Http\Business\Route\RouteInterface;
@@ -26,14 +26,11 @@ public function __construct(
     ) {
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public function create(RouteInterface $route): ResponseCallbackInterface
     {
         return new ResponseCallback(
             $this->autowireHelperFactory->create(),
-            $route
+            $route,
         );
     }
 }

src/Business/Response/ResponseCallbackFactoryInterface.php renamed to src/Business/Response/Callback/ResponseCallbackFactoryInterface.php

@@ -11,7 +11,7 @@
  *  file that was distributed with this source code.
  */
 
-namespace Micro\Plugin\Http\Business\Response;
+namespace Micro\Plugin\Http\Business\Response\Callback;
 
 use Micro\Plugin\Http\Business\Route\RouteInterface;
 

src/Business/Response/ResponseCallbackInterface.php renamed to src/Business/Response/Callback/ResponseCallbackInterface.php

@@ -11,11 +11,10 @@
  *  file that was distributed with this source code.
  */
 
-namespace Micro\Plugin\Http\Business\Response;
+namespace Micro\Plugin\Http\Business\Response\Callback;
 
 use Micro\Plugin\Http\Exception\HttpException;
 use Micro\Plugin\Http\Exception\ResponseInvalidException;
-use Symfony\Component\HttpFoundation\Response;
 
 /**
  * @author Stanislau Komar <[email protected]>
@@ -26,5 +25,5 @@ interface ResponseCallbackInterface
      * @throws ResponseInvalidException
      * @throws HttpException
      */
-    public function __invoke(): Response;
+    public function __invoke(): mixed;
 }

src/Business/Response/Transformer/ResponseTransformer.php

@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ *  This file is part of the Micro framework package.
+ *
+ *  (c) Stanislau Komar <[email protected]>
+ *
+ *  For the full copyright and license information, please view the LICENSE
+ *  file that was distributed with this source code.
+ */
+
+namespace Micro\Plugin\Http\Business\Response\Transformer;
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+/**
+ * @author Stanislau Komar <[email protected]>
+ */
+readonly class ResponseTransformer implements ResponseTransformerInterface
+{
+    /**
+     * @param iterable<ResponseTransformerInterface> $responseTransformersCollection
+     */
+    public function __construct(
+        private iterable $responseTransformersCollection
+    ) {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function transform(Request $request, Response $response, mixed &$responseData): bool
+    {
+        $transformed = false;
+
+        foreach ($this->responseTransformersCollection as $responseTransformer) {
+            $isTransformed = $responseTransformer->transform($request, $response, $responseData);
+            if (false === $isTransformed) {
+                continue;
+            }
+
+            $transformed = true;
+        }
+
+        return $transformed;
+    }
+}

src/Business/Response/Transformer/ResponseTransformerFactory.php

@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ *  This file is part of the Micro framework package.
+ *
+ *  (c) Stanislau Komar <[email protected]>
+ *
+ *  For the full copyright and license information, please view the LICENSE
+ *  file that was distributed with this source code.
+ */
+
+namespace Micro\Plugin\Http\Business\Response\Transformer;
+
+use Micro\Framework\Kernel\KernelInterface;
+use Micro\Plugin\Http\Plugin\HttpResponseTransformerPlugin;
+
+/**
+ * @author Stanislau Komar <[email protected]>
+ */
+readonly class ResponseTransformerFactory implements ResponseTransformerFactoryInterface
+{
+    public function __construct(
+        private KernelInterface $kernel
+    ) {
+    }
+
+    public function create(): ResponseTransformerInterface
+    {
+        $transformers = [];
+        $iterator = $this->kernel->plugins(HttpResponseTransformerPlugin::class);
+        /** @var HttpResponseTransformerPlugin $plugin */
+        foreach ($iterator as $plugin) {
+            $transformers[$plugin->weight()] = $plugin->createTransformer();
+        }
+
+        krsort($transformers);
+
+        return new ResponseTransformer(array_values($transformers));
+    }
+}