Merge pull request #293 from jonnybarnes/develop

MTM Mentions Improvements

.github/dependabot.yml

@@ -0,0 +1,12 @@
+version: 2
+
+updates:
+  - package-ecosystem: "composer"
+    directory: "/"
+    schedule:
+      interval: "daily"
+
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/phpunit.yml

@@ -0,0 +1,68 @@
+name: PHP Unit
+
+on:
+  pull_request:
+
+jobs:
+  phpunit:
+    runs-on: ubuntu-latest
+
+    name: PHPUnit test suite
+
+    services:
+      postgres:
+        image: postgres:latest
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: jbukdev_testing
+        ports:
+          - 5432:5432
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Install Node and dependencies
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          cache: 'npm'
+      - run: npm ci
+
+      - name: Setup PHP with pecl extensions
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.1'
+          extensions: phpredis,imagick
+
+      - name: Copy .env
+        run: php -r "file_exists('.env') || copy('.env.github', '.env');"
+
+      - name: Get Composer Cache Directory
+        id: composer-cache
+        run: |
+          echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Cache composer dependencies
+        uses: actions/cache@v3
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-composer-
+
+      - name: Install Composer Dependencies
+        run: composer install --quiet --no-ansi --no-interaction --no-progress
+
+      - name: Generate Key
+        run: php artisan key:generate
+
+      - name: Setup Directory Permissions
+        run: chmod -R 777 storage bootstrap/cache
+
+      - name: Setup Database
+        run: php artisan migrate
+
+      - name: Execute PHPUnit Tests
+        run: vendor/bin/phpunit

.github/workflows/pint.yml

@@ -0,0 +1,38 @@
+name: Laravel Pint
+
+on:
+  pull_request:
+
+jobs:
+  pint:
+    runs-on: ubuntu-latest
+
+    name: Laravel Pint
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Setup PHP with pecl extensions
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.1'
+
+      - name: Get Composer Cache Directory
+        id: composer-cache
+        run: |
+          echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Cache composer dependencies
+        uses: actions/cache@v3
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-composer-
+
+      - name: Install Composer Dependencies
+        run: composer install --quiet --no-ansi --no-interaction --no-progress
+
+      - name: Check Files with Laravel Pint
+        run: vendor/bin/pint --test

.github/workflows/run-tests.yml

@@ -1,49 +0,0 @@
-name: Run Tests
-
-on:
-  pull_request:
-
-jobs:
-  phpunit:
-    runs-on: ubuntu-20.04
-
-    name: PHPUnit test suite
-
-    services:
-      postgres:
-        image: postgres:13.4
-        env:
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_DB: jbukdev_testing
-        ports:
-          - 5432:5432
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Cache node modules
-        uses: actions/cache@v2
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-${{ hashFiles('**/package.json') }}
-      - name: Install npm dependencies
-        run: npm install
-      - name: Setup PHP with pecl extension
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: '8.1'
-          tools: phpcs
-      - name: Copy .env
-        run: php -r "file_exists('.env') || copy('.env.github', '.env');"
-      - name: Install dependencies
-        run: composer install --quiet --no-ansi --no-interaction --no-progress
-      - name: Generate key
-        run: php artisan key:generate
-      - name: Setup directory permissions
-        run: chmod -R 777 storage bootstrap/cache
-      - name: Setup test database
-        run: php artisan migrate
-      - name: Execute tests (Unit and Feature tests) via PHPUnit
-        run: vendor/bin/phpunit
-      - name: Run phpcs
-        run: phpcs

app/CommonMark/Generators/ContactMentionGenerator.php

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\CommonMark\Generators;
+
+use League\CommonMark\Extension\Mention\Generator\MentionGeneratorInterface;
+use League\CommonMark\Extension\Mention\Mention;
+use League\CommonMark\Node\Inline\AbstractInline;
+
+class ContactMentionGenerator implements MentionGeneratorInterface
+{
+    public function generateMention(Mention $mention): ?AbstractInline
+    {
+        return $mention;
+    }
+}

app/CommonMark/Renderers/ContactMentionRenderer.php

@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\CommonMark\Renderers;
+
+use App\Models\Contact;
+use League\CommonMark\Node\Node;
+use League\CommonMark\Renderer\ChildNodeRendererInterface;
+use League\CommonMark\Renderer\NodeRendererInterface;
+
+class ContactMentionRenderer implements NodeRendererInterface
+{
+    public function render(Node $node, ChildNodeRendererInterface $childRenderer): string
+    {
+        $contact = Contact::where('nick', $node->getIdentifier())->first();
+
+        if ($contact === null) {
+            return '<a href="https://twitter.com/' . $node->getIdentifier() . '">@' . $node->getIdentifier() . '</a>';
+        }
+
+        return trim(view('templates.mini-hcard', ['contact' => $contact])->render());
+    }
+}

app/Exceptions/Handler.php

@@ -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  Request  $request
-     * @param Throwable $throwable
+     * @param  Throwable  $throwable
      * @return Response
+     *
      * @throws Throwable
      */
     public function render($request, Throwable $throwable)

app/Http/Controllers/ArticlesController.php

@@ -15,8 +15,8 @@ class ArticlesController extends Controller
     /**
      * Show all articles (with pagination).
      *
-     * @param int|null $year
+     * @param  int|null  $year
-     * @param int|null $month
+     * @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  $year
-     * @param int $month
+     * @param  int  $month
-     * @param string $slug
+     * @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

app/Http/Controllers/BookmarksController.php

@@ -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

app/Http/Controllers/ContactsController.php

@@ -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

app/Http/Controllers/FeedsController.php

@@ -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;
 

app/Http/Controllers/LikesController.php

@@ -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

app/Http/Controllers/MicropubController.php

@@ -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)
     {

app/Http/Controllers/MicropubMediaController.php

@@ -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

app/Http/Controllers/NotesController.php

@@ -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

app/Http/Controllers/PlacesController.php

@@ -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

app/Http/Controllers/TokenEndpointController.php

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

app/Http/Middleware/CSPHeader.php

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

app/Jobs/AddClientToDatabase.php

@@ -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)
     {

app/Jobs/DownloadWebMention.php

@@ -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)

app/Jobs/ProcessBookmark.php

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

app/Jobs/ProcessLike.php

@@ -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  Client  $client
-     * @param Authorship $authorship
+     * @param  Authorship  $authorship
      * @return int
+     *
      * @throws GuzzleException
      */
     public function handle(Client $client, Authorship $authorship): int

app/Jobs/ProcessMedia.php

@@ -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)
     {

app/Jobs/ProcessWebMention.php

@@ -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  Note  $note
-     * @param string $source
+     * @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  Parser  $parser
-     * @param Client $guzzle
+     * @param  Client  $guzzle
+     *
      * @throws RemoteContentNotFoundException
      * @throws GuzzleException
      * @throws InvalidMentionException

app/Jobs/SaveProfileImage.php

@@ -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)
     {

app/Jobs/SendWebMentions.php

@@ -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  $url
-     * @param string $base The base of the URL
+     * @param  string  $base The base of the URL
      * @return string
      */
     public function resolveUri(string $url, string $base): string

app/Jobs/SyndicateBookmarkToTwitter.php

@@ -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)

app/Jobs/SyndicateNoteToTwitter.php

@@ -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)

app/Models/Article.php

@@ -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  Builder  $query
-     * @param int|null $year
+     * @param  int|null  $year
-     * @param int|null $month
+     * @param  int|null  $month
      * @return Builder
      */
     public function scopeDate(Builder $query, int $year = null, int $month = null): Builder

app/Models/Bookmark.php

@@ -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()

app/Models/Contact.php

@@ -4,10 +4,9 @@ declare(strict_types=1);
 
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Carbon;
 
 class Contact extends Model
 {
@@ -26,4 +25,20 @@ class Contact extends Model
      * @var array
      */
     protected $fillable = ['nick', 'name', 'homepage', 'twitter', 'facebook'];
+
+    protected function photo(): Attribute
+    {
+        $photo = '/assets/profile-images/default-image';
+
+        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';
+            }
+        }
+
+        return Attribute::make(
+            get: fn () => $photo,
+        );
+    }
 }

app/Models/Like.php

@@ -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

app/Models/Media.php

@@ -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

app/Models/MicropubClient.php

@@ -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
 {

app/Models/Note.php

@@ -4,13 +4,20 @@ declare(strict_types=1);
 
 namespace App\Models;
 
+use App\CommonMark\Generators\ContactMentionGenerator;
+use App\CommonMark\Renderers\ContactMentionRenderer;
 use App\Exceptions\TwitterContentException;
-use Barryvdh\LaravelIdeHelper\Eloquent;
 use Codebird\Codebird;
 use Exception;
 use GuzzleHttp\Client;
-use Illuminate\Database\Eloquent\Relations\{BelongsTo, BelongsToMany, HasMany, MorphMany};
+use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\{Builder, Factories\HasFactory, Model, SoftDeletes};
+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;
@@ -19,9 +26,12 @@ use League\CommonMark\Extension\Autolink\AutolinkExtension;
 use League\CommonMark\Extension\CommonMark\CommonMarkCoreExtension;
 use League\CommonMark\Extension\CommonMark\Node\Block\FencedCode;
 use League\CommonMark\Extension\CommonMark\Node\Block\IndentedCode;
+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
 {
@@ -43,7 +53,7 @@ class Note extends Model
     /**
      * Set our contacts variable to null.
      *
-     * @param array $attributes
+     * @param  array  $attributes
      */
     public function __construct(array $attributes = [])
     {
@@ -131,7 +141,7 @@ class Note extends Model
      *
      * @return array
      */
-    #[ArrayShape(['note' => "null|string"])]
+    #[ArrayShape(['note' => 'null|string'])]
     public function toSearchableArray(): array
     {
         return [
@@ -142,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
     {
@@ -158,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
@@ -172,8 +182,7 @@ class Note extends Model
             return null;
         }
 
-        $hcards = $this->makeHCards($value);
+        $hashtags = $this->autoLinkHashtag($value);
-        $hashtags = $this->autoLinkHashtag($hcards);
 
         return $this->convertMarkdown($hashtags);
     }
@@ -337,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;
         }
@@ -373,13 +382,16 @@ class Note extends Model
      * That is we swap the contacts names for their known Twitter handles.
      *
      * @return string
+     *
      * @throws TwitterContentException
      */
     public function getTwitterContentAttribute(): string
     {
+        $this->getContacts();
+
         // check for contacts
         if ($this->contacts === null || count($this->contacts) === 0) {
-            throw new TwitterContentException('There are no contacts for this note');
+            return '';
         }
 
         // here we check the matched contact from the note corresponds to a contact
@@ -388,10 +400,10 @@ class Note extends Model
             count(array_unique(array_values($this->contacts))) === 1
             && array_unique(array_values($this->contacts))[0] === null
         ) {
-            throw new TwitterContentException('The matched contact is not in the database');
+            return '';
         }
 
-        // swap in twitter usernames
+        // swap in Twitter usernames
         $swapped = preg_replace_callback(
             self::USERNAMES_REGEX,
             function ($matches) {
@@ -406,7 +418,7 @@ class Note extends Model
 
                 return $contact->name;
             },
-            $this->getOriginal('note')
+            $this->getRawOriginal('note')
         );
 
         return $this->convertMarkdown($swapped);
@@ -415,8 +427,8 @@ class Note extends Model
     /**
      * Scope a query to select a note via a NewBase60 id.
      *
-     * @param Builder $query
+     * @param  Builder  $query
-     * @param string $nb60id
+     * @param  string  $nb60id
      * @return Builder
      */
     public function scopeNb60(Builder $query, string $nb60id): Builder
@@ -432,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
@@ -503,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
@@ -522,14 +534,26 @@ 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
     {
-        $environment = new Environment();
+        $config = [
+            'mentions' => [
+                'contacts_handle' => [
+                    'prefix' => '@',
+                    'pattern' => '[a-z\d](?:[a-z\d]|-(?=[a-z\d])){0,38}(?!\w)',
+                    'generator' => new ContactMentionGenerator(),
+                ],
+            ],
+        ];
+
+        $environment = new Environment($config);
         $environment->addExtension(new CommonMarkCoreExtension());
         $environment->addExtension(new AutolinkExtension());
+        $environment->addExtension(new MentionExtension());
+        $environment->addRenderer(Mention::class, new ContactMentionRenderer());
         $environment->addRenderer(FencedCode::class, new FencedCodeRenderer());
         $environment->addRenderer(IndentedCode::class, new IndentedCodeRenderer());
         $markdownConverter = new MarkdownConverter($environment);
@@ -540,8 +564,8 @@ class Note extends Model
     /**
      * Do a reverse geocode lookup of a `lat,lng` value.
      *
-     * @param float $latitude
+     * @param  float  $latitude
-     * @param float $longitude
+     * @param  float  $longitude
      * @return string
      */
     public function reverseGeoCode(float $latitude, float $longitude): string

app/Models/Place.php

@@ -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  Builder  $query
-     * @param object $location
+     * @param  object  $location
-     * @param int $distance
+     * @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  Builder  $query
-     * @param string $url
+     * @param  string  $url
      * @return Builder
      */
     public function scopeWhereExternalURL(Builder $query, string $url): Builder

app/Models/Tag.php

@@ -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

app/Models/User.php

@@ -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
 {

app/Models/WebMention.php

@@ -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

app/Observers/NoteObserver.php

@@ -4,15 +4,17 @@ declare(strict_types=1);
 
 namespace App\Observers;
 
-use App\Models\{Note, Tag};
+use App\Models\Note;
-use Illuminate\Support\{Arr, Collection};
+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

app/Providers/AppServiceProvider.php

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

app/Services/BookmarkService.php

@@ -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

app/Services/LikeService.php

@@ -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

app/Services/Micropub/HEntryService.php

@@ -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

app/Services/Micropub/UpdateService.php

@@ -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
 {

app/Services/NoteService.php

@@ -4,9 +4,13 @@ declare(strict_types=1);
 
 namespace App\Services;
 
-use App\Jobs\{SendWebMentions, SyndicateNoteToTwitter};
+use App\Jobs\SendWebMentions;
-use App\Models\{Media, Note, Place};
+use App\Jobs\SyndicateNoteToTwitter;
-use Illuminate\Support\{Arr, Str};
+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

app/Services/PlaceService.php

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

app/Services/TokenService.php

@@ -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
 {

composer.json

@@ -28,7 +28,6 @@
         "league/commonmark": "^2.0",
         "league/flysystem-aws-s3-v3": "^3.0",
         "mf2/mf2": "~0.3",
-        "predis/predis": "~1.0",
         "spatie/browsershot": "~3.0",
         "spatie/commonmark-highlighter": "^3.0",
         "symfony/html-sanitizer": "^6.1"
@@ -39,6 +38,7 @@
         "beyondcode/laravel-dump-server": "^1.0",
         "fakerphp/faker": "^1.9.2",
         "laravel/dusk": "^6.0",
+        "laravel/pint": "^0.2.3",
         "mockery/mockery": "^1.0",
         "nunomaduro/collision": "^6.1",
         "phpunit/php-code-coverage": "^9.2",

config/debugbar.php

@@ -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(
+    'collectors' => [
-        'phpinfo'         => true,  // Php version
+        'phpinfo' => true,  // Php version
-        'messages'        => true,  // Messages
+        'messages' => true,  // Messages
-        'time'            => true,  // Time Datalogger
+        'time' => true,  // Time Datalogger
-        'memory'          => true,  // Memory usage
+        'memory' => true,  // Memory usage
-        'exceptions'      => true,  // Exception displayer
+        'exceptions' => true,  // Exception displayer
-        'log'             => true,  // Logs from Monolog (merged in messages if enabled)
+        'log' => true,  // Logs from Monolog (merged in messages if enabled)
-        'db'              => true,  // Show database (PDO) queries and bindings
+        'db' => true,  // Show database (PDO) queries and bindings
-        'views'           => true,  // Views with their data
+        'views' => true,  // Views with their data
-        'route'           => true,  // Current route information
+        'route' => true,  // Current route information
-        'laravel'         => false, // Laravel version and environment
+        'laravel' => false, // Laravel version and environment
-        'events'          => false, // All events fired
+        '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
+        'mail' => true,  // Catch mail messages
-        'logs'            => false, // Add the latest log messages
+        'logs' => false, // Add the latest log messages
-        'files'           => false, // Show the included files
+        'files' => false, // Show the included files
-        'config'          => false, // Display config settings
+        'config' => false, // Display config settings
-        'auth'            => false, // Display Laravel authentication status
+        'auth' => false, // Display Laravel authentication status
-        'session'         => false, // Display session data in a separate tab
+        'session' => false, // Display session data in a separate tab
-    ),
+    ],
 
     /*
      |--------------------------------------------------------------------------
@@ -101,33 +101,33 @@ return array(
      |
      */
 
-    'options' => array(
+    'options' => [
-        'auth' => array(
+        'auth' => [
             'show_name' => false,   // Also show the users name/email in the debugbar
-        ),
+        ],
-        'db' => array(
+        'db' => [
-            'with_params'       => true,   // Render SQL with the parameters substituted
+            'with_params' => true,   // Render SQL with the parameters substituted
-            'timeline'          => false,  // Add the queries to the timeline
+            'timeline' => false,  // Add the queries to the timeline
-            'backtrace'         => false,  // EXPERIMENTAL: Use a backtrace to find the origin of the query in your files.
+            'backtrace' => false,  // EXPERIMENTAL: Use a backtrace to find the origin of the query in your files.
-            'explain' => array(            // EXPERIMENTAL: Show EXPLAIN output on queries
+            'explain' => [            // EXPERIMENTAL: Show EXPLAIN output on queries
                 'enabled' => false,
-                'types' => array('SELECT'), // array('SELECT', 'INSERT', 'UPDATE', 'DELETE'); for MySQL 5.6.3+
+                'types' => ['SELECT'], // array('SELECT', 'INSERT', 'UPDATE', 'DELETE'); for MySQL 5.6.3+
-            ),
+            ],
-            'hints'             => true,    // Show hints for common mistakes
+            'hints' => true,    // Show hints for common mistakes
-        ),
+        ],
-        'mail' => array(
+        'mail' => [
-            'full_log' => false
+            'full_log' => false,
-        ),
+        ],
-        'views' => array(
+        'views' => [
             'data' => false,    //Note: Can slow down the application, because the data can be quite large..
-        ),
+        ],
-        'route' => array(
+        'route' => [
-            'label' => true  // show complete route on bar
+            'label' => true,  // show complete route on bar
-        ),
+        ],
-        'logs' => array(
+        'logs' => [
-            'file' => null
+            'file' => null,
-        ),
+        ],
-    ),
+    ],
 
     /*
      |--------------------------------------------------------------------------
@@ -142,4 +142,4 @@ return array(
 
     'inject' => true,
 
-);
+];

config/filesystems.php

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

config/ide-helper.php

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

config/sluggable.php

@@ -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,
 
 ];

config/syndication.php

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

config/ttwitter.php

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

config/url.php

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

database/factories/NoteFactory.php

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

database/migrations/2015_02_28_132629_create_articles_table.php

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

database/migrations/2015_02_28_144939_create_notes_table.php

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

database/migrations/2015_03_02_084342_create_tags_table.php

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

database/migrations/2015_03_02_084956_create_note_tag_table.php

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

database/migrations/2015_03_02_105623_create_contacts_table.php

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

database/migrations/2015_03_02_114340_create_web_mentions_table.php

@@ -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');

database/migrations/2015_07_17_111512_create_clients_table.php

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

database/migrations/2015_07_22_084423_create_failed_jobs_table.php

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

database/migrations/2015_10_08_155111_create_media_table.php

@@ -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.
      */

database/migrations/2015_11_07_130637_create_places_table.php

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

database/migrations/2015_11_19_221933_add_place_relation_to_notes.php

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

database/migrations/2016_07_29_113150_add_jsonb_mf2_column_to_webmentions_table.php

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

database/migrations/2016_09_06_152900_add_exception_column_to_failed_jobs_table.php

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

database/migrations/2016_09_30_214651_cascade_delete_note_tags.php

@@ -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
 {

database/migrations/2016_10_26_170858_add_facebook_url_column_to_notes.php

@@ -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
 {

database/migrations/2016_11_23_154939_add_facebook_to_contacts.php

@@ -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
 {

database/migrations/2016_12_05_204035_add_search_to_notes.php

@@ -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
 {

database/migrations/2016_12_28_160024_add_icon_to_places.php

@@ -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
 {

database/migrations/2017_03_09_155908_create_media_endpoint_table.php

@@ -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
 {

database/migrations/2017_03_28_130855_create_indie_web_users_table.php

@@ -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
 {

database/migrations/2017_04_25_203734_update_notes_table_add_swarm_url.php

@@ -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
 {

database/migrations/2017_05_12_135451_update_places_table_add_foursquare_column.php

@@ -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
 {

database/migrations/2017_06_11_193737_update_notes_table_add_instagram_url.php

@@ -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
 {

database/migrations/2017_06_27_164743_update_places_table_add_external_urls.php

@@ -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
 {

database/migrations/2017_08_09_181357_allow_empty_note_content.php

@@ -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
 {

database/migrations/2017_09_15_081131_update_media_endpoint_table_add_nullable_image_width_column.php

@@ -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
 {

database/migrations/2017_09_16_191741_create_likes_table.php

@@ -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
 {

database/migrations/2017_10_07_163425_create_bookmarks_table.php

@@ -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
 {

database/migrations/2017_10_07_164651_create_bookmark_tag_pivot_table.php

@@ -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
 {

database/migrations/2017_12_19_160117_update_models_reference_in_webmentions_table.php

@@ -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
 {

database/migrations/2018_08_08_100000_create_telescope_entries_table.php

@@ -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
 {

database/migrations/2019_03_20_181657_create_users_table.php

@@ -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
 {

database/seeders/ArticlesTableSeeder.php

@@ -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:

database/seeders/BookmarksTableSeeder.php

@@ -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

database/seeders/ContactsTableSeeder.php

@@ -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(

database/seeders/LikesTableSeeder.php

@@ -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

database/seeders/NotesTableSeeder.php

@@ -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)

database/seeders/WebMentionsTableSeeder.php

@@ -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"]}}]}',
         ]);
     }
 }

helpers.php

@@ -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/',
+            $defaultIndexes = ["/default\.aspx/" => 'default.aspx/', "/default\.asp/" => 'default.asp/',
-                               "/index\.html/"   => 'index.html/',   "/index\.htm/"    => 'index.htm/',
+                "/index\.html/" => 'index.html/',   "/index\.htm/" => 'index.htm/',
-                               "/default\.html/" => 'default.html/', "/default\.htm/"  => 'default.htm/',
+                "/default\.html/" => 'default.html/', "/default\.htm/" => 'default.htm/',
-                               "/index\.php/"    => 'index.php/',    "/index\.jsp/"    => 'index.jsp/', ];
+                "/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']);

package.json

@@ -9,8 +9,8 @@
         "puppeteer": "^14.1.0"
     },
     "devDependencies": {
-        "@babel/core": "^7.12.3",
+        "@babel/core": "^7.18.6",
-        "@babel/preset-env": "^7.12.1",
+        "@babel/preset-env": "^7.18.6",
         "autoprefixer": "^10.2.4",
         "babel-loader": "^8.2.1",
         "browserlist": "^1.0.1",
@@ -19,18 +19,18 @@
         "cssnano": "^5.0.2",
         "eslint": "^8.6.0",
         "eslint-webpack-plugin": "^3.0.1",
-        "mini-css-extract-plugin": "^2.2.1",
+        "mini-css-extract-plugin": "^2.6.1",
         "postcss": "^8.1.6",
         "postcss-combine-duplicated-selectors": "^10.0.2",
         "postcss-combine-media-query": "^1.0.1",
         "postcss-import": "^14.0.0",
         "postcss-loader": "^7.0.0",
         "pre-commit": "^1.1.3",
-        "stylelint": "^14.2.0",
+        "stylelint": "^14.9.1",
         "stylelint-config-standard": "^25.0.0",
         "stylelint-webpack-plugin": "^3.1.1",
         "webpack": "^5.3.2",
-        "webpack-cli": "^4.0.0"
+        "webpack-cli": "^4.10.0"
     },
     "scripts": {
         "compress": "scripts/compress",

pint.json

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