Merge branch 'master' of github.com:xp-forge/frontend

xp-forge · Oct 30, 2023 · a43d7ce · a43d7ce
2 parents b32ba2c + bfb9102
commit a43d7ce
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 6 deletions.
diff --git a/src/main/php/web/frontend/Frontend.class.php b/src/main/php/web/frontend/Frontend.class.php
@@ -115,16 +115,27 @@ private function view($req, $res, $delegate, $matches= []) {
   public function handle($req, $res, $target= null) {
     static $NOT_FOUND= [null];
 
-    // Handle HEAD requests with GET unless explicitely specified
     $method= strtolower($req->method());
     $path= $req->uri()->path();
+
+    // Allow overwriting HTTP method in POST request via `_method`
+    if ('post' === $method && $o= $req->param('_method')) {
+      $method= strtolower($o);
+    }
+
+    // Handle HEAD requests with GET unless explicitely specified
     if ('head' === $method) {
-      $target= $this->delegates->target($method, $path) ?? $this->delegates->target('get', $path) ?? $NOT_FOUND;
-      $view= $this->view($req, $res, ...$target);
+      $view= $this->view($req, $res, ...$target
+        ?? $this->delegates->target($method, $path)
+        ?? $this->delegates->target('get', $path)
+        ?? $NOT_FOUND
+      );
       $view->stream= false;
     } else {
-      $target= $target ?? $this->delegates->target($method, $path) ?? $NOT_FOUND;
-      $view= $this->view($req, $res, ...$target);
+      $view= $this->view($req, $res, ...$target
+        ?? $this->delegates->target($method, $path)
+        ?? $NOT_FOUND
+      );
     }
 
     $res->header('Server', 'XP/Frontend');

diff --git a/src/test/php/web/frontend/unittest/HandlersInTest.class.php b/src/test/php/web/frontend/unittest/HandlersInTest.class.php
@@ -25,6 +25,7 @@ public function patterns_sorted_by_length() {
         '#get/blogs/(?<category>[^/]+)/(?<id>[0-9]+)$#',
         '#get/oauth/(?<tenant>[^/]+)/select/?$#',
         '#get/users/(?<id>[^/]+)/avatar$#',
+        '#delete/users/(?<id>[^/]+)$#',
         '#get/users/(?<id>[^/]+)$#',
         '#get/blogs/stats$#',
         '#get/blogs/?$#',

diff --git a/src/test/php/web/frontend/unittest/HandlingTest.class.php b/src/test/php/web/frontend/unittest/HandlingTest.class.php
@@ -140,6 +140,38 @@ public function post() {
     );
   }
 
+  #[Test]
+  public function delete() {
+    $fixture= new Frontend(new Users(), new class() implements Templates {
+      public function write($template, $context, $out) { /* NOOP */ }
+    });
+
+    $res= $this->handle($fixture, 'DELETE', '/users/1000');
+    Assert::equals(302, $res->status());
+    Assert::equals('/users?deleted=1000', $res->headers()['Location']);
+  }
+
+  #[Test]
+  public function special_method_field_overwrites_post_method() {
+    $fixture= new Frontend(new Users(), new class() implements Templates {
+      public function write($template, $context, $out) { /* NOOP */ }
+    });
+
+    $res= $this->handle($fixture, 'POST', '/users/1000', [], '_method=DELETE');
+    Assert::equals(302, $res->status());
+    Assert::equals('/users?deleted=1000', $res->headers()['Location']);
+  }
+
+  #[Test]
+  public function special_method_field_cannot_be_used_for_get() {
+    $fixture= new Frontend(new Users(), new class() implements Templates {
+      public function write($template, $context, $out) { /* NOOP */ }
+    });
+
+    $res= $this->handle($fixture, 'GET', '/users/1000?_method=DELETE');
+    Assert::equals(404, $res->status());
+  }
+
   #[Test, Expect(class: Error::class, message: '/Cannot route PATCH requests to .+/')]
   public function unsupported_route() {
     $fixture= new Frontend(new Users(), new class() implements Templates {

diff --git a/src/test/php/web/frontend/unittest/MethodsInTest.class.php b/src/test/php/web/frontend/unittest/MethodsInTest.class.php
@@ -18,6 +18,7 @@ public function patterns_sorted_by_length() {
     Assert::equals(
       [
         '#get/users/(?<id>[^/]+)/avatar$#',
+        '#delete/users/(?<id>[^/]+)$#',
         '#get/users/(?<id>[^/]+)$#',
         '#post/users$#',
         '#get/users$#',

diff --git a/src/test/php/web/frontend/unittest/actions/Users.class.php b/src/test/php/web/frontend/unittest/actions/Users.class.php
@@ -1,7 +1,7 @@
 <?php namespace web\frontend\unittest\actions;
 
 use web\Error;
-use web\frontend\{Get, Handler, Param, Post, View};
+use web\frontend\{Delete, Get, Handler, Param, Post, View};
 
 #[Handler]
 class Users {
@@ -48,6 +48,12 @@ public function create(
     return ['created' => $id];
   }
 
+  #[Delete('/users/{id}')]
+  public function delete($id) {
+    unset($this->list[$id]);
+    return View::redirect('/users?deleted='.urlencode($id));
+  }
+
   #[Get('/users/{id}/avatar')]
   public function avatar($id) {
     if (!isset($this->list[$id])) {