Support unmarshalling handler parameters

composer.json

@@ -12,6 +12,7 @@
     "xp-forge/web": "^3.0 | ^2.9",
     "xp-forge/compression": "^1.0",
     "xp-forge/json": "^5.0 | ^4.0",
+    "xp-forge/marshalling": "^2.0",
     "php": ">=7.0.0"
   },
   "require-dev" : {

src/main/php/web/frontend/Delegate.class.php

@@ -47,30 +47,31 @@ public function name() {
    * Returns a map of named sources to read arguments from request. Lazily
    * initialized on first use.
    *
-   * @return [:(function(web.Request, string): var)]
+   * @return [:var]
    */
   public function parameters() {
     if (null === $this->parameters) {
       $this->parameters= [];
       foreach ($this->method->parameters() as $param) {
+        $type= $param->constraint()->type();
 
         // Check for parameter annotations...
         foreach ($param->annotations() as $annotation) {
           $source= self::$SOURCES[$annotation->name()] ?? self::$SOURCES['default'];
           $name= $annotation->argument(0) ?? $param->name();
 
           if ($param->optional()) {
-            $this->parameters[$name]= function($req, $name) use($source, $param) {
+            $this->parameters[$name]= [$type, function($req, $name) use($source, $param) {
               return $source($req, $name) ?? $param->default();
-            };
+            }];
           } else {
-            $this->parameters[$name]= $source;
+            $this->parameters[$name]= [$type, $source];
           }
           continue 2;
         }
 
         // ...falling back to selecting the parameter from the segments
-        $this->parameters[$param->name()]= self::$SOURCES['segment'];
+        $this->parameters[$param->name()]= [$type, self::$SOURCES['segment']];
       }
     }
 

src/main/php/web/frontend/Frontend.class.php

@@ -1,6 +1,7 @@
 <?php namespace web\frontend;
 
 use lang\reflection\TargetException;
+use util\data\Marshalling;
 use web\{Error, Handler, Request};
 
 /**
@@ -92,10 +93,11 @@ private function view($req, $res, $delegate, $matches= []) {
       return $this->errors()->handle(new Error(403, 'Incorrect CSRF token for '.$delegate->name()));
     }
 
+    $marshalling= new Marshalling();
     try {
       $args= [];
-      foreach ($delegate->parameters() as $name => $source) {
-        $args[]= $matches[$name] ?? $source($req, $name);
+      foreach ($delegate->parameters() as $name => $spec) {
+        $args[]= $marshalling->unmarshal($matches[$name] ?? $spec[1]($req, $name), $spec[0]);
       }
 
       return $delegate->invoke($args);

src/test/php/web/frontend/unittest/HandlersInTest.class.php

@@ -27,6 +27,7 @@ public function patterns_sorted_by_length() {
         '#get/users/(?<id>[^/]+)/avatar$#',
         '#delete/users/(?<id>[^/]+)$#',
         '#get/users/(?<id>[^/]+)$#',
+        '#get/post/(?<id>[^/]+)$#',
         '#get/blogs/stats$#',
         '#get/blogs/?$#',
         '#post/users$#',

src/test/php/web/frontend/unittest/HandlingTest.class.php

@@ -3,7 +3,7 @@
 use lang\IndexOutOfBoundsException;
 use test\Assert;
 use test\{Expect, Test, TestCase, Values};
-use web\frontend\unittest\actions\{Blogs, Home, Select, Users};
+use web\frontend\unittest\actions\{Blogs, Home, Select, Users, Posts};
 use web\frontend\{Frontend, Templates, View};
 use web\io\{TestInput, TestOutput};
 use web\{Error, Request, Response};
@@ -408,4 +408,16 @@ public function head_request_does_not_send_response() {
     $res= $this->handle($fixture, 'HEAD', '/users/1');
     Assert::equals("\r\n\r\n", strstr($res->output()->bytes(), "\r\n\r\n"));
   }
+
+  #[Test]
+  public function marshals_to_custom_input() {
+    $fixture= new Frontend(new Posts(), newinstance(Templates::class, [], [
+      'write' => function($template, $context, $out) use(&$result) {
+        $result= $context;
+      }
+    ]));
+
+    $this->handle($fixture, 'GET', '/post/1234');
+    $this->assertContext(['id' => '1234', 'request' => ['params' => []]], $result);
+  }
 }

src/test/php/web/frontend/unittest/ObjectId.class.php

@@ -0,0 +1,12 @@
+<?php namespace web\frontend\unittest;
+
+class ObjectId {
+  private $id;
+
+  public function __construct($id) {
+    $this->id= (string)$id;
+  }
+
+
+  public function string() { return $this->id; }
+}

src/test/php/web/frontend/unittest/actions/Posts.class.php

@@ -0,0 +1,13 @@
+<?php namespace web\frontend\unittest\actions;
+
+use web\frontend\unittest\ObjectId;
+use web\frontend\{Handler, Get};
+
+#[Handler('/post')]
+class Posts {
+
+  #[Get('/{id}')]
+  public function get(ObjectId $id) {
+    return ['id' => $id->string()];
+  }
+}