Merge pull request #1197 from hydephp/update-RouteNotFoundException-to-support-custom-message

emmadesilva · web-flow · commit dc8e759fa14e · 2023-03-04T11:18:59.000+01:00
Update RouteNotFoundException to support custom message
diff --git a/packages/framework/src/Framework/Exceptions/RouteNotFoundException.php b/packages/framework/src/Framework/Exceptions/RouteNotFoundException.php
@@ -14,11 +14,14 @@ class RouteNotFoundException extends Exception
     /** @var int */
     protected $code = 404;
 
-    public function __construct(?string $routeKey = null)
+    public function __construct(?string $routeKey = null, ?string $message = null)
     {
         if ($routeKey) {
             $this->message = "Route not found: '$routeKey'";
         }
+        if ($message) {
+            $this->message = $message;
+        }
 
         parent::__construct($this->message, $this->code);
     }
diff --git a/packages/framework/tests/Unit/RouteNotFoundExceptionTest.php b/packages/framework/tests/Unit/RouteNotFoundExceptionTest.php
@@ -27,4 +27,13 @@ public function test_it_throws_an_exception_when_page_type_is_not_supported()
 
         throw new RouteNotFoundException('not-found');
     }
+
+    public function test_it_throws_an_exception_with_custom_message()
+    {
+        $this->expectException(RouteNotFoundException::class);
+        $this->expectExceptionMessage('Custom message');
+        $this->expectExceptionCode(404);
+
+        throw new RouteNotFoundException(null, 'Custom message');
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -14,11 +14,14 @@ class RouteNotFoundException extends Exception`
`14`	`14`	`/** @var int */`
`15`	`15`	`protected $code = 404;`
`16`	`16`
`17`		`- public function __construct(?string $routeKey = null)`
	`17`	`+ public function __construct(?string $routeKey = null, ?string $message = null)`
`18`	`18`	`{`
`19`	`19`	`if ($routeKey) {`
`20`	`20`	`$this->message = "Route not found: '$routeKey'";`
`21`	`21`	`}`
	`22`	`+ if ($message) {`
	`23`	`+ $this->message = $message;`
	`24`	`+ }`
`22`	`25`
`23`	`26`	`parent::__construct($this->message, $this->code);`
`24`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,4 +27,13 @@ public function test_it_throws_an_exception_when_page_type_is_not_supported()`
`27`	`27`
`28`	`28`	`throw new RouteNotFoundException('not-found');`
`29`	`29`	`}`
	`30`	`+`
	`31`	`+ public function test_it_throws_an_exception_with_custom_message()`
	`32`	`+ {`
	`33`	`+ $this->expectException(RouteNotFoundException::class);`
	`34`	`+ $this->expectExceptionMessage('Custom message');`
	`35`	`+ $this->expectExceptionCode(404);`
	`36`	`+`
	`37`	`+ throw new RouteNotFoundException(null, 'Custom message');`
	`38`	`+ }`
`30`	`39`	`}`