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

Merge pull request #291 from jonnybarnes/289-initial-fix-of-code-base-with-laravel-pint

Browse source 
Initial fix of code base with Laravel Pint
This commit is contained in:
Jonny Barnes 2022-07-09 10:29:03 +01:00 • committed by GitHub
commit f763532199
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
117 changed files with 415 additions and 378 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/Exceptions/Handler.php
View file

@ -43,8 +43,9 @@ class Handler extends ExceptionHandler
*
* This is a great spot to send exceptions to Sentry, Bugsnag, etc.
*
* @param Throwable $throwable
* @param Throwable $throwable
* @return void
*
* @throws Exception
* @throws Throwable
*/
@ -87,9 +88,10 @@ class Handler extends ExceptionHandler
/**
* Render an exception into an HTTP response.
*
* @param Request $request
* @param Throwable $throwable
* @param Request $request
* @param Throwable $throwable
* @return Response
*
* @throws Throwable
*/
public function render($request, Throwable $throwable)

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

@ -15,8 +15,8 @@ class ArticlesController extends Controller
/**
* Show all articles (with pagination).
*
* @param int|null $year
* @param int|null $month
* @param int|null $year
* @param int|null $month
* @return View
*/
public function index(int $year = null, int $month = null): View
@ -32,9 +32,9 @@ class ArticlesController extends Controller
/**
* Show a single article.
*
* @param int $year
* @param int $month
* @param string $slug
* @param int $year
* @param int $month
* @param string $slug
* @return RedirectResponse|View
*/
public function show(int $year, int $month, string $slug)
@ -59,7 +59,7 @@ class ArticlesController extends Controller
* We only have the ID, work out post title, year and month
* and redirect to it.
*
* @param string $idFromUrl
* @param string $idFromUrl
* @return RedirectResponse
*/
public function onlyIdInUrl(string $idFromUrl): RedirectResponse

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

@ -24,7 +24,7 @@ class BookmarksController extends Controller
/**
* Show a single bookmark.
*
* @param Bookmark $bookmark
* @param Bookmark $bookmark
* @return View
*/
public function show(Bookmark $bookmark): View

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

@ -34,7 +34,7 @@ class ContactsController extends Controller
/**
* Show a single contact.
*
* @param Contact $contact
* @param Contact $contact
* @return View
*/
public function show(Contact $contact): View

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

@ -4,7 +4,8 @@ declare(strict_types=1);
namespace App\Http\Controllers;
use App\Models\{Article, Note};
use App\Models\Article;
use App\Models\Note;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Response;

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

@ -24,7 +24,7 @@ class LikesController extends Controller
/**
* Show a single like.
*
* @param Like $like
* @param Like $like
* @return View
*/
public function show(Like $like): View

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

@ -6,7 +6,9 @@ namespace App\Http\Controllers;
use App\Http\Responses\MicropubResponses;
use App\Models\Place;
use App\Services\Micropub\{HCardService, HEntryService, UpdateService};
use App\Services\Micropub\HCardService;
use App\Services\Micropub\HEntryService;
use App\Services\Micropub\UpdateService;
use App\Services\TokenService;
use Illuminate\Http\JsonResponse;
use Lcobucci\JWT\Encoding\CannotDecodeContent;
@ -18,8 +20,11 @@ use Monolog\Logger;
class MicropubController extends Controller
{
protected TokenService $tokenService;
protected HEntryService $hentryService;
protected HCardService $hcardService;
protected UpdateService $updateService;
public function __construct(
@ -168,6 +173,7 @@ class MicropubController extends Controller
* Determine the client id from the access token sent with the request.
*
* @return string
*
* @throws RequiredConstraintsViolated
*/
private function getClientId(): string
@ -180,7 +186,7 @@ class MicropubController extends Controller
/**
* Save the details of the micropub request to a log file.
*
* @param array $request This is the info from request()->all()
* @param array $request This is the info from request()->all()
*/
private function logMicropubRequest(array $request)
{

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

@ -97,6 +97,7 @@ class MicropubMediaController extends Controller
* Process a media item posted to the media endpoint.
*
* @return JsonResponse
*
* @throws BindingResolutionException
* @throws Exception
*/
@ -184,7 +185,7 @@ class MicropubMediaController extends Controller
/**
* Get the file type from the mime-type of the uploaded file.
*
* @param string $mimeType
* @param string $mimeType
* @return string
*/
private function getFileTypeFromMimeType(string $mimeType): string
@ -229,8 +230,9 @@ class MicropubMediaController extends Controller
/**
* Save an uploaded file to the local disk.
*
* @param UploadedFile $file
* @param UploadedFile $file
* @return string
*
* @throws Exception
*/
private function saveFile(UploadedFile $file): string

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

@ -40,7 +40,7 @@ class NotesController extends Controller
/**
* Show a single note.
*
* @param string $urlId The id of the note
* @param string $urlId The id of the note
* @return View|JsonResponse|Response
*/
public function show(string $urlId)
@ -61,7 +61,7 @@ class NotesController extends Controller
/**
* Redirect /note/{decID} to /notes/{nb60id}.
*
* @param int $decId The decimal id of the note
* @param int $decId The decimal id of the note
* @return RedirectResponse
*/
public function redirect(int $decId): RedirectResponse
@ -72,7 +72,7 @@ class NotesController extends Controller
/**
* Show all notes tagged with {tag}.
*
* @param string $tag
* @param string $tag
* @return View
*/
public function tagged(string $tag): View

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

@ -24,7 +24,7 @@ class PlacesController extends Controller
/**
* Show a specific place.
*
* @param Place $place
* @param Place $place
* @return View
*/
public function show(Place $place): View

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

@ -23,8 +23,8 @@ class TokenEndpointController extends Controller
/**
* Inject the dependencies.
*
* @param Client $client
* @param TokenService $tokenService
* @param Client $client
* @param TokenService $tokenService
*/
public function __construct(
Client $client,

4
app/Http/Middleware/CSPHeader.php
View file

@ -10,8 +10,8 @@ class CSPHeader
/**
* Handle an incoming request.
*
* @param Request $request
* @param Closure $next
* @param Request $request
* @param Closure $next
* @return mixed
*/
public function handle($request, Closure $next)

2
app/Jobs/AddClientToDatabase.php
View file

@ -23,7 +23,7 @@ class AddClientToDatabase implements ShouldQueue
/**
* Create a new job instance.
*
* @param string $client_id
* @param string $client_id
*/
public function __construct(string $client_id)
{

7
app/Jobs/DownloadWebMention.php
View file

@ -29,7 +29,7 @@ class DownloadWebMention implements ShouldQueue
/**
* Create a new job instance.
*
* @param string $source
* @param string $source
*/
public function __construct(string $source)
{
@ -39,7 +39,8 @@ class DownloadWebMention implements ShouldQueue
/**
* Execute the job.
*
* @param Client $guzzle
* @param Client $guzzle
*
* @throws GuzzleException
* @throws FileNotFoundException
*/
@ -81,7 +82,7 @@ class DownloadWebMention implements ShouldQueue
/**
* Create a file path from a URL. This is used when caching the HTML response.
*
* @param string $url
* @param string $url
* @return string The path name
*/
private function createFilenameFromURL(string $url)

2
app/Jobs/ProcessBookmark.php
View file

@ -26,7 +26,7 @@ class ProcessBookmark implements ShouldQueue
/**
* Create a new job instance.
*
* @param Bookmark $bookmark
* @param Bookmark $bookmark
*/
public function __construct(Bookmark $bookmark)
{

7
app/Jobs/ProcessLike.php
View file

@ -31,7 +31,7 @@ class ProcessLike implements ShouldQueue
/**
* Create a new job instance.
*
* @param Like $like
* @param Like $like
*/
public function __construct(Like $like)
{
@ -41,9 +41,10 @@ class ProcessLike implements ShouldQueue
/**
* Execute the job.
*
* @param Client $client
* @param Authorship $authorship
* @param Client $client
* @param Authorship $authorship
* @return int
*
* @throws GuzzleException
*/
public function handle(Client $client, Authorship $authorship): int

4
app/Jobs/ProcessMedia.php
View file

@ -26,7 +26,7 @@ class ProcessMedia implements ShouldQueue
/**
* Create a new job instance.
*
* @param string $filename
* @param string $filename
*/
public function __construct(string $filename)
{
@ -36,7 +36,7 @@ class ProcessMedia implements ShouldQueue
/**
* Execute the job.
*
* @param ImageManager $manager
* @param ImageManager $manager
*/
public function handle(ImageManager $manager)
{

15
app/Jobs/ProcessWebMention.php
View file

@ -5,13 +5,15 @@ declare(strict_types=1);
namespace App\Jobs;
use App\Exceptions\RemoteContentNotFoundException;
use App\Models\{Note, WebMention};
use App\Models\Note;
use App\Models\WebMention;
use GuzzleHttp\Client;
use GuzzleHttp\Exception\GuzzleException;
use GuzzleHttp\Exception\RequestException;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Queue\{InteractsWithQueue, SerializesModels};
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
use Jonnybarnes\WebmentionsParser\Exceptions\InvalidMentionException;
use Jonnybarnes\WebmentionsParser\Parser;
use Mf2;
@ -31,8 +33,8 @@ class ProcessWebMention implements ShouldQueue
/**
* Create a new job instance.
*
* @param Note $note
* @param string $source
* @param Note $note
* @param string $source
*/
public function __construct(Note $note, string $source)
{
@ -43,8 +45,9 @@ class ProcessWebMention implements ShouldQueue
/**
* Execute the job.
*
* @param Parser $parser
* @param Client $guzzle
* @param Parser $parser
* @param Client $guzzle
*
* @throws RemoteContentNotFoundException
* @throws GuzzleException
* @throws InvalidMentionException

4
app/Jobs/SaveProfileImage.php
View file

@ -25,7 +25,7 @@ class SaveProfileImage implements ShouldQueue
/**
* Create a new job instance.
*
* @param array $microformats
* @param array $microformats
*/
public function __construct(array $microformats)
{
@ -35,7 +35,7 @@ class SaveProfileImage implements ShouldQueue
/**
* Execute the job.
*
* @param Authorship $authorship
* @param Authorship $authorship
*/
public function handle(Authorship $authorship)
{

10
app/Jobs/SendWebMentions.php
View file

@ -28,7 +28,7 @@ class SendWebMentions implements ShouldQueue
/**
* Create the job instance, inject dependencies.
*
* @param Note $note
* @param Note $note
*/
public function __construct(Note $note)
{
@ -65,7 +65,7 @@ class SendWebMentions implements ShouldQueue
/**
* Discover if a URL has a webmention endpoint.
*
* @param string $url
* @param string $url
* @return string|null
*/
public function discoverWebmentionEndpoint(string $url): ?string
@ -108,7 +108,7 @@ class SendWebMentions implements ShouldQueue
/**
* Get the URLs from a note.
*
* @param string|null $html
* @param string|null $html
* @return array
*/
public function getLinks(?string $html): array
@ -133,8 +133,8 @@ class SendWebMentions implements ShouldQueue
*
* @todo Update deprecated resolve method
*
* @param string $url
* @param string $base The base of the URL
* @param string $url
* @param string $base The base of the URL
* @return string
*/
public function resolveUri(string $url, string $base): string

5
app/Jobs/SyndicateBookmarkToTwitter.php
View file

@ -26,7 +26,7 @@ class SyndicateBookmarkToTwitter implements ShouldQueue
/**
* Create a new job instance.
*
* @param Bookmark $bookmark
* @param Bookmark $bookmark
*/
public function __construct(Bookmark $bookmark)
{
@ -36,7 +36,8 @@ class SyndicateBookmarkToTwitter implements ShouldQueue
/**
* Execute the job.
*
* @param Client $guzzle
* @param Client $guzzle
*
* @throws GuzzleException
*/
public function handle(Client $guzzle)

5
app/Jobs/SyndicateNoteToTwitter.php
View file

@ -24,7 +24,7 @@ class SyndicateNoteToTwitter implements ShouldQueue
/**
* Create a new job instance.
*
* @param Note $note
* @param Note $note
*/
public function __construct(Note $note)
{
@ -34,7 +34,8 @@ class SyndicateNoteToTwitter implements ShouldQueue
/**
* Execute the job.
*
* @param Client $guzzle
* @param Client $guzzle
*
* @throws GuzzleException
*/
public function handle(Client $guzzle)

7
app/Models/Article.php
View file

@ -9,7 +9,6 @@ use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
use League\CommonMark\CommonMarkConverter;
use League\CommonMark\Environment\Environment;
use League\CommonMark\Extension\CommonMark\CommonMarkCoreExtension;
use League\CommonMark\Extension\CommonMark\Node\Block\FencedCode;
@ -128,9 +127,9 @@ class Article extends Model
/**
* Scope a query to only include articles from a particular year/month.
*
* @param Builder $query
* @param int|null $year
* @param int|null $month
* @param Builder $query
* @param int|null $year
* @param int|null $month
* @return Builder
*/
public function scopeDate(Builder $query, int $year = null, int $month = null): Builder

1
app/Models/Bookmark.php
View file

@ -26,6 +26,7 @@ use Illuminate\Support\Carbon;
* @property-read string $longurl
* @property-read Collection|Tag[] $tags
* @property-read int|null $tags_count
*
* @method static Builder|Bookmark newModelQuery()
* @method static Builder|Bookmark newQuery()
* @method static Builder|Bookmark query()

2
app/Models/Contact.php
View file

@ -30,7 +30,7 @@ class Contact extends Model
{
$photo = '/assets/profile-images/default-image';
if (array_key_exists('homepage', $this->attributes) && !empty($this->attributes['homepage'])) {
if (array_key_exists('homepage', $this->attributes) && ! empty($this->attributes['homepage'])) {
$host = parse_url($this->attributes['homepage'], PHP_URL_HOST);
if (file_exists(public_path() . '/assets/profile-images/' . $host . '/image')) {
$photo = '/assets/profile-images/' . $host . '/image';

6
app/Models/Like.php
View file

@ -5,11 +5,9 @@ declare(strict_types=1);
namespace App\Models;
use App\Traits\FilterHtml;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Arr;
use Illuminate\Support\Carbon;
use Mf2;
class Like extends Model
@ -32,7 +30,7 @@ class Like extends Model
/**
* Normalize the URL of the author of the like.
*
* @param string|null $value The author’s url
* @param string|null $value The author’s url
*/
public function setAuthorUrlAttribute(?string $value)
{
@ -42,7 +40,7 @@ class Like extends Model
/**
* If the content contains HTML, filter it.
*
* @param string|null $value The content of the like
* @param string|null $value The content of the like
* @return string|null
*/
public function getContentAttribute(?string $value): ?string

6
app/Models/Media.php
View file

@ -4,11 +4,9 @@ declare(strict_types=1);
namespace App\Models;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Support\Carbon;
use Illuminate\Support\Str;
class Media extends Model
@ -82,7 +80,7 @@ class Media extends Model
/**
* Give the real part of a filename, i.e. strip the file extension.
*
* @param string $path
* @param string $path
* @return string
*/
public function getBasename(string $path): string
@ -100,7 +98,7 @@ class Media extends Model
/**
* Get the extension from a given filename.
*
* @param string $path
* @param string $path
* @return string
*/
public function getExtension(string $path): string

3
app/Models/MicropubClient.php
View file

@ -4,12 +4,9 @@ declare(strict_types=1);
namespace App\Models;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Support\Carbon;
class MicropubClient extends Model
{

42
app/Models/Note.php
View file

@ -10,8 +10,14 @@ use App\Exceptions\TwitterContentException;
use Codebird\Codebird;
use Exception;
use GuzzleHttp\Client;
use Illuminate\Database\Eloquent\{Builder, Factories\HasFactory, Model, SoftDeletes};
use Illuminate\Database\Eloquent\Relations\{BelongsTo, BelongsToMany, HasMany, MorphMany};
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Relations\MorphMany;
use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Support\Facades\Cache;
use JetBrains\PhpStorm\ArrayShape;
use Jonnybarnes\IndieWeb\Numbers;
@ -24,7 +30,8 @@ use League\CommonMark\Extension\Mention\Mention;
use League\CommonMark\Extension\Mention\MentionExtension;
use League\CommonMark\MarkdownConverter;
use Normalizer;
use Spatie\CommonMarkHighlighter\{FencedCodeRenderer, IndentedCodeRenderer};
use Spatie\CommonMarkHighlighter\FencedCodeRenderer;
use Spatie\CommonMarkHighlighter\IndentedCodeRenderer;
class Note extends Model
{
@ -46,7 +53,7 @@ class Note extends Model
/**
* Set our contacts variable to null.
*
* @param array $attributes
* @param array $attributes
*/
public function __construct(array $attributes = [])
{
@ -134,7 +141,7 @@ class Note extends Model
*
* @return array
*/
#[ArrayShape(['note' => "null|string"])]
#[ArrayShape(['note' => 'null|string'])]
public function toSearchableArray(): array
{
return [
@ -145,7 +152,7 @@ class Note extends Model
/**
* Normalize the note to Unicode FORM C.
*
* @param string|null $value
* @param string|null $value
*/
public function setNoteAttribute(?string $value): void
{
@ -161,7 +168,7 @@ class Note extends Model
/**
* Pre-process notes for web-view.
*
* @param string|null $value
* @param string|null $value
* @return string|null
*/
public function getNoteAttribute(?string $value): ?string
@ -339,7 +346,7 @@ class Note extends Model
{
if (
$this->in_reply_to === null ||
!$this->isTwitterLink($this->in_reply_to)
! $this->isTwitterLink($this->in_reply_to)
) {
return null;
}
@ -375,6 +382,7 @@ class Note extends Model
* That is we swap the contacts names for their known Twitter handles.
*
* @return string
*
* @throws TwitterContentException
*/
public function getTwitterContentAttribute(): string
@ -419,8 +427,8 @@ class Note extends Model
/**
* Scope a query to select a note via a NewBase60 id.
*
* @param Builder $query
* @param string $nb60id
* @param Builder $query
* @param string $nb60id
* @return Builder
*/
public function scopeNb60(Builder $query, string $nb60id): Builder
@ -436,7 +444,7 @@ class Note extends Model
* due to lack of contact info, we assume @username is a twitter handle and link it
* as such.
*
* @param string $text
* @param string $text
* @return string
*/
private function makeHCards(string $text): string
@ -507,7 +515,7 @@ class Note extends Model
* `#[\-_a-zA-Z0-9]+` and wraps them in an `a` element with
* `rel=tag` set and a `href` of 'section/tagged/' + tagname without the #.
*
* @param string $note
* @param string $note
* @return string
*/
public function autoLinkHashtag(string $note): string
@ -526,7 +534,7 @@ class Note extends Model
/**
* Pass a note through the commonmark library.
*
* @param string $note
* @param string $note
* @return string
*/
private function convertMarkdown(string $note): string
@ -534,8 +542,8 @@ class Note extends Model
$config = [
'mentions' => [
'contacts_handle' => [
'prefix' => '@',
'pattern' => '[a-z\d](?:[a-z\d]|-(?=[a-z\d])){0,38}(?!\w)',
'prefix' => '@',
'pattern' => '[a-z\d](?:[a-z\d]|-(?=[a-z\d])){0,38}(?!\w)',
'generator' => new ContactMentionGenerator(),
],
],
@ -556,8 +564,8 @@ class Note extends Model
/**
* Do a reverse geocode lookup of a `lat,lng` value.
*
* @param float $latitude
* @param float $longitude
* @param float $latitude
* @param float $longitude
* @return string
*/
public function reverseGeoCode(float $latitude, float $longitude): string

15
app/Models/Place.php
View file

@ -5,9 +5,10 @@ declare(strict_types=1);
namespace App\Models;
use Cviebrock\EloquentSluggable\Sluggable;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\{Builder, Collection, Factories\HasFactory, Model};
use Illuminate\Support\Carbon;
use Illuminate\Support\Str;
class Place extends Model
@ -70,9 +71,9 @@ class Place extends Model
/**
* Select places near a given location.
*
* @param Builder $query
* @param object $location
* @param int $distance
* @param Builder $query
* @param object $location
* @param int $distance
* @return Builder
*/
public function scopeNear(Builder $query, object $location, int $distance = 1000): Builder
@ -93,8 +94,8 @@ class Place extends Model
/**
* Select places based on a URL.
*
* @param Builder $query
* @param string $url
* @param Builder $query
* @param string $url
* @return Builder
*/
public function scopeWhereExternalURL(Builder $query, string $url): Builder

7
app/Models/Tag.php
View file

@ -4,12 +4,9 @@ declare(strict_types=1);
namespace App\Models;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Support\Carbon;
use Illuminate\Support\Str;
class Tag extends Model
@ -46,7 +43,7 @@ class Tag extends Model
/**
* When creating a Tag model instance, invoke the nomralize method on the tag.
*
* @param string $value
* @param string $value
*/
public function setTagAttribute(string $value)
{
@ -57,7 +54,7 @@ class Tag extends Model
* This method actually normalizes a tag. That means lowercase-ing and
* removing fancy diatric characters.
*
* @param string $tag
* @param string $tag
* @return string
*/
public static function normalize(string $tag): string

4
app/Models/User.php
View file

@ -4,13 +4,9 @@ declare(strict_types=1);
namespace App\Models;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Notifications\DatabaseNotification;
use Illuminate\Notifications\DatabaseNotificationCollection;
use Illuminate\Notifications\Notifiable;
use Illuminate\Support\Carbon;
class User extends Authenticatable
{

5
app/Models/WebMention.php
View file

@ -6,12 +6,10 @@ namespace App\Models;
use App\Traits\FilterHtml;
use Codebird\Codebird;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\MorphTo;
use Illuminate\Filesystem\Filesystem;
use Illuminate\Support\Carbon;
use Illuminate\Support\Facades\Cache;
use Jonnybarnes\WebmentionsParser\Authorship;
use Jonnybarnes\WebmentionsParser\Exceptions\AuthorshipParserException;
@ -49,6 +47,7 @@ class WebMention extends Model
* Get the author of the webmention.
*
* @return array
*
* @throws AuthorshipParserException
*/
public function getAuthorAttribute(): array
@ -115,7 +114,7 @@ class WebMention extends Model
/**
* Create the photo link.
*
* @param string $url
* @param string $url
* @return string
*/
public function createPhotoLink(string $url): string

14
app/Observers/NoteObserver.php
View file

@ -4,15 +4,17 @@ declare(strict_types=1);
namespace App\Observers;
use App\Models\{Note, Tag};
use Illuminate\Support\{Arr, Collection};
use App\Models\Note;
use App\Models\Tag;
use Illuminate\Support\Arr;
use Illuminate\Support\Collection;
class NoteObserver
{
/**
* Listen to the Note created event.
*
* @param Note $note
* @param Note $note
*/
public function created(Note $note)
{
@ -36,7 +38,7 @@ class NoteObserver
/**
* Listen to the Note updated event.
*
* @param Note $note
* @param Note $note
*/
public function updated(Note $note)
{
@ -62,7 +64,7 @@ class NoteObserver
/**
* Listen to the Note deleting event.
*
* @param Note $note
* @param Note $note
*/
public function deleting(Note $note)
{
@ -72,7 +74,7 @@ class NoteObserver
/**
* Retrieve the tags from a note’s text, tag for form #tag.
*
* @param string $note
* @param string $note
* @return Collection
*/
private function getTagsFromNote(string $note): Collection

8
app/Providers/AppServiceProvider.php
View file

@ -62,10 +62,10 @@ class AppServiceProvider extends ServiceProvider
/**
* Paginate a standard Laravel Collection.
*
* @param int $perPage
* @param int $total
* @param int $page
* @param string $pageName
* @param int $perPage
* @param int $total
* @param int $page
* @param string $pageName
* @return array
*/
Collection::macro('paginate', function ($perPage, $total = null, $page = null, $pageName = 'page') {

14
app/Services/BookmarkService.php
View file

@ -7,10 +7,12 @@ namespace App\Services;
use App\Exceptions\InternetArchiveException;
use App\Jobs\ProcessBookmark;
use App\Jobs\SyndicateBookmarkToTwitter;
use App\Models\{Bookmark, Tag};
use App\Models\Bookmark;
use App\Models\Tag;
use GuzzleHttp\Client;
use GuzzleHttp\Exception\ClientException;
use Illuminate\Support\{Arr, Str};
use Illuminate\Support\Arr;
use Illuminate\Support\Str;
use Ramsey\Uuid\Uuid;
use Spatie\Browsershot\Browsershot;
use Spatie\Browsershot\Exceptions\CouldNotTakeBrowsershot;
@ -20,7 +22,7 @@ class BookmarkService
/**
* Create a new Bookmark.
*
* @param array $request Data from request()->all()
* @param array $request Data from request()->all()
* @return Bookmark
*/
public function createBookmark(array $request): Bookmark
@ -81,8 +83,9 @@ class BookmarkService
/**
* Given a URL, use `browsershot` to save an image of the page.
*
* @param string $url
* @param string $url
* @return string The uuid for the screenshot
*
* @throws CouldNotTakeBrowsershot
* @codeCoverageIgnore
*/
@ -104,8 +107,9 @@ class BookmarkService
/**
* Given a URL, attempt to save it to the Internet Archive.
*
* @param string $url
* @param string $url
* @return string
*
* @throws InternetArchiveException
*/
public function getArchiveLink(string $url): string

2
app/Services/LikeService.php
View file

@ -13,7 +13,7 @@ class LikeService
/**
* Create a new Like.
*
* @param array $request
* @param array $request
* @return Like $like
*/
public function createLike(array $request): Like

4
app/Services/Micropub/HEntryService.php
View file

@ -4,7 +4,9 @@ declare(strict_types=1);
namespace App\Services\Micropub;
use App\Services\{BookmarkService, LikeService, NoteService};
use App\Services\BookmarkService;
use App\Services\LikeService;
use App\Services\NoteService;
use Illuminate\Support\Arr;
class HEntryService

6
app/Services/Micropub/UpdateService.php
View file

@ -4,9 +4,11 @@ declare(strict_types=1);
namespace App\Services\Micropub;
use App\Models\{Media, Note};
use App\Models\Media;
use App\Models\Note;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Support\{Arr, Str};
use Illuminate\Support\Arr;
use Illuminate\Support\Str;
class UpdateService
{

28
app/Services/NoteService.php
View file

@ -4,9 +4,13 @@ declare(strict_types=1);
namespace App\Services;
use App\Jobs\{SendWebMentions, SyndicateNoteToTwitter};
use App\Models\{Media, Note, Place};
use Illuminate\Support\{Arr, Str};
use App\Jobs\SendWebMentions;
use App\Jobs\SyndicateNoteToTwitter;
use App\Models\Media;
use App\Models\Note;
use App\Models\Place;
use Illuminate\Support\Arr;
use Illuminate\Support\Str;
class NoteService
{
@ -61,7 +65,7 @@ class NoteService
/**
* Get the content from the request to create a new note.
*
* @param array $request Data from request()->all()
* @param array $request Data from request()->all()
* @return string|null
*/
private function getContent(array $request): ?string
@ -79,7 +83,7 @@ class NoteService
/**
* Get the in-reply-to from the request to create a new note.
*
* @param array $request Data from request()->all()
* @param array $request Data from request()->all()
* @return string|null
*/
private function getInReplyTo(array $request): ?string
@ -94,7 +98,7 @@ class NoteService
/**
* Get the published time from the request to create a new note.
*
* @param array $request Data from request()->all()
* @param array $request Data from request()->all()
* @return string|null
*/
private function getPublished(array $request): ?string
@ -113,7 +117,7 @@ class NoteService
/**
* Get the location data from the request to create a new note.
*
* @param array $request Data from request()->all()
* @param array $request Data from request()->all()
* @return string|null
*/
private function getLocation(array $request): ?string
@ -135,7 +139,7 @@ class NoteService
/**
* Get the checkin data from the request to create a new note. This will be a Place.
*
* @param array $request Data from request()->all()
* @param array $request Data from request()->all()
* @return Place|null
*/
private function getCheckin(array $request): ?Place
@ -181,7 +185,7 @@ class NoteService
/**
* Get the Swarm URL from the syndication data in the request to create a new note.
*
* @param array $request Data from request()->all()
* @param array $request Data from request()->all()
* @return string|null
*/
private function getSwarmUrl(array $request): ?string
@ -196,7 +200,7 @@ class NoteService
/**
* Get the syndication targets from the request to create a new note.
*
* @param array $request Data from request()->all()
* @param array $request Data from request()->all()
* @return array
*/
private function getSyndicationTargets(array $request): array
@ -225,7 +229,7 @@ class NoteService
/**
* Get the media URLs from the request to create a new note.
*
* @param array $request Data from request()->all()
* @param array $request Data from request()->all()
* @return array
*/
private function getMedia(array $request): array
@ -255,7 +259,7 @@ class NoteService
/**
* Get the Instagram photo URL from the request to create a new note.
*
* @param array $request Data from request()->all()
* @param array $request Data from request()->all()
* @return string|null
*/
private function getInstagramUrl(array $request): ?string

2
app/Services/PlaceService.php
View file

@ -12,7 +12,7 @@ class PlaceService
/**
* Create a place.
*
* @param array $data
* @param array $data
* @return Place
*/
public function createPlace(array $data): Place

3
app/Services/TokenService.php
View file

@ -6,7 +6,8 @@ namespace App\Services;
use App\Jobs\AddClientToDatabase;
use DateTimeImmutable;
use Lcobucci\JWT\{Configuration, Token};
use Lcobucci\JWT\Configuration;
use Lcobucci\JWT\Token;
class TokenService
{

94
config/debugbar.php
View file

@ -1,6 +1,6 @@
<?php
return array(
return [
/*
|--------------------------------------------------------------------------
@ -26,12 +26,12 @@ return array(
| can also be used. For PDO, run the package migrations first.
|
*/
'storage' => array(
'storage' => [
'enabled' => true,
'driver' => 'file', // redis, file, pdo
'path' => storage_path() . '/debugbar', // For file driver
'connection' => null, // Leave null for default connection (Redis/PDO)
),
],
/*
|--------------------------------------------------------------------------
@ -70,27 +70,27 @@ return array(
|
*/
'collectors' => array(
'phpinfo' => true, // Php version
'messages' => true, // Messages
'time' => true, // Time Datalogger
'memory' => true, // Memory usage
'exceptions' => true, // Exception displayer
'log' => true, // Logs from Monolog (merged in messages if enabled)
'db' => true, // Show database (PDO) queries and bindings
'views' => true, // Views with their data
'route' => true, // Current route information
'laravel' => false, // Laravel version and environment
'events' => false, // All events fired
'collectors' => [
'phpinfo' => true, // Php version
'messages' => true, // Messages
'time' => true, // Time Datalogger
'memory' => true, // Memory usage
'exceptions' => true, // Exception displayer
'log' => true, // Logs from Monolog (merged in messages if enabled)
'db' => true, // Show database (PDO) queries and bindings
'views' => true, // Views with their data
'route' => true, // Current route information
'laravel' => false, // Laravel version and environment
'events' => false, // All events fired
'default_request' => false, // Regular or special Symfony request logger
'symfony_request' => true, // Only one can be enabled..
'mail' => true, // Catch mail messages
'logs' => false, // Add the latest log messages
'files' => false, // Show the included files
'config' => false, // Display config settings
'auth' => false, // Display Laravel authentication status
'session' => false, // Display session data in a separate tab
),
'mail' => true, // Catch mail messages
'logs' => false, // Add the latest log messages
'files' => false, // Show the included files
'config' => false, // Display config settings
'auth' => false, // Display Laravel authentication status
'session' => false, // Display session data in a separate tab
],
/*
|--------------------------------------------------------------------------
@ -101,33 +101,33 @@ return array(
|
*/
'options' => array(
'auth' => array(
'options' => [
'auth' => [
'show_name' => false, // Also show the users name/email in the debugbar
),
'db' => array(
'with_params' => true, // Render SQL with the parameters substituted
'timeline' => false, // Add the queries to the timeline
'backtrace' => false, // EXPERIMENTAL: Use a backtrace to find the origin of the query in your files.
'explain' => array( // EXPERIMENTAL: Show EXPLAIN output on queries
],
'db' => [
'with_params' => true, // Render SQL with the parameters substituted
'timeline' => false, // Add the queries to the timeline
'backtrace' => false, // EXPERIMENTAL: Use a backtrace to find the origin of the query in your files.
'explain' => [ // EXPERIMENTAL: Show EXPLAIN output on queries
'enabled' => false,
'types' => array('SELECT'), // array('SELECT', 'INSERT', 'UPDATE', 'DELETE'); for MySQL 5.6.3+
),
'hints' => true, // Show hints for common mistakes
),
'mail' => array(
'full_log' => false
),
'views' => array(
'types' => ['SELECT'], // array('SELECT', 'INSERT', 'UPDATE', 'DELETE'); for MySQL 5.6.3+
],
'hints' => true, // Show hints for common mistakes
],
'mail' => [
'full_log' => false,
],
'views' => [
'data' => false, //Note: Can slow down the application, because the data can be quite large..
),
'route' => array(
'label' => true // show complete route on bar
),
'logs' => array(
'file' => null
),
),
],
'route' => [
'label' => true, // show complete route on bar
],
'logs' => [
'file' => null,
],
],
/*
|--------------------------------------------------------------------------
@ -142,4 +142,4 @@ return array(
'inject' => true,
);
];

2
config/filesystems.php
View file

@ -67,7 +67,7 @@ return [
'media' => [
'driver' => 'local',
'root' => public_path() . '/media',
'root' => public_path() . '/media',
],
],

4
config/ide-helper.php
View file

@ -11,8 +11,8 @@ return [
|
*/
'filename' => '_ide_helper',
'format' => 'php',
'filename' => '_ide_helper',
'format' => 'php',
/*
|--------------------------------------------------------------------------

9
config/sluggable.php
View file

@ -17,7 +17,6 @@ return [
*
* Defaults to null, which uses the toString() method on your model.
*/
'source' => null,
/**
@ -25,7 +24,6 @@ return [
* no length restrictions are enforced. Set it to a positive integer if you
* want to make sure your slugs aren't too long.
*/
'maxLength' => null,
/**
@ -43,13 +41,11 @@ return [
*
* 'method' => array('Str','slug'),
*/
'method' => null,
/**
* Separator to use when generating slugs. Defaults to a hyphen.
*/
'separator' => '-',
/**
@ -61,7 +57,6 @@ return [
* my-slug-1
* my-slug-2
*/
'unique' => true,
/**
@ -72,7 +67,6 @@ return [
* "similar" slugs. The closure should return the new unique
* suffix to append to the slug.
*/
'uniqueSuffix' => null,
/**
@ -81,7 +75,6 @@ return [
* If set to "false", then a new slug could duplicate one that exists on a trashed model.
* If set to "true", then uniqueness is enforced across trashed and existing models.
*/
'includeTrashed' => false,
/**
@ -107,7 +100,6 @@ return [
*
* and continue from there.
*/
'reserved' => null,
/**
@ -120,7 +112,6 @@ return [
* is probably not a good idea from an SEO point of view.
* Only set this to true if you understand the possible consequences.
*/
'onUpdate' => false,
];

2
config/syndication.php
View file

@ -22,5 +22,5 @@ return [
'photo' => 'https://pbs.twimg.com/profile_images/875422855932121089/W628ZI8w_400x400.jpg',
],
],
]
],
];

26
config/ttwitter.php
View file

@ -2,17 +2,17 @@
// You can find the keys here : https://dev.twitter.com/
return [
'API_URL' => 'api.twitter.com',
'API_VERSION' => '1.1',
'AUTHENTICATE_URL' => 'https://api.twitter.com/oauth/authenticate',
'AUTHORIZE_URL' => 'https://api.twitter.com/oauth/authorize',
'ACCESS_TOKEN_URL' => 'oauth/access_token',
'REQUEST_TOKEN_URL' => 'oauth/request_token',
'USE_SSL' => true,
return [
'API_URL' => 'api.twitter.com',
'API_VERSION' => '1.1',
'AUTHENTICATE_URL' => 'https://api.twitter.com/oauth/authenticate',
'AUTHORIZE_URL' => 'https://api.twitter.com/oauth/authorize',
'ACCESS_TOKEN_URL' => 'oauth/access_token',
'REQUEST_TOKEN_URL' => 'oauth/request_token',
'USE_SSL' => true,
'CONSUMER_KEY' => env('TWITTER_CONSUMER_KEY'),
'CONSUMER_SECRET' => env('TWITTER_CONSUMER_SECRET'),
'ACCESS_TOKEN' => env('TWITTER_ACCESS_TOKEN'),
'ACCESS_TOKEN_SECRET' => env('TWITTER_ACCESS_TOKEN_SECRET'),
];
'CONSUMER_KEY' => env('TWITTER_CONSUMER_KEY'),
'CONSUMER_SECRET' => env('TWITTER_CONSUMER_SECRET'),
'ACCESS_TOKEN' => env('TWITTER_ACCESS_TOKEN'),
'ACCESS_TOKEN_SECRET' => env('TWITTER_ACCESS_TOKEN_SECRET'),
];

2
config/url.php
View file

@ -7,5 +7,5 @@
return [
'longurl' => env('APP_LONGURL', 'jonnybarnes.uk'),
'shorturl' => env('APP_SHORTURL', 'jmb.lv')
'shorturl' => env('APP_SHORTURL', 'jmb.lv'),
];

1
database/factories/NoteFactory.php
View file

@ -20,6 +20,7 @@ class NoteFactory extends Factory
* Define the model's default state.
*
* @return array
*
* @throws Exception
*/
public function definition()

2
database/migrations/2015_02_28_132629_create_articles_table.php
View file

@ -1,7 +1,7 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateArticlesTable extends Migration
{

2
database/migrations/2015_02_28_144939_create_notes_table.php
View file

@ -1,7 +1,7 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateNotesTable extends Migration
{

2
database/migrations/2015_03_02_084342_create_tags_table.php
View file

@ -1,7 +1,7 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateTagsTable extends Migration
{

2
database/migrations/2015_03_02_084956_create_note_tag_table.php
View file

@ -1,7 +1,7 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateNoteTagTable extends Migration
{

2
database/migrations/2015_03_02_105623_create_contacts_table.php
View file

@ -1,7 +1,7 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateContactsTable extends Migration
{

5
database/migrations/2015_03_02_114340_create_web_mentions_table.php
View file

@ -1,7 +1,7 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateWebMentionsTable extends Migration
{
@ -12,8 +12,7 @@ class CreateWebMentionsTable extends Migration
*/
public function up()
{
Schema::create('webmentions', function (Blueprint $table)
{
Schema::create('webmentions', function (Blueprint $table) {
$table->increments('id');
$table->string('source');
$table->string('target');

2
database/migrations/2015_07_17_111512_create_clients_table.php
View file

@ -1,7 +1,7 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateClientsTable extends Migration
{

2
database/migrations/2015_07_22_084423_create_failed_jobs_table.php
View file

@ -1,7 +1,7 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateFailedJobsTable extends Migration
{

5
database/migrations/2015_10_08_155111_create_media_table.php
View file

@ -1,8 +1,8 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class CreateMediaTable extends Migration
{
@ -25,6 +25,7 @@ class CreateMediaTable extends Migration
$table->timestamps();
});
}
/**
* Reverse the migrations.
*/

2
database/migrations/2015_11_07_130637_create_places_table.php
View file

@ -1,7 +1,7 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreatePlacesTable extends Migration
{

2
database/migrations/2015_11_19_221933_add_place_relation_to_notes.php
View file

@ -1,7 +1,7 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class AddPlaceRelationToNotes extends Migration
{

2
database/migrations/2016_07_29_113150_add_jsonb_mf2_column_to_webmentions_table.php
View file

@ -1,7 +1,7 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class AddJsonbMf2ColumnToWebmentionsTable extends Migration
{

2
database/migrations/2016_09_06_152900_add_exception_column_to_failed_jobs_table.php
View file

@ -1,7 +1,7 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class AddExceptionColumnToFailedJobsTable extends Migration
{

3
database/migrations/2016_09_30_214651_cascade_delete_note_tags.php
View file

@ -1,8 +1,7 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Support\Facades\Schema;
class CascadeDeleteNoteTags extends Migration
{

4
database/migrations/2016_10_26_170858_add_facebook_url_column_to_notes.php
View file

@ -1,8 +1,8 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class AddFacebookUrlColumnToNotes extends Migration
{

4
database/migrations/2016_11_23_154939_add_facebook_to_contacts.php
View file

@ -1,8 +1,8 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class AddFacebookToContacts extends Migration
{

4
database/migrations/2016_12_05_204035_add_search_to_notes.php
View file

@ -1,9 +1,9 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class AddSearchToNotes extends Migration
{

4
database/migrations/2016_12_28_160024_add_icon_to_places.php
View file

@ -1,8 +1,8 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class AddIconToPlaces extends Migration
{

4
database/migrations/2017_03_09_155908_create_media_endpoint_table.php
View file

@ -1,8 +1,8 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class CreateMediaEndpointTable extends Migration
{

4
database/migrations/2017_03_28_130855_create_indie_web_users_table.php
View file

@ -1,8 +1,8 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class CreateIndieWebUsersTable extends Migration
{

4
database/migrations/2017_04_25_203734_update_notes_table_add_swarm_url.php
View file

@ -1,8 +1,8 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class UpdateNotesTableAddSwarmUrl extends Migration
{

4
database/migrations/2017_05_12_135451_update_places_table_add_foursquare_column.php
View file

@ -1,8 +1,8 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class UpdatePlacesTableAddFoursquareColumn extends Migration
{

4
database/migrations/2017_06_11_193737_update_notes_table_add_instagram_url.php
View file

@ -1,8 +1,8 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class UpdateNotesTableAddInstagramUrl extends Migration
{

4
database/migrations/2017_06_27_164743_update_places_table_add_external_urls.php
View file

@ -1,8 +1,8 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class UpdatePlacesTableAddExternalUrls extends Migration
{

4
database/migrations/2017_08_09_181357_allow_empty_note_content.php
View file

@ -1,9 +1,9 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class AllowEmptyNoteContent extends Migration
{

4
database/migrations/2017_09_15_081131_update_media_endpoint_table_add_nullable_image_width_column.php
View file

@ -1,8 +1,8 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class UpdateMediaEndpointTableAddNullableImageWidthColumn extends Migration
{

4
database/migrations/2017_09_16_191741_create_likes_table.php
View file

@ -1,8 +1,8 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class CreateLikesTable extends Migration
{

4
database/migrations/2017_10_07_163425_create_bookmarks_table.php
View file

@ -1,8 +1,8 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class CreateBookmarksTable extends Migration
{

4
database/migrations/2017_10_07_164651_create_bookmark_tag_pivot_table.php
View file

@ -1,8 +1,8 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class CreateBookmarkTagPivotTable extends Migration
{

4
database/migrations/2017_12_19_160117_update_models_reference_in_webmentions_table.php
View file

@ -1,8 +1,8 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class UpdateModelsReferenceInWebmentionsTable extends Migration
{

4
database/migrations/2018_08_08_100000_create_telescope_entries_table.php
View file

@ -1,8 +1,8 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class CreateTelescopeEntriesTable extends Migration
{

4
database/migrations/2019_03_20_181657_create_users_table.php
View file

@ -1,8 +1,8 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class CreateUsersTable extends Migration
{

4
database/seeders/ArticlesTableSeeder.php
View file

@ -3,8 +3,8 @@
namespace Database\Seeders;
use App\Models\Article;
use Illuminate\Support\Carbon;
use Illuminate\Database\Seeder;
use Illuminate\Support\Carbon;
use Illuminate\Support\Facades\DB;
class ArticlesTableSeeder extends Seeder
@ -28,7 +28,7 @@ class ArticlesTableSeeder extends Seeder
->update(['updated_at' => $now->toDateTimeString()]);
$now = Carbon::now()->subHours(2)->subMinutes(25);
$articleWithCode = <<<EOF
$articleWithCode = <<<'EOF'
I wrote some code.
I liked writing this:

3
database/seeders/BookmarksTableSeeder.php
View file

@ -2,7 +2,8 @@
namespace Database\Seeders;
use App\Models\{Bookmark, Tag};
use App\Models\Bookmark;
use App\Models\Tag;
use Illuminate\Database\Seeder;
class BookmarksTableSeeder extends Seeder

2
database/seeders/ContactsTableSeeder.php
View file

@ -28,7 +28,7 @@ class ContactsTableSeeder extends Seeder
'facebook' => '123456',
]);
$fs = new FileSystem();
if (!$fs->exists(public_path('assets/profile-images/aaronparecki.com'))) {
if (! $fs->exists(public_path('assets/profile-images/aaronparecki.com'))) {
$fs->makeDirectory(public_path('assets/profile-images/aaronparecki.com'));
}
$fs->copy(

2
database/seeders/LikesTableSeeder.php
View file

@ -4,8 +4,8 @@ namespace Database\Seeders;
use App\Models\Like;
use Faker\Generator;
use Illuminate\Support\Carbon;
use Illuminate\Database\Seeder;
use Illuminate\Support\Carbon;
use Illuminate\Support\Facades\DB;
class LikesTableSeeder extends Seeder

10
database/seeders/NotesTableSeeder.php
View file

@ -2,10 +2,12 @@
namespace Database\Seeders;
use Illuminate\Support\Carbon;
use App\Models\Media;
use App\Models\Note;
use App\Models\Place;
use Illuminate\Database\Seeder;
use Illuminate\Support\Carbon;
use Illuminate\Support\Facades\DB;
use App\Models\{Media, Note, Place};
use SplFileInfo;
class NotesTableSeeder extends Seeder
@ -184,7 +186,7 @@ class NotesTableSeeder extends Seeder
->update(['updated_at' => $now->toDateTimeString()]);
$now = Carbon::now()->subHours(2);
$noteWithCodeContent = <<<EOF
$noteWithCodeContent = <<<'EOF'
A note with some code:
```php
<?php
@ -203,7 +205,7 @@ EOF;
$noteWithLongUrl = Note::create([
'note' => 'Best site: https://example.org/posts/some-really-long-slug-that-is-too-wide-on-mobile',
'created_at' => $now,
'client_id' => 'https://beta.indigenous.abode.pub/ios/'
'client_id' => 'https://beta.indigenous.abode.pub/ios/',
]);
DB::table('notes')
->where('id', $noteWithLongUrl->id)

4
database/seeders/WebMentionsTableSeeder.php
View file

@ -21,7 +21,7 @@ class WebMentionsTableSeeder extends Seeder
'commentable_id' => '14',
'commentable_type' => 'App\Models\Note',
'type' => 'in-reply-to',
'mf2' => '{"rels": [], "items": [{"type": ["h-entry"], "properties": {"url": ["https://aaronpk.localhost/reply/1"], "name": ["Hi too"], "author": [{"type": ["h-card"], "value": "Aaron Parecki", "properties": {"url": ["https://aaronpk.localhost"], "name": ["Aaron Parecki"], "photo": ["https://aaronparecki.com/images/profile.jpg"]}}], "content": [{"html": "Hi too", "value": "Hi too"}], "published": ["' . date(DATE_W3C) . '"], "in-reply-to": ["https://aaronpk.loclahost/reply/1", "' . config('app.url') .'/notes/E"]}}]}'
'mf2' => '{"rels": [], "items": [{"type": ["h-entry"], "properties": {"url": ["https://aaronpk.localhost/reply/1"], "name": ["Hi too"], "author": [{"type": ["h-card"], "value": "Aaron Parecki", "properties": {"url": ["https://aaronpk.localhost"], "name": ["Aaron Parecki"], "photo": ["https://aaronparecki.com/images/profile.jpg"]}}], "content": [{"html": "Hi too", "value": "Hi too"}], "published": ["' . date(DATE_W3C) . '"], "in-reply-to": ["https://aaronpk.loclahost/reply/1", "' . config('app.url') .'/notes/E"]}}]}',
]);
// WebMention Tantek
WebMention::create([
@ -30,7 +30,7 @@ class WebMentionsTableSeeder extends Seeder
'commentable_id' => '13',
'commentable_type' => 'App\Models\Note',
'type' => 'in-reply-to',
'mf2' => '{"rels": [], "items": [{"type": ["h-entry"], "properties": {"url": ["http://tantek.com/"], "name": ["KUTGW"], "author": [{"type": ["h-card"], "value": "Tantek Celik", "properties": {"url": ["http://tantek.com/"], "name": ["Tantek Celik"]}}], "content": [{"html": "kutgw", "value": "kutgw"}], "published": ["' . date(DATE_W3C) . '"], "in-reply-to": ["' . config('app.url') . '/notes/D"]}}]}'
'mf2' => '{"rels": [], "items": [{"type": ["h-entry"], "properties": {"url": ["http://tantek.com/"], "name": ["KUTGW"], "author": [{"type": ["h-card"], "value": "Tantek Celik", "properties": {"url": ["http://tantek.com/"], "name": ["Tantek Celik"]}}], "content": [{"html": "kutgw", "value": "kutgw"}], "published": ["' . date(DATE_W3C) . '"], "in-reply-to": ["' . config('app.url') . '/notes/D"]}}]}',
]);
}
}

10
helpers.php
View file

@ -68,7 +68,7 @@ if (! function_exists('normalize_url')) {
$url['path'] = preg_replace_callback(
array_map(
function ($str) {
return "/%" . strtoupper($str) . "/x";
return '/%' . strtoupper($str) . '/x';
},
$u
),
@ -78,10 +78,10 @@ if (! function_exists('normalize_url')) {
$url['path']
);
// Remove directory index
$defaultIndexes = ["/default\.aspx/" => 'default.aspx/', "/default\.asp/" => 'default.asp/',
"/index\.html/" => 'index.html/', "/index\.htm/" => 'index.htm/',
"/default\.html/" => 'default.html/', "/default\.htm/" => 'default.htm/',
"/index\.php/" => 'index.php/', "/index\.jsp/" => 'index.jsp/', ];
$defaultIndexes = ["/default\.aspx/" => 'default.aspx/', "/default\.asp/" => 'default.asp/',
"/index\.html/" => 'index.html/', "/index\.htm/" => 'index.htm/',
"/default\.html/" => 'default.html/', "/default\.htm/" => 'default.htm/',
"/index\.php/" => 'index.php/', "/index\.jsp/" => 'index.jsp/', ];
foreach ($defaultIndexes as $index => $strip) {
if (preg_match($index, $url['path'])) {
$url['path'] = str_replace($strip, '', $url['path']);

6
pint.json Normal file
View file

@ -0,0 +1,6 @@
{
"preset": "laravel",
"rules": {
"concat_space": false
}
}

3
routes/web.php
View file

@ -29,7 +29,6 @@ use App\Http\Controllers\MicropubController;
use App\Http\Controllers\MicropubMediaController;
use App\Http\Controllers\NotesController;
use App\Http\Controllers\PlacesController;
use App\Http\Controllers\SearchController;
use App\Http\Controllers\ShortURLsController;
use App\Http\Controllers\TokenEndpointController;
use App\Http\Controllers\WebMentionsController;
@ -167,7 +166,7 @@ Route::group(['domain' => config('url.longurl')], function () {
Route::get('api/post', [MicropubController::class, 'get'])->middleware('micropub.token');
Route::post('api/post', [MicropubController::class, 'post'])->middleware('micropub.token');
Route::get('api/media', [MicropubMediaController::class, 'getHandler'])->middleware('micropub.token');
Route::post('api/media', [MicropubMediaController:: class, 'media'])
Route::post('api/media', [MicropubMediaController::class, 'media'])
->middleware('micropub.token', 'cors')
->name('media-endpoint');
Route::options('/api/media', [MicropubMediaController::class, 'mediaOptionsResponse'])->middleware('cors');

2
server.php
View file

@ -3,10 +3,8 @@
/**
* Laravel - A PHP Framework For Web Artisans
*
* @package Laravel
* @author Taylor Otwell <taylor@laravel.com>
*/
$uri = urldecode(
parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)
);

3
tests/Browser/ExampleTest.php
View file

@ -2,9 +2,8 @@
namespace Tests\Browser;
use Tests\DuskTestCase;
use Laravel\Dusk\Browser;
use Illuminate\Foundation\Testing\DatabaseMigrations;
use Tests\DuskTestCase;
class ExampleTest extends DuskTestCase
{

1
tests/Browser/NotesTest.php
View file

@ -3,7 +3,6 @@
namespace Tests\Browser;
use Tests\DuskTestCase;
use Illuminate\Foundation\Testing\DatabaseMigrations;
class NotesTest extends DuskTestCase
{

7
tests/DuskTestCase.php
View file

@ -2,10 +2,10 @@
namespace Tests;
use Laravel\Dusk\TestCase as BaseTestCase;
use Facebook\WebDriver\Chrome\ChromeOptions;
use Facebook\WebDriver\Remote\RemoteWebDriver;
use Facebook\WebDriver\Remote\DesiredCapabilities;
use Facebook\WebDriver\Remote\RemoteWebDriver;
use Laravel\Dusk\TestCase as BaseTestCase;
abstract class DuskTestCase extends BaseTestCase
{
@ -15,6 +15,7 @@ abstract class DuskTestCase extends BaseTestCase
* Prepare for Dusk test execution.
*
* @beforeClass
*
* @return void
*/
public static function prepare()
@ -34,7 +35,7 @@ abstract class DuskTestCase extends BaseTestCase
$options = new ChromeOptions();
$options->addArguments([
'headless',
'disable-gpu'
'disable-gpu',
]);
$desiredCapabilities->setCapability(ChromeOptions::CAPABILITY, $options);

4
tests/Feature/ActivityStreamTest.php
View file

@ -53,8 +53,8 @@ class ActivityStreamTest extends TestCase
],
'object' => [
'type' => 'Note',
'name' => strip_tags($note->note)
]
'name' => strip_tags($note->note),
],
]);
}
}

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

@ -43,7 +43,7 @@ class ArticlesTest extends TestCase
$this->actingAs($user)
->post('/admin/blog', [
'title' => 'Test Title',
'main' => 'Article content'
'main' => 'Article content',
]);
$this->assertDatabaseHas('articles', ['title' => 'Test Title']);
}
@ -63,8 +63,8 @@ class ArticlesTest extends TestCase
$this->actingAs($user)
->post('/admin/blog', [
'title' => 'Uploaded Article',
'article' => $file,
'title' => 'Uploaded Article',
'article' => $file,
]);
$this->assertDatabaseHas('articles', [

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

@ -41,11 +41,11 @@ class ClientsTest extends TestCase
$this->actingAs($user)
->post('/admin/clients', [
'client_name' => 'Micropublish',
'client_url' => 'https://micropublish.net'
'client_url' => 'https://micropublish.net',
]);
$this->assertDatabaseHas('clients', [
'client_name' => 'Micropublish',
'client_url' => 'https://micropublish.net'
'client_url' => 'https://micropublish.net',
]);
}

8
tests/Feature/Admin/ContactsTest.php
View file

@ -4,8 +4,8 @@ declare(strict_types=1);
namespace Tests\Feature\Admin;
use App\Models\User;
use App\Models\Contact;
use App\Models\User;
use GuzzleHttp\Client;
use GuzzleHttp\Handler\MockHandler;
use GuzzleHttp\HandlerStack;
@ -58,7 +58,7 @@ class ContactsTest extends TestCase
$this->assertDatabaseHas('contacts', [
'name' => 'Fred Bloggs',
'nick' => 'fred',
'homepage' => 'https://fred.blog/gs'
'homepage' => 'https://fred.blog/gs',
]);
}
@ -135,7 +135,7 @@ class ContactsTest extends TestCase
/** @test */
public function adminCanTriggerRetrievalOfRemoteAvatar(): void
{
$html = <<<HTML
$html = <<<'HTML'
<div class="h-card">
<img class="u-photo" alt="" src="http://tantek.com/tantek.png">
</div>
@ -181,7 +181,7 @@ class ContactsTest extends TestCase
/** @test */
public function gettingRemoteAvatarFailsGracefullyWithRemoteError(): void
{
$html = <<<HTML
$html = <<<'HTML'
<div class="h-card">
<img class="u-photo" src="http://tantek.com/tantek.png">
</div>

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

@ -43,10 +43,10 @@ class LikesTest extends TestCase
$this->actingAs($user)
->post('/admin/likes', [
'like_url' => 'https://example.com'
'like_url' => 'https://example.com',
]);
$this->assertDatabaseHas('likes', [
'url' => 'https://example.com'
'url' => 'https://example.com',
]);
Queue::assertPushed(ProcessLike::class);
}

Some files were not shown because too many files have changed in this diff Show more