fix for empty PUT/DELETE/PATCH etc requests by parsing values into global _QUERY (#15)

Author: nimmneun

src/Nono/Request.php

@@ -8,6 +8,7 @@
  *
  * @method string|mixed get(string $name = null, mixed $default = null)
  * @method string|mixed post(string $name = null, mixed $default = null)
+ * @method string|mixed query(string $name = null, mixed $default = null)
  * @method string|mixed request(string $name = null, mixed $default = null)
  * @method string|mixed server(string $name = null, mixed $default = null)
  * @method string|mixed session(string $name = null, mixed $default = null)
@@ -17,31 +18,34 @@
 class Request
 {
     /**
-     * Just triggering the super global.
+     * Just triggering the super global and fill the query global.
      */
     public function __construct()
     {
         $_SERVER;
+        if (!in_array($this->method(), ['GET', 'POST'])) {
+            parse_str(file_get_contents('php://input'), $GLOBALS['_QUERY']);
+        }
     }
 
     /**
      * Return URI with query string.
      *
      * @return string
      */
-    public function uri()
+    public function uriWithQuery()
     {
-        return urldecode($this->plainUri());
+        return urldecode($this->server('REQUEST_URI'));
     }
 
     /**
      * Return URI without query string.
      *
      * @return string
      */
-    public function plainUri()
+    public function uri()
     {
-        return explode('?', $this->server('REQUEST_URI'))[0];
+        return explode('?', $this->uriWithQuery())[0];
     }
 
     /**

tests/ApplicationTest.php

@@ -99,7 +99,7 @@ public function testRun()
 
         $app = new Application();
         $app->get('/profile/{id}', function (Request $request, $id) {
-            echo $request->plainUri() . ' has id ' . $id;
+            echo $request->uriWithQuery() . ' has id ' . $id;
         });
         self::assertEquals('/profile/123 has id 123', $app->run());
     }

tests/RequestTest.php

@@ -27,6 +27,11 @@ public function testUri()
         self::assertEquals('/profile/123', $this->request->uri());
     }
 
+    public function testUriWithQuery()
+    {
+        self::assertEquals('/profile/123?show=settings', $this->request->uriWithQuery());
+    }
+
     public function testIsHttps()
     {
         self::assertEquals(false, $this->request->isHttps());