Merge branch 'release/0.8.2'

ljonesfl · ljonesfl · commit 7964a4dc74f9 · 2025-11-07T13:11:47.000-06:00
diff --git a/.version.json b/.version.json
@@ -2,6 +2,6 @@
   "strategy": "semver",
   "major": 0,
   "minor": 8,
-  "patch": 1,
+  "patch": 2,
   "build": 0
 }
diff --git a/src/Bootstrap.php b/src/Bootstrap.php
@@ -59,7 +59,7 @@ function dispatch( Application $App ) : void
 	}
 	catch( \Exception $e )
 	{
-		echo $e->getMessage()."<br>".$e->getTraceAsString();
+		echo $App->handleException( $e );
 	}
 }
 
diff --git a/src/Mvc/Application.php b/src/Mvc/Application.php
@@ -478,5 +478,43 @@ public function clearExpiredCache(): int
 		
 		return 0;
 	}
+
+	public function beautifyException( \Exception $e ): string
+	{
+		// this function should return a nicely formatted HTML representation of the exception
+		$ExceptionType = get_class( $e );
+		$Message = htmlspecialchars( $e->getMessage(), ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8' );
+		$File = htmlspecialchars( $e->getFile(), ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8' );
+		$Line = $e->getLine();
+		$Trace = nl2br( htmlspecialchars( $e->getTraceAsString(), ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8' ) );
+		$Html = "<html><head><title>Exception: $ExceptionType</title>
+		<style>
+		body { font-family: Arial, sans-serif; margin: 20px; }
+		h1 { color: #c00; }
+		pre { background-color: #f4f4f4; padding: 10px; border: 1px solid #ddd; }
+		</style>
+		</head><body>";
+		$Html .= "<h1>Exception: $ExceptionType</h1>";
+		$Html .= "<p><strong>Message:</strong> $Message</p>";
+		$Html .= "<p><strong>File:</strong> $File</p>";
+		$Html .= "<p><strong>Line:</strong> $Line</p>";
+		$Html .= "<h2>Stack Trace:</h2><pre>$Trace</pre>";
+		$Html .= "</body></html>";
+
+		return $Html;
+	}
+
+	public function handleException( \Exception $e ) : string
+	{
+		if( $this->getCaptureOutput() )
+		{
+			$this->_Output .= $this->beautifyException( $e );
+			return $this->_Output;
+		}
+		else
+		{
+			return $this->beautifyException( $e );
+		}
+	}
 }
 
diff --git a/tests/BootstrapTest.php b/tests/BootstrapTest.php
@@ -236,21 +236,25 @@ public function testDispatchParametersStructure()
 	 */
 	public function testDispatchWithException()
 	{
-		// Create mock application that throws exception
-		$App = $this->createMock( Application::class );
-		$App->expects( $this->once() )
-			->method( 'run' )
-			->willThrowException( new \Exception( 'Test exception' ) );
-		
-		// Capture output
-		ob_start();
-		dispatch( $App );
-		$Output = ob_get_clean();
-		
-		// Should output 'Ouch.' when exception is caught
-		$this->assertStringContainsString( 'Exception', $Output );
+		 // Create mock application with handleException
+		 $App = $this->createMock(Application::class);
+		 $App->expects($this->once())
+			  ->method('run')
+			  ->willThrowException(new \Exception('Test exception'));
+		 $App->expects($this->once())
+			  ->method('handleException')
+				->willReturnCallback( function( $e ) {
+					return "Exception: " . $e->getMessage();
+				});
+
+		 // Capture output
+		 ob_start();
+		 dispatch($App);
+		 $Output = ob_get_clean();
+
+		 $this->assertStringContainsString('Exception', $Output);
 	}
-	
+
 	/**
 	 * Test ClearExpiredCache function
 	 */
diff --git a/versionlog.md b/versionlog.md
@@ -1,3 +1,7 @@
+* Added exception formatting.
+
+## 0.8.2 2025-11-07
+
 * Added routing exception output.
 
 ## 0.8.1 2025-11-07

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`	`"strategy": "semver",`
`3`	`3`	`"major": 0,`
`4`	`4`	`"minor": 8,`
`5`		`- "patch": 1,`
	`5`	`+ "patch": 2,`
`6`	`6`	`"build": 0`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ function dispatch( Application $App ) : void`
`59`	`59`	`}`
`60`	`60`	`catch( \Exception $e )`
`61`	`61`	`{`
`62`		`- echo $e->getMessage()."<br>".$e->getTraceAsString();`
	`62`	`+ echo $App->handleException( $e );`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`