jonny/jonnybarnes.uk
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases 5 Packages Wiki Activity Actions

Merge pull request #918 from jonnybarnes/917-typeerror-in-articlescontroller

Browse source 
fix: Improve routing specificity and add new test.
This commit is contained in:
Jonny Barnes 2023-06-16 13:14:14 +01:00 • committed by GitHub
commit 58ee36c932
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
routes/web.php
View file

@ -150,8 +150,8 @@ Route::group(['domain' => config('url.longurl')], function () {
Route::get('/feed.json', [FeedsController::class, 'blogJson']);
Route::get('/feed.jf2', [FeedsController::class, 'blogJf2']);
Route::get('/s/{id}', [ArticlesController::class, 'onlyIdInURL']);
Route::get('/{year?}/{month?}', [ArticlesController::class, 'index']);
Route::get('/{year}/{month}/{slug}', [ArticlesController::class, 'show']);
Route::get('/{year?}/{month?}', [ArticlesController::class, 'index'])->where(['year' => '[0-9]{4}', 'month' => '[0-9]{2}']);
Route::get('/{year}/{month}/{slug}', [ArticlesController::class, 'show'])->where(['year' => '[0-9]{4}', 'month' => '[0-9]{2}']);
});
// Notes pages using NotesController

7
tests/Feature/ArticlesTest.php
View file

@ -58,4 +58,11 @@ class ArticlesTest extends TestCase
$response = $this->get('/blog/s/22');
$response->assertNotFound();
}
/** @test */
public function someUrlsDoNotParseCorrectly(): void
{
$response = $this->get('/blog/feed.js');
$response->assertNotFound();
}
}