Merge pull request #127 from daniellienert/task/refactor-to-middlewar…

…e-for-neos-7 !!! TASK: Refactor to middleware for Flow 7
t3n · Dec 22, 2020 · 9052ab4 · 9052ab4
2 parents 4e974ce + f6a568f
commit 9052ab4
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 35 deletions.
diff --git a/...s/Http/AddServerTimingHeaderComponent.php → .../Middleware/AddServerTimingMiddleware.php b/...s/Http/AddServerTimingHeaderComponent.php → .../Middleware/AddServerTimingMiddleware.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace t3n\Neos\Debug\Http;
+namespace t3n\Neos\Debug\Http\Middleware;
 
 /**
  * This file is part of the t3n.Neos.Debugger package.
@@ -15,14 +15,16 @@
  */
 
 use Neos\Flow\Annotations as Flow;
-use Neos\Flow\Http\Component\ComponentContext;
-use Neos\Flow\Http\Component\ComponentInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use t3n\Neos\Debug\Service\DebugService;
 
 /**
  * Cache control header component
  */
-class AddServerTimingHeaderComponent implements ComponentInterface
+class AddServerTimingMiddleware implements MiddlewareInterface
 {
     /**
      * @Flow\InjectConfiguration(path="serverTimingHeader.enabled")
@@ -38,17 +40,14 @@ class AddServerTimingHeaderComponent implements ComponentInterface
      */
     protected $debugService;
 
-    /**
-     * @inheritDoc
-     */
-    public function handle(ComponentContext $componentContext)
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
+        $response = $handler->handle($request);
+
         if (! $this->enabled) {
-            return;
+            return $response;
         }
 
-        $response = $componentContext->getHttpResponse();
-
         $serverTiming = '';
         $metrics = $this->debugService->getMetrics();
         foreach ($metrics as $key => ['value' => $value, 'description' => $description]) {
@@ -61,8 +60,6 @@ public function handle(ComponentContext $componentContext)
             }
         }
 
-        $modifiedResponse = $response->withAddedHeader('Server-Timing', $serverTiming);
-
-        $componentContext->replaceHttpResponse($modifiedResponse);
+        return $response->withAddedHeader('Server-Timing', $serverTiming);
     }
 }
diff --git a/...ses/Http/MeasureServerTimingComponent.php → ...dleware/MeasureServerTimingMiddleware.php b/...ses/Http/MeasureServerTimingComponent.php → ...dleware/MeasureServerTimingMiddleware.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace t3n\Neos\Debug\Http;
+namespace t3n\Neos\Debug\Http\Middleware;
 
 /**
  * This file is part of the t3n.Neos.Debugger package.
@@ -15,11 +15,13 @@
  */
 
 use Neos\Flow\Annotations as Flow;
-use Neos\Flow\Http\Component\ComponentContext;
-use Neos\Flow\Http\Component\ComponentInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
 use t3n\Neos\Debug\Service\DebugService;
 
-class MeasureServerTimingComponent implements ComponentInterface
+class MeasureServerTimingMiddleware implements MiddlewareInterface
 {
     /**
      * @Flow\InjectConfiguration(path="serverTimingHeader.enabled")
@@ -35,15 +37,14 @@ class MeasureServerTimingComponent implements ComponentInterface
      */
     protected $debugService;
 
-    /**
-     * @inheritDoc
-     */
-    public function handle(ComponentContext $componentContext)
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
-        if (! $this->enabled) {
-            return;
+        $response = $handler->handle($request);
+
+        if ($this->enabled) {
+            $this->debugService->startRequestTimer();
         }
 
-        $this->debugService->startRequestTimer();
+        return $response;
     }
 }
diff --git a/Configuration/Settings.yaml b/Configuration/Settings.yaml
@@ -18,15 +18,13 @@ Neos:
 
   Flow:
     http:
-      chain:
-        'process':
-          chain:
-            t3n.Neos.Debug:MeasureServerTiming:
-              position: 'start'
-              component: 't3n\Neos\Debug\Http\MeasureServerTimingComponent'
-            t3n.Neos.Debug:AddServerTimingHeader:
-              position: 'after setHeader'
-              component: 't3n\Neos\Debug\Http\AddServerTimingHeaderComponent'
+      middlewares:
+        t3n.Neos.Debug:MeasureServerTiming:
+          position: 'start'
+          middleware: 't3n\Neos\Debug\Http\Middleware\MeasureServerTimingMiddleware'
+        t3n.Neos.Debug:AddServerTimingHeader:
+          position: 'after dispatch'
+          middleware: 't3n\Neos\Debug\Http\Middleware\AddServerTimingMiddleware'
 
     reflection:
       ignoredTags:

diff --git a/composer.json b/composer.json
@@ -4,7 +4,7 @@
     "license": "MIT",
     "type": "neos-package",
     "require": {
-        "neos/neos": "~3.3.0 || ~4.0 || ~5.0"
+        "neos/neos": "^7.0"
     },
     "autoload": {
         "psr-4": {