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

Update Laravel Pint

Browse source
This commit is contained in:
Jonny Barnes 2023-04-20 17:34:06 +01:00
parent 8d93a5ac7a
commit 7ee5bb00ba
Signed by: jonny
SSH key fingerprint: SHA256:CTuSlns5U7qlD9jqHvtnVmfYV3Zwl2Z7WnJ4/dqOaL8
13 changed files with 78 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/Http/Controllers/ArticlesController.php
View file

@ -18,9 +18,9 @@ class ArticlesController extends Controller
public function index(int $year = null, int $month = null): View public function index(int $year = null, int $month = null): View
{ {
$articles = Article::where('published', '1') $articles = Article::where('published', '1')
->date($year, $month) ->date($year, $month)
->orderBy('updated_at', 'desc') ->orderBy('updated_at', 'desc')
->simplePaginate(5); ->simplePaginate(5);
return view('articles.index', compact('articles')); return view('articles.index', compact('articles'));
} }

16
app/Http/Controllers/FeedsController.php
View file

@ -20,8 +20,8 @@ class FeedsController extends Controller
$buildDate = $articles->first()->updated_at->toRssString(); $buildDate = $articles->first()->updated_at->toRssString();
return response() return response()
->view('articles.rss', compact('articles', 'buildDate')) ->view('articles.rss', compact('articles', 'buildDate'))
->header('Content-Type', 'application/rss+xml; charset=utf-8'); ->header('Content-Type', 'application/rss+xml; charset=utf-8');
} }
/** /**
@ -32,8 +32,8 @@ class FeedsController extends Controller
$articles = Article::where('published', '1')->latest('updated_at')->take(20)->get(); $articles = Article::where('published', '1')->latest('updated_at')->take(20)->get();
return response() return response()
->view('articles.atom', compact('articles')) ->view('articles.atom', compact('articles'))
->header('Content-Type', 'application/atom+xml; charset=utf-8'); ->header('Content-Type', 'application/atom+xml; charset=utf-8');
} }
/** /**
@ -45,8 +45,8 @@ class FeedsController extends Controller
$buildDate = $notes->first()->updated_at->toRssString(); $buildDate = $notes->first()->updated_at->toRssString();
return response() return response()
->view('notes.rss', compact('notes', 'buildDate')) ->view('notes.rss', compact('notes', 'buildDate'))
->header('Content-Type', 'application/rss+xml; charset=utf-8'); ->header('Content-Type', 'application/rss+xml; charset=utf-8');
} }
/** /**
@ -57,8 +57,8 @@ class FeedsController extends Controller
$notes = Note::latest()->take(20)->get(); $notes = Note::latest()->take(20)->get();
return response() return response()
->view('notes.atom', compact('notes')) ->view('notes.atom', compact('notes'))
->header('Content-Type', 'application/atom+xml; charset=utf-8'); ->header('Content-Type', 'application/atom+xml; charset=utf-8');
} }
/** @todo sort out return type for json responses */ /** @todo sort out return type for json responses */

2
app/Services/NoteService.php
View file

@ -63,7 +63,7 @@ class NoteService extends Service
{ {
if (Arr::get($request, 'properties.published.0')) { if (Arr::get($request, 'properties.published.0')) {
return carbon(Arr::get($request, 'properties.published.0')) return carbon(Arr::get($request, 'properties.published.0'))
->toDateTimeString(); ->toDateTimeString();
} }
if (Arr::get($request, 'published')) { if (Arr::get($request, 'published')) {
return carbon(Arr::get($request, 'published'))->toDateTimeString(); return carbon(Arr::get($request, 'published'))->toDateTimeString();

10
composer.lock generated
View file

@ -8751,16 +8751,16 @@
}, },
{ {
"name": "laravel/pint", "name": "laravel/pint",
"version": "v1.8.0", "version": "v1.9.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/pint.git", "url": "https://github.com/laravel/pint.git",
"reference": "4b8f2ef22bfcddd1d163cfd282e3f42ee1a5cce2" "reference": "eac5ec3d6b5c96543c682e309a10fdddc9f61d80"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/pint/zipball/4b8f2ef22bfcddd1d163cfd282e3f42ee1a5cce2", "url": "https://api.github.com/repos/laravel/pint/zipball/eac5ec3d6b5c96543c682e309a10fdddc9f61d80",
"reference": "4b8f2ef22bfcddd1d163cfd282e3f42ee1a5cce2", "reference": "eac5ec3d6b5c96543c682e309a10fdddc9f61d80",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -8813,7 +8813,7 @@
"issues": "https://github.com/laravel/pint/issues", "issues": "https://github.com/laravel/pint/issues",
"source": "https://github.com/laravel/pint" "source": "https://github.com/laravel/pint"
}, },
"time": "2023-04-04T13:08:09+00:00" "time": "2023-04-18T14:50:44+00:00"
}, },
{ {
"name": "laravel/sail", "name": "laravel/sail",

2
tests/Browser/ExampleTest.php
View file

@ -16,7 +16,7 @@ class ExampleTest extends DuskTestCase
{ {
$this->browse(function (Browser $browser) { $this->browse(function (Browser $browser) {
$browser->visit('/') $browser->visit('/')
->assertSee('Laravel'); ->assertSee('Laravel');
}); });
} }
} }

4
tests/Browser/NotesTest.php
View file

@ -15,7 +15,7 @@ class NotesTest extends DuskTestCase
{ {
$this->browse(function ($browser) { $this->browse(function ($browser) {
$browser->visit('/notes/D') $browser->visit('/notes/D')
->assertSee('JBL5'); ->assertSee('JBL5');
}); });
} }
@ -28,7 +28,7 @@ class NotesTest extends DuskTestCase
{ {
$this->browse(function ($browser) { $this->browse(function ($browser) {
$browser->visit('/notes/E') $browser->visit('/notes/E')
->assertSee('quill.p3k.io'); ->assertSee('quill.p3k.io');
}); });
} }
} }

2
tests/Feature/Admin/AdminHomeControllerTest.php
View file

@ -18,7 +18,7 @@ class AdminHomeControllerTest extends TestCase
$user = User::factory()->make(); $user = User::factory()->make();
$response = $this->actingAs($user) $response = $this->actingAs($user)
->get('/admin'); ->get('/admin');
$response->assertViewIs('admin.welcome'); $response->assertViewIs('admin.welcome');
} }

38
tests/Feature/Admin/ArticlesTest.php
View file

@ -21,7 +21,7 @@ class ArticlesTest extends TestCase
$user = User::factory()->make(); $user = User::factory()->make();
$response = $this->actingAs($user) $response = $this->actingAs($user)
->get('/admin/blog'); ->get('/admin/blog');
$response->assertSeeText('Select article to edit:'); $response->assertSeeText('Select article to edit:');
} }
@ -31,7 +31,7 @@ class ArticlesTest extends TestCase
$user = User::factory()->make(); $user = User::factory()->make();
$response = $this->actingAs($user) $response = $this->actingAs($user)
->get('/admin/blog/create'); ->get('/admin/blog/create');
$response->assertSeeText('Title (URL)'); $response->assertSeeText('Title (URL)');
} }
@ -41,10 +41,10 @@ class ArticlesTest extends TestCase
$user = User::factory()->make(); $user = User::factory()->make();
$this->actingAs($user) $this->actingAs($user)
->post('/admin/blog', [ ->post('/admin/blog', [
'title' => 'Test Title', 'title' => 'Test Title',
'main' => 'Article content', 'main' => 'Article content',
]); ]);
$this->assertDatabaseHas('articles', ['title' => 'Test Title']); $this->assertDatabaseHas('articles', ['title' => 'Test Title']);
} }
@ -62,10 +62,10 @@ class ArticlesTest extends TestCase
$file = new UploadedFile($path, 'article.md', 'text/plain', null, true); $file = new UploadedFile($path, 'article.md', 'text/plain', null, true);
$this->actingAs($user) $this->actingAs($user)
->post('/admin/blog', [ ->post('/admin/blog', [
'title' => 'Uploaded Article', 'title' => 'Uploaded Article',
'article' => $file, 'article' => $file,
]); ]);
$this->assertDatabaseHas('articles', [ $this->assertDatabaseHas('articles', [
'title' => 'Uploaded Article', 'title' => 'Uploaded Article',
@ -82,7 +82,7 @@ class ArticlesTest extends TestCase
]); ]);
$response = $this->actingAs($user) $response = $this->actingAs($user)
->get('/admin/blog/' . $article->id . '/edit'); ->get('/admin/blog/' . $article->id . '/edit');
$response->assertSeeText('This is *my* new blog. It uses `Markdown`.'); $response->assertSeeText('This is *my* new blog. It uses `Markdown`.');
} }
@ -93,11 +93,11 @@ class ArticlesTest extends TestCase
$article = Article::factory()->create(); $article = Article::factory()->create();
$this->actingAs($user) $this->actingAs($user)
->post('/admin/blog/' . $article->id, [ ->post('/admin/blog/' . $article->id, [
'_method' => 'PUT', '_method' => 'PUT',
'title' => 'My New Blog', 'title' => 'My New Blog',
'main' => 'This article has been edited', 'main' => 'This article has been edited',
]); ]);
$this->assertDatabaseHas('articles', [ $this->assertDatabaseHas('articles', [
'title' => 'My New Blog', 'title' => 'My New Blog',
'main' => 'This article has been edited', 'main' => 'This article has been edited',
@ -111,9 +111,9 @@ class ArticlesTest extends TestCase
$article = Article::factory()->create(); $article = Article::factory()->create();
$this->actingAs($user) $this->actingAs($user)
->post('/admin/blog/' . $article->id, [ ->post('/admin/blog/' . $article->id, [
'_method' => 'DELETE', '_method' => 'DELETE',
]); ]);
$this->assertSoftDeleted('articles', [ $this->assertSoftDeleted('articles', [
'title' => $article->title, 'title' => $article->title,
]); ]);

30
tests/Feature/Admin/ClientsTest.php
View file

@ -19,7 +19,7 @@ class ClientsTest extends TestCase
$user = User::factory()->make(); $user = User::factory()->make();
$response = $this->actingAs($user) $response = $this->actingAs($user)
->get('/admin/clients'); ->get('/admin/clients');
$response->assertSeeText('Clients'); $response->assertSeeText('Clients');
} }
@ -29,7 +29,7 @@ class ClientsTest extends TestCase
$user = User::factory()->make(); $user = User::factory()->make();
$response = $this->actingAs($user) $response = $this->actingAs($user)
->get('/admin/clients/create'); ->get('/admin/clients/create');
$response->assertSeeText('New Client'); $response->assertSeeText('New Client');
} }
@ -39,10 +39,10 @@ class ClientsTest extends TestCase
$user = User::factory()->make(); $user = User::factory()->make();
$this->actingAs($user) $this->actingAs($user)
->post('/admin/clients', [ ->post('/admin/clients', [
'client_name' => 'Micropublish', 'client_name' => 'Micropublish',
'client_url' => 'https://micropublish.net', 'client_url' => 'https://micropublish.net',
]); ]);
$this->assertDatabaseHas('clients', [ $this->assertDatabaseHas('clients', [
'client_name' => 'Micropublish', 'client_name' => 'Micropublish',
'client_url' => 'https://micropublish.net', 'client_url' => 'https://micropublish.net',
@ -58,7 +58,7 @@ class ClientsTest extends TestCase
]); ]);
$response = $this->actingAs($user) $response = $this->actingAs($user)
->get('/admin/clients/' . $client->id . '/edit'); ->get('/admin/clients/' . $client->id . '/edit');
$response->assertSee('https://jbl5.dev/notes/new'); $response->assertSee('https://jbl5.dev/notes/new');
} }
@ -69,11 +69,11 @@ class ClientsTest extends TestCase
$client = MicropubClient::factory()->create(); $client = MicropubClient::factory()->create();
$this->actingAs($user) $this->actingAs($user)
->post('/admin/clients/' . $client->id, [ ->post('/admin/clients/' . $client->id, [
'_method' => 'PUT', '_method' => 'PUT',
'client_url' => 'https://jbl5.dev/notes/new', 'client_url' => 'https://jbl5.dev/notes/new',
'client_name' => 'JBL5dev', 'client_name' => 'JBL5dev',
]); ]);
$this->assertDatabaseHas('clients', [ $this->assertDatabaseHas('clients', [
'client_url' => 'https://jbl5.dev/notes/new', 'client_url' => 'https://jbl5.dev/notes/new',
'client_name' => 'JBL5dev', 'client_name' => 'JBL5dev',
@ -89,9 +89,9 @@ class ClientsTest extends TestCase
]); ]);
$this->actingAs($user) $this->actingAs($user)
->post('/admin/clients/' . $client->id, [ ->post('/admin/clients/' . $client->id, [
'_method' => 'DELETE', '_method' => 'DELETE',
]); ]);
$this->assertDatabaseMissing('clients', [ $this->assertDatabaseMissing('clients', [
'client_url' => 'https://jbl5.dev/notes/new', 'client_url' => 'https://jbl5.dev/notes/new',
]); ]);

26
tests/Feature/Admin/LikesTest.php
View file

@ -21,7 +21,7 @@ class LikesTest extends TestCase
$user = User::factory()->make(); $user = User::factory()->make();
$response = $this->actingAs($user) $response = $this->actingAs($user)
->get('/admin/likes'); ->get('/admin/likes');
$response->assertSeeText('Likes'); $response->assertSeeText('Likes');
} }
@ -31,7 +31,7 @@ class LikesTest extends TestCase
$user = User::factory()->make(); $user = User::factory()->make();
$response = $this->actingAs($user) $response = $this->actingAs($user)
->get('/admin/likes/create'); ->get('/admin/likes/create');
$response->assertSeeText('New Like'); $response->assertSeeText('New Like');
} }
@ -42,9 +42,9 @@ class LikesTest extends TestCase
$user = User::factory()->make(); $user = User::factory()->make();
$this->actingAs($user) $this->actingAs($user)
->post('/admin/likes', [ ->post('/admin/likes', [
'like_url' => 'https://example.com', 'like_url' => 'https://example.com',
]); ]);
$this->assertDatabaseHas('likes', [ $this->assertDatabaseHas('likes', [
'url' => 'https://example.com', 'url' => 'https://example.com',
]); ]);
@ -58,7 +58,7 @@ class LikesTest extends TestCase
$like = Like::factory()->create(); $like = Like::factory()->create();
$response = $this->actingAs($user) $response = $this->actingAs($user)
->get('/admin/likes/' . $like->id . '/edit'); ->get('/admin/likes/' . $like->id . '/edit');
$response->assertSee('Edit Like'); $response->assertSee('Edit Like');
} }
@ -70,10 +70,10 @@ class LikesTest extends TestCase
$like = Like::factory()->create(); $like = Like::factory()->create();
$this->actingAs($user) $this->actingAs($user)
->post('/admin/likes/' . $like->id, [ ->post('/admin/likes/' . $like->id, [
'_method' => 'PUT', '_method' => 'PUT',
'like_url' => 'https://example.com', 'like_url' => 'https://example.com',
]); ]);
$this->assertDatabaseHas('likes', [ $this->assertDatabaseHas('likes', [
'url' => 'https://example.com', 'url' => 'https://example.com',
]); ]);
@ -88,9 +88,9 @@ class LikesTest extends TestCase
$user = User::factory()->make(); $user = User::factory()->make();
$this->actingAs($user) $this->actingAs($user)
->post('/admin/likes/' . $like->id, [ ->post('/admin/likes/' . $like->id, [
'_method' => 'DELETE', '_method' => 'DELETE',
]); ]);
$this->assertDatabaseMissing('likes', [ $this->assertDatabaseMissing('likes', [
'url' => $url, 'url' => $url,
]); ]);

4
tests/Unit/Jobs/ProcessBookmarkJobTest.php
View file

@ -25,7 +25,7 @@ class ProcessBookmarkJobTest extends TestCase
$bookmark = Bookmark::factory()->create(); $bookmark = Bookmark::factory()->create();
$service = $this->createMock(BookmarkService::class); $service = $this->createMock(BookmarkService::class);
$service->method('getArchiveLink') $service->method('getArchiveLink')
->willReturn('https://web.archive.org/web/1234'); ->willReturn('https://web.archive.org/web/1234');
$this->app->instance(BookmarkService::class, $service); $this->app->instance(BookmarkService::class, $service);
$job = new ProcessBookmark($bookmark); $job = new ProcessBookmark($bookmark);
@ -46,7 +46,7 @@ class ProcessBookmarkJobTest extends TestCase
$bookmark = Bookmark::factory()->create(); $bookmark = Bookmark::factory()->create();
$service = $this->createMock(BookmarkService::class); $service = $this->createMock(BookmarkService::class);
$service->method('getArchiveLink') $service->method('getArchiveLink')
->will($this->throwException(new InternetArchiveException())); ->will($this->throwException(new InternetArchiveException()));
$this->app->instance(BookmarkService::class, $service); $this->app->instance(BookmarkService::class, $service);
$job = new ProcessBookmark($bookmark); $job = new ProcessBookmark($bookmark);

8
tests/Unit/Jobs/SaveProfileImageJobTest.php
View file

@ -30,7 +30,7 @@ class SaveProfileImageJobTest extends TestCase
$mf = ['items' => []]; $mf = ['items' => []];
$authorship = $this->createMock(Authorship::class); $authorship = $this->createMock(Authorship::class);
$authorship->method('findAuthor') $authorship->method('findAuthor')
->will($this->throwException(new AuthorshipParserException())); ->will($this->throwException(new AuthorshipParserException()));
$job = new SaveProfileImage($mf); $job = new SaveProfileImage($mf);
$this->assertNull($job->handle($authorship)); $this->assertNull($job->handle($authorship));
@ -48,7 +48,7 @@ class SaveProfileImageJobTest extends TestCase
]; ];
$authorship = $this->createMock(Authorship::class); $authorship = $this->createMock(Authorship::class);
$authorship->method('findAuthor') $authorship->method('findAuthor')
->willReturn($author); ->willReturn($author);
$job = new SaveProfileImage($mf); $job = new SaveProfileImage($mf);
$this->assertNull($job->handle($authorship)); $this->assertNull($job->handle($authorship));
@ -72,7 +72,7 @@ class SaveProfileImageJobTest extends TestCase
]; ];
$authorship = $this->createMock(Authorship::class); $authorship = $this->createMock(Authorship::class);
$authorship->method('findAuthor') $authorship->method('findAuthor')
->willReturn($author); ->willReturn($author);
$job = new SaveProfileImage($mf); $job = new SaveProfileImage($mf);
$job->handle($authorship); $job->handle($authorship);
@ -97,7 +97,7 @@ class SaveProfileImageJobTest extends TestCase
]; ];
$authorship = $this->createMock(Authorship::class); $authorship = $this->createMock(Authorship::class);
$authorship->method('findAuthor') $authorship->method('findAuthor')
->willReturn($author); ->willReturn($author);
$job = new SaveProfileImage($mf); $job = new SaveProfileImage($mf);
$job->handle($authorship); $job->handle($authorship);

8
tests/Unit/WebMentionTest.php
View file

@ -105,11 +105,11 @@ class WebMentionTest extends TestCase
$this->app->instance(Codebird::class, $codebirdMock); $this->app->instance(Codebird::class, $codebirdMock);
Cache::shouldReceive('has') Cache::shouldReceive('has')
->once() ->once()
->andReturn(false); ->andReturn(false);
Cache::shouldReceive('put') Cache::shouldReceive('put')
->once() ->once()
->andReturn(true); ->andReturn(true);
$webmention = new WebMention(); $webmention = new WebMention();
$twitterURL = 'https://twitter.com/example'; $twitterURL = 'https://twitter.com/example';