Simplify routing setup

xp-forge · Aug 28, 2021 · 4073d88 · 4073d88
1 parent 01259f9
commit 4073d88
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -8,7 +8,7 @@
   "require" : {
     "xp-framework/core": "^10.0 | ^9.0 | ^8.0 | ^7.0",
     "xp-forge/lambda": "^1.0",
-    "xp-forge/web": "^2.0",
+    "xp-forge/web": "^2.13",
     "php": ">=7.0.0"
   },
   "require-dev" : {

diff --git a/src/main/php/com/amazon/aws/lambda/HttpApi.class.php b/src/main/php/com/amazon/aws/lambda/HttpApi.class.php
@@ -33,15 +33,14 @@ public function target() {
     });
 
     // Determine routing
-    $r= $this->routes(new Environment(
+    $routing= Routing::cast($this->routes(new Environment(
       getenv('PROFILE') ?: 'prod',
       $this->environment->root,
       $this->environment->path('static'),
       [$this->environment->properties],
       [],
       $logging
-    ));
-    $routing= $r instanceof Application ? $r->routing() : Routing::cast($r);
+    )));
 
     // Return event handler
     return function($event, $context) use($routing, $logging) {