From 343da9fc40c7a8bb08174628a7efd694fe031fd3 Mon Sep 17 00:00:00 2001
From: Franz Liedke <franz@develophp.org>
Date: Wed, 27 May 2015 01:48:04 +0200
Subject: [PATCH] Extract another middleware from API routing

---
 src/Api/Middleware/ReadJsonParameters.php | 24 +++++++++++++++++++++++
 src/Api/routes.php                        | 12 +++---------
 2 files changed, 27 insertions(+), 9 deletions(-)
 create mode 100644 src/Api/Middleware/ReadJsonParameters.php

diff --git a/src/Api/Middleware/ReadJsonParameters.php b/src/Api/Middleware/ReadJsonParameters.php
new file mode 100644
index 000000000..6395d805d
--- /dev/null
+++ b/src/Api/Middleware/ReadJsonParameters.php
@@ -0,0 +1,24 @@
+<?php namespace Flarum\Api\Middleware;
+
+use Psr\Http\Message\ResponseInterface as Response;
+use Psr\Http\Message\ServerRequestInterface as Request;
+use Zend\Stratigility\MiddlewareInterface;
+
+class ReadJsonParameters implements MiddlewareInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function __invoke(Request $request, Response $response, callable $out = null)
+    {
+        if (str_contains($request->getHeaderLine('content-type'), 'application/vnd.api+json')) {
+            $input = json_decode($request->getBody(), true);
+
+            foreach ($input as $name => $value) {
+                $request = $request->withAttribute($name, $value);
+            }
+        }
+
+        return $out ? $out($request, $response) : $response;
+    }
+}
diff --git a/src/Api/routes.php b/src/Api/routes.php
index af64c7145..4e64707dd 100644
--- a/src/Api/routes.php
+++ b/src/Api/routes.php
@@ -1,6 +1,6 @@
 <?php
 
-use Flarum\Api\Request as ApiRequest;
+use Flarum\Api\Request;
 use Psr\Http\Message\ServerRequestInterface;
 
 $action = function ($class) {
@@ -8,14 +8,8 @@ $action = function ($class) {
         $action = $this->app->make($class);
         $actor = $this->app->make('Flarum\Support\Actor');
 
-        if (str_contains($httpRequest->getHeaderLine('content-type'), 'application/vnd.api+json')) {
-            $input = json_decode($httpRequest->getBody(), true);
-        } else {
-            $input = $httpRequest->getAttributes();
-        }
-        $input = array_merge($input, $routeParams);
-
-        $request = new ApiRequest($input, $actor, $httpRequest);
+        $input = array_merge($httpRequest->getAttributes(), $routeParams);
+        $request = new Request($input, $actor, $httpRequest);
 
         return $action->handle($request);
     };