Wrap application setup in try/catch

Fixes issue #46
xp-forge · Aug 12, 2018 · cfbb1bb · cfbb1bb
1 parent 7757e44
commit cfbb1bb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -5,6 +5,9 @@ Web change log
 
 ## 1.4.0 / 2018-08-12
 
+* Fixed issue #46: Uncaught exceptions from application setup in
+  development mode
+  (@thekid)
 * Merged PR #45: Pass all additional command line arguments to app
   environment
   (@thekid)

diff --git a/src/main/php/xp/web/WebRunner.class.php b/src/main/php/xp/web/WebRunner.class.php
@@ -70,7 +70,6 @@ private static function error($request, $response, $error, $profile) {
   /** @param string[] $args */
   public static function main($args) {
     $env= new Environment($args[2], $args[0], $args[1], explode('PATH_SEPARATOR', getenv('WEB_CONFIG')), explode('|', getenv('WEB_ARGS')));
-    $application= (new Source(getenv('WEB_SOURCE'), $env))->application();
 
     $sapi= new SAPI();
     $request= new Request($sapi);
@@ -79,6 +78,7 @@ public static function main($args) {
     $response->header('Host', $request->header('Host'));
 
     try {
+      $application= (new Source(getenv('WEB_SOURCE'), $env))->application();
       $application->service($request, $response);
       self::log($request, $response);
     } catch (Error $e) {