wip

src/Tqdev/PhpCrudApi/Controller/ColumnController.php

@@ -72,7 +72,7 @@ class ColumnController
         if (!$this->reflection->hasTable($tableName)) {
             return $this->responder->error(ErrorCode::TABLE_NOT_FOUND, $tableName);
         }
-        $success = $this->definition->updateTable($tableName, $request->getBody());
+        $success = $this->definition->updateTable($tableName, $request->getParsedBody());
         if ($success) {
             $this->reflection->refreshTables();
         }
@@ -90,7 +90,7 @@ class ColumnController
         if (!$table->hasColumn($columnName)) {
             return $this->responder->error(ErrorCode::COLUMN_NOT_FOUND, $columnName);
         }
-        $success = $this->definition->updateColumn($tableName, $columnName, $request->getBody());
+        $success = $this->definition->updateColumn($tableName, $columnName, $request->getParsedBody());
         if ($success) {
             $this->reflection->refreshTable($tableName);
         }
@@ -99,11 +99,11 @@ class ColumnController
 
     public function addTable(ServerRequestInterface $request): Response
     {
-        $tableName = $request->getBody()->name;
+        $tableName = $request->getParsedBody()->name;
         if ($this->reflection->hasTable($tableName)) {
             return $this->responder->error(ErrorCode::TABLE_ALREADY_EXISTS, $tableName);
         }
-        $success = $this->definition->addTable($request->getBody());
+        $success = $this->definition->addTable($request->getParsedBody());
         if ($success) {
             $this->reflection->refreshTables();
         }
@@ -116,12 +116,12 @@ class ColumnController
         if (!$this->reflection->hasTable($tableName)) {
             return $this->responder->error(ErrorCode::TABLE_NOT_FOUND, $tableName);
         }
-        $columnName = $request->getBody()->name;
+        $columnName = $request->getParsedBody()->name;
         $table = $this->reflection->getTable($tableName);
         if ($table->hasColumn($columnName)) {
             return $this->responder->error(ErrorCode::COLUMN_ALREADY_EXISTS, $columnName);
         }
-        $success = $this->definition->addColumn($tableName, $request->getBody());
+        $success = $this->definition->addColumn($tableName, $request->getParsedBody());
         if ($success) {
             $this->reflection->refreshTable($tableName);
         }

src/Tqdev/PhpCrudApi/Controller/RecordController.php

@@ -71,7 +71,7 @@ class RecordController
         if ($this->service->getType($table) != 'table') {
             return $this->responder->error(ErrorCode::OPERATION_NOT_SUPPORTED, __FUNCTION__);
         }
-        $record = $request->getBody();
+        $record = $request->getParsedBody();
         if ($record === null) {
             return $this->responder->error(ErrorCode::HTTP_MESSAGE_NOT_READABLE, '');
         }
@@ -98,7 +98,7 @@ class RecordController
         }
         $id = RequestUtils::getPathSegment($request, 3);
         $params = RequestUtils::getParams($request);
-        $record = $request->getBody();
+        $record = $request->getParsedBody();
         if ($record === null) {
             return $this->responder->error(ErrorCode::HTTP_MESSAGE_NOT_READABLE, '');
         }
@@ -153,7 +153,7 @@ class RecordController
             return $this->responder->error(ErrorCode::OPERATION_NOT_SUPPORTED, __FUNCTION__);
         }
         $id = RequestUtils::getPathSegment($request, 3);
-        $record = $request->getBody();
+        $record = $request->getParsedBody();
         if ($record === null) {
             return $this->responder->error(ErrorCode::HTTP_MESSAGE_NOT_READABLE, '');
         }

src/Tqdev/PhpCrudApi/Middleware/IpAddressMiddleware.php

@@ -46,7 +46,7 @@ class IpAddressMiddleware extends Middleware
             $tableName = RequestUtils::getPathSegment($request, 2);
             if (!$tableNames || in_array($tableName, explode(',', $tableNames))) {
                 if ($this->reflection->hasTable($tableName)) {
-                    $record = $request->getBody();
+                    $record = $request->getParsedBody();
                     if ($record !== null) {
                         $table = $this->reflection->getTable($tableName);
                         if (is_array($record)) {
@@ -56,7 +56,7 @@ class IpAddressMiddleware extends Middleware
                         } else {
                             $record = $this->callHandler($record, $operation, $table);
                         }
-                        $request->setBody($record);
+                        $request = $request->withParsedBody($record);
                     }
                 }
             }

src/Tqdev/PhpCrudApi/Middleware/MultiTenancyMiddleware.php

@@ -46,11 +46,11 @@ class MultiTenancyMiddleware extends Middleware
         return $result;
     }
 
-    private function handleRecord(ServerRequestInterface $request, string $operation, array $pairs) /*: void*/
+    private function handleRecord(ServerRequestInterface $request, string $operation, array $pairs): ServerRequestInterface
     {
-        $record = $request->getBody();
+        $record = $request->getParsedBody();
         if ($record === null) {
-            return;
+            return $request;
         }
         $multi = is_array($record);
         $records = $multi ? $record : [$record];
@@ -65,7 +65,7 @@ class MultiTenancyMiddleware extends Middleware
                 }
             }
         }
-        $request->setBody($multi ? $records : $records[0]);
+        return $request->withParsedBody($multi ? $records : $records[0]);
     }
 
     public function handle(ServerRequestInterface $request): Response
@@ -83,7 +83,7 @@ class MultiTenancyMiddleware extends Middleware
                     $pairs = $this->getPairs($handler, $operation, $tableName);
                     if ($i == 0) {
                         if (in_array($operation, ['create', 'update', 'increment'])) {
-                            $this->handleRecord($request, $operation, $pairs);
+                            $request = $this->handleRecord($request, $operation, $pairs);
                         }
                     }
                     $condition = $this->getCondition($tableName, $pairs);

src/Tqdev/PhpCrudApi/Middleware/SanitationMiddleware.php

@@ -39,7 +39,7 @@ class SanitationMiddleware extends Middleware
         if (in_array($operation, ['create', 'update', 'increment'])) {
             $tableName = RequestUtils::getPathSegment($request, 2);
             if ($this->reflection->hasTable($tableName)) {
-                $record = $request->getBody();
+                $record = $request->getParsedBody();
                 if ($record !== null) {
                     $handler = $this->getProperty('handler', '');
                     if ($handler !== '') {
@@ -51,7 +51,7 @@ class SanitationMiddleware extends Middleware
                         } else {
                             $record = $this->callHandler($handler, $record, $operation, $table);
                         }
-                        $request->setBody($record);
+                        $request = $request->withParsedBody($record);
                     }
                 }
             }

src/Tqdev/PhpCrudApi/Middleware/ValidationMiddleware.php

@@ -47,7 +47,7 @@ class ValidationMiddleware extends Middleware
         if (in_array($operation, ['create', 'update', 'increment'])) {
             $tableName = RequestUtils::getPathSegment($request, 2);
             if ($this->reflection->hasTable($tableName)) {
-                $record = $request->getBody();
+                $record = $request->getParsedBody();
                 if ($record !== null) {
                     $handler = $this->getProperty('handler', '');
                     if ($handler !== '') {

src/Tqdev/PhpCrudApi/RequestFactory.php

@@ -7,11 +7,38 @@ use Psr\Http\Message\ServerRequestInterface;
 
 class RequestFactory
 {
+    private static function parseBody(string $body) /*: ?object*/
+    {
+        $first = substr($body, 0, 1);
+        if ($first == '[' || $first == '{') {
+            $object = json_decode($body);
+            $causeCode = json_last_error();
+            if ($causeCode !== JSON_ERROR_NONE) {
+                $object = null;
+            }
+        } else {
+            parse_str($body, $input);
+            foreach ($input as $key => $value) {
+                if (substr($key, -9) == '__is_null') {
+                    $input[substr($key, 0, -9)] = null;
+                    unset($input[$key]);
+                }
+            }
+            $object = (object) $input;
+        }
+        return $object;
+    }
+
     public static function fromGlobals(): ServerRequestInterface
     {
         $psr17Factory = new Psr17Factory();
         $creator = new ServerRequestCreator($psr17Factory, $psr17Factory, $psr17Factory, $psr17Factory);
-        return $creator->fromGlobals();
+        $serverRequest = $creator->fromGlobals();
+        $body = file_get_contents('php://input');
+        if ($body) {
+            $serverRequest = $serverRequest->withParsedBody(self::parseBody($body));
+        }
+        return $serverRequest;
     }
 
     public static function fromString(string $request): ServerRequestInterface
@@ -25,13 +52,16 @@ class RequestFactory
 
         $psr17Factory = new Psr17Factory();
         $serverRequest = $psr17Factory->createServerRequest($method, $url);
-        if ($body) {
-            $serverRequest = $serverRequest->withBody($psr17Factory->createStream($body));
-        }
         foreach ($lines as $line) {
             list($key, $value) = explode(':', $line, 2);
             $serverRequest = $serverRequest->withAddedHeader($key, $value);
         }
+        if ($body) {
+            $stream = $psr17Factory->createStream($body);
+            $stream->rewind();
+            $serverRequest = $serverRequest->withBody($stream);
+            $serverRequest = $serverRequest->withParsedBody(self::parseBody($body));
+        }
         return $serverRequest;
     }
 }

src/Tqdev/PhpCrudApi/RequestUtils.php

@@ -8,7 +8,8 @@ class RequestUtils
 {
     public static function setParams(ServerRequestInterface $request, array $params): ServerRequestInterface
     {
-        return $request->withUri($request->getUri()->withQuery(http_build_query($params)));
+        $query = preg_replace('|%5B[0-9]+%5D=|', '=', http_build_query($params));
+        return $request->withUri($request->getUri()->withQuery($query));
     }
 
     public static function getHeader(ServerRequestInterface $request, string $header): string
@@ -21,16 +22,8 @@ class RequestUtils
     {
         $params = array();
         $query = $request->getUri()->getQuery();
-        if ($query) {
-            die(var_dump($query));
-        }
-
         $query = str_replace('][]=', ']=', str_replace('=', '[]=', $query));
         parse_str($query, $params);
-        if ($params) {
-            die(var_dump($params));
-        }
-
         return $params;
     }
 
@@ -40,7 +33,7 @@ class RequestUtils
         if ($part < 0 || $part >= count($pathSegments)) {
             return '';
         }
-        return $pathSegments[$part];
+        return urldecode($pathSegments[$part]);
     }
 
     public static function getOperation(ServerRequestInterface $request): string

tests/functional/001_records/006_add_post.log

@@ -1,4 +1,5 @@
 POST /records/posts
+Content-Type: application/json
 
 {"user_id":1,"category_id":1,"content":"test"}
 ===