tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1729 from ajshort/no-rule-match-404

Browse Source 
API: Return a 404 error when no director rule is matched
This commit is contained in:
Ingo Schommer 2013-04-06 03:09:48 -07:00
commit 5c82efd61d
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
control/Director.php
View File

@ -331,6 +331,9 @@ class Director implements TemplateGlobalProvider {
} }
} }
} }
// No URL rules matched, so return a 404 error.
return new SS_HTTPResponse('No URL rule was matched', 404);
} }
/** /**

4
tests/control/DirectorTest.php
View File

@ -281,6 +281,10 @@ class DirectorTest extends SapphireTest {
$this->assertEquals($headers, Director::extract_request_headers($request)); $this->assertEquals($headers, Director::extract_request_headers($request));
} }
public function testUnmatchedRequestReturns404() {
$this->assertEquals(404, Director::test('no-route')->getStatusCode());
}
} }
class DirectorTestRequest_Controller extends Controller implements TestOnly { class DirectorTestRequest_Controller extends Controller implements TestOnly {