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

Struct Types

Browse source 
Squashed commit of the following:

commit 74ed84617fcbecf661695763323e50d049a88db7
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Jan 15 12:46:29 2018 +0000

    Test passes so remove the dump statement

commit a7d3323be02da64f76e8ec88713e3de84a13ded7
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Jan 15 12:40:35 2018 +0000

    Values with spaces need to be quoted

commit 58a120bb238f14346793c388b948b7351d3b51fd
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Jan 15 12:37:23 2018 +0000

    We need a diplay name for the tests to work now we are using strict type checking

commit b46f177053bd697db9a4835d073f2f37e088b26f
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Jan 15 12:31:29 2018 +0000

    Get travis to show more info about failing test

commit 60323f3ce5a0561329a1721ee94821571cdcc86a
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Jan 15 12:23:27 2018 +0000

    Remove un-used namnepsace imports

commit 096d3505920bc94ff8677c77430eca0aae0be58a
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Jan 15 12:21:55 2018 +0000

    we need php7.2 for object type-hint

commit bb818bc19c73d02d510af9f002199f5718a54608
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Jan 15 12:15:48 2018 +0000

    Added lots of strict_types
This commit is contained in:
Jonny Barnes 2018-01-15 14:02:13 +00:00
parent 053e19a457
commit e4fe2ecde3
64 changed files with 911 additions and 406 deletions
Download patch file Download diff file Expand all files Collapse all files

56
app/Http/Controllers/Admin/ArticlesController.php
View file

@ -1,19 +1,23 @@
<?php
declare(strict_types=1);
namespace App\Http\Controllers\Admin;
use App\Models\Article;
use Illuminate\View\View;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use Illuminate\Http\RedirectResponse;
class ArticlesController extends Controller
{
/**
* List the articles that can be edited.
*
* @return \Illuminate\View\Factory view
* @return \Illuminate\View\View
*/
public function index()
public function index(): View
{
$posts = Article::select('id', 'title', 'published')->orderBy('id', 'desc')->get();
@ -23,9 +27,9 @@ class ArticlesController extends Controller
/**
* Show the new article form.
*
* @return \Illuminate\View\Factory view
* @return \Illuminate\View\View
*/
public function create()
public function create(): View
{
$message = session('message');
@ -35,23 +39,22 @@ class ArticlesController extends Controller
/**
* Process an incoming request for a new article and save it.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\View\Factory view
* @return \Illuminate\Http\RedirectResponse
*/
public function store(Request $request)
public function store(): RedirectResponse
{
//if a `.md` is attached use that for the main content.
if ($request->hasFile('article')) {
$file = $request->file('article')->openFile();
if (request()->hasFile('article')) {
$file = request()->file('article')->openFile();
$content = $file->fread($file->getSize());
}
$main = $content ?? $request->input('main');
$main = $content ?? request()->input('main');
$article = Article::create(
[
'url' => $request->input('url'),
'title' => $request->input('title'),
'url' => request()->input('url'),
'title' => request()->input('title'),
'main' => $main,
'published' => $request->input('published') ?? 0,
'published' => request()->input('published') ?? 0,
]
);
@ -61,10 +64,10 @@ class ArticlesController extends Controller
/**
* Show the edit form for an existing article.
*
* @param string The article id
* @return \Illuminate\View\Factory view
* @param int $articleId
* @return \Illuminate\View\View
*/
public function edit($articleId)
public function edit(int $articleId): View
{
$post = Article::select(
'title',
@ -79,17 +82,16 @@ class ArticlesController extends Controller
/**
* Process an incoming request to edit an article.
*
* @param \Illuminate\Http\Request $request
* @param string
* @return \Illuminate|View\Factory view
* @param int $articleId
* @return \Illuminate\Http\RedirectResponse
*/
public function update(Request $request, $articleId)
public function update(int $articleId): RedirectResponse
{
$article = Article::find($articleId);
$article->title = $request->input('title');
$article->url = $request->input('url');
$article->main = $request->input('main');
$article->published = $request->input('published') ?? 0;
$article->title = request()->input('title');
$article->url = request()->input('url');
$article->main = request()->input('main');
$article->published = request()->input('published') ?? 0;
$article->save();
return redirect('/admin/blog');
@ -98,10 +100,10 @@ class ArticlesController extends Controller
/**
* Process a request to delete an aricle.
*
* @param string The article id
* @return \Illuminate\View\Factory view
* @param int $articleId
* @return \Illuminate\Http\RedirectResponse
*/
public function destroy($articleId)
public function destroy(int $articleId): RedirectResponse
{
Article::where('id', $articleId)->delete();

44
app/Http/Controllers/Admin/ClientsController.php
View file

@ -1,19 +1,23 @@
<?php
declare(strict_types=1);
namespace App\Http\Controllers\Admin;
use Illuminate\View\View;
use Illuminate\Http\Request;
use App\Models\MicropubClient;
use App\Http\Controllers\Controller;
use Illuminate\Http\RedirectResponse;
class ClientsController extends Controller
{
/**
* Show a list of known clients.
*
* @return \Illuminate\View\Factory view
* @return \Illuminate\View\View
*/
public function index()
public function index(): View
{
$clients = MicropubClient::all();
@ -23,9 +27,9 @@ class ClientsController extends Controller
/**
* Show form to add a client name.
*
* @return \Illuminate\View\Factory view
* @return \Illuminate\View\View
*/
public function create()
public function create(): View
{
return view('admin.clients.create');
}
@ -33,14 +37,13 @@ class ClientsController extends Controller
/**
* Process the request to adda new client name.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\View\Factory view
* @return \Illuminate\Http\RedirectResponse
*/
public function store(Request $request)
public function store(): RedirectResponse
{
MicropubClient::create([
'client_url' => $request->input('client_url'),
'client_name' => $request->input('client_name'),
'client_url' => request()->input('client_url'),
'client_name' => request()->input('client_name'),
]);
return redirect('/admin/clients');
@ -49,10 +52,10 @@ class ClientsController extends Controller
/**
* Show a form to edit a client name.
*
* @param string The client id
* @return \Illuminate\View\Factory view
* @param int $clientId
* @return \Illuminate\View\View
*/
public function edit($clientId)
public function edit(int $clientId): View
{
$client = MicropubClient::findOrFail($clientId);
@ -66,15 +69,14 @@ class ClientsController extends Controller
/**
* Process the request to edit a client name.
*
* @param string The client id
* @param \Illuminate\Http\Request $request
* @return \Illuminate\View\Factory view
* @param int $clientId
* @return \Illuminate\Http\RedirectResponse
*/
public function update($clientId, Request $request)
public function update(int $clientId): RedirectResponse
{
$client = MicropubClient::findOrFail($clientId);
$client->client_url = $request->input('client_url');
$client->client_name = $request->input('client_name');
$client->client_url = request()->input('client_url');
$client->client_name = request()->input('client_name');
$client->save();
return redirect('/admin/clients');
@ -83,10 +85,10 @@ class ClientsController extends Controller
/**
* Process a request to delete a client.
*
* @param string The client id
* @return redirect
* @param int $clientId
* @return \Illuminate\Http\RedirectResponse
*/
public function destroy($clientId)
public function destroy(int $clientId): RedirectResponse
{
MicropubClient::where('id', $clientId)->delete();

70
app/Http/Controllers/Admin/ContactsController.php
View file

@ -1,21 +1,25 @@
<?php
declare(strict_types=1);
namespace App\Http\Controllers\Admin;
use GuzzleHttp\Client;
use App\Models\Contact;
use Illuminate\View\View;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use Illuminate\Filesystem\Filesystem;
use Illuminate\Http\RedirectResponse;
class ContactsController extends Controller
{
/**
* List the currect contacts that can be edited.
*
* @return \Illuminate\View\Factory view
* @return \Illuminate\View\View
*/
public function index()
public function index(): View
{
$contacts = Contact::all();
@ -25,9 +29,9 @@ class ContactsController extends Controller
/**
* Display the form to add a new contact.
*
* @return \Illuminate\View\Factory view
* @return \Illuminate\View\View
*/
public function create()
public function create(): View
{
return view('admin.contacts.create');
}
@ -35,17 +39,16 @@ class ContactsController extends Controller
/**
* Process the request to add a new contact.
*
* @param \Illuminate\Http|request $request
* @return \Illuminate\View\Factory view
* @return \Illuminate\Http\RedirectResponse
*/
public function store(Request $request)
public function store(): RedirectResponse
{
$contact = new Contact();
$contact->name = $request->input('name');
$contact->nick = $request->input('nick');
$contact->homepage = $request->input('homepage');
$contact->twitter = $request->input('twitter');
$contact->facebook = $request->input('facebook');
$contact->name = request()->input('name');
$contact->nick = request()->input('nick');
$contact->homepage = request()->input('homepage');
$contact->twitter = request()->input('twitter');
$contact->facebook = request()->input('facebook');
$contact->save();
return redirect('/admin/contacts');
@ -54,10 +57,10 @@ class ContactsController extends Controller
/**
* Show the form to edit an existing contact.
*
* @param string The contact id
* @return \Illuminate\View\Factory view
* @param int $contactId
* @return \Illuminate\View\View
*/
public function edit($contactId)
public function edit(int $contactId): View
{
$contact = Contact::findOrFail($contactId);
@ -69,28 +72,27 @@ class ContactsController extends Controller
*
* @todo Allow saving profile pictures for people without homepages
*
* @param string The contact id
* @param \Illuminate\Http\Request $request
* @return \Illuminate\View\Factory view
* @param int $contactId
* @return \Illuminate\Http\RedirectResponse
*/
public function update($contactId, Request $request)
public function update(int $contactId): RedirectResponse
{
$contact = Contact::findOrFail($contactId);
$contact->name = $request->input('name');
$contact->nick = $request->input('nick');
$contact->homepage = $request->input('homepage');
$contact->twitter = $request->input('twitter');
$contact->facebook = $request->input('facebook');
$contact->name = request()->input('name');
$contact->nick = request()->input('nick');
$contact->homepage = request()->input('homepage');
$contact->twitter = request()->input('twitter');
$contact->facebook = request()->input('facebook');
$contact->save();
if ($request->hasFile('avatar') && ($request->input('homepage') != '')) {
$dir = parse_url($request->input('homepage'), PHP_URL_HOST);
if (request()->hasFile('avatar') && (request()->input('homepage') != '')) {
$dir = parse_url(request()->input('homepage'), PHP_URL_HOST);
$destination = public_path() . '/assets/profile-images/' . $dir;
$filesystem = new Filesystem();
if ($filesystem->isDirectory($destination) === false) {
$filesystem->makeDirectory($destination);
}
$request->file('avatar')->move($destination, 'image');
request()->file('avatar')->move($destination, 'image');
}
return redirect('/admin/contacts');
@ -99,10 +101,10 @@ class ContactsController extends Controller
/**
* Process the request to delete a contact.
*
* @param string The contact id
* @return \Illuminate\View\Factory view
* @param int $contactId
* @return \Illuminate\Http\RedirectResponse
*/
public function destroy($contactId)
public function destroy(int $contactId): RedirectResponse
{
$contact = Contact::findOrFail($contactId);
$contact->delete();
@ -116,16 +118,16 @@ class ContactsController extends Controller
* This method attempts to find the microformat marked-up profile image
* from a given homepage and save it accordingly
*
* @param string The contact id
* @return \Illuminate\View\Factory view
* @param int $contactId
* @return \Illuminate\Http\RedirectResponse|\Illuminate\View\View
*/
public function getAvatar($contactId)
public function getAvatar(int $contactId)
{
// Initialising
$avatarURL = null;
$avatar = null;
$contact = Contact::findOrFail($contactId);
if (mb_strlen($contact->homepage !== null) !== 0) {
if ($contact->homepage !== null && mb_strlen($contact->homepage) !== 0) {
$client = resolve(Client::class);
try {
$response = $client->get($contact->homepage);

10
app/Http/Controllers/Admin/HomeController.php
View file

@ -1,12 +1,20 @@
<?php
declare(strict_types=1);
namespace App\Http\Controllers\Admin;
use Illuminate\View\View;
use App\Http\Controllers\Controller;
class HomeController extends Controller
{
public function welcome()
/**
* Show the homepage of the admin CP.
*
* @return \Illuminate\View\View
*/
public function welcome(): View
{
return view('admin.welcome', ['name' => config('admin.user')]);
}

33
app/Http/Controllers/Admin/LikesController.php
View file

@ -12,6 +12,11 @@ use Illuminate\Http\RedirectResponse;
class LikesController extends Controller
{
/**
* List the likes that can be edited.
*
* @return \Illuminate\View\View
*/
public function index(): View
{
$likes = Like::all();
@ -19,11 +24,21 @@ class LikesController extends Controller
return view('admin.likes.index', compact('likes'));
}
/**
* Show the form to make a new like.
*
* @return \Illuminate\View\View
*/
public function create(): View
{
return view('admin.likes.create');
}
/**
* Process a request to make a new like.
*
* @return \Illuminate\Http\RedirectResponse
*/
public function store(): RedirectResponse
{
$like = Like::create([
@ -34,6 +49,12 @@ class LikesController extends Controller
return redirect('/admin/likes');
}
/**
* Display the form to edit a specific like.
*
* @param int $likeId
* @return \Illuminate\View\View
*/
public function edit(int $likeId): View
{
$like = Like::findOrFail($likeId);
@ -44,6 +65,12 @@ class LikesController extends Controller
]);
}
/**
* Process a request to edit a like.
*
* @param int $likeId
* @return \Illuminate\Http\RedirectResponse
*/
public function update(int $likeId): RedirectResponse
{
$like = Like::findOrFail($likeId);
@ -54,6 +81,12 @@ class LikesController extends Controller
return redirect('/admin/likes');
}
/**
* Process the request to delete a like.
*
* @param int $likeId
* @return \Illuminate\Http\RedirectResponse
*/
public function destroy(int $likeId): RedirectResponse
{
Like::where('id', $likeId)->delete();

47
app/Http/Controllers/Admin/NotesController.php
View file

@ -1,20 +1,24 @@
<?php
declare(strict_types=1);
namespace App\Http\Controllers\Admin;
use App\Models\Note;
use Illuminate\View\View;
use Illuminate\Http\Request;
use App\Jobs\SendWebMentions;
use App\Http\Controllers\Controller;
use Illuminate\Http\RedirectResponse;
class NotesController extends Controller
{
/**
* List the notes that can be edited.
*
* @return \Illuminate\View\Factory view
* @return \Illuminate\View\View
*/
public function index()
public function index(): View
{
$notes = Note::select('id', 'note')->orderBy('id', 'desc')->get();
foreach ($notes as $note) {
@ -27,9 +31,9 @@ class NotesController extends Controller
/**
* Show the form to make a new note.
*
* @return \Illuminate\View\Factory view
* @return \Illuminate\View\View
*/
public function create()
public function create(): View
{
return view('admin.notes.create');
}
@ -37,14 +41,13 @@ class NotesController extends Controller
/**
* Process a request to make a new note.
*
* @param Illuminate\Http\Request $request
* @todo Sort this mess out
* @return \Illuminate\Http\RedirectResponse
*/
public function store(Request $request)
public function store(): RedirectResponse
{
Note::create([
'in-reply-to' => $request->input('in-reply-to'),
'note' => $request->input('content'),
'in-reply-to' => request()->input('in-reply-to'),
'note' => request()->input('content'),
]);
return redirect('/admin/notes');
@ -53,10 +56,10 @@ class NotesController extends Controller
/**
* Display the form to edit a specific note.
*
* @param string The note id
* @return \Illuminate\View\Factory view
* @param int $noteId
* @return \Illuminate\View\View
*/
public function edit($noteId)
public function edit(int $noteId): View
{
$note = Note::find($noteId);
$note->originalNote = $note->getOriginal('note');
@ -68,18 +71,18 @@ class NotesController extends Controller
* Process a request to edit a note. Easy since this can only be done
* from the admin CP.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\View\Factory view
* @param int $noteId
* @return \Illuminate\Http\RedirectResponse
*/
public function update($noteId, Request $request)
public function update(int $noteId): RedirectResponse
{
//update note data
$note = Note::findOrFail($noteId);
$note->note = $request->input('content');
$note->in_reply_to = $request->input('in-reply-to');
$note->note = request()->input('content');
$note->in_reply_to = request()->input('in-reply-to');
$note->save();
if ($request->input('webmentions')) {
if (request()->input('webmentions')) {
dispatch(new SendWebMentions($note));
}
@ -89,12 +92,12 @@ class NotesController extends Controller
/**
* Delete the note.
*
* @param int id
* @return view
* @param int $noteId
* @return \Illuminate\Http\RedirectResponse
*/
public function destroy($id)
public function destroy(int $noteId): RedirectResponse
{
$note = Note::findOrFail($id);
$note = Note::findOrFail($noteId);
$note->delete();
return redirect('/admin/notes');

77
app/Http/Controllers/Admin/PlacesController.php
View file

@ -1,11 +1,15 @@
<?php
declare(strict_types=1);
namespace App\Http\Controllers\Admin;
use App\Models\Place;
use Illuminate\View\View;
use Illuminate\Http\Request;
use App\Services\PlaceService;
use App\Http\Controllers\Controller;
use Illuminate\Http\RedirectResponse;
use Phaza\LaravelPostgis\Geometries\Point;
class PlacesController extends Controller
@ -20,9 +24,9 @@ class PlacesController extends Controller
/**
* List the places that can be edited.
*
* @return \Illuminate\View\Factory view
* @return \Illuminate\View\View
*/
public function index()
public function index(): View
{
$places = Place::all();
@ -32,9 +36,9 @@ class PlacesController extends Controller
/**
* Show the form to make a new place.
*
* @return \Illuminate\View\Factory view
* @return \Illuminate\View\View
*/
public function create()
public function create(): View
{
return view('admin.places.create');
}
@ -42,12 +46,11 @@ class PlacesController extends Controller
/**
* Process a request to make a new place.
*
* @param Illuminate\Http\Request $request
* @return Illuminate\View\Factory view
* @return \Illuminate\Http\RedirectResponse
*/
public function store(Request $request)
public function store(): RedirectResponse
{
$data = $request->only(['name', 'description', 'latitude', 'longitude']);
$data = request()->only(['name', 'description', 'latitude', 'longitude']);
$place = $this->placeService->createPlace($data);
return redirect('/admin/places');
@ -56,10 +59,10 @@ class PlacesController extends Controller
/**
* Display the form to edit a specific place.
*
* @param string The place id
* @return \Illuminate\View\Factory view
* @param int $placeId
* @return \Illuminate\View\View
*/
public function edit($placeId)
public function edit(int $placeId): View
{
$place = Place::findOrFail($placeId);
@ -69,17 +72,19 @@ class PlacesController extends Controller
/**
* Process a request to edit a place.
*
* @param string The place id
* @param Illuminate\Http\Request $request
* @return Illuminate\View\Factory view
* @param int $placeId
* @return \Illuminate\Http\RedirectResponse
*/
public function update($placeId, Request $request)
public function update(int $placeId): RedirectResponse
{
$place = Place::findOrFail($placeId);
$place->name = $request->name;
$place->description = $request->description;
$place->location = new Point((float) $request->latitude, (float) $request->longitude);
$place->icon = $request->icon;
$place->name = request()->input('name');
$place->description = request()->input('description');
$place->location = new Point(
(float) request()->input('latitude'),
(float) request()->input('longitude')
);
$place->icon = request()->input('icon');
$place->save();
return redirect('/admin/places');
@ -88,10 +93,10 @@ class PlacesController extends Controller
/**
* List the places we can merge with the current place.
*
* @param string Place id
* @return Illuminate\View\Factory view
* @param int $placeId
* @return \Illuminate\View\View
*/
public function mergeIndex($placeId)
public function mergeIndex(int $placeId): View
{
$first = Place::find($placeId);
$results = Place::near(new Point($first->latitude, $first->longitude))->get();
@ -105,27 +110,39 @@ class PlacesController extends Controller
return view('admin.places.merge.index', compact('first', 'places'));
}
public function mergeEdit($place1_id, $place2_id)
/**
* Show a form for merging two specific places.
*
* @param int $placeId1
* @param int $placeId2
* @return \Illuminate\View\View
*/
public function mergeEdit(int $placeId1, int $placeId2): View
{
$place1 = Place::find($place1_id);
$place2 = Place::find($place2_id);
$place1 = Place::find($placeId1);
$place2 = Place::find($placeId2);
return view('admin.places.merge.edit', compact('place1', 'place2'));
}
public function mergeStore(Request $request)
/**
* Process the request to merge two places.
*
* @return \Illuminate\Http\RedirectResponse
*/
public function mergeStore(): RedirectResponse
{
$place1 = Place::find($request->input('place1'));
$place2 = Place::find($request->input('place2'));
$place1 = Place::find(request()->input('place1'));
$place2 = Place::find(request()->input('place2'));
if ($request->input('delete') === '1') {
if (request()->input('delete') === '1') {
foreach ($place1->notes as $note) {
$note->place()->dissociate();
$note->place()->associate($place2->id);
}
$place1->delete();
}
if ($request->input('delete') === '2') {
if (request()->input('delete') === '2') {
foreach ($place2->notes as $note) {
$note->place()->dissociate();
$note->place()->associate($place1->id);

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

@ -1,21 +1,27 @@
<?php
declare(strict_types=1);
namespace App\Http\Controllers;
use App\Models\Article;
use Illuminate\View\View;
use Jonnybarnes\IndieWeb\Numbers;
use Illuminate\Http\RedirectResponse;
class ArticlesController extends Controller
{
/**
* Show all articles (with pagination).
*
* @return \Illuminate\View\Factory view
* @param int $year
* @param int $month
* @return \Illuminate\View\View
*/
public function index($year = null, $month = null)
public function index(int $year = null, int $month = null): View
{
$articles = Article::where('published', '1')
->date((int) $year, (int) $month)
->date($year, $month)
->orderBy('updated_at', 'desc')
->simplePaginate(5);
@ -25,9 +31,12 @@ class ArticlesController extends Controller
/**
* Show a single article.
*
* @return \Illuminate\View\Factory view
* @param int $year
* @param int $month
* @param string $slug
* @return \Illuminate\Http\RedirectResponse|\Illuminate\View\View
*/
public function show($year, $month, $slug)
public function show(int $year, int $month, string $slug)
{
$article = Article::where('titleurl', $slug)->firstOrFail();
if ($article->updated_at->year != $year || $article->updated_at->month != $month) {
@ -44,12 +53,12 @@ class ArticlesController extends Controller
* We only have the ID, work out post title, year and month
* and redirect to it.
*
* @return \Illuminte\Routing\RedirectResponse redirect
* @param int $idFromUrl
* @return \Illuminte\Http\RedirectResponse
*/
public function onlyIdInUrl($inURLId)
public function onlyIdInUrl(int $idFromUrl): RedirectResponse
{
$numbers = new Numbers();
$realId = $numbers->b60tonum($inURLId);
$realId = resolve(Numbers::class)->b60tonum($idFromUrl);
$article = Article::findOrFail($realId);
return redirect($article->link);

20
app/Http/Controllers/AuthController.php
View file

@ -1,12 +1,21 @@
<?php
declare(strict_types=1);
namespace App\Http\Controllers;
use Illuminate\View\View;
use Illuminate\Http\Request;
use Illuminate\Http\RedirectResponse;
class AuthController extends Controller
{
public function showLogin()
/**
* Show the login form.
*
* @return \Illuminate\View\View
*/
public function showLogin(): View
{
return view('login');
}
@ -15,14 +24,13 @@ class AuthController extends Controller
* Log in a user, set a sesion variable, check credentials against
* the .env file.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Routing\RedirectResponse redirect
* @return \Illuminate\Http\RedirectResponse
*/
public function login(Request $request)
public function login(): RedirectResponse
{
if ($request->input('username') === config('admin.user')
if (request()->input('username') === config('admin.user')
&&
$request->input('password') === config('admin.pass')
request()->input('password') === config('admin.pass')
) {
session(['loggedin' => true]);

18
app/Http/Controllers/BookmarksController.php
View file

@ -1,19 +1,33 @@
<?php
declare(strict_types=1);
namespace App\Http\Controllers;
use App\Models\Bookmark;
use Illuminate\View\View;
class BookmarksController extends Controller
{
public function index()
/**
* Show the most recent bookmarks.
*
* @return \Illuminate\View\View
*/
public function index(): View
{
$bookmarks = Bookmark::latest()->with('tags')->withCount('tags')->paginate(10);
return view('bookmarks.index', compact('bookmarks'));
}
public function show(Bookmark $bookmark)
/**
* Show a single bookmark.
*
* @param \App\Models\Bookmark $bookmark
* @return \Illuminate\View\View
*/
public function show(Bookmark $bookmark): View
{
$bookmark->loadMissing('tags');

14
app/Http/Controllers/ContactsController.php
View file

@ -1,8 +1,11 @@
<?php
declare(strict_types=1);
namespace App\Http\Controllers;
use App\Models\Contact;
use Illuminate\View\View;
use Illuminate\Filesystem\Filesystem;
class ContactsController extends Controller
@ -10,9 +13,9 @@ class ContactsController extends Controller
/**
* Show all the contacts.
*
* @return \Illuminate\View\Factory view
* @return \Illuminate\View\View
*/
public function index()
public function index(): View
{
$filesystem = new Filesystem();
$contacts = Contact::all();
@ -31,9 +34,12 @@ class ContactsController extends Controller
/**
* Show a single contact.
*
* @return \Illuminate\View\Factory view
* @todo Use implicit model binding.
*
* @param string $nick The nickname associated with contact
* @return \Illuminate\View\View
*/
public function show($nick)
public function show(string $nick): View
{
$filesystem = new Filesystem();
$contact = Contact::where('nick', '=', $nick)->firstOrFail();

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

@ -1,7 +1,10 @@
<?php
declare(strict_types=1);
namespace App\Http\Controllers;
use Illuminate\Http\Response;
use App\Models\{Article, Note};
class FeedsController extends Controller
@ -11,7 +14,7 @@ class FeedsController extends Controller
*
* @return \Illuminate\Http\Response
*/
public function blogRss()
public function blogRss(): Response
{
$articles = Article::where('published', '1')->latest('updated_at')->take(20)->get();
$buildDate = $articles->first()->updated_at->toRssString();
@ -26,7 +29,7 @@ class FeedsController extends Controller
*
* @return \Illuminate\Http\Response
*/
public function blogAtom()
public function blogAtom(): Response
{
$articles = Article::where('published', '1')->latest('updated_at')->take(20)->get();
@ -40,7 +43,7 @@ class FeedsController extends Controller
*
* @return \Illuminate\Http\Response
*/
public function notesRss()
public function notesRss(): Response
{
$notes = Note::latest()->take(20)->get();
$buildDate = $notes->first()->updated_at->toRssString();
@ -55,7 +58,7 @@ class FeedsController extends Controller
*
* @return \Illuminate\Http\Response
*/
public function notesAtom()
public function notesAtom(): Response
{
$notes = Note::latest()->take(20)->get();
@ -64,10 +67,12 @@ class FeedsController extends Controller
->header('Content-Type', 'application/atom+xml; charset=utf-8');
}
/** @todo sort out return type for json responses */
/**
* Returns the blog JSON feed.
*
* @return \Illuminate\Http\response
* @return \Illuminate\Http\JsonResponse
*/
public function blogJson()
{
@ -100,7 +105,7 @@ class FeedsController extends Controller
/**
* Returns the notes JSON feed.
*
* @return \Illuminate\Http\response
* @return \Illuminate\Http\JsonResponse
*/
public function notesJson()
{

18
app/Http/Controllers/LikesController.php
View file

@ -1,19 +1,33 @@
<?php
declare(strict_types=1);
namespace App\Http\Controllers;
use App\Models\Like;
use Illuminate\View\View;
class LikesController extends Controller
{
public function index()
/**
* Show the latest likes.
*
* @return \Illuminate\View\View
*/
public function index(): View
{
$likes = Like::latest()->paginate(20);
return view('likes.index', compact('likes'));
}
public function show(Like $like)
/**
* Show a single like.
*
* @param \App\Models\Like $like
* @return \Illuminate\View\View
*/
public function show(Like $like): View
{
return view('likes.show', compact('like'));
}

59
app/Http/Controllers/MicropubController.php
View file

@ -1,11 +1,14 @@
<?php
declare(strict_types=1);
namespace App\Http\Controllers;
use Monolog\Logger;
use Ramsey\Uuid\Uuid;
use App\Jobs\ProcessMedia;
use App\Services\TokenService;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\UploadedFile;
use Monolog\Handler\StreamHandler;
use Intervention\Image\ImageManager;
@ -40,12 +43,11 @@ class MicropubController extends Controller
* This function receives an API request, verifies the authenticity
* then passes over the info to the relavent Service class.
*
* @return \Illuminate\Http\Response
* @return \Illuminate\Http\JsonResponse
*/
public function post()
public function post(): JsonResponse
{
try {
info(request()->input('access_token'));
$tokenData = $this->tokenService->validateToken(request()->input('access_token'));
} catch (InvalidTokenException $e) {
return $this->invalidTokenResponse();
@ -96,14 +98,16 @@ class MicropubController extends Controller
}
/**
* Respond to a GET request to the micropub endpoint.
*
* A GET request has been made to `api/post` with an accompanying
* token, here we check wether the token is valid and respond
* appropriately. Further if the request has the query parameter
* synidicate-to we respond with the known syndication endpoints.
*
* @return \Illuminate\Http\Response
* @return \Illuminate\Http\JsonResponse
*/
public function get()
public function get(): JsonResponse
{
try {
$tokenData = $this->tokenService->validateToken(request()->bearerToken());
@ -124,7 +128,7 @@ class MicropubController extends Controller
]);
}
if (substr(request()->input('q'), 0, 4) === 'geo:') {
if (request()->has('q') && substr(request()->input('q'), 0, 4) === 'geo:') {
preg_match_all(
'/([0-9\.\-]+)/',
request()->input('q'),
@ -153,9 +157,9 @@ class MicropubController extends Controller
/**
* Process a media item posted to the media endpoint.
*
* @return Illuminate\Http\Response
* @return Illuminate\Http\JsonResponse
*/
public function media()
public function media(): JsonResponse
{
try {
$tokenData = $this->tokenService->validateToken(request()->bearerToken());
@ -210,10 +214,10 @@ class MicropubController extends Controller
/**
* Get the file type from the mimetype of the uploaded file.
*
* @param string The mimetype
* @return string The type
* @param string $mimetype
* @return string
*/
private function getFileTypeFromMimeType($mimetype)
private function getFileTypeFromMimeType(string $mimetype): string
{
//try known images
$imageMimeTypes = [
@ -252,6 +256,11 @@ class MicropubController extends Controller
return 'download';
}
/**
* Determine the client id from the access token sent with the request.
*
* @return string
*/
private function getClientId(): string
{
return resolve(TokenService::class)
@ -259,6 +268,11 @@ class MicropubController extends Controller
->getClaim('client_id');
}
/**
* Save the details of the micropub request to a log file.
*
* @param array $request This is the info from request()->all()
*/
private function logMicropubRequest(array $request)
{
$logger = new Logger('micropub');
@ -266,7 +280,13 @@ class MicropubController extends Controller
$logger->debug('MicropubLog', $request);
}
private function saveFile(UploadedFile $file)
/**
* Save an uploaded file to the local disk.
*
* @param \Illuminate\Http\UploadedFele $file
* @return string $filename
*/
private function saveFile(UploadedFile $file): string
{
$filename = Uuid::uuid4() . '.' . $file->extension();
Storage::disk('local')->put($filename, $file);
@ -274,6 +294,11 @@ class MicropubController extends Controller
return $filename;
}
/**
* Generate a response to be returned when the token has insufficient scope.
*
* @return \Illuminate\Http\JsonRepsonse
*/
private function insufficientScopeResponse()
{
return response()->json([
@ -283,6 +308,11 @@ class MicropubController extends Controller
], 401);
}
/**
* Generate a response to be returned when the token is invalid.
*
* @return \Illuminate\Http\JsonRepsonse
*/
private function invalidTokenResponse()
{
return response()->json([
@ -292,6 +322,11 @@ class MicropubController extends Controller
], 400);
}
/**
* Generate a response to be returned when the token has no scope.
*
* @return \Illuminate\Http\JsonRepsonse
*/
private function tokenHasNoScopeResponse()
{
return response()->json([

24
app/Http/Controllers/NotesController.php
View file

@ -1,10 +1,14 @@
<?php
declare(strict_types=1);
namespace App\Http\Controllers;
use App\Models\Note;
use Illuminate\View\View;
use Illuminate\Http\Request;
use Jonnybarnes\IndieWeb\Numbers;
use Illuminate\Http\RedirectResponse;
use App\Services\ActivityStreamsService;
// Need to sort out Twitter and webmentions!
@ -14,7 +18,7 @@ class NotesController extends Controller
/**
* Show all the notes. This is also the homepage.
*
* @return \Illuminte\View\Factory view
* @return \Illuminate\View\View|\Illuminate\Http\JsonResponse
*/
public function index()
{
@ -34,10 +38,10 @@ class NotesController extends Controller
/**
* Show a single note.
*
* @param string The id of the note
* @return \Illuminate\View\Factory view
* @param string $urlId The id of the note
* @return \Illuminate\View\View|\Illuminate\Http\JsonResponse
*/
public function show($urlId)
public function show(string $urlId)
{
$note = Note::nb60($urlId)->with('webmentions')->firstOrFail();
@ -51,10 +55,10 @@ class NotesController extends Controller
/**
* Redirect /note/{decID} to /notes/{nb60id}.
*
* @param string The decimal id of he note
* @return \Illuminate\Routing\RedirectResponse redirect
* @param int $decId The decimal id of the note
* @return \Illuminate\Http\RedirectResponse
*/
public function redirect($decId)
public function redirect(int $decId): RedirectResponse
{
return redirect(config('app.url') . '/notes/' . (new Numbers())->numto60($decId));
}
@ -62,10 +66,10 @@ class NotesController extends Controller
/**
* Show all notes tagged with {tag}.
*
* @param string The tag
* @return \Illuminate\View\Factory view
* @param string $tag
* @return \Illuminate\View\View
*/
public function tagged($tag)
public function tagged(string $tag): View
{
$notes = Note::whereHas('tags', function ($query) use ($tag) {
$query->where('tag', $tag);

15
app/Http/Controllers/PlacesController.php
View file

@ -1,17 +1,20 @@
<?php
declare(strict_types=1);
namespace App\Http\Controllers;
use App\Models\Place;
use Illuminate\View\View;
class PlacesController extends Controller
{
/**
* Display a listing of the resource.
* Show all the places.
*
* @return \Illuminate\Http\Response
* @return \Illuminate\View\View
*/
public function index()
public function index(): View
{
$places = Place::all();
@ -19,12 +22,12 @@ class PlacesController extends Controller
}
/**
* Display the specified resource.
* Show a specific place.
*
* @param string $slug
* @return \Illuminate\Http\Response
* @return \Illuminate\View\View
*/
public function show($slug)
public function show(string $slug): View
{
$place = Place::where('slug', '=', $slug)->firstOrFail();

13
app/Http/Controllers/SearchController.php
View file

@ -1,15 +1,22 @@
<?php
declare(strict_types=1);
namespace App\Http\Controllers;
use App\Models\Note;
use Illuminate\Http\Request;
use Illuminate\View\View;
class SearchController extends Controller
{
public function search(Request $request)
/**
* Display search results.
*
* @return \Illuminate\View\View
*/
public function search(): View
{
$notes = Note::search($request->terms)->paginate(10);
$notes = Note::search(request()->input('terms'))->paginate(10);
return view('search', compact('notes'));
}

7
app/Http/Controllers/SessionStoreController.php
View file

@ -1,9 +1,16 @@
<?php
declare(strict_types=1);
namespace App\Http\Controllers;
class SessionStoreController extends Controller
{
/**
* Save the selected colour scheme in the session.
*
* @return \Illuminate\Http\JsonResponse
*/
public function saveColour()
{
$css = request()->input('css');

20
app/Http/Controllers/ShortURLsController.php
View file

@ -1,7 +1,11 @@
<?php
declare(strict_types=1);
namespace App\Http\Controllers;
use Illuminate\Http\RedirectResponse;
class ShortURLsController extends Controller
{
/*
@ -16,9 +20,9 @@ class ShortURLsController extends Controller
/**
* Redirect from '/' to the long url.
*
* @return \Illuminate\Routing\RedirectResponse redirect
* @return \Illuminate\Http\RedirectResponse
*/
public function baseURL()
public function baseURL(): RedirectResponse
{
return redirect(config('app.url'));
}
@ -26,9 +30,9 @@ class ShortURLsController extends Controller
/**
* Redirect from '/@' to a twitter profile.
*
* @return \Illuminate\Routing\RedirectResponse redirect
* @return \Illuminate\Http\RedirectResponse
*/
public function twitter()
public function twitter(): RedirectResponse
{
return redirect('https://twitter.com/jonnybarnes');
}
@ -36,9 +40,9 @@ class ShortURLsController extends Controller
/**
* Redirect from '/+' to a Google+ profile.
*
* @return \Illuminate\Routing\RedirectResponse redirect
* @return \Illuminate\Http\RedirectResponse
*/
public function googlePlus()
public function googlePlus(): RedirectResponse
{
return redirect('https://plus.google.com/u/0/117317270900655269082/about');
}
@ -49,9 +53,9 @@ class ShortURLsController extends Controller
*
* @param string Post type
* @param string Post ID
* @return \Illuminate\Routing\Redirector redirect
* @return \Illuminate\Http\RedirectResponse
*/
public function expandType($type, $postId)
public function expandType(string $type, string $postId): RedirectResponse
{
if ($type == 't') {
$type = 'notes';

28
app/Http/Controllers/TokenEndpointController.php
View file

@ -1,9 +1,11 @@
<?php
declare(strict_types=1);
namespace App\Http\Controllers;
use IndieAuth\Client;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use App\Services\TokenService;
class TokenEndpointController extends Controller
@ -21,9 +23,8 @@ class TokenEndpointController extends Controller
/**
* Inject the dependencies.
*
* @param \IndieAuth\Client $client
* @param \App\Services\TokenService $tokenService
* @return void
* @param \IndieAuth\Client $client
* @param \App\Services\TokenService $tokenService
*/
public function __construct(
Client $client,
@ -36,30 +37,29 @@ class TokenEndpointController extends Controller
/**
* If the user has auth’d via the IndieAuth protocol, issue a valid token.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function create(Request $request)
public function create(): Response
{
$authorizationEndpoint = $this->client->discoverAuthorizationEndpoint(normalize_url($request->input('me')));
$authorizationEndpoint = $this->client->discoverAuthorizationEndpoint(normalize_url(request()->input('me')));
if ($authorizationEndpoint) {
$auth = $this->client->verifyIndieAuthCode(
$authorizationEndpoint,
$request->input('code'),
$request->input('me'),
$request->input('redirect_uri'),
$request->input('client_id')
request()->input('code'),
request()->input('me'),
request()->input('redirect_uri'),
request()->input('client_id')
);
if (array_key_exists('me', $auth)) {
$scope = $auth['scope'] ?? '';
$tokenData = [
'me' => $request->input('me'),
'client_id' => $request->input('client_id'),
'me' => request()->input('me'),
'client_id' => request()->input('client_id'),
'scope' => $scope,
];
$token = $this->tokenService->getNewToken($tokenData);
$content = http_build_query([
'me' => $request->input('me'),
'me' => request()->input('me'),
'scope' => $scope,
'access_token' => $token,
]);

36
app/Http/Controllers/WebMentionsController.php
View file

@ -1,9 +1,11 @@
<?php
declare(strict_types=1);
namespace App\Http\Controllers;
use App\Models\Note;
use Illuminate\Http\Request;
use Illuminate\View\View;
use Illuminate\Http\Response;
use App\Jobs\ProcessWebMention;
use Jonnybarnes\IndieWeb\Numbers;
@ -11,7 +13,15 @@ use Illuminate\Database\Eloquent\ModelNotFoundException;
class WebMentionsController extends Controller
{
public function get()
/**
* Response to a GET request to the webmention endpoint.
*
* This is probably someone looking for information about what
* webmentions are, or about my particular implementation.
*
* @return \Illuminate\View\View
*/
public function get(): View
{
return view('webmention-endpoint');
}
@ -19,47 +29,45 @@ class WebMentionsController extends Controller
/**
* Receive and process a webmention.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Respone
*/
public function receive(Request $request)
public function receive(): Response
{
//first we trivially reject requets that lack all required inputs
if (($request->has('target') !== true) || ($request->has('source') !== true)) {
return new Response(
if ((request()->has('target') !== true) || (request()->has('source') !== true)) {
return response(
'You need both the target and source parameters',
400
);
}
//next check the $target is valid
$path = parse_url($request->input('target'), PHP_URL_PATH);
$path = parse_url(request()->input('target'), PHP_URL_PATH);
$pathParts = explode('/', $path);
if ($pathParts[1] == 'notes') {
//we have a note
$noteId = $pathParts[2];
$numbers = new Numbers();
try {
$note = Note::findOrFail($numbers->b60tonum($noteId));
dispatch(new ProcessWebMention($note, $request->input('source')));
$note = Note::findOrFail(resolve(Numbers::class)->b60tonum($noteId));
dispatch(new ProcessWebMention($note, request()->input('source')));
} catch (ModelNotFoundException $e) {
return new Response('This note doesn’t exist.', 400);
return response('This note doesn’t exist.', 400);
}
return new Response(
return response(
'Webmention received, it will be processed shortly',
202
);
}
if ($pathParts[1] == 'blog') {
return new Response(
return response(
'I don’t accept webmentions for blog posts yet.',
501
);
}
return new Response(
return response(
'Invalid request',
400
);

5
app/Http/Middleware/ActivityStreamLinks.php
View file

@ -1,8 +1,11 @@
<?php
declare(strict_types=1);
namespace App\Http\Middleware;
use Closure;
use Illuminate\Http\Request;
class ActivityStreamLinks
{
@ -13,7 +16,7 @@ class ActivityStreamLinks
* @param \Closure $next
* @return mixed
*/
public function handle($request, Closure $next)
public function handle(Request $request, Closure $next)
{
$response = $next($request);
if ($request->path() === '/') {

5
app/Http/Middleware/LocalhostSessionMiddleware.php
View file

@ -1,8 +1,11 @@
<?php
declare(strict_types=1);
namespace App\Http\Middleware;
use Closure;
use Illuminate\Http\Request;
class LocalhostSessionMiddleware
{
@ -15,7 +18,7 @@ class LocalhostSessionMiddleware
* @param \Closure $next
* @return mixed
*/
public function handle($request, Closure $next)
public function handle(Request $request, Closure $next)
{
if (config('app.env') !== 'production') {
session(['me' => config('app.url')]);

5
app/Http/Middleware/MyAuthMiddleware.php
View file

@ -1,8 +1,11 @@
<?php
declare(strict_types=1);
namespace App\Http\Middleware;
use Closure;
use Illuminate\Http\Request;
class MyAuthMiddleware
{
@ -13,7 +16,7 @@ class MyAuthMiddleware
* @param \Closure $next
* @return mixed
*/
public function handle($request, Closure $next)
public function handle(Request $request, Closure $next)
{
if ($request->session()->has('loggedin') !== true) {
//they’re not logged in, so send them to login form

5
app/Http/Middleware/VerifyMicropubToken.php
View file

@ -1,8 +1,11 @@
<?php
declare(strict_types=1);
namespace App\Http\Middleware;
use Closure;
use Illuminate\Http\Request;
class VerifyMicropubToken
{
@ -13,7 +16,7 @@ class VerifyMicropubToken
* @param \Closure $next
* @return mixed
*/
public function handle($request, Closure $next)
public function handle(Request $request, Closure $next)
{
if ($request->input('access_token')) {
return $next($request);