.env.example

@@ -12,7 +12,9 @@ APP_FALLBACK_LOCALE=en
 APP_FAKER_LOCALE=en_US
 
 APP_MAINTENANCE_DRIVER=file
-APP_MAINTENANCE_STORE=database
+# APP_MAINTENANCE_STORE=database
+
+PHP_CLI_SERVER_WORKERS=4
 
 BCRYPT_ROUNDS=12
 
@@ -39,7 +41,7 @@ FILESYSTEM_DISK=local
 QUEUE_CONNECTION=database
 
 CACHE_STORE=database
-CACHE_PREFIX=
+# CACHE_PREFIX=
 
 MEMCACHED_HOST=127.0.0.1
 
@@ -49,6 +51,7 @@ REDIS_PASSWORD=null
 REDIS_PORT=6379
 
 MAIL_MAILER=log
+MAIL_SCHEME=null
 MAIL_HOST=127.0.0.1
 MAIL_PORT=2525
 MAIL_USERNAME=null

app/Console/Commands/ParseCachedWebMentions.php

@@ -37,7 +37,7 @@ class ParseCachedWebMentions extends Command
     {
         $htmlFiles = $filesystem->allFiles(storage_path() . '/HTML');
         foreach ($htmlFiles as $file) {
-            if ($file->getExtension() !== 'backup') { //we don’t want to parse `.backup` files
+            if ($file->getExtension() !== 'backup') { // we don’t want to parse `.backup` files
                 $filepath = $file->getPathname();
                 $this->info('Loading HTML from: ' . $filepath);
                 $html = $filesystem->get($filepath);

app/Exceptions/RemoteContentNotFoundException.php

@@ -6,5 +6,5 @@ use Exception;
 
 class RemoteContentNotFoundException extends Exception
 {
-    //used when guzzle can’t find the remote content
+    // used when guzzle can’t find the remote content
 }

app/Http/Controllers/Admin/ArticlesController.php

@@ -30,7 +30,7 @@ class ArticlesController extends Controller
 
     public function store(): RedirectResponse
     {
-        //if a `.md` is attached use that for the main content.
+        // if a `.md` is attached use that for the main content.
         if (request()->hasFile('article')) {
             $file = request()->file('article')->openFile();
             $content = $file->fread($file->getSize());

app/Http/Controllers/Admin/NotesController.php

@@ -67,7 +67,7 @@ class NotesController extends Controller
      */
     public function update(int $noteId): RedirectResponse
     {
-        //update note data
+        // update note data
         $note = Note::findOrFail($noteId);
         $note->note = request()->input('content');
         $note->in_reply_to = request()->input('in-reply-to');

app/Http/Controllers/IndieAuthController.php

@@ -26,8 +26,8 @@ class IndieAuthController extends Controller
             'authorization_endpoint' => route('indieauth.start'),
             'token_endpoint' => route('indieauth.token'),
             'code_challenge_methods_supported' => ['S256'],
-            //'introspection_endpoint' => route('indieauth.introspection'),
+            // 'introspection_endpoint' => route('indieauth.introspection'),
-            //'introspection_endpoint_auth_methods_supported' => ['none'],
+            // 'introspection_endpoint_auth_methods_supported' => ['none'],
         ]);
     }
 

app/Http/Controllers/MicropubMediaController.php

@@ -191,7 +191,7 @@ class MicropubMediaController extends Controller
      */
     private function getFileTypeFromMimeType(string $mimeType): string
     {
-        //try known images
+        // try known images
         $imageMimeTypes = [
             'image/gif',
             'image/jpeg',
@@ -203,7 +203,7 @@ class MicropubMediaController extends Controller
         if (in_array($mimeType, $imageMimeTypes)) {
             return 'image';
         }
-        //try known video
+        // try known video
         $videoMimeTypes = [
             'video/mp4',
             'video/mpeg',
@@ -214,7 +214,7 @@ class MicropubMediaController extends Controller
         if (in_array($mimeType, $videoMimeTypes)) {
             return 'video';
         }
-        //try known audio types
+        // try known audio types
         $audioMimeTypes = [
             'audio/midi',
             'audio/mpeg',

app/Http/Controllers/WebMentionsController.php

@@ -33,7 +33,7 @@ class WebMentionsController extends Controller
      */
     public function receive(Request $request): Response
     {
-        //first we trivially reject requests that lack all required inputs
+        // first we trivially reject requests that lack all required inputs
         if (($request->has('target') !== true) || ($request->has('source') !== true)) {
             return response(
                 'You need both the target and source parameters',
@@ -41,12 +41,12 @@ class WebMentionsController extends Controller
             );
         }
 
-        //next check the $target is valid
+        // next check the $target is valid
         $path = parse_url($request->input('target'), PHP_URL_PATH);
         $pathParts = explode('/', $path);
 
         if ($pathParts[1] === 'notes') {
-            //we have a note
+            // we have a note
             $noteId = $pathParts[2];
             try {
                 $note = Note::findOrFail(resolve(Numbers::class)->b60tonum($noteId));

app/Jobs/DownloadWebMention.php

@@ -35,30 +35,30 @@ class DownloadWebMention implements ShouldQueue
     public function handle(Client $guzzle): void
     {
         $response = $guzzle->request('GET', $this->source);
-        //4XX and 5XX responses should get Guzzle to throw an exception,
+        // 4XX and 5XX responses should get Guzzle to throw an exception,
-        //Laravel should catch and retry these automatically.
+        // Laravel should catch and retry these automatically.
         if ($response->getStatusCode() === 200) {
             $filesystem = new FileSystem;
             $filename = storage_path('HTML') . '/' . $this->createFilenameFromURL($this->source);
-            //backup file first
+            // backup file first
             $filenameBackup = $filename . '.' . date('Y-m-d') . '.backup';
             if ($filesystem->exists($filename)) {
                 $filesystem->copy($filename, $filenameBackup);
             }
-            //check if base directory exists
+            // check if base directory exists
             if (! $filesystem->exists($filesystem->dirname($filename))) {
                 $filesystem->makeDirectory(
                     $filesystem->dirname($filename),
-                    0755,  //mode
+                    0755,  // mode
-                    true //recursive
+                    true // recursive
                 );
             }
-            //save new HTML
+            // save new HTML
             $filesystem->put(
                 $filename,
                 (string) $response->getBody()
             );
-            //remove backup if the same
+            // remove backup if the same
             if ($filesystem->exists($filenameBackup)) {
                 if ($filesystem->get($filename) === $filesystem->get($filenameBackup)) {
                     $filesystem->delete($filenameBackup);

app/Jobs/ProcessLike.php

@@ -49,7 +49,7 @@ class ProcessLike implements ShouldQueue
             $this->like->content = $tweet->html;
             $this->like->save();
 
-            //POSSE like
+            // POSSE like
             try {
                 $client->request(
                     'POST',

app/Jobs/ProcessMedia.php

@@ -32,18 +32,21 @@ class ProcessMedia implements ShouldQueue
      */
     public function handle(ImageManager $manager): void
     {
+        // Load file
+        $file = Storage::disk('local')->get('media/' . $this->filename);
+
         // Open file
         try {
-            $image = $manager->read(storage_path('app/media/') . $this->filename);
+            $image = $manager->read($file);
         } catch (DecoderException) {
             // not an image; delete file and end job
-            unlink(storage_path('app/media/') . $this->filename);
+            Storage::disk('local')->delete('media/' . $this->filename);
 
             return;
         }
 
         // Save the file publicly
-        Storage::disk('local')->copy('media/' . $this->filename, 'public/media/' . $this->filename);
+        Storage::disk('public')->put('media/' . $this->filename, $file);
 
         // Create smaller versions if necessary
         if ($image->width() > 1000) {
@@ -54,13 +57,13 @@ class ProcessMedia implements ShouldQueue
             $basename = trim(implode('.', $filenameParts), '.');
 
             $medium = $image->resize(width: 1000);
-            Storage::disk('local')->put('public/media/' . $basename . '-medium.' . $extension, (string) $medium->encode());
+            Storage::disk('public')->put('media/' . $basename . '-medium.' . $extension, (string) $medium->encode());
 
             $small = $image->resize(width: 500);
-            Storage::disk('local')->put('public/media/' . $basename . '-small.' . $extension, (string) $small->encode());
+            Storage::disk('public')->put('media/' . $basename . '-small.' . $extension, (string) $small->encode());
         }
 
         // Now we can delete the locally saved image
-        unlink(storage_path('app/media/') . $this->filename);
+        Storage::disk('local')->delete('media/' . $this->filename);
     }
 }

app/Jobs/SaveProfileImage.php

@@ -49,7 +49,7 @@ class SaveProfileImage implements ShouldQueue
             $home = array_shift($home);
         }
 
-        //dont save pbs.twimg.com links
+        // dont save pbs.twimg.com links
         if (
             $photo
             && parse_url($photo, PHP_URL_HOST) !== 'pbs.twimg.com'

app/Jobs/SendWebMentions.php

@@ -72,7 +72,7 @@ class SendWebMentions implements ShouldQueue
 
         $guzzle = resolve(Client::class);
         $response = $guzzle->get($url);
-        //check HTTP Headers for webmention endpoint
+        // check HTTP Headers for webmention endpoint
         $links = Header::parse($response->getHeader('Link'));
         foreach ($links as $link) {
             if (array_key_exists('rel', $link) && mb_stristr($link['rel'], 'webmention')) {
@@ -80,7 +80,7 @@ class SendWebMentions implements ShouldQueue
             }
         }
 
-        //failed to find a header so parse HTML
+        // failed to find a header so parse HTML
         $html = (string) $response->getBody();
 
         $mf2 = new \Mf2\Parser($html, $url);

app/Models/Note.php

@@ -111,7 +111,7 @@ class Note extends Model
     {
         if ($value !== null) {
             $normalized = normalizer_normalize($value, Normalizer::FORM_C);
-            if ($normalized === '') { //we don’t want to save empty strings to the db
+            if ($normalized === '') { // we don’t want to save empty strings to the db
                 $normalized = null;
             }
             $this->attributes['note'] = $normalized;

app/Models/Place.php

@@ -59,7 +59,7 @@ class Place extends Model
                      * sin(radians(places.latitude))))";
 
         return $query
-            ->select() //pick the columns you want here.
+            ->select() // pick the columns you want here.
             ->selectRaw("{$haversine} AS distance")
             ->whereRaw("{$haversine} < ?", [$distance]);
     }

app/Models/WebMention.php

@@ -123,7 +123,7 @@ class WebMention extends Model
         $host = parse_url($url, PHP_URL_HOST);
 
         if ($host === 'pbs.twimg.com') {
-            //make sure we use HTTPS, we know twitter supports it
+            // make sure we use HTTPS, we know twitter supports it
             return str_replace('http://', 'https://', $url);
         }
 
@@ -135,7 +135,7 @@ class WebMention extends Model
             $codebird = resolve(Codebird::class);
             $info = $codebird->users_show(['screen_name' => $username]);
             $profile_image = $info->profile_image_url_https;
-            Cache::put($url, $profile_image, 10080); //1 week
+            Cache::put($url, $profile_image, 10080); // 1 week
 
             return $profile_image;
         }

app/Services/BookmarkService.php

@@ -21,7 +21,7 @@ class BookmarkService extends Service
     public function create(array $request, ?string $client = null): Bookmark
     {
         if (Arr::get($request, 'properties.bookmark-of.0')) {
-            //micropub request
+            // micropub request
             $url = normalize_url(Arr::get($request, 'properties.bookmark-of.0'));
             $name = Arr::get($request, 'properties.name.0');
             $content = Arr::get($request, 'properties.content.0');
@@ -61,7 +61,7 @@ class BookmarkService extends Service
         try {
             $response = $client->request('GET', 'https://web.archive.org/save/' . $url);
         } catch (ClientException $e) {
-            //throw an exception to be caught
+            // throw an exception to be caught
             throw new InternetArchiveException;
         }
         if ($response->hasHeader('Content-Location')) {
@@ -70,7 +70,7 @@ class BookmarkService extends Service
             }
         }
 
-        //throw an exception to be caught
+        // throw an exception to be caught
         throw new InternetArchiveException;
     }
 }

app/Services/LikeService.php

@@ -16,7 +16,7 @@ class LikeService extends Service
     public function create(array $request, ?string $client = null): Like
     {
         if (Arr::get($request, 'properties.like-of.0')) {
-            //micropub request
+            // micropub request
             $url = normalize_url(Arr::get($request, 'properties.like-of.0'));
         }
         if (Arr::get($request, 'like-of')) {

app/Services/Micropub/UpdateService.php

@@ -20,7 +20,7 @@ class UpdateService
     {
         $urlPath = parse_url(Arr::get($request, 'url'), PHP_URL_PATH);
 
-        //is it a note we are updating?
+        // is it a note we are updating?
         if (mb_substr($urlPath, 1, 5) !== 'notes') {
             return response()->json([
                 'error' => 'invalid',
@@ -37,7 +37,7 @@ class UpdateService
             ], 404);
         }
 
-        //got the note, are we dealing with a “replace” request?
+        // got the note, are we dealing with a “replace” request?
         if (Arr::get($request, 'replace')) {
             foreach (Arr::get($request, 'replace') as $property => $value) {
                 if ($property === 'content') {
@@ -64,7 +64,7 @@ class UpdateService
             ]);
         }
 
-        //how about “add”
+        // how about “add”
         if (Arr::get($request, 'add')) {
             foreach (Arr::get($request, 'add') as $property => $value) {
                 if ($property === 'syndication') {

app/Services/PlaceService.php

@@ -14,8 +14,8 @@ class PlaceService
      */
     public function createPlace(array $data): Place
     {
-        //obviously a place needs a lat/lng, but this could be sent in a geo-url
+        // obviously a place needs a lat/lng, but this could be sent in a geo-url
-        //if no geo array key, we assume the array already has lat/lng values
+        // if no geo array key, we assume the array already has lat/lng values
         if (array_key_exists('geo', $data) && $data['geo'] !== null) {
             preg_match_all(
                 '/([0-9\.\-]+)/',
@@ -40,7 +40,7 @@ class PlaceService
      */
     public function createPlaceFromCheckin(array $checkin): Place
     {
-        //check if the place exists if from swarm
+        // check if the place exists if from swarm
         if (Arr::has($checkin, 'properties.url')) {
             $place = Place::whereExternalURL(Arr::get($checkin, 'properties.url.0'))->get();
             if (count($place) === 1) {

composer.json

@@ -1,7 +1,8 @@
 {
+    "$schema": "https://getcomposer.org/schema.json",
     "name": "jonnybarnes/jonnybarnes.uk",
     "type": "project",
-    "description": "The code for jonnybarnes.uk, based on Laravel 10",
+    "description": "The code for jonnybarnes.uk, based on Laravel 11",
     "keywords": ["laravel", "framework", "indieweb"],
     "license": "CC0-1.0",
     "require": {
@@ -11,14 +12,14 @@
         "ext-json": "*",
         "ext-pgsql": "*",
         "ext-sodium": "*",
-        "cviebrock/eloquent-sluggable": "^11.0",
+        "cviebrock/eloquent-sluggable": "^12.0",
         "guzzlehttp/guzzle": "^7.2",
         "indieauth/client": "^1.1",
         "intervention/image": "^3",
         "jonnybarnes/indieweb": "~0.2",
         "jonnybarnes/webmentions-parser": "~0.5",
         "jublonet/codebird-php": "4.0.0-beta.1",
-        "laravel/framework": "^11.0",
+        "laravel/framework": "^12.0",
         "laravel/horizon": "^5.0",
         "laravel/sanctum": "^4.0",
         "laravel/scout": "^10.1",
@@ -40,16 +41,15 @@
         "barryvdh/laravel-ide-helper": "^3.0",
         "fakerphp/faker": "^1.9.2",
         "laravel/dusk": "^8.0",
+        "laravel/pail": "^1.2",
         "laravel/pint": "^1.0",
         "laravel/sail": "^1.18",
         "mockery/mockery": "^1.4.4",
         "nunomaduro/collision": "^8.1",
         "openai-php/client": "^0.10.1",
-        "phpunit/php-code-coverage": "^10.0",
+        "phpunit/php-code-coverage": "^11.0",
-        "phpunit/phpunit": "^10.1",
+        "phpunit/phpunit": "^11.0",
-        "psalm/plugin-laravel": "^2.8",
+        "spatie/laravel-ray": "^1.12"
-        "spatie/laravel-ray": "^1.12",
-        "vimeo/psalm": "^5.0"
     },
     "autoload": {
         "psr-4": {
@@ -78,7 +78,13 @@
             "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
         ],
         "post-create-project-cmd": [
-            "@php artisan key:generate --ansi"
+            "@php artisan key:generate --ansi",
+            "@php -r \"file_exists('database/database.sqlite') || touch('database/database.sqlite');\"",
+            "@php artisan migrate --graceful --ansi"
+        ],
+        "dev": [
+            "Composer\\Config::disableProcessTimeout",
+            "npx concurrently -c \"#93c5fd,#c4b5fd,#fb7185,#fdba74\" \"php artisan serve\" \"php artisan queue:listen --tries=1\" \"php artisan pail --timeout=0\" \"npm run dev\" --names=server,queue,logs,vite"
         ]
     },
     "extra": {

config/app.php

@@ -65,7 +65,7 @@ return [
     |
     */
 
-    'timezone' => env('APP_TIMEZONE', 'UTC'),
+    'timezone' => 'UTC',
 
     /*
     |--------------------------------------------------------------------------

config/database.php

@@ -37,6 +37,9 @@ return [
             'database' => env('DB_DATABASE', database_path('database.sqlite')),
             'prefix' => '',
             'foreign_key_constraints' => env('DB_FOREIGN_KEYS', true),
+            'busy_timeout' => null,
+            'journal_mode' => null,
+            'synchronous' => null,
         ],
 
         'mysql' => [
@@ -145,6 +148,7 @@ return [
         'options' => [
             'cluster' => env('REDIS_CLUSTER', 'redis'),
             'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_database_'),
+            'persistent' => env('REDIS_PERSISTENT', false),
         ],
 
         'default' => [

config/debugbar.php

@@ -119,7 +119,7 @@ return [
             'full_log' => false,
         ],
         'views' => [
-            'data' => false,    //Note: Can slow down the application, because the data can be quite large..
+            'data' => false,    // Note: Can slow down the application, because the data can be quite large..
         ],
         'route' => [
             'label' => true,  // show complete route on bar

config/filesystems.php

@@ -32,8 +32,10 @@ return [
 
         'local' => [
             'driver' => 'local',
-            'root' => storage_path('app'),
+            'root' => storage_path('app/private'),
+            'serve' => true,
             'throw' => false,
+            'report' => false,
         ],
 
         'public' => [
@@ -42,6 +44,7 @@ return [
             'url' => env('APP_URL').'/storage',
             'visibility' => 'public',
             'throw' => false,
+            'report' => false,
         ],
 
         's3' => [
@@ -54,6 +57,7 @@ return [
             'endpoint' => env('AWS_ENDPOINT'),
             'use_path_style_endpoint' => env('AWS_USE_PATH_STYLE_ENDPOINT', false),
             'throw' => false,
+            'report' => false,
         ],
 
     ],

config/mail.php

@@ -38,14 +38,14 @@ return [
 
         'smtp' => [
             'transport' => 'smtp',
+            'scheme' => env('MAIL_SCHEME'),
             'url' => env('MAIL_URL'),
             'host' => env('MAIL_HOST', '127.0.0.1'),
             'port' => env('MAIL_PORT', 2525),
-            'encryption' => env('MAIL_ENCRYPTION', 'tls'),
             'username' => env('MAIL_USERNAME'),
             'password' => env('MAIL_PASSWORD'),
             'timeout' => null,
-            'local_domain' => env('MAIL_EHLO_DOMAIN'),
+            'local_domain' => env('MAIL_EHLO_DOMAIN', parse_url(env('APP_URL', 'http://localhost'), PHP_URL_HOST)),
         ],
 
         'ses' => [

config/session.php

@@ -32,7 +32,7 @@ return [
     |
     */
 
-    'lifetime' => env('SESSION_LIFETIME', 120),
+    'lifetime' => (int) env('SESSION_LIFETIME', 120),
 
     'expire_on_close' => env('SESSION_EXPIRE_ON_CLOSE', false),
 

database/seeders/NotesTableSeeder.php

@@ -83,7 +83,7 @@ class NotesTableSeeder extends Seeder
             ->where('id', $noteWithoutContact->id)
             ->update(['updated_at' => $now->toDateTimeString()]);
 
-        //copy aaron’s profile pic in place
+        // copy aaron’s profile pic in place
         $spl = new SplFileInfo(public_path() . '/assets/profile-images/aaronparecki.com');
         if ($spl->isDir() === false) {
             mkdir(public_path() . '/assets/profile-images/aaronparecki.com', 0755);

helpers.php

@@ -138,7 +138,7 @@ if (! function_exists('normalize_url')) {
             $url['query'] = '';
             sort($queries);
             foreach ($queries as $query) {
-                //lets drop query params we don’t want
+                // lets drop query params we don’t want
                 $key = stristr($query, '=', true);
                 if (queryKeyIsBanned($key) === false) {
                     $url['query'] .= "{$query}&";
@@ -197,7 +197,7 @@ if (! function_exists('prettyPrintJson')) {
                     case '{':
                     case '[':
                         $level++;
-                        //no break
+                        // no break
                     case ',':
                         $ends_line_level = $level;
                         break;

package-lock.json

@@ -14,11 +14,11 @@
             },
             "devDependencies": {
                 "@eslint/js": "^9.6.0",
-                "@stylistic/eslint-plugin": "^2.3.0",
+                "@stylistic/eslint-plugin": "^3.0.0",
                 "eslint": "^9.7.0",
                 "globals": "^15.8.0",
                 "stylelint": "^16.7.0",
-                "stylelint-config-standard": "^36.0.1"
+                "stylelint-config-standard": "^37.0.0"
             }
         },
         "node_modules/@11ty/is-land": {
@@ -200,13 +200,13 @@
             }
         },
         "node_modules/@eslint/config-array": {
-            "version": "0.19.0",
+            "version": "0.19.1",
-            "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.0.tgz",
+            "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.1.tgz",
-            "integrity": "sha512-zdHg2FPIFNKPdcHWtiNT+jEFCHYVplAXRDlQDyqy0zGx/q2parwh7brGJSiTxRk/TSMkbM//zt/f5CHgyTyaSQ==",
+            "integrity": "sha512-fo6Mtm5mWyKjA/Chy1BYTdn5mGJoDNjC7C64ug20ADsRDGrA85bN3uK3MaKbeRkRuuIEAR5N33Jr1pbm411/PA==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
-                "@eslint/object-schema": "^2.1.4",
+                "@eslint/object-schema": "^2.1.5",
                 "debug": "^4.3.1",
                 "minimatch": "^3.1.2"
             },
@@ -239,11 +239,14 @@
             }
         },
         "node_modules/@eslint/core": {
-            "version": "0.9.0",
+            "version": "0.10.0",
-            "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.9.0.tgz",
+            "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.10.0.tgz",
-            "integrity": "sha512-7ATR9F0e4W85D/0w7cU0SNj7qkAexMG+bAHEZOjo9akvGuhHE2m7umzWzfnpa0XAg5Kxc1BWmtPMV67jJ+9VUg==",
+            "integrity": "sha512-gFHJ+xBOo4G3WRlR1e/3G8A6/KZAH6zcE/hkLRCZTi/B9avAG365QhFA8uOGzTMqgTghpn7/fSnscW++dpMSAw==",
             "dev": true,
             "license": "Apache-2.0",
+            "dependencies": {
+                "@types/json-schema": "^7.0.15"
+            },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
             }
@@ -310,9 +313,9 @@
             }
         },
         "node_modules/@eslint/js": {
-            "version": "9.16.0",
+            "version": "9.19.0",
-            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.16.0.tgz",
+            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.19.0.tgz",
-            "integrity": "sha512-tw2HxzQkrbeuvyj1tG2Yqq+0H9wGoI2IMk4EOsQeX+vmd75FtJAzf+gTA69WF+baUKRYQ3x2kbLE08js5OsTVg==",
+            "integrity": "sha512-rbq9/g38qjfqFLOVPvwjIvFFdNziEC5S65jmjPw5r6A//QH+W91akh9irMwjDN8zKUTak6W9EsAv4m/7Wnw0UQ==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -320,9 +323,9 @@
             }
         },
         "node_modules/@eslint/object-schema": {
-            "version": "2.1.4",
+            "version": "2.1.5",
-            "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.4.tgz",
+            "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.5.tgz",
-            "integrity": "sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==",
+            "integrity": "sha512-o0bhxnL89h5Bae5T318nFoFzGy+YE5i/gGkoPAgkmTVdRKTiv3p8JHevPiPaMwoloKfEiiaHlawCqaZMqRm+XQ==",
             "dev": true,
             "license": "Apache-2.0",
             "engines": {
@@ -330,12 +333,13 @@
             }
         },
         "node_modules/@eslint/plugin-kit": {
-            "version": "0.2.3",
+            "version": "0.2.5",
-            "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.3.tgz",
+            "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.5.tgz",
-            "integrity": "sha512-2b/g5hRmpbb1o4GnTZax9N9m0FXzz9OV42ZzI4rDDMDuHUqigAiQCEWChBWCY4ztAGVRjoWT19v0yMmc5/L5kA==",
+            "integrity": "sha512-lB05FkqEdUg2AA0xEbUz0SnkXT1LcCTa438W4IWTUh4hdOnVbQyOJ81OrDXsJk/LSiJHubgGEFoR5EHq1NsH1A==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
+                "@eslint/core": "^0.10.0",
                 "levn": "^0.4.1"
             },
             "engines": {
@@ -408,6 +412,16 @@
                 "url": "https://github.com/sponsors/nzakas"
             }
         },
+        "node_modules/@keyv/serialize": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/@keyv/serialize/-/serialize-1.0.2.tgz",
+            "integrity": "sha512-+E/LyaAeuABniD/RvUezWVXKpeuvwLEA9//nE9952zBaOdBd2mQ3pPoM8cUe2X6IcMByfuSLzmYqnYshG60+HQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "buffer": "^6.0.3"
+            }
+        },
         "node_modules/@nodelib/fs.scandir": {
             "version": "2.1.5",
             "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -447,13 +461,13 @@
             }
         },
         "node_modules/@stylistic/eslint-plugin": {
-            "version": "2.11.0",
+            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin/-/eslint-plugin-2.11.0.tgz",
+            "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin/-/eslint-plugin-3.0.0.tgz",
-            "integrity": "sha512-PNRHbydNG5EH8NK4c+izdJlxajIR6GxcUhzsYNRsn6Myep4dsZt0qFCz3rCPnkvgO5FYibDcMqgNHUT+zvjYZw==",
+            "integrity": "sha512-9GJI6iBtGjOqSsyCKUvE6Vn7qDT52hbQaoq/SwxH6A1bciymZfvBfHIIrD3E7Koi2sjzOa/MNQ2XOguHtVJOyw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/utils": "^8.13.0",
+                "@typescript-eslint/utils": "8.13.0",
                 "eslint-visitor-keys": "^4.2.0",
                 "espree": "^10.3.0",
                 "estraverse": "^5.3.0",
@@ -481,14 +495,14 @@
             "license": "MIT"
         },
         "node_modules/@typescript-eslint/scope-manager": {
-            "version": "8.16.0",
+            "version": "8.13.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.16.0.tgz",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.13.0.tgz",
-            "integrity": "sha512-mwsZWubQvBki2t5565uxF0EYvG+FwdFb8bMtDuGQLdCCnGPrDEDvm1gtfynuKlnpzeBRqdFCkMf9jg1fnAK8sg==",
+            "integrity": "sha512-XsGWww0odcUT0gJoBZ1DeulY1+jkaHUciUq4jKNv4cpInbvvrtDoyBH9rE/n2V29wQJPk8iCH1wipra9BhmiMA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/types": "8.16.0",
+                "@typescript-eslint/types": "8.13.0",
-                "@typescript-eslint/visitor-keys": "8.16.0"
+                "@typescript-eslint/visitor-keys": "8.13.0"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -499,9 +513,9 @@
             }
         },
         "node_modules/@typescript-eslint/types": {
-            "version": "8.16.0",
+            "version": "8.13.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.16.0.tgz",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.13.0.tgz",
-            "integrity": "sha512-NzrHj6thBAOSE4d9bsuRNMvk+BvaQvmY4dDglgkgGC0EW/tB3Kelnp3tAKH87GEwzoxgeQn9fNGRyFJM/xd+GQ==",
+            "integrity": "sha512-4cyFErJetFLckcThRUFdReWJjVsPCqyBlJTi6IDEpc1GWCIIZRFxVppjWLIMcQhNGhdWJJRYFHpHoDWvMlDzng==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -513,14 +527,14 @@
             }
         },
         "node_modules/@typescript-eslint/typescript-estree": {
-            "version": "8.16.0",
+            "version": "8.13.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.16.0.tgz",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.13.0.tgz",
-            "integrity": "sha512-E2+9IzzXMc1iaBy9zmo+UYvluE3TW7bCGWSF41hVWUE01o8nzr1rvOQYSxelxr6StUvRcTMe633eY8mXASMaNw==",
+            "integrity": "sha512-v7SCIGmVsRK2Cy/LTLGN22uea6SaUIlpBcO/gnMGT/7zPtxp90bphcGf4fyrCQl3ZtiBKqVTG32hb668oIYy1g==",
             "dev": true,
             "license": "BSD-2-Clause",
             "dependencies": {
-                "@typescript-eslint/types": "8.16.0",
+                "@typescript-eslint/types": "8.13.0",
-                "@typescript-eslint/visitor-keys": "8.16.0",
+                "@typescript-eslint/visitor-keys": "8.13.0",
                 "debug": "^4.3.4",
                 "fast-glob": "^3.3.2",
                 "is-glob": "^4.0.3",
@@ -542,16 +556,16 @@
             }
         },
         "node_modules/@typescript-eslint/utils": {
-            "version": "8.16.0",
+            "version": "8.13.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.16.0.tgz",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.13.0.tgz",
-            "integrity": "sha512-C1zRy/mOL8Pj157GiX4kaw7iyRLKfJXBR3L82hk5kS/GyHcOFmy4YUq/zfZti72I9wnuQtA/+xzft4wCC8PJdA==",
+            "integrity": "sha512-A1EeYOND6Uv250nybnLZapeXpYMl8tkzYUxqmoKAWnI4sei3ihf2XdZVd+vVOmHGcp3t+P7yRrNsyyiXTvShFQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@eslint-community/eslint-utils": "^4.4.0",
-                "@typescript-eslint/scope-manager": "8.16.0",
+                "@typescript-eslint/scope-manager": "8.13.0",
-                "@typescript-eslint/types": "8.16.0",
+                "@typescript-eslint/types": "8.13.0",
-                "@typescript-eslint/typescript-estree": "8.16.0"
+                "@typescript-eslint/typescript-estree": "8.13.0"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -562,22 +576,17 @@
             },
             "peerDependencies": {
                 "eslint": "^8.57.0 || ^9.0.0"
-            },
-            "peerDependenciesMeta": {
-                "typescript": {
-                    "optional": true
-                }
             }
         },
         "node_modules/@typescript-eslint/visitor-keys": {
-            "version": "8.16.0",
+            "version": "8.13.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.16.0.tgz",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.13.0.tgz",
-            "integrity": "sha512-pq19gbaMOmFE3CbL0ZB8J8BFCo2ckfHBfaIsaOZgBIF4EoISJIdLX5xRhd0FGB0LlHReNRuzoJoMGpTjq8F2CQ==",
+            "integrity": "sha512-7N/+lztJqH4Mrf0lb10R/CbI1EaAMMGyF5y0oJvFoAhafwgiRA7TXyd8TFn8FC8k5y2dTsYogg238qavRGNnlw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/types": "8.16.0",
+                "@typescript-eslint/types": "8.13.0",
-                "eslint-visitor-keys": "^4.2.0"
+                "eslint-visitor-keys": "^3.4.3"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -587,10 +596,23 @@
                 "url": "https://opencollective.com/typescript-eslint"
             }
         },
+        "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
+            "version": "3.4.3",
+            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+            "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
+            }
+        },
         "node_modules/@zachleat/snow-fall": {
-            "version": "1.0.2",
+            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/@zachleat/snow-fall/-/snow-fall-1.0.2.tgz",
+            "resolved": "https://registry.npmjs.org/@zachleat/snow-fall/-/snow-fall-1.0.3.tgz",
-            "integrity": "sha512-nyNeliowryq+roSMktyV3o14DduSuU4BvBzruVSPV6e8U8Eid2zNzSj1AzCQByPId7Q4MrIP2QWL2UHeHGfmcA==",
+            "integrity": "sha512-Y9srRbmO+k31vSm+eINYRV9DRoeWGV5/hlAn9o34bLpoWo+T5945v6XGBrFzQYjhyEGB4j/4zXuTW1zTxp2Reg==",
             "license": "MIT"
         },
         "node_modules/acorn": {
@@ -693,6 +715,27 @@
             "dev": true,
             "license": "MIT"
         },
+        "node_modules/base64-js": {
+            "version": "1.5.1",
+            "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+            "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/feross"
+                },
+                {
+                    "type": "patreon",
+                    "url": "https://www.patreon.com/feross"
+                },
+                {
+                    "type": "consulting",
+                    "url": "https://feross.org/support"
+                }
+            ],
+            "license": "MIT"
+        },
         "node_modules/brace-expansion": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
@@ -716,6 +759,52 @@
                 "node": ">=8"
             }
         },
+        "node_modules/buffer": {
+            "version": "6.0.3",
+            "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+            "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/feross"
+                },
+                {
+                    "type": "patreon",
+                    "url": "https://www.patreon.com/feross"
+                },
+                {
+                    "type": "consulting",
+                    "url": "https://feross.org/support"
+                }
+            ],
+            "license": "MIT",
+            "dependencies": {
+                "base64-js": "^1.3.1",
+                "ieee754": "^1.2.1"
+            }
+        },
+        "node_modules/cacheable": {
+            "version": "1.8.8",
+            "resolved": "https://registry.npmjs.org/cacheable/-/cacheable-1.8.8.tgz",
+            "integrity": "sha512-OE1/jlarWxROUIpd0qGBSKFLkNsotY8pt4GeiVErUYh/NUeTNrT+SBksUgllQv4m6a0W/VZsLuiHb88maavqEw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "hookified": "^1.7.0",
+                "keyv": "^5.2.3"
+            }
+        },
+        "node_modules/cacheable/node_modules/keyv": {
+            "version": "5.2.3",
+            "resolved": "https://registry.npmjs.org/keyv/-/keyv-5.2.3.tgz",
+            "integrity": "sha512-AGKecUfzrowabUv0bH1RIR5Vf7w+l4S3xtQAypKaUpTdIR1EbrAcTxHCrpo9Q+IWeUlFE2palRtgIQcgm+PQJw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@keyv/serialize": "^1.0.2"
+            }
+        },
         "node_modules/callsites": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@@ -830,13 +919,13 @@
             }
         },
         "node_modules/css-tree": {
-            "version": "3.0.1",
+            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-3.0.1.tgz",
+            "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-3.1.0.tgz",
-            "integrity": "sha512-8Fxxv+tGhORlshCdCwnNJytvlvq46sOLSYEx2ZIGurahWvMucSRnyjPA3AmrMq4VPRYbHVpWj5VkiVasrM2H4Q==",
+            "integrity": "sha512-0eW44TGN5SQXU1mWSkKwFstI/22X2bG1nYzZTYMAWjylYURhse752YgbE4Cx46AC+bAvI+/dYTPRk1LqSUnu6w==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "mdn-data": "2.12.1",
+                "mdn-data": "2.12.2",
                 "source-map-js": "^1.0.1"
             },
             "engines": {
@@ -857,9 +946,9 @@
             }
         },
         "node_modules/debug": {
-            "version": "4.3.7",
+            "version": "4.4.0",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
-            "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+            "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -935,19 +1024,19 @@
             }
         },
         "node_modules/eslint": {
-            "version": "9.16.0",
+            "version": "9.19.0",
-            "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.16.0.tgz",
+            "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.19.0.tgz",
-            "integrity": "sha512-whp8mSQI4C8VXd+fLgSM0lh3UlmcFtVwUQjyKCFfsp+2ItAIYhlq/hqGahGqHE6cv9unM41VlqKk2VtKYR2TaA==",
+            "integrity": "sha512-ug92j0LepKlbbEv6hD911THhoRHmbdXt2gX+VDABAW/Ir7D3nqKdv5Pf5vtlyY6HQMTEP2skXY43ueqTCWssEA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@eslint-community/eslint-utils": "^4.2.0",
                 "@eslint-community/regexpp": "^4.12.1",
                 "@eslint/config-array": "^0.19.0",
-                "@eslint/core": "^0.9.0",
+                "@eslint/core": "^0.10.0",
                 "@eslint/eslintrc": "^3.2.0",
-                "@eslint/js": "9.16.0",
+                "@eslint/js": "9.19.0",
-                "@eslint/plugin-kit": "^0.2.3",
+                "@eslint/plugin-kit": "^0.2.5",
                 "@humanfs/node": "^0.16.6",
                 "@humanwhocodes/module-importer": "^1.0.1",
                 "@humanwhocodes/retry": "^0.4.1",
@@ -955,7 +1044,7 @@
                 "@types/json-schema": "^7.0.15",
                 "ajv": "^6.12.4",
                 "chalk": "^4.0.0",
-                "cross-spawn": "^7.0.5",
+                "cross-spawn": "^7.0.6",
                 "debug": "^4.3.2",
                 "escape-string-regexp": "^4.0.0",
                 "eslint-scope": "^8.2.0",
@@ -1120,9 +1209,9 @@
             "license": "MIT"
         },
         "node_modules/fast-glob": {
-            "version": "3.3.2",
+            "version": "3.3.3",
-            "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+            "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
-            "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
+            "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -1130,7 +1219,7 @@
                 "@nodelib/fs.walk": "^1.2.3",
                 "glob-parent": "^5.1.2",
                 "merge2": "^1.3.0",
-                "micromatch": "^4.0.4"
+                "micromatch": "^4.0.8"
             },
             "engines": {
                 "node": ">=8.6.0"
@@ -1164,10 +1253,20 @@
             "license": "MIT"
         },
         "node_modules/fast-uri": {
-            "version": "3.0.3",
+            "version": "3.0.6",
-            "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.3.tgz",
+            "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz",
-            "integrity": "sha512-aLrHthzCjH5He4Z2H9YZ+v6Ujb9ocRuW6ZzkJQOrTxleEijANq4v1TsaPaVG1PZcuurEzrLcWRyYBYXD5cEiaw==",
+            "integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==",
             "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/fastify"
+                },
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/fastify"
+                }
+            ],
             "license": "BSD-3-Clause"
         },
         "node_modules/fastest-levenshtein": {
@@ -1181,9 +1280,9 @@
             }
         },
         "node_modules/fastq": {
-            "version": "1.17.1",
+            "version": "1.18.0",
-            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
+            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.18.0.tgz",
-            "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
+            "integrity": "sha512-QKHXPW0hD8g4UET03SdOdunzSouc9N4AuHdsX8XNcTsuz+yYFILVNIX4l9yHABMhiEI9Db0JTTIpu0wB+Y1QQw==",
             "dev": true,
             "license": "ISC",
             "dependencies": {
@@ -1309,9 +1408,9 @@
             }
         },
         "node_modules/globals": {
-            "version": "15.12.0",
+            "version": "15.14.0",
-            "resolved": "https://registry.npmjs.org/globals/-/globals-15.12.0.tgz",
+            "resolved": "https://registry.npmjs.org/globals/-/globals-15.14.0.tgz",
-            "integrity": "sha512-1+gLErljJFhbOVyaetcwJiJ4+eLe45S2E7P5UiZ9xGfeq3ATQf5DOv9G7MH3gGbKQLkzmNh2DxfZwLdw+j6oTQ==",
+            "integrity": "sha512-OkToC372DtlQeje9/zHIo5CT8lRP/FUgEOKBEhU4e0abL7J7CD24fD9ohiLN5hagG/kWCYj4K5oaxxtj2Z0Dig==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -1359,6 +1458,13 @@
                 "node": ">=8"
             }
         },
+        "node_modules/hookified": {
+            "version": "1.7.0",
+            "resolved": "https://registry.npmjs.org/hookified/-/hookified-1.7.0.tgz",
+            "integrity": "sha512-XQdMjqC1AyeOzfs+17cnIk7Wdfu1hh2JtcyNfBf5u9jHrT3iZUlGHxLTntFBuk5lwkqJ6l3+daeQdHK5yByHVA==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/html-tags": {
             "version": "3.3.1",
             "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.3.1.tgz",
@@ -1372,6 +1478,27 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
+        "node_modules/ieee754": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+            "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/feross"
+                },
+                {
+                    "type": "patreon",
+                    "url": "https://www.patreon.com/feross"
+                },
+                {
+                    "type": "consulting",
+                    "url": "https://feross.org/support"
+                }
+            ],
+            "license": "BSD-3-Clause"
+        },
         "node_modules/ignore": {
             "version": "5.3.2",
             "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
@@ -1621,9 +1748,9 @@
             }
         },
         "node_modules/mdn-data": {
-            "version": "2.12.1",
+            "version": "2.12.2",
-            "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.12.1.tgz",
+            "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.12.2.tgz",
-            "integrity": "sha512-rsfnCbOHjqrhWxwt5/wtSLzpoKTzW7OXdT5lLOIH1OTYhWu9rRJveGq0sKvDZODABH7RX+uoR+DYcpFnq4Tf6Q==",
+            "integrity": "sha512-IEn+pegP1aManZuckezWCO+XZQDplx1366JoVhTpMpBB1sPey/SbveZQUosKiKiGYjg1wH4pMlNgXbCiYgihQA==",
             "dev": true,
             "license": "CC0-1.0"
         },
@@ -1869,9 +1996,9 @@
             }
         },
         "node_modules/postcss": {
-            "version": "8.4.49",
+            "version": "8.5.1",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.1.tgz",
-            "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
+            "integrity": "sha512-6oz2beyjc5VMn/KV1pPw8fliQkhBXrVn1Z3TVyqZxU8kZpzEKhBdmCFqI6ZbmGtamQvQGuU1sgPTk8ZrXDD7jQ==",
             "dev": true,
             "funding": [
                 {
@@ -1889,7 +2016,7 @@
             ],
             "license": "MIT",
             "dependencies": {
-                "nanoid": "^3.3.7",
+                "nanoid": "^3.3.8",
                 "picocolors": "^1.1.1",
                 "source-map-js": "^1.2.1"
             },
@@ -2177,9 +2304,9 @@
             }
         },
         "node_modules/stylelint": {
-            "version": "16.11.0",
+            "version": "16.13.2",
-            "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.11.0.tgz",
+            "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.13.2.tgz",
-            "integrity": "sha512-zrl4IrKmjJQ+h9FoMp69UMCq5SxeHk0URhxUBj4d3ISzo/DplOFBJZc7t7Dr6otB+1bfbbKNLOmCDpzKSlW+Nw==",
+            "integrity": "sha512-wDlgh0mRO9RtSa3TdidqHd0nOG8MmUyVKl+dxA6C1j8aZRzpNeEgdhFmU5y4sZx4Fc6r46p0fI7p1vR5O2DZqA==",
             "dev": true,
             "funding": [
                 {
@@ -2202,16 +2329,16 @@
                 "colord": "^2.9.3",
                 "cosmiconfig": "^9.0.0",
                 "css-functions-list": "^3.2.3",
-                "css-tree": "^3.0.1",
+                "css-tree": "^3.1.0",
                 "debug": "^4.3.7",
-                "fast-glob": "^3.3.2",
+                "fast-glob": "^3.3.3",
                 "fastest-levenshtein": "^1.0.16",
-                "file-entry-cache": "^9.1.0",
+                "file-entry-cache": "^10.0.5",
                 "global-modules": "^2.0.0",
                 "globby": "^11.1.0",
                 "globjoin": "^0.1.4",
                 "html-tags": "^3.3.1",
-                "ignore": "^6.0.2",
+                "ignore": "^7.0.1",
                 "imurmurhash": "^0.1.4",
                 "is-plain-object": "^5.0.0",
                 "known-css-properties": "^0.35.0",
@@ -2229,7 +2356,7 @@
                 "string-width": "^4.2.3",
                 "supports-hyperlinks": "^3.1.0",
                 "svg-tags": "^1.0.0",
-                "table": "^6.8.2",
+                "table": "^6.9.0",
                 "write-file-atomic": "^5.0.1"
             },
             "bin": {
@@ -2240,9 +2367,9 @@
             }
         },
         "node_modules/stylelint-config-recommended": {
-            "version": "14.0.1",
+            "version": "15.0.0",
-            "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-14.0.1.tgz",
+            "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-15.0.0.tgz",
-            "integrity": "sha512-bLvc1WOz/14aPImu/cufKAZYfXs/A/owZfSMZ4N+16WGXLoX5lOir53M6odBxvhgmgdxCVnNySJmZKx73T93cg==",
+            "integrity": "sha512-9LejMFsat7L+NXttdHdTq94byn25TD+82bzGRiV1Pgasl99pWnwipXS5DguTpp3nP1XjvLXVnEJIuYBfsRjRkA==",
             "dev": true,
             "funding": [
                 {
@@ -2259,13 +2386,13 @@
                 "node": ">=18.12.0"
             },
             "peerDependencies": {
-                "stylelint": "^16.1.0"
+                "stylelint": "^16.13.0"
             }
         },
         "node_modules/stylelint-config-standard": {
-            "version": "36.0.1",
+            "version": "37.0.0",
-            "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-36.0.1.tgz",
+            "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-37.0.0.tgz",
-            "integrity": "sha512-8aX8mTzJ6cuO8mmD5yon61CWuIM4UD8Q5aBcWKGSf6kg+EC3uhB+iOywpTK4ca6ZL7B49en8yanOFtUW0qNzyw==",
+            "integrity": "sha512-+6eBlbSTrOn/il2RlV0zYGQwRTkr+WtzuVSs1reaWGObxnxLpbcspCUYajVQHonVfxVw2U+h42azGhrBvcg8OA==",
             "dev": true,
             "funding": [
                 {
@@ -2279,13 +2406,13 @@
             ],
             "license": "MIT",
             "dependencies": {
-                "stylelint-config-recommended": "^14.0.1"
+                "stylelint-config-recommended": "^15.0.0"
             },
             "engines": {
                 "node": ">=18.12.0"
             },
             "peerDependencies": {
-                "stylelint": "^16.1.0"
+                "stylelint": "^16.13.0"
             }
         },
         "node_modules/stylelint/node_modules/balanced-match": {
@@ -2296,36 +2423,31 @@
             "license": "MIT"
         },
         "node_modules/stylelint/node_modules/file-entry-cache": {
-            "version": "9.1.0",
+            "version": "10.0.5",
-            "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-9.1.0.tgz",
+            "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-10.0.5.tgz",
-            "integrity": "sha512-/pqPFG+FdxWQj+/WSuzXSDaNzxgTLr/OrR1QuqfEZzDakpdYE70PwUxL7BPUa8hpjbvY1+qvCl8k+8Tq34xJgg==",
+            "integrity": "sha512-umpQsJrBNsdMDgreSryMEXvJh66XeLtZUwA8Gj7rHGearGufUFv6rB/bcXRFsiGWw/VeSUgUofF4Rf2UKEOrTA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "flat-cache": "^5.0.0"
+                "flat-cache": "^6.1.5"
-            },
-            "engines": {
-                "node": ">=18"
             }
         },
         "node_modules/stylelint/node_modules/flat-cache": {
-            "version": "5.0.0",
+            "version": "6.1.5",
-            "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-5.0.0.tgz",
+            "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-6.1.5.tgz",
-            "integrity": "sha512-JrqFmyUl2PnPi1OvLyTVHnQvwQ0S+e6lGSwu8OkAZlSaNIZciTY2H/cOOROxsBA1m/LZNHDsqAgDZt6akWcjsQ==",
+            "integrity": "sha512-QR+2kN38f8nMfiIQ1LHYjuDEmZNZVjxuxY+HufbS3BW0EX01Q5OnH7iduOYRutmgiXb797HAKcXUeXrvRjjgSQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "flatted": "^3.3.1",
+                "cacheable": "^1.8.7",
-                "keyv": "^4.5.4"
+                "flatted": "^3.3.2",
-            },
+                "hookified": "^1.6.0"
-            "engines": {
-                "node": ">=18"
             }
         },
         "node_modules/stylelint/node_modules/ignore": {
-            "version": "6.0.2",
+            "version": "7.0.3",
-            "resolved": "https://registry.npmjs.org/ignore/-/ignore-6.0.2.tgz",
+            "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.3.tgz",
-            "integrity": "sha512-InwqeHHN2XpumIkMvpl/DCJVrAHgCsG5+cn1XlnLWGwtZBm8QJfSusItfrwx81CTp5agNZqpKU2J/ccC5nGT4A==",
+            "integrity": "sha512-bAH5jbK/F3T3Jls4I0SO1hmPR0dKU0a7+SY6n1yzRtG54FLO8d6w/nxLFX2Nb7dBu6cCWXPaAME6cYqFUMmuCA==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -2379,9 +2501,9 @@
             "dev": true
         },
         "node_modules/table": {
-            "version": "6.8.2",
+            "version": "6.9.0",
-            "resolved": "https://registry.npmjs.org/table/-/table-6.8.2.tgz",
+            "resolved": "https://registry.npmjs.org/table/-/table-6.9.0.tgz",
-            "integrity": "sha512-w2sfv80nrAh2VCbqR5AK27wswXhqcck2AhfnNW76beQXskGZ1V12GwS//yYVa3d3fcvAip2OUnbDAjW2k3v9fA==",
+            "integrity": "sha512-9kY+CygyYM6j02t5YFHbNz2FN5QmYGv9zAjVp4lCDjlCw7amdckXlEt/bjMhUIfj4ThGRE4gCUH5+yGnNuPo5A==",
             "dev": true,
             "license": "BSD-3-Clause",
             "dependencies": {
@@ -2459,9 +2581,9 @@
             }
         },
         "node_modules/typescript": {
-            "version": "5.7.2",
+            "version": "5.7.3",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.2.tgz",
+            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz",
-            "integrity": "sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==",
+            "integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==",
             "dev": true,
             "license": "Apache-2.0",
             "peer": true,

package.json

@@ -7,11 +7,11 @@
     "license": "CC0-1.0",
     "devDependencies": {
         "@eslint/js": "^9.6.0",
-        "@stylistic/eslint-plugin": "^2.3.0",
+        "@stylistic/eslint-plugin": "^3.0.0",
         "eslint": "^9.7.0",
         "globals": "^15.8.0",
         "stylelint": "^16.7.0",
-        "stylelint-config-standard": "^36.0.1"
+        "stylelint-config-standard": "^37.0.0"
     },
     "scripts": {
         "eslint": "eslint public/assets/js/*.js",

public/index.php

@@ -1,55 +1,20 @@
 <?php
 
-use Illuminate\Contracts\Http\Kernel;
+use Illuminate\Foundation\Application;
 use Illuminate\Http\Request;
 
 define('LARAVEL_START', microtime(true));
 
-/*
+// Determine if the application is in maintenance mode...
-|--------------------------------------------------------------------------
-| Check If The Application Is Under Maintenance
-|--------------------------------------------------------------------------
-|
-| If the application is in maintenance / demo mode via the "down" command
-| we will load this file so that any pre-rendered content can be shown
-| instead of starting the framework, which could cause an exception.
-|
-*/
-
 if (file_exists($maintenance = __DIR__.'/../storage/framework/maintenance.php')) {
     require $maintenance;
 }
 
-/*
+// Register the Composer autoloader...
-|--------------------------------------------------------------------------
-| Register The Auto Loader
-|--------------------------------------------------------------------------
-|
-| Composer provides a convenient, automatically generated class loader for
-| this application. We just need to utilize it! We'll simply require it
-| into the script here so we don't need to manually load our classes.
-|
-*/
-
 require __DIR__.'/../vendor/autoload.php';
 
-/*
+// Bootstrap Laravel and handle the request...
-|--------------------------------------------------------------------------
+/** @var Application $app */
-| Run The Application
-|--------------------------------------------------------------------------
-|
-| Once we have the application, we can handle the incoming request using
-| the application's HTTP kernel. Then, we will send the response back
-| to this client's browser, allowing them to enjoy our application.
-|
-*/
-
 $app = require_once __DIR__.'/../bootstrap/app.php';
 
-$kernel = $app->make(Kernel::class);
+$app->handleRequest(Request::capture());
-
-$response = $kernel->handle(
-    $request = Request::capture()
-)->send();
-
-$kernel->terminate($request, $response);

routes/web.php

@@ -64,7 +64,7 @@ Route::domain(config('url.longurl'))->group(function () {
     Route::middleware(MyAuthMiddleware::class)->prefix('admin')->group(function () {
         Route::get('/', [HomeController::class, 'welcome']);
 
-        //Articles
+        // Articles
         Route::prefix('blog')->group(function () {
             Route::get('/', [AdminArticlesController::class, 'index']);
             Route::get('/create', [AdminArticlesController::class, 'create']);

scripts/compress.sh

@@ -1,13 +1,41 @@
 #!/usr/bin/env zsh
 
-if ! type fd &> /dev/null; then
+if ! (( $+commands[fd] )) &> /dev/null; then
     echo "fd not installed"
     exit 1
 fi
 
-if ! type brotli &> /dev/null; then
+if ! (( $+commands[brotli] )) &> /dev/null; then
     echo "brotli not installed"
     exit 1
 fi
 
-fd -e css -e js --search-path ./public/assets --type f -x brotli --force --best --output={}.br {}
+if ! (( $+commands[zstd] )) &> /dev/null; then
+    echo "zstd not installed"
+    exit 1
+fi
+
+# Make .br files
+fd --extension css --extension js --search-path ./public/assets --type f --exec brotli --force --best --output={}.br {}
+# Make .zst files
+fd --extension css --extension js --search-path ./public/assets --type f --exec zstd --quiet --force --ultra -22 --exclude-compressed {} -o {}.zst
+
+# Remove files that actually got bigger!
+fd --extension br --extension zst --search-path ./public/assets --type f --exec sh -c '
+for file; do
+  src="${file%.br}"
+  src="${src%.zst}"
+  if [ -f "$src" ]; then
+    # Get file sizes using stat with cross-platform compatibility
+    if [ "$(uname)" = "Darwin" ]; then
+      file_size=$(stat -f%z "$file")
+      src_size=$(stat -f%z "$src")
+    else
+      file_size=$(stat -c%s "$file")
+      src_size=$(stat -c%s "$src")
+    fi
+    # Compare sizes and rm compressed file if larger than the source
+    [ "$file_size" -ge "$src_size" ] && rm "$file"
+  fi
+done
+' _ {}

tests/Browser/ExampleTest.php

@@ -12,7 +12,7 @@ class ExampleTest extends DuskTestCase
      *
      * @return void
      */
-    public function testBasicExample()
+    public function test_basic_example()
     {
         $this->browse(function (Browser $browser) {
             $browser->visit('/')

tests/Feature/Admin/AdminHomeControllerTest.php

@@ -6,13 +6,14 @@ namespace Tests\Feature\Admin;
 
 use App\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class AdminHomeControllerTest extends TestCase
 {
     use RefreshDatabase;
 
-    /** @test */
+    #[Test]
     public function adminHomepageLoads(): void
     {
         $user = User::factory()->make();

tests/Feature/Admin/AdminTest.php

@@ -5,25 +5,26 @@ declare(strict_types=1);
 namespace Tests\Feature\Admin;
 
 use App\Models\User;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class AdminTest extends TestCase
 {
-    /** @test */
+    #[Test]
     public function adminPageRedirectsUnauthorisedUsersToLoginPage(): void
     {
         $response = $this->get('/admin');
         $response->assertRedirect('/login');
     }
 
-    /** @test */
+    #[Test]
     public function loginPageLoads(): void
     {
         $response = $this->get('/login');
         $response->assertViewIs('login');
     }
 
-    /** @test */
+    #[Test]
     public function loginAttemptWithBadCredentialsFails(): void
     {
         $response = $this->post('/login', [
@@ -33,7 +34,7 @@ class AdminTest extends TestCase
         $response->assertRedirect('/login');
     }
 
-    /** @test */
+    #[Test]
     public function loginSucceeds(): void
     {
         User::factory([
@@ -49,7 +50,7 @@ class AdminTest extends TestCase
         $response->assertRedirect('/admin');
     }
 
-    /** @test */
+    #[Test]
     public function whenLoggedInRedirectsToAdminPage(): void
     {
         $user = User::factory()->create();
@@ -57,14 +58,14 @@ class AdminTest extends TestCase
         $response->assertRedirect('/');
     }
 
-    /** @test */
+    #[Test]
     public function loggedOutUsersSimplyRedirected(): void
     {
         $response = $this->get('/logout');
         $response->assertRedirect('/');
     }
 
-    /** @test */
+    #[Test]
     public function loggedInUsersShownLogoutForm(): void
     {
         $user = User::factory()->create();
@@ -72,7 +73,7 @@ class AdminTest extends TestCase
         $response->assertViewIs('logout');
     }
 
-    /** @test */
+    #[Test]
     public function loggedInUsersCanLogout(): void
     {
         $user = User::factory()->create();

tests/Feature/Admin/ArticlesTest.php

@@ -9,13 +9,14 @@ use App\Models\User;
 use Faker\Factory;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Http\UploadedFile;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class ArticlesTest extends TestCase
 {
     use RefreshDatabase;
 
-    /** @test */
+    #[Test]
     public function adminArticlesPageLoads(): void
     {
         $user = User::factory()->make();
@@ -25,7 +26,7 @@ class ArticlesTest extends TestCase
         $response->assertSeeText('Select article to edit:');
     }
 
-    /** @test */
+    #[Test]
     public function adminCanLoadFormToCreateArticle(): void
     {
         $user = User::factory()->make();
@@ -35,7 +36,7 @@ class ArticlesTest extends TestCase
         $response->assertSeeText('Title (URL)');
     }
 
-    /** @test */
+    #[Test]
     public function admiNCanCreateNewArticle(): void
     {
         $user = User::factory()->make();
@@ -48,7 +49,7 @@ class ArticlesTest extends TestCase
         $this->assertDatabaseHas('articles', ['title' => 'Test Title']);
     }
 
-    /** @test */
+    #[Test]
     public function adminCanCreateNewArticleWithFile(): void
     {
         $user = User::factory()->make();
@@ -73,7 +74,7 @@ class ArticlesTest extends TestCase
         ]);
     }
 
-    /** @test */
+    #[Test]
     public function articleCanLoadFormToEditArticle(): void
     {
         $user = User::factory()->make();
@@ -86,7 +87,7 @@ class ArticlesTest extends TestCase
         $response->assertSeeText('This is *my* new blog. It uses `Markdown`.');
     }
 
-    /** @test */
+    #[Test]
     public function adminCanEditArticle(): void
     {
         $user = User::factory()->make();
@@ -104,7 +105,7 @@ class ArticlesTest extends TestCase
         ]);
     }
 
-    /** @test */
+    #[Test]
     public function adminCanDeleteArticle(): void
     {
         $user = User::factory()->make();

tests/Feature/Admin/BioTest.php

@@ -7,13 +7,14 @@ namespace Tests\Feature\Admin;
 use App\Models\Bio;
 use App\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class BioTest extends TestCase
 {
     use RefreshDatabase;
 
-    /** @test */
+    #[Test]
     public function adminBiosPageLoads(): void
     {
         $user = User::factory()->make();
@@ -23,7 +24,7 @@ class BioTest extends TestCase
         $response->assertSeeText('Edit bio');
     }
 
-    /** @test */
+    #[Test]
     public function adminCanCreateBio(): void
     {
         $user = User::factory()->make();
@@ -36,7 +37,7 @@ class BioTest extends TestCase
         $this->assertDatabaseHas('bios', ['content' => 'Bio content']);
     }
 
-    /** @test */
+    #[Test]
     public function adminCanLoadExistingBio(): void
     {
         $user = User::factory()->make();
@@ -49,7 +50,7 @@ class BioTest extends TestCase
         $response->assertSeeText('This is <em>my</em> bio. It uses <strong>HTML</strong>.');
     }
 
-    /** @test */
+    #[Test]
     public function adminCanEditBio(): void
     {
         $user = User::factory()->make();

tests/Feature/Admin/ClientsTest.php

@@ -7,13 +7,14 @@ namespace Tests\Feature\Admin;
 use App\Models\MicropubClient;
 use App\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class ClientsTest extends TestCase
 {
     use RefreshDatabase;
 
-    /** @test */
+    #[Test]
     public function clientsPageLoads(): void
     {
         $user = User::factory()->make();
@@ -23,7 +24,7 @@ class ClientsTest extends TestCase
         $response->assertSeeText('Clients');
     }
 
-    /** @test */
+    #[Test]
     public function adminCanLoadFormToCreateClient(): void
     {
         $user = User::factory()->make();
@@ -33,7 +34,7 @@ class ClientsTest extends TestCase
         $response->assertSeeText('New Client');
     }
 
-    /** @test */
+    #[Test]
     public function adminCanCreateNewClient(): void
     {
         $user = User::factory()->make();
@@ -49,7 +50,7 @@ class ClientsTest extends TestCase
         ]);
     }
 
-    /** @test */
+    #[Test]
     public function adminCanLoadEditFormForClient(): void
     {
         $user = User::factory()->make();
@@ -62,7 +63,7 @@ class ClientsTest extends TestCase
         $response->assertSee('https://jbl5.dev/notes/new');
     }
 
-    /** @test */
+    #[Test]
     public function adminCanEditClient(): void
     {
         $user = User::factory()->make();
@@ -80,7 +81,7 @@ class ClientsTest extends TestCase
         ]);
     }
 
-    /** @test */
+    #[Test]
     public function adminCanDeleteClient(): void
     {
         $user = User::factory()->make();

tests/Feature/Admin/ContactsTest.php

@@ -12,6 +12,7 @@ use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Http\UploadedFile;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class ContactsTest extends TestCase
@@ -27,7 +28,7 @@ class ContactsTest extends TestCase
         parent::tearDown();
     }
 
-    /** @test */
+    #[Test]
     public function contactIndexPageLoads(): void
     {
         $user = User::factory()->make();
@@ -36,7 +37,7 @@ class ContactsTest extends TestCase
         $response->assertViewIs('admin.contacts.index');
     }
 
-    /** @test */
+    #[Test]
     public function contactCreatePageLoads(): void
     {
         $user = User::factory()->make();
@@ -45,7 +46,7 @@ class ContactsTest extends TestCase
         $response->assertViewIs('admin.contacts.create');
     }
 
-    /** @test */
+    #[Test]
     public function adminCanCreateNewContact(): void
     {
         $user = User::factory()->make();
@@ -62,7 +63,7 @@ class ContactsTest extends TestCase
         ]);
     }
 
-    /** @test */
+    #[Test]
     public function adminCanSeeFormToEditContact(): void
     {
         $user = User::factory()->make();
@@ -72,7 +73,7 @@ class ContactsTest extends TestCase
         $response->assertViewIs('admin.contacts.edit');
     }
 
-    /** @test */
+    #[Test]
     public function adminCanUpdateContact(): void
     {
         $user = User::factory()->make();
@@ -91,7 +92,7 @@ class ContactsTest extends TestCase
         ]);
     }
 
-    /** @test */
+    #[Test]
     public function adminCanEditContactAndUploadAvatar(): void
     {
         copy(__DIR__ . '/../../aaron.png', sys_get_temp_dir() . '/tantek.png');
@@ -114,7 +115,7 @@ class ContactsTest extends TestCase
         );
     }
 
-    /** @test */
+    #[Test]
     public function adminCanDeleteContact(): void
     {
         $user = User::factory()->make();
@@ -132,7 +133,7 @@ class ContactsTest extends TestCase
         ]);
     }
 
-    /** @test */
+    #[Test]
     public function adminCanTriggerRetrievalOfRemoteAvatar(): void
     {
         $html = <<<'HTML'
@@ -161,7 +162,7 @@ class ContactsTest extends TestCase
         );
     }
 
-    /** @test */
+    #[Test]
     public function gettingRemoteAvatarFailsGracefullyWithRemoteNotFound(): void
     {
         $mock = new MockHandler([
@@ -178,7 +179,7 @@ class ContactsTest extends TestCase
         $response->assertRedirect('/admin/contacts/' . $contact->id . '/edit');
     }
 
-    /** @test */
+    #[Test]
     public function gettingRemoteAvatarFailsGracefullyWithRemoteError(): void
     {
         $html = <<<'HTML'
@@ -201,7 +202,7 @@ class ContactsTest extends TestCase
         $response->assertRedirect('/admin/contacts/' . $contact->id . '/edit');
     }
 
-    /** @test */
+    #[Test]
     public function gettingRemoteAvatarFailsGracefullyForContactWithNoHompage(): void
     {
         $contact = Contact::create([

tests/Feature/Admin/LikesTest.php

@@ -9,13 +9,14 @@ use App\Models\Like;
 use App\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Queue;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class LikesTest extends TestCase
 {
     use RefreshDatabase;
 
-    /** @test */
+    #[Test]
     public function likesPageLoads(): void
     {
         $user = User::factory()->make();
@@ -25,7 +26,7 @@ class LikesTest extends TestCase
         $response->assertSeeText('Likes');
     }
 
-    /** @test */
+    #[Test]
     public function likeCreateFormLoads(): void
     {
         $user = User::factory()->make();
@@ -35,7 +36,7 @@ class LikesTest extends TestCase
         $response->assertSeeText('New Like');
     }
 
-    /** @test */
+    #[Test]
     public function adminCanCreateLike(): void
     {
         Queue::fake();
@@ -51,7 +52,7 @@ class LikesTest extends TestCase
         Queue::assertPushed(ProcessLike::class);
     }
 
-    /** @test */
+    #[Test]
     public function likeEditFormLoads(): void
     {
         $user = User::factory()->make();
@@ -62,7 +63,7 @@ class LikesTest extends TestCase
         $response->assertSee('Edit Like');
     }
 
-    /** @test */
+    #[Test]
     public function adminCanEditLike(): void
     {
         Queue::fake();
@@ -80,7 +81,7 @@ class LikesTest extends TestCase
         Queue::assertPushed(ProcessLike::class);
     }
 
-    /** @test */
+    #[Test]
     public function adminCanDeleteLike(): void
     {
         $like = Like::factory()->create();

tests/Feature/Admin/NotesTest.php

@@ -9,13 +9,14 @@ use App\Models\Note;
 use App\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Queue;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class NotesTest extends TestCase
 {
     use RefreshDatabase;
 
-    /** @test */
+    #[Test]
     public function notesPageLoads(): void
     {
         $user = User::factory()->make();
@@ -24,7 +25,7 @@ class NotesTest extends TestCase
         $response->assertViewIs('admin.notes.index');
     }
 
-    /** @test */
+    #[Test]
     public function noteCreatePageLoads(): void
     {
         $user = User::factory()->make();
@@ -33,7 +34,7 @@ class NotesTest extends TestCase
         $response->assertViewIs('admin.notes.create');
     }
 
-    /** @test */
+    #[Test]
     public function adminCanCreateNewNote(): void
     {
         $user = User::factory()->make();
@@ -47,7 +48,7 @@ class NotesTest extends TestCase
         ]);
     }
 
-    /** @test */
+    #[Test]
     public function noteEditFormLoads(): void
     {
         $user = User::factory()->make();
@@ -57,7 +58,7 @@ class NotesTest extends TestCase
         $response->assertViewIs('admin.notes.edit');
     }
 
-    /** @test */
+    #[Test]
     public function adminCanEditNote(): void
     {
         Queue::fake();
@@ -76,7 +77,7 @@ class NotesTest extends TestCase
         Queue::assertPushed(SendWebMentions::class);
     }
 
-    /** @test */
+    #[Test]
     public function adminCanDeleteNote(): void
     {
         $user = User::factory()->make();

tests/Feature/Admin/PlacesTest.php

@@ -7,13 +7,14 @@ namespace Tests\Feature\Admin;
 use App\Models\Place;
 use App\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class PlacesTest extends TestCase
 {
     use RefreshDatabase;
 
-    /** @test */
+    #[Test]
     public function placesPageLoads(): void
     {
         $user = User::factory()->make();
@@ -22,7 +23,7 @@ class PlacesTest extends TestCase
         $response->assertViewIs('admin.places.index');
     }
 
-    /** @test */
+    #[Test]
     public function createPlacePageLoads(): void
     {
         $user = User::factory()->make();
@@ -31,7 +32,7 @@ class PlacesTest extends TestCase
         $response->assertViewIs('admin.places.create');
     }
 
-    /** @test */
+    #[Test]
     public function adminCanCreateNewPlace(): void
     {
         $user = User::factory()->make();
@@ -48,7 +49,7 @@ class PlacesTest extends TestCase
         ]);
     }
 
-    /** @test */
+    #[Test]
     public function editPlacePageLoads(): void
     {
         $user = User::factory()->make();
@@ -58,7 +59,7 @@ class PlacesTest extends TestCase
         $response->assertViewIs('admin.places.edit');
     }
 
-    /** @test */
+    #[Test]
     public function adminCanUpdatePlace(): void
     {
         $user = User::factory()->make();

tests/Feature/ArticlesTest.php

@@ -7,20 +7,21 @@ namespace Tests\Feature;
 use App\Models\Article;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Jonnybarnes\IndieWeb\Numbers;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class ArticlesTest extends TestCase
 {
     use RefreshDatabase;
 
-    /** @test */
+    #[Test]
     public function articlesPageLoads(): void
     {
         $response = $this->get('/blog');
         $response->assertViewIs('articles.index');
     }
 
-    /** @test */
+    #[Test]
     public function singleArticlePageLoads()
     {
         $article = Article::factory()->create();
@@ -28,7 +29,7 @@ class ArticlesTest extends TestCase
         $response->assertViewIs('articles.show');
     }
 
-    /** @test */
+    #[Test]
     public function wrongDateInUrlRedirectsToCorrectDate()
     {
         $article = Article::factory()->create();
@@ -36,7 +37,7 @@ class ArticlesTest extends TestCase
         $response->assertRedirect('/blog/' . date('Y') . '/' . date('m') . '/' . $article->titleurl);
     }
 
-    /** @test */
+    #[Test]
     public function oldUrlsWithIdAreRedirected()
     {
         $article = Article::factory()->create();
@@ -45,21 +46,21 @@ class ArticlesTest extends TestCase
         $response->assertRedirect($article->link);
     }
 
-    /** @test  */
+    #[Test]
     public function unknownSlugGetsNotFoundResponse()
     {
         $response = $this->get('/blog/' . date('Y') . '/' . date('m') . '/unknown-slug');
         $response->assertNotFound();
     }
 
-    /** @test */
+    #[Test]
     public function unknownArticleIdGetsNotFoundResponse()
     {
         $response = $this->get('/blog/s/22');
         $response->assertNotFound();
     }
 
-    /** @test */
+    #[Test]
     public function someUrlsDoNotParseCorrectly(): void
     {
         $response = $this->get('/blog/feed.js');

tests/Feature/BookmarksTest.php

@@ -8,6 +8,7 @@ use App\Jobs\ProcessBookmark;
 use App\Models\Bookmark;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Queue;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 use Tests\TestToken;
 
@@ -15,14 +16,14 @@ class BookmarksTest extends TestCase
 {
     use RefreshDatabase, TestToken;
 
-    /** @test */
+    #[Test]
     public function bookmarksPageLoadsWithoutError(): void
     {
         $response = $this->get('/bookmarks');
         $response->assertViewIs('bookmarks.index');
     }
 
-    /** @test */
+    #[Test]
     public function singleBookmarkPageLoadsWithoutError(): void
     {
         $bookmark = Bookmark::factory()->create();
@@ -30,7 +31,7 @@ class BookmarksTest extends TestCase
         $response->assertViewIs('bookmarks.show');
     }
 
-    /** @test */
+    #[Test]
     public function whenBookmarkIsAddedUsingHttpSyntaxCheckJobToTakeScreenshotIsInvoked(): void
     {
         Queue::fake();
@@ -48,7 +49,7 @@ class BookmarksTest extends TestCase
         $this->assertDatabaseHas('bookmarks', ['url' => 'https://example.org/blog-post']);
     }
 
-    /** @test */
+    #[Test]
     public function whenBookmarkIsAddedUsingJsonSyntaxCheckJobToTakeScreenshotIsInvoked(): void
     {
         Queue::fake();
@@ -68,7 +69,7 @@ class BookmarksTest extends TestCase
         $this->assertDatabaseHas('bookmarks', ['url' => 'https://example.org/blog-post']);
     }
 
-    /** @test */
+    #[Test]
     public function whenTheBookmarkIsCreatedCheckNecessaryTagsAreAlsoCreated(): void
     {
         Queue::fake();

tests/Feature/ContactsTest.php

@@ -6,6 +6,7 @@ namespace Tests\Feature;
 
 use App\Models\Contact;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class ContactsTest extends TestCase
@@ -14,9 +15,8 @@ class ContactsTest extends TestCase
 
     /**
      * Check the `/contacts` page gives a good response.
-     *
-     * @test
      */
+    #[Test]
     public function contactsPageLoadsWithoutError(): void
     {
         $response = $this->get('/contacts');
@@ -25,9 +25,8 @@ class ContactsTest extends TestCase
 
     /**
      * Test an individual contact page with default profile image.
-     *
-     * @test
      */
+    #[Test]
     public function contactPageShouldFallbackToDefaultProfilePic(): void
     {
         Contact::factory()->create([
@@ -39,9 +38,8 @@ class ContactsTest extends TestCase
 
     /**
      * Test an individual contact page with a specific profile image.
-     *
-     * @test
      */
+    #[Test]
     public function contactPageShouldUseSpecificProfilePicIfPresent(): void
     {
         Contact::factory()->create([
@@ -52,7 +50,7 @@ class ContactsTest extends TestCase
         $response->assertViewHas('image', '/assets/profile-images/aaronparecki.com/image');
     }
 
-    /** @test */
+    #[Test]
     public function unknownContactReturnsNotFoundResponse(): void
     {
         $response = $this->get('/contacts/unknown');

tests/Feature/CorsHeadersTest.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace Tests\Feature;
 
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 use Tests\TestToken;
 
@@ -11,7 +12,7 @@ class CorsHeadersTest extends TestCase
 {
     use TestToken;
 
-    /** @test */
+    #[Test]
     public function checkCorsHeadersOnMediaEndpoint(): void
     {
         $response = $this->call(
@@ -25,7 +26,7 @@ class CorsHeadersTest extends TestCase
         $response->assertHeader('Access-Control-Allow-Origin', '*');
     }
 
-    /** @test */
+    #[Test]
     public function checkForNoCorsHeaderOnNonMediaEndpointLinks(): void
     {
         $response = $this->get('/blog');

tests/Feature/FeedsTest.php

@@ -8,6 +8,7 @@ use App\Models\Article;
 use App\Models\Note;
 use App\Models\Place;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class FeedsTest extends TestCase
@@ -16,9 +17,8 @@ class FeedsTest extends TestCase
 
     /**
      * Test the blog RSS feed.
-     *
-     * @test
      */
+    #[Test]
     public function blogRssFeedIsPresent(): void
     {
         Article::factory()->count(3)->create();
@@ -29,9 +29,8 @@ class FeedsTest extends TestCase
 
     /**
      * Test the notes RSS feed.
-     *
-     * @test
      */
+    #[Test]
     public function notesRssFeedIsPresent(): void
     {
         Note::factory()->count(3)->create();
@@ -42,9 +41,8 @@ class FeedsTest extends TestCase
 
     /**
      * Test the blog RSS feed.
-     *
-     * @test
      */
+    #[Test]
     public function blogAtomFeedIsPresent(): void
     {
         Article::factory()->count(3)->create();
@@ -53,7 +51,7 @@ class FeedsTest extends TestCase
         $response->assertOk();
     }
 
-    /** @test */
+    #[Test]
     public function blogJf2FeedIsPresent(): void
     {
         Article::factory()->count(3)->create();
@@ -77,9 +75,8 @@ class FeedsTest extends TestCase
 
     /**
      * Test the notes RSS feed.
-     *
-     * @test
      */
+    #[Test]
     public function notesAtomFeedIsPresent(): void
     {
         Note::factory()->count(3)->create();
@@ -90,9 +87,8 @@ class FeedsTest extends TestCase
 
     /**
      * Test the blog JSON feed.
-     *
-     * @test
      */
+    #[Test]
     public function blogJsonFeedIsPresent(): void
     {
         Article::factory()->count(3)->create();
@@ -103,9 +99,8 @@ class FeedsTest extends TestCase
 
     /**
      * Test the notes JSON feed.
-     *
-     * @test
      */
+    #[Test]
     public function notesJsonFeedIsPresent(): void
     {
         Note::factory()->count(3)->create();
@@ -114,7 +109,7 @@ class FeedsTest extends TestCase
         $response->assertOk();
     }
 
-    /** @test */
+    #[Test]
     public function notesJf2FeedIsPresent(): void
     {
         Note::factory()->count(3)->create();
@@ -139,9 +134,8 @@ class FeedsTest extends TestCase
     /**
      * Each JSON feed item must have one of `content_text` or `content_html`,
      * and whichever one they have can’t be `null`.
-     *
-     * @test
      */
+    #[Test]
     public function jsonFeedsHaveRequiredAttributes(): void
     {
         Note::factory()->count(3)->create();
@@ -161,7 +155,7 @@ class FeedsTest extends TestCase
         }
     }
 
-    /** @test */
+    #[Test]
     public function jsonNoteFeedLoadsPlaceDataWithoutLazyLoading(): void
     {
         $place = Place::factory()->create();

tests/Feature/FrontPageTest.php

@@ -7,13 +7,14 @@ use App\Models\Bookmark;
 use App\Models\Like;
 use App\Models\Note;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class FrontPageTest extends TestCase
 {
     use RefreshDatabase;
 
-    /** @test */
+    #[Test]
     public function frontPageLoadsAllContent(): void
     {
         Note::factory()->create(['note' => 'Note 1']);

tests/Feature/HorizonTest.php

@@ -3,15 +3,15 @@
 namespace Tests\Feature;
 
 use App\Models\User;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class HorizonTest extends TestCase
 {
     /**
      * Horizon has its own test suite, here we just test it has been installed successfully.
-     *
-     * @test
      */
+    #[Test]
     public function horizonIsInstalled(): void
     {
         $user = User::factory()->create([

tests/Feature/IndieAuthTest.php

@@ -31,8 +31,8 @@ class IndieAuthTest extends TestCase
             'authorization_endpoint' => route('indieauth.start'),
             'token_endpoint' => route('indieauth.token'),
             'code_challenge_methods_supported' => ['S256'],
-            //'introspection_endpoint' => 'introspection_endpoint',
+            // 'introspection_endpoint' => 'introspection_endpoint',
-            //'introspection_endpoint_auth_methods_supported' => ['none'],
+            // 'introspection_endpoint_auth_methods_supported' => ['none'],
         ]);
     }
 

tests/Feature/LikesTest.php

@@ -14,6 +14,7 @@ use GuzzleHttp\Psr7\Response;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Queue;
 use Jonnybarnes\WebmentionsParser\Authorship;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 use Tests\TestToken;
 
@@ -22,14 +23,14 @@ class LikesTest extends TestCase
     use RefreshDatabase;
     use TestToken;
 
-    /** @test */
+    #[Test]
     public function likesPageHasCorrectView(): void
     {
         $response = $this->get('/likes');
         $response->assertViewIs('likes.index');
     }
 
-    /** @test */
+    #[Test]
     public function singleLikePageHasCorrectView(): void
     {
         $like = Like::factory()->create();
@@ -37,7 +38,7 @@ class LikesTest extends TestCase
         $response->assertViewIs('likes.show');
     }
 
-    /** @test */
+    #[Test]
     public function checkLikeCreatedFromMicropubApiRequests(): void
     {
         Queue::fake();
@@ -57,7 +58,7 @@ class LikesTest extends TestCase
         $this->assertDatabaseHas('likes', ['url' => 'https://example.org/blog-post']);
     }
 
-    /** @test */
+    #[Test]
     public function checkLikeCreatedFromMicropubWebRequests(): void
     {
         Queue::fake();
@@ -75,7 +76,7 @@ class LikesTest extends TestCase
         $this->assertDatabaseHas('likes', ['url' => 'https://example.org/blog-post']);
     }
 
-    /** @test */
+    #[Test]
     public function likeWithSimpleAuthor(): void
     {
         $like = new Like;
@@ -114,7 +115,7 @@ class LikesTest extends TestCase
         $this->assertEquals('Fred Bloggs', Like::find($id)->author_name);
     }
 
-    /** @test */
+    #[Test]
     public function likeWithHCard(): void
     {
         $like = new Like;
@@ -157,7 +158,7 @@ class LikesTest extends TestCase
         $this->assertEquals('Fred Bloggs', Like::find($id)->author_name);
     }
 
-    /** @test */
+    #[Test]
     public function likeWithoutMicroformats(): void
     {
         $like = new Like;
@@ -193,7 +194,7 @@ class LikesTest extends TestCase
         $this->assertNull(Like::find($id)->author_name);
     }
 
-    /** @test */
+    #[Test]
     public function likeThatIsATweet(): void
     {
         $like = new Like;
@@ -219,10 +220,9 @@ class LikesTest extends TestCase
             'author_url' => 'https://twitter.com/jonnybarnes',
             'html' => '<div>HTML of the tweet embed</div>',
         ];
-        $codebirdMock = $this->getMockBuilder(Codebird::class)
+        $codebirdMock = $this->createPartialMock(Codebird::class, ['__call']);
-            ->addMethods(['statuses_oembed'])
+        $codebirdMock->method('__call')
-            ->getMock();
+            ->with('statuses_oembed', $this->anything())
-        $codebirdMock->method('statuses_oembed')
             ->willReturn($info);
         $this->app->instance(Codebird::class, $codebirdMock);
 
@@ -233,7 +233,7 @@ class LikesTest extends TestCase
         $this->assertEquals('Jonny Barnes', Like::find($id)->author_name);
     }
 
-    /** @test */
+    #[Test]
     public function noErrorForFailureToPosseWithBridgy(): void
     {
         $like = new Like;
@@ -257,10 +257,9 @@ class LikesTest extends TestCase
             'author_url' => 'https://twitter.com/jonnybarnes',
             'html' => '<div>HTML of the tweet embed</div>',
         ];
-        $codebirdMock = $this->getMockBuilder(Codebird::class)
+        $codebirdMock = $this->createPartialMock(Codebird::class, ['__call']);
-            ->addMethods(['statuses_oembed'])
+        $codebirdMock->method('__call')
-            ->getMock();
+            ->with('statuses_oembed', $this->anything())
-        $codebirdMock->method('statuses_oembed')
             ->willReturn($info);
         $this->app->instance(Codebird::class, $codebirdMock);
 
@@ -271,7 +270,7 @@ class LikesTest extends TestCase
         $this->assertEquals('Jonny Barnes', Like::find($id)->author_name);
     }
 
-    /** @test */
+    #[Test]
     public function unknownLikeGivesNotFoundResponse(): void
     {
         $response = $this->get('/likes/202');

tests/Feature/MicropubControllerTest.php

@@ -15,6 +15,7 @@ use Carbon\Carbon;
 use Faker\Factory;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Queue;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 use Tests\TestToken;
 
@@ -23,7 +24,7 @@ class MicropubControllerTest extends TestCase
     use RefreshDatabase;
     use TestToken;
 
-    /** @test */
+    #[Test]
     public function micropubGetRequestWithoutTokenReturnsErrorResponse(): void
     {
         $response = $this->get('/api/post');
@@ -31,7 +32,7 @@ class MicropubControllerTest extends TestCase
         $response->assertJsonFragment(['error_description' => 'No access token was provided in the request']);
     }
 
-    /** @test */
+    #[Test]
     public function micropubGetRequestWithoutValidTokenReturnsErrorResponse(): void
     {
         $response = $this->get('/api/post', ['HTTP_Authorization' => 'Bearer abc123']);
@@ -42,9 +43,8 @@ class MicropubControllerTest extends TestCase
     /**
      * Test a GET request for the micropub endpoint with a valid token gives a
      * 200 response. Check token information is also returned in the response.
-     *
-     * @test
      */
+    #[Test]
     public function micropubGetRequestWithValidTokenReturnsOkResponse(): void
     {
         $response = $this->get('/api/post', ['HTTP_Authorization' => 'Bearer ' . $this->getToken()]);
@@ -52,14 +52,14 @@ class MicropubControllerTest extends TestCase
         $response->assertJsonFragment(['response' => 'token']);
     }
 
-    /** @test */
+    #[Test]
     public function micropubClientsCanRequestSyndicationTargetsCanBeEmpty(): void
     {
         $response = $this->get('/api/post?q=syndicate-to', ['HTTP_Authorization' => 'Bearer ' . $this->getToken()]);
         $response->assertJsonFragment(['syndicate-to' => []]);
     }
 
-    /** @test */
+    #[Test]
     public function micropubClientsCanRequestSyndicationTargetsPopulatesFromModel(): void
     {
         $syndicationTarget = SyndicationTarget::factory()->create();
@@ -67,7 +67,7 @@ class MicropubControllerTest extends TestCase
         $response->assertJsonFragment(['uid' => $syndicationTarget->uid]);
     }
 
-    /** @test */
+    #[Test]
     public function micropubClientsCanRequestKnownNearbyPlaces(): void
     {
         Place::factory()->create([
@@ -80,8 +80,6 @@ class MicropubControllerTest extends TestCase
     }
 
     /**
-     * @test
-     *
      * @todo Add uncertainty parameter
      *
     public function micropubClientsCanRequestKnownNearbyPlacesWithUncertaintyParameter(): void
@@ -89,22 +87,21 @@ class MicropubControllerTest extends TestCase
         $response = $this->get('/api/post?q=geo:53.5,-2.38', ['HTTP_Authorization' => 'Bearer ' . $this->getToken()]);
         $response->assertJson(['places' => [['slug' => 'the-bridgewater-pub']]]);
     }*/
-
+    #[Test]
-    /** @test */
     public function returnEmptyResultWhenMicropubClientRequestsKnownNearbyPlaces(): void
     {
         $response = $this->get('/api/post?q=geo:1.23,4.56', ['HTTP_Authorization' => 'Bearer ' . $this->getToken()]);
         $response->assertJson(['places' => []]);
     }
 
-    /** @test */
+    #[Test]
     public function micropubClientCanRequestEndpointConfig(): void
     {
         $response = $this->get('/api/post?q=config', ['HTTP_Authorization' => 'Bearer ' . $this->getToken()]);
         $response->assertJsonFragment(['media-endpoint' => route('media-endpoint')]);
     }
 
-    /** @test */
+    #[Test]
     public function micropubClientCanCreateNewNote(): void
     {
         $faker = Factory::create();
@@ -123,7 +120,7 @@ class MicropubControllerTest extends TestCase
         $this->assertDatabaseHas('notes', ['note' => $note]);
     }
 
-    /** @test */
+    #[Test]
     public function micropubClientCanRequestTheNewNoteIsSyndicatedToMastodonAndBluesky(): void
     {
         Queue::fake();
@@ -157,7 +154,7 @@ class MicropubControllerTest extends TestCase
         Queue::assertPushed(SyndicateNoteToBluesky::class);
     }
 
-    /** @test */
+    #[Test]
     public function micropubClientsCanCreateNewPlaces(): void
     {
         $response = $this->post(
@@ -173,7 +170,7 @@ class MicropubControllerTest extends TestCase
         $this->assertDatabaseHas('places', ['slug' => 'the-barton-arms']);
     }
 
-    /** @test */
+    #[Test]
     public function micropubClientsCanCreateNewPlacesWithOldLocationSyntax(): void
     {
         $response = $this->post(
@@ -190,7 +187,7 @@ class MicropubControllerTest extends TestCase
         $this->assertDatabaseHas('places', ['slug' => 'the-barton-arms']);
     }
 
-    /** @test */
+    #[Test]
     public function micropubClientWebRequestWithInvalidTokenReturnsErrorResponse(): void
     {
         $response = $this->post(
@@ -205,7 +202,7 @@ class MicropubControllerTest extends TestCase
         $response->assertJson(['error' => 'invalid_token']);
     }
 
-    /** @test */
+    #[Test]
     public function micropubClientWebRequestWithTokenWithoutAnyScopesReturnsErrorResponse(): void
     {
         $response = $this->post(
@@ -220,7 +217,7 @@ class MicropubControllerTest extends TestCase
         $response->assertJson(['error_description' => 'The provided token has no scopes']);
     }
 
-    /** @test */
+    #[Test]
     public function micropubClientWebRequestWithTokenWithoutCreateScopesReturnsErrorResponse(): void
     {
         $response = $this->post(
@@ -238,9 +235,8 @@ class MicropubControllerTest extends TestCase
 
     /**
      * Test a valid micropub requests using JSON syntax creates a new note.
-     *
-     * @test
      */
+    #[Test]
     public function micropubClientApiRequestCreatesNewNote(): void
     {
         Queue::fake();
@@ -286,9 +282,8 @@ class MicropubControllerTest extends TestCase
     /**
      * Test a valid micropub requests using JSON syntax creates a new note with
      * existing self-created place.
-     *
-     * @test
      */
+    #[Test]
     public function micropubClientApiRequestCreatesNewNoteWithExistingPlaceInLocationData(): void
     {
         $place = new Place;
@@ -317,9 +312,8 @@ class MicropubControllerTest extends TestCase
     /**
      * Test a valid micropub requests using JSON syntax creates a new note with
      * a new place defined in the location block.
-     *
-     * @test
      */
+    #[Test]
     public function micropubClientApiRequestCreatesNewNoteWithNewPlaceInLocationData(): void
     {
         $faker = Factory::create();
@@ -353,9 +347,8 @@ class MicropubControllerTest extends TestCase
     /**
      * Test a valid micropub requests using JSON syntax creates a new note without
      * a new place defined in the location block if there is missing data.
-     *
-     * @test
      */
+    #[Test]
     public function micropubClientApiRequestCreatesNewNoteWithoutNewPlaceInLocationData(): void
     {
         $faker = Factory::create();
@@ -387,9 +380,8 @@ class MicropubControllerTest extends TestCase
     /**
      * Test a micropub requests using JSON syntax without a token returns an
      * error. Also check the message.
-     *
-     * @test
      */
+    #[Test]
     public function micropubClientApiRequestWithoutTokenReturnsError(): void
     {
         $faker = Factory::create();
@@ -414,9 +406,8 @@ class MicropubControllerTest extends TestCase
     /**
      * Test a micropub requests using JSON syntax without a valid token returns
      * an error. Also check the message.
-     *
-     * @test
      */
+    #[Test]
     public function micropubClientApiRequestWithTokenWithInsufficientPermissionReturnsError(): void
     {
         $faker = Factory::create();
@@ -439,7 +430,7 @@ class MicropubControllerTest extends TestCase
             ->assertStatus(401);
     }
 
-    /** @test */
+    #[Test]
     public function micropubClientApiRequestForUnsupportedPostTypeReturnsError(): void
     {
         $response = $this->postJson(
@@ -460,7 +451,7 @@ class MicropubControllerTest extends TestCase
             ->assertStatus(500);
     }
 
-    /** @test */
+    #[Test]
     public function micropubClientApiRequestCreatesNewPlace(): void
     {
         $faker = Factory::create();
@@ -480,7 +471,7 @@ class MicropubControllerTest extends TestCase
             ->assertStatus(201);
     }
 
-    /** @test */
+    #[Test]
     public function micropubClientApiRequestCreatesNewPlaceWithUncertaintyParameter(): void
     {
         $faker = Factory::create();
@@ -500,7 +491,7 @@ class MicropubControllerTest extends TestCase
             ->assertStatus(201);
     }
 
-    /** @test */
+    #[Test]
     public function micropubClientApiRequestUpdatesExistingNote(): void
     {
         $note = Note::factory()->create();
@@ -520,7 +511,7 @@ class MicropubControllerTest extends TestCase
             ->assertStatus(200);
     }
 
-    /** @test */
+    #[Test]
     public function micropubClientApiRequestUpdatesNoteSyndicationLinks(): void
     {
         $note = Note::factory()->create();
@@ -547,7 +538,7 @@ class MicropubControllerTest extends TestCase
         ]);
     }
 
-    /** @test */
+    #[Test]
     public function micropubClientApiRequestAddsImageToNote(): void
     {
         $note = Note::factory()->create();
@@ -570,7 +561,7 @@ class MicropubControllerTest extends TestCase
         ]);
     }
 
-    /** @test */
+    #[Test]
     public function micropubClientApiRequestReturnsErrorTryingToUpdateNonNoteModel(): void
     {
         $response = $this->postJson(
@@ -589,7 +580,7 @@ class MicropubControllerTest extends TestCase
             ->assertStatus(500);
     }
 
-    /** @test */
+    #[Test]
     public function micropubClientApiRequestReturnsErrorTryingToUpdateNonExistingNote(): void
     {
         $response = $this->postJson(
@@ -608,7 +599,7 @@ class MicropubControllerTest extends TestCase
             ->assertStatus(404);
     }
 
-    /** @test */
+    #[Test]
     public function micropubClientApiRequestReturnsErrorWhenTryingToUpdateUnsupportedProperty(): void
     {
         $note = Note::factory()->create();
@@ -628,7 +619,7 @@ class MicropubControllerTest extends TestCase
             ->assertStatus(500);
     }
 
-    /** @test */
+    #[Test]
     public function micropubClientApiRequestWithTokenWithInsufficientScopeReturnsError(): void
     {
         $response = $this->postJson(
@@ -647,7 +638,7 @@ class MicropubControllerTest extends TestCase
             ->assertJson(['error' => 'insufficient_scope']);
     }
 
-    /** @test */
+    #[Test]
     public function micropubClientApiRequestCanReplaceNoteSyndicationTargets(): void
     {
         $note = Note::factory()->create();
@@ -674,7 +665,7 @@ class MicropubControllerTest extends TestCase
         ]);
     }
 
-    /** @test */
+    #[Test]
     public function micropubClientWebRequestCanEncodeTokenWithinTheForm(): void
     {
         $faker = Factory::create();
@@ -692,7 +683,7 @@ class MicropubControllerTest extends TestCase
         $this->assertDatabaseHas('notes', ['note' => $note]);
     }
 
-    /** @test */
+    #[Test]
     public function micropubClientApiRequestCreatesArticlesWhenItIncludesTheNameProperty(): void
     {
         $faker = Factory::create();

tests/Feature/MicropubMediaTest.php

@@ -11,6 +11,7 @@ use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\Queue;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 use Tests\TestToken;
 
@@ -19,7 +20,7 @@ class MicropubMediaTest extends TestCase
     use RefreshDatabase;
     use TestToken;
 
-    /** @test */
+    #[Test]
     public function emptyResponseForLastUploadWhenNoneFound(): void
     {
         // Make sure there’s no media
@@ -33,7 +34,7 @@ class MicropubMediaTest extends TestCase
         $response->assertJson(['url' => null]);
     }
 
-    /** @test */
+    #[Test]
     public function getRequestWithInvalidTokenReturnsErrorResponse(): void
     {
         $response = $this->get(
@@ -44,7 +45,7 @@ class MicropubMediaTest extends TestCase
         $response->assertJsonFragment(['error_description' => 'The provided token did not pass validation']);
     }
 
-    /** @test */
+    #[Test]
     public function getRequestWithTokenWithoutScopeReturnsErrorResponse(): void
     {
         $response = $this->get(
@@ -55,7 +56,7 @@ class MicropubMediaTest extends TestCase
         $response->assertJsonFragment(['error_description' => 'The provided token has no scopes']);
     }
 
-    /** @test */
+    #[Test]
     public function getRequestWithTokenWithInsufficientScopeReturnsErrorResponse(): void
     {
         $response = $this->get(
@@ -66,7 +67,7 @@ class MicropubMediaTest extends TestCase
         $response->assertJsonFragment(['error_description' => 'The token’s scope does not have the necessary requirements.']);
     }
 
-    /** @test */
+    #[Test]
     public function emptyGetRequestWithTokenReceivesOkResponse(): void
     {
         $response = $this->get(
@@ -77,7 +78,7 @@ class MicropubMediaTest extends TestCase
         $response->assertJson(['status' => 'OK']);
     }
 
-    /** @test */
+    #[Test]
     public function clientCanListLastUpload(): void
     {
         Queue::fake();
@@ -102,11 +103,11 @@ class MicropubMediaTest extends TestCase
         $lastUploadResponse->assertJson(['url' => $response->headers->get('Location')]);
 
         // now remove file
-        unlink(storage_path('app/media/') . $filename);
+        unlink(storage_path('app/private/media/') . $filename);
-        $this->removeDirIfEmpty(storage_path('app/media'));
+        $this->removeDirIfEmpty(storage_path('app/private/media'));
     }
 
-    /** @test */
+    #[Test]
     public function clientCanSourceUploads(): void
     {
         Queue::fake();
@@ -134,11 +135,11 @@ class MicropubMediaTest extends TestCase
         ]]]);
 
         // now remove file
-        unlink(storage_path('app/media/') . $filename);
+        unlink(storage_path('app/private/media/') . $filename);
-        $this->removeDirIfEmpty(storage_path('app/media'));
+        $this->removeDirIfEmpty(storage_path('app/private/media'));
     }
 
-    /** @test */
+    #[Test]
     public function clientCanSourceUploadsWithLimit(): void
     {
         Queue::fake();
@@ -168,11 +169,11 @@ class MicropubMediaTest extends TestCase
         $this->assertCount(1, json_decode($sourceUploadResponse->getContent(), true)['items']);
 
         // now remove file
-        unlink(storage_path('app/media/') . $filename);
+        unlink(storage_path('app/private/media/') . $filename);
-        $this->removeDirIfEmpty(storage_path('app/media'));
+        $this->removeDirIfEmpty(storage_path('app/private/media'));
     }
 
-    /** @test */
+    #[Test]
     public function mediaEndpointUploadRequiresFile(): void
     {
         $response = $this->post(
@@ -188,7 +189,7 @@ class MicropubMediaTest extends TestCase
         ]);
     }
 
-    /** @test */
+    #[Test]
     public function errorResponseForUnknownQValue(): void
     {
         $response = $this->get(
@@ -199,7 +200,7 @@ class MicropubMediaTest extends TestCase
         $response->assertJson(['error' => 'invalid_request']);
     }
 
-    /** @test */
+    #[Test]
     public function optionsRequestReturnsCorsResponse(): void
     {
         $response = $this->options('/api/media');
@@ -208,7 +209,7 @@ class MicropubMediaTest extends TestCase
         $response->assertHeader('access-control-allow-origin', '*');
     }
 
-    /** @test */
+    #[Test]
     public function mediaEndpointRequestWithInvalidTokenReturns400Response(): void
     {
         $response = $this->post(
@@ -220,7 +221,7 @@ class MicropubMediaTest extends TestCase
         $response->assertJsonFragment(['error_description' => 'The provided token did not pass validation']);
     }
 
-    /** @test */
+    #[Test]
     public function mediaEndpointRequestWithTokenWithNoScopeReturns400Response(): void
     {
         $response = $this->post(
@@ -232,7 +233,7 @@ class MicropubMediaTest extends TestCase
         $response->assertJsonFragment(['error_description' => 'The provided token has no scopes']);
     }
 
-    /** @test */
+    #[Test]
     public function mediaEndpointRequestWithInsufficientTokenScopesReturns401Response(): void
     {
         $response = $this->post(
@@ -246,7 +247,7 @@ class MicropubMediaTest extends TestCase
         ]);
     }
 
-    /** @test */
+    #[Test]
     public function mediaEndpointUploadFile(): void
     {
         Queue::fake();
@@ -265,11 +266,11 @@ class MicropubMediaTest extends TestCase
         Queue::assertPushed(ProcessMedia::class);
         Storage::disk('local')->assertExists($filename);
         // now remove file
-        unlink(storage_path('app/') . $filename);
+        unlink(storage_path('app/private/') . $filename);
-        $this->removeDirIfEmpty(storage_path('app/media'));
+        $this->removeDirIfEmpty(storage_path('app/private/media'));
     }
 
-    /** @test */
+    #[Test]
     public function mediaEndpointUploadAudioFile(): void
     {
         Queue::fake();
@@ -288,11 +289,11 @@ class MicropubMediaTest extends TestCase
         Queue::assertPushed(ProcessMedia::class);
         Storage::disk('local')->assertExists($filename);
         // now remove file
-        unlink(storage_path('app/') . $filename);
+        unlink(storage_path('app/private/') . $filename);
-        $this->removeDirIfEmpty(storage_path('app/media'));
+        $this->removeDirIfEmpty(storage_path('app/private/media'));
     }
 
-    /** @test */
+    #[Test]
     public function mediaEndpointUploadVideoFile(): void
     {
         Queue::fake();
@@ -311,11 +312,11 @@ class MicropubMediaTest extends TestCase
         Queue::assertPushed(ProcessMedia::class);
         Storage::disk('local')->assertExists($filename);
         // now remove file
-        unlink(storage_path('app/') . $filename);
+        unlink(storage_path('app/private/') . $filename);
-        $this->removeDirIfEmpty(storage_path('app/media'));
+        $this->removeDirIfEmpty(storage_path('app/private/media'));
     }
 
-    /** @test */
+    #[Test]
     public function mediaEndpointUploadDocumentFile(): void
     {
         Queue::fake();
@@ -333,11 +334,11 @@ class MicropubMediaTest extends TestCase
         Queue::assertPushed(ProcessMedia::class);
         Storage::disk('local')->assertExists($filename);
         // now remove file
-        unlink(storage_path('app/') . $filename);
+        unlink(storage_path('app/private/') . $filename);
-        $this->removeDirIfEmpty(storage_path('app/media'));
+        $this->removeDirIfEmpty(storage_path('app/private/media'));
     }
 
-    /** @test */
+    #[Test]
     public function mediaEndpointUploadInvalidFileReturnsError(): void
     {
         Queue::fake();

tests/Feature/NotesControllerTest.php

@@ -6,6 +6,7 @@ namespace Tests\Feature;
 
 use App\Models\Note;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class NotesControllerTest extends TestCase
@@ -15,9 +16,8 @@ class NotesControllerTest extends TestCase
     /**
      * Test the `/notes` page returns 200, this should
      * mean the database is being hit.
-     *
-     * @test
      */
+    #[Test]
     public function notesPageLoads(): void
     {
         $response = $this->get('/notes');
@@ -26,9 +26,8 @@ class NotesControllerTest extends TestCase
 
     /**
      * Test a specific note.
-     *
-     * @test
      */
+    #[Test]
     public function specificNotePageLoads(): void
     {
         $note = Note::factory()->create();
@@ -46,9 +45,8 @@ class NotesControllerTest extends TestCase
 
     /**
      * Test that `/note/{decID}` redirects to `/notes/{nb60id}`.
-     *
-     * @test
      */
+    #[Test]
     public function oldNoteUrlsRedirect(): void
     {
         $note = Note::factory()->create();
@@ -58,23 +56,22 @@ class NotesControllerTest extends TestCase
 
     /**
      * Visit the tagged page and check the tag view data.
-     *
-     * @test
      */
+    #[Test]
     public function taggedNotesPageLoads(): void
     {
         $response = $this->get('/notes/tagged/beer');
         $response->assertViewHas('tag', 'beer');
     }
 
-    /** @test */
+    #[Test]
     public function unknownNoteGives404(): void
     {
         $response = $this->get('/notes/112233');
         $response->assertNotFound();
     }
 
-    /** @test */
+    #[Test]
     public function checkNoteIdNotOutOfRange(): void
     {
         $response = $this->get('/notes/photou-photologo');

tests/Feature/OwnYourGramTest.php

@@ -6,6 +6,7 @@ namespace Tests\Feature;
 
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Carbon;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 use Tests\TestToken;
 
@@ -14,7 +15,7 @@ class OwnYourGramTest extends TestCase
     use RefreshDatabase;
     use TestToken;
 
-    /** @test */
+    #[Test]
     public function postingInstagramUrlSavesMediaPath(): void
     {
         $response = $this->json(

tests/Feature/ParseCachedWebMentionsTest.php

@@ -9,6 +9,7 @@ use Illuminate\FileSystem\FileSystem;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Artisan;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class ParseCachedWebMentionsTest extends TestCase
@@ -25,7 +26,7 @@ class ParseCachedWebMentionsTest extends TestCase
         copy(__DIR__ . '/../tantek.html', storage_path('HTML') . '/http/tantek.com/index.html');
     }
 
-    /** @test */
+    #[Test]
     public function parseWebmentionHtml(): void
     {
         $webmentionAaron = WebMention::factory()->create([

tests/Feature/PlacesTest.php

@@ -6,6 +6,7 @@ namespace Tests\Feature;
 
 use App\Models\Place;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class PlacesTest extends TestCase
@@ -14,9 +15,8 @@ class PlacesTest extends TestCase
 
     /**
      * Test the `/places` page for OK response.
-     *
-     * @test
      */
+    #[Test]
     public function placesPageLoads(): void
     {
         $response = $this->get('/places');
@@ -25,9 +25,8 @@ class PlacesTest extends TestCase
 
     /**
      * Test a specific place.
-     *
-     * @test
      */
+    #[Test]
     public function singlePlacePageLoads(): void
     {
         $place = Place::factory()->create();
@@ -35,7 +34,7 @@ class PlacesTest extends TestCase
         $response->assertViewHas('place', $place);
     }
 
-    /** @test */
+    #[Test]
     public function unknownPlaceGives404()
     {
         $response = $this->get('/places/unknown');

tests/Feature/ReDownloadWebMentionsTest.php

@@ -9,13 +9,14 @@ use App\Models\WebMention;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Queue;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class ReDownloadWebMentionsTest extends TestCase
 {
     use RefreshDatabase;
 
-    /** @test */
+    #[Test]
     public function downloadJobGetsQueued(): void
     {
         Queue::fake();

tests/Feature/SearchTest.php

@@ -5,11 +5,12 @@ declare(strict_types=1);
 namespace Tests\Feature;
 
 use App\Models\Note;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class SearchTest extends TestCase
 {
-    /** @test */
+    #[Test]
     public function searchEndpointReturnsResults(): void
     {
         Note::factory(10)->create();

tests/Feature/ShortURLsControllerTest.php

@@ -4,32 +4,33 @@ declare(strict_types=1);
 
 namespace Tests\Feature;
 
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class ShortURLsControllerTest extends TestCase
 {
-    /** @test */
+    #[Test]
     public function shortDomainRedirectsToLongDomain(): void
     {
         $response = $this->get('https://' . config('url.shorturl'));
         $response->assertRedirect(config('app.url'));
     }
 
-    /** @test */
+    #[Test]
     public function shortDomainSlashAtRedirectsToTwitter(): void
     {
         $response = $this->get('https://' . config('url.shorturl') . '/@');
         $response->assertRedirect('https://twitter.com/jonnybarnes');
     }
 
-    /** @test */
+    #[Test]
     public function shortDomainSlashTRedirectsToLongDomainSlashNotes(): void
     {
         $response = $this->get('https://' . config('url.shorturl') . '/t/E');
         $response->assertRedirect(config('app.url') . '/notes/E');
     }
 
-    /** @test */
+    #[Test]
     public function shortDomainSlashBRedirectsToLongDomainSlashBlog(): void
     {
         $response = $this->get('https://' . config('url.shorturl') . '/b/1');

tests/Feature/SwarmTest.php

@@ -8,6 +8,7 @@ use App\Jobs\SendWebMentions;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Queue;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 use Tests\TestToken;
 
@@ -18,9 +19,8 @@ class SwarmTest extends TestCase
 
     /**
      * Given a check in to Foursquare, this is the content Ownyourswarm will post to us.
-     *
-     * @test
      */
+    #[Test]
     public function mockedOwnyourswarmRequestWithFoursquare(): void
     {
         Queue::fake();
@@ -66,9 +66,8 @@ class SwarmTest extends TestCase
     /**
      * This request would actually come from another client than OwnYourSwarm, but we’re testing
      * OpenStreetMap data.
-     *
-     * @test
      */
+    #[Test]
     public function mockedOwnyourswarmRequestWithOsm(): void
     {
         Queue::fake();
@@ -109,9 +108,8 @@ class SwarmTest extends TestCase
 
     /**
      * This request would actually come from another client than OwnYourSwarm, as that would include a Foursquare URL
-     *
-     * @test
      */
+    #[Test]
     public function mockedOwnyourswarmRequestWithoutKnownExternalUrl(): void
     {
         Queue::fake();
@@ -150,7 +148,7 @@ class SwarmTest extends TestCase
         Queue::assertPushed(SendWebMentions::class);
     }
 
-    /** @test */
+    #[Test]
     public function mockedOwnyourswarmRequestWithNoTextContent(): void
     {
         $response = $this->json(
@@ -187,7 +185,7 @@ class SwarmTest extends TestCase
         $this->get($response->__get('headers')->get('location'))->assertSee('📍');
     }
 
-    /** @test */
+    #[Test]
     public function mockedOwnyourswarmRequestSavesJustThePostWhenAnErrorOccursInTheCheckinData(): void
     {
         Queue::fake();
@@ -225,7 +223,7 @@ class SwarmTest extends TestCase
         Queue::assertPushed(SendWebMentions::class);
     }
 
-    /** @test */
+    #[Test]
     public function mockedOwnyourswarmRequestWithHAdrLocation(): void
     {
         Queue::fake();
@@ -271,7 +269,7 @@ class SwarmTest extends TestCase
         Queue::assertPushed(SendWebMentions::class);
     }
 
-    /** @test */
+    #[Test]
     public function ownyourswarmCheckinTestUsingRealData(): void
     {
         $response = $this->json(

tests/Feature/TokenServiceTest.php

@@ -9,6 +9,7 @@ use DateTimeImmutable;
 use Lcobucci\JWT\Configuration;
 use Lcobucci\JWT\Signer\Key\InMemory;
 use Lcobucci\JWT\Validation\RequiredConstraintsViolated;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class TokenServiceTest extends TestCase
@@ -16,9 +17,8 @@ class TokenServiceTest extends TestCase
     /**
      * Given the token is dependent on a random nonce, the time of creation and
      * the APP_KEY, to test, we shall create a token, and then verify it.
-     *
-     * @test
      */
+    #[Test]
     public function tokenserviceCreatesAndValidatesTokens(): void
     {
         $tokenService = new TokenService;
@@ -37,11 +37,7 @@ class TokenServiceTest extends TestCase
         $this->assertSame($data, $validData);
     }
 
-    /**
+    #[Test]
-     * @test
-     *
-     * @throws \Exception
-     */
     public function tokensWithDifferentSigningKeyThrowsException(): void
     {
         $this->expectException(RequiredConstraintsViolated::class);

tests/Feature/WebMentionsControllerTest.php

@@ -8,13 +8,14 @@ use App\Jobs\ProcessWebMention;
 use App\Models\Note;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Queue;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class WebMentionsControllerTest extends TestCase
 {
     use RefreshDatabase;
 
-    /** @test */
+    #[Test]
     public function webmentionEndpointCanServeBrowserRequest(): void
     {
         $response = $this->get('/webmention');
@@ -23,9 +24,8 @@ class WebMentionsControllerTest extends TestCase
 
     /**
      * Test webmentions without source and target are rejected.
-     *
-     * @test
      */
+    #[Test]
     public function webmentionsWithoutSourceAndTargetAreRejected(): void
     {
         $response = $this->call('POST', '/webmention', ['source' => 'https://example.org/post/123']);
@@ -36,9 +36,8 @@ class WebMentionsControllerTest extends TestCase
      * Test invalid target gives a 400 response.
      *
      * In this case an invalid target is a URL that doesn’t exist on our domain.
-     *
-     * @test
      */
+    #[Test]
     public function invalidTargetReturnsErrorResponse(): void
     {
         $response = $this->call('POST', '/webmention', [
@@ -50,9 +49,8 @@ class WebMentionsControllerTest extends TestCase
 
     /**
      * Test blog target gets a 501 response due to our not supporting it.
-     *
-     * @test
      */
+    #[Test]
     public function blogTargetReturns501Response(): void
     {
         $response = $this->call('POST', '/webmention', [
@@ -64,9 +62,8 @@ class WebMentionsControllerTest extends TestCase
 
     /**
      * Test that a non-existent note gives a 400 response.
-     *
-     * @test
      */
+    #[Test]
     public function nonexistentNoteReturnsErrorResponse(): void
     {
         $response = $this->call('POST', '/webmention', [
@@ -76,7 +73,7 @@ class WebMentionsControllerTest extends TestCase
         $response->assertStatus(400);
     }
 
-    /** @test */
+    #[Test]
     public function legitimateWebmentionTriggersProcessWebmentionJob(): void
     {
         Queue::fake();

tests/Unit/ArticlesTest.php

@@ -7,13 +7,14 @@ namespace Tests\Unit;
 use App\Models\Article;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Carbon;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class ArticlesTest extends TestCase
 {
     use RefreshDatabase;
 
-    /** @test */
+    #[Test]
     public function titleSlugIsGeneratedAutomatically(): void
     {
         $article = new Article;
@@ -24,7 +25,7 @@ class ArticlesTest extends TestCase
         $this->assertEquals('my-title', $article->titleurl);
     }
 
-    /** @test */
+    #[Test]
     public function markdownContentIsConverted(): void
     {
         $article = new Article;
@@ -33,7 +34,7 @@ class ArticlesTest extends TestCase
         $this->assertEquals('<p>Some <em>markdown</em></p>' . PHP_EOL, $article->html);
     }
 
-    /** @test */
+    #[Test]
     public function weGenerateTheDifferentTimeAttributes(): void
     {
         $article = Article::create([
@@ -47,7 +48,7 @@ class ArticlesTest extends TestCase
         $this->assertEquals($article->pubdate, $article->updated_at->toRSSString());
     }
 
-    /** @test */
+    #[Test]
     public function weGenerateTheArticleLinkFromTheSlug(): void
     {
         $article = Article::create([
@@ -62,7 +63,7 @@ class ArticlesTest extends TestCase
         );
     }
 
-    /** @test */
+    #[Test]
     public function dateScopeReturnsExpectedArticles(): void
     {
         Article::factory()->create([
@@ -81,7 +82,7 @@ class ArticlesTest extends TestCase
         $this->assertCount(2, $emptyScope);
     }
 
-    /** @test */
+    #[Test]
     public function dateScopeReturnsExpectedArticlesForDecember(): void
     {
         Article::factory()->create([

tests/Unit/BookmarksTest.php

@@ -10,14 +10,15 @@ use GuzzleHttp\Client;
 use GuzzleHttp\Handler\MockHandler;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class BookmarksTest extends TestCase
 {
-    /**
+    /*
-     * @test
+     * @\test
      *
-     * @group puppeteer
+     * @\group puppeteer
      *
     public function takeScreenshotOfDuckDuckGo()
     {
@@ -25,7 +26,7 @@ class BookmarksTest extends TestCase
         $this->assertTrue(file_exists(public_path() . '/assets/img/bookmarks/' . $uuid . '.png'));
     }*/
 
-    /** @test */
+    #[Test]
     public function archiveLinkMethodCallsArchiveService(): void
     {
         $mock = new MockHandler([
@@ -38,7 +39,7 @@ class BookmarksTest extends TestCase
         $this->assertEquals('/web/1234/example.org', $url);
     }
 
-    /** @test */
+    #[Test]
     public function archiveLinkMethodThrowsAnExceptionOnError(): void
     {
         $this->expectException(InternetArchiveException::class);
@@ -52,7 +53,7 @@ class BookmarksTest extends TestCase
         (new BookmarkService)->getArchiveLink('https://example.org');
     }
 
-    /** @test */
+    #[Test]
     public function archiveLinkMethodThrowsAnExceptionIfNoLocationReturned(): void
     {
         $this->expectException(InternetArchiveException::class);

tests/Unit/HelpersTest.php

@@ -4,28 +4,27 @@ declare(strict_types=1);
 
 namespace Tests\Unit;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class HelpersTest extends TestCase
 {
-    /** @test */
+    #[Test]
     public function normalizeUrlIsIdempotent(): void
     {
         $input = 'http://example.org:80/index.php?foo=bar&baz=1';
         $this->assertEquals(normalize_url(normalize_url($input)), normalize_url($input));
     }
 
-    /**
+    #[Test]
-     * @test
+    #[DataProvider('urlProvider')]
-     *
-     * @dataProvider urlProvider
-     */
     public function normalizeUrlOnDataProvider(string $input, string $output): void
     {
         $this->assertEquals($output, normalize_url($input));
     }
 
-    /** @test */
+    #[Test]
     public function prettyPrintJson(): void
     {
         // phpcs:disable Generic.Files.LineLength.TooLong

tests/Unit/Jobs/AddClientToDatabaseJobTest.php

@@ -6,13 +6,14 @@ namespace Tests\Unit\Jobs;
 
 use App\Jobs\AddClientToDatabase;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class AddClientToDatabaseJobTest extends TestCase
 {
     use RefreshDatabase;
 
-    /** @test */
+    #[Test]
     public function clientIsAddedToDatabaseByJob(): void
     {
         $job = new AddClientToDatabase('https://example.org/client');

tests/Unit/Jobs/DownloadWebMentionJobTest.php

@@ -10,6 +10,7 @@ use GuzzleHttp\Handler\MockHandler;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;
 use Illuminate\FileSystem\FileSystem;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class DownloadWebMentionJobTest extends TestCase
@@ -23,7 +24,7 @@ class DownloadWebMentionJobTest extends TestCase
         parent::tearDown();
     }
 
-    /** @test */
+    #[Test]
     public function htmlIsSavedByJob(): void
     {
         $this->assertFileDoesNotExist(storage_path('HTML/https'));
@@ -51,7 +52,7 @@ class DownloadWebMentionJobTest extends TestCase
         $this->assertFileDoesNotExist(storage_path('HTML/https/example.org/reply') . '/1.' . date('Y-m-d') . '.backup');
     }
 
-    /** @test */
+    #[Test]
     public function htmlAndBackupSavedByJob(): void
     {
         $this->assertFileDoesNotExist(storage_path('HTML/https'));
@@ -86,7 +87,7 @@ class DownloadWebMentionJobTest extends TestCase
         $this->assertFileExists(storage_path('HTML/https/example.org/reply') . '/1.' . date('Y-m-d') . '.backup');
     }
 
-    /** @test */
+    #[Test]
     public function indexHtmlFileIsSavedByJobForUrlsEndingWithSlash(): void
     {
         $this->assertFileDoesNotExist(storage_path('HTML/https'));

tests/Unit/Jobs/ProcessBookmarkJobTest.php

@@ -11,13 +11,14 @@ use App\Models\Bookmark;
 use App\Services\BookmarkService;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Queue;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class ProcessBookmarkJobTest extends TestCase
 {
     use RefreshDatabase;
 
-    /** @test */
+    #[Test]
     public function archiveLinkIsSavedByJobAndScreenshotJobIsQueued(): void
     {
         Queue::fake();
@@ -38,7 +39,7 @@ class ProcessBookmarkJobTest extends TestCase
         Queue::assertPushed(SaveScreenshot::class);
     }
 
-    /** @test */
+    #[Test]
     public function archiveLinkSavedAsNullWhenExceptionThrown(): void
     {
         Queue::fake();

tests/Unit/Jobs/ProcessMediaJobTest.php

@@ -7,11 +7,12 @@ namespace Tests\Unit\Jobs;
 use App\Jobs\ProcessMedia;
 use Illuminate\Support\Facades\Storage;
 use Intervention\Image\ImageManager;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class ProcessMediaJobTest extends TestCase
 {
-    /** @test */
+    #[Test]
     public function nonMediaFilesAreNotSaved(): void
     {
         $manager = app()->make(ImageManager::class);
@@ -22,7 +23,7 @@ class ProcessMediaJobTest extends TestCase
         $this->assertFileDoesNotExist(storage_path('app/media/') . 'file.txt');
     }
 
-    /** @test */
+    #[Test]
     public function smallImagesAreNotResized(): void
     {
         $manager = app()->make(ImageManager::class);
@@ -37,7 +38,7 @@ class ProcessMediaJobTest extends TestCase
         Storage::disk('local')->delete('public/media');
     }
 
-    /** @test */
+    #[Test]
     public function largeImagesHaveSmallerImagesCreated(): void
     {
         $manager = app()->make(ImageManager::class);
@@ -45,16 +46,17 @@ class ProcessMediaJobTest extends TestCase
         $job = new ProcessMedia('test-image.jpg');
         $job->handle($manager);
 
-        Storage::disk('local')->assertExists('public/media/test-image.jpg');
+        // These need to look in public disk
-        Storage::disk('local')->assertExists('public/media/test-image-small.jpg');
+        Storage::disk('public')->assertExists('media/test-image.jpg');
-        Storage::disk('local')->assertExists('public/media/test-image-medium.jpg');
+        Storage::disk('public')->assertExists('media/test-image-small.jpg');
+        Storage::disk('public')->assertExists('media/test-image-medium.jpg');
 
         $this->assertFileDoesNotExist(storage_path('app/media/') . 'test-image.jpg');
 
         // Tidy up files created by the job
-        Storage::disk('local')->delete('public/media/test-image.jpg');
+        Storage::disk('public')->delete('media/test-image.jpg');
-        Storage::disk('local')->delete('public/media/test-image-small.jpg');
+        Storage::disk('public')->delete('media/test-image-small.jpg');
-        Storage::disk('local')->delete('public/media/test-image-medium.jpg');
+        Storage::disk('public')->delete('media/test-image-medium.jpg');
         $this->removeDirIfEmpty(storage_path('app/public/media'));
         $this->removeDirIfEmpty(storage_path('app/media'));
     }

tests/Unit/Jobs/ProcessWebMentionJobTest.php

@@ -17,6 +17,7 @@ use Illuminate\FileSystem\FileSystem;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Queue;
 use Jonnybarnes\WebmentionsParser\Parser;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class ProcessWebMentionJobTest extends TestCase
@@ -32,7 +33,7 @@ class ProcessWebMentionJobTest extends TestCase
         parent::tearDown();
     }
 
-    /** @test */
+    #[Test]
     public function failureGettingWebmentionThrowsAnException(): void
     {
         $this->expectException(RemoteContentNotFoundException::class);
@@ -51,7 +52,7 @@ class ProcessWebMentionJobTest extends TestCase
         $job->handle($parser, $client);
     }
 
-    /** @test */
+    #[Test]
     public function newWebmentionGetsSavedByJob(): void
     {
         Queue::fake();
@@ -83,7 +84,7 @@ class ProcessWebMentionJobTest extends TestCase
         ]);
     }
 
-    /** @test */
+    #[Test]
     public function existingWebmentionGetsUpdatedByJob(): void
     {
         Queue::fake();
@@ -120,7 +121,7 @@ class ProcessWebMentionJobTest extends TestCase
         ]);
     }
 
-    /** @test */
+    #[Test]
     public function webmentionReplyGetsDeletedWhenReplyToValueChanges(): void
     {
         $parser = new Parser;
@@ -157,7 +158,7 @@ class ProcessWebMentionJobTest extends TestCase
         ]);
     }
 
-    /** @test */
+    #[Test]
     public function webmentionLikeGetsDeletedWhenLikeOfValueChanges(): void
     {
         $parser = new Parser;
@@ -194,7 +195,7 @@ class ProcessWebMentionJobTest extends TestCase
         ]);
     }
 
-    /** @test */
+    #[Test]
     public function webmentionRepostGetsDeletedWhenRepostOfValueChanges(): void
     {
         $parser = new Parser;

tests/Unit/Jobs/SaveProfileImageJobTest.php

@@ -11,6 +11,7 @@ use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;
 use Jonnybarnes\WebmentionsParser\Authorship;
 use Jonnybarnes\WebmentionsParser\Exceptions\AuthorshipParserException;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class SaveProfileImageJobTest extends TestCase
@@ -24,7 +25,7 @@ class SaveProfileImageJobTest extends TestCase
         parent::tearDown();
     }
 
-    /** @test */
+    #[Test]
     public function authorshipAlgorithmReturnsNullOnException(): void
     {
         $mf = ['items' => []];
@@ -36,7 +37,7 @@ class SaveProfileImageJobTest extends TestCase
         $this->assertNull($job->handle($authorship));
     }
 
-    /** @test */
+    #[Test]
     public function weDoNotProcessTwitterImages(): void
     {
         $mf = ['items' => []];
@@ -54,7 +55,7 @@ class SaveProfileImageJobTest extends TestCase
         $this->assertNull($job->handle($authorship));
     }
 
-    /** @test */
+    #[Test]
     public function remoteAuthorImagesAreSavedLocally(): void
     {
         $mock = new MockHandler([
@@ -79,7 +80,7 @@ class SaveProfileImageJobTest extends TestCase
         $this->assertFileExists(public_path() . '/assets/profile-images/example.org/image');
     }
 
-    /** @test */
+    #[Test]
     public function localDefaultAuthorImageIsUsedAsFallback(): void
     {
         $mock = new MockHandler([
@@ -107,7 +108,7 @@ class SaveProfileImageJobTest extends TestCase
         );
     }
 
-    /** @test */
+    #[Test]
     public function weGetUrlFromPhotoObjectIfAltTextIsProvided(): void
     {
         $mock = new MockHandler([
@@ -135,7 +136,7 @@ class SaveProfileImageJobTest extends TestCase
         $this->assertFileExists(public_path() . '/assets/profile-images/example.org/image');
     }
 
-    /** @test */
+    #[Test]
     public function useFirstUrlIfMultipleHomepagesAreProvided(): void
     {
         $mock = new MockHandler([

tests/Unit/Jobs/SaveScreenshotJobTest.php

@@ -13,13 +13,14 @@ use GuzzleHttp\Middleware;
 use GuzzleHttp\Psr7\Response;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Storage;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class SaveScreenshotJobTest extends TestCase
 {
     use RefreshDatabase;
 
-    /** @test */
+    #[Test]
     public function screenshotIsSavedByJob(): void
     {
         Storage::fake('public');
@@ -84,7 +85,7 @@ class SaveScreenshotJobTest extends TestCase
         Storage::disk('public')->assertExists('/assets/img/bookmarks/' . $bookmark->screenshot . '.png');
     }
 
-    /** @test */
+    #[Test]
     public function screenshotJobHandlesUnfinishedTasks(): void
     {
         Storage::fake('public');

tests/Unit/Jobs/SendWebMentionJobTest.php

@@ -10,11 +10,12 @@ use GuzzleHttp\Client;
 use GuzzleHttp\Handler\MockHandler;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class SendWebMentionJobTest extends TestCase
 {
-    /** @test */
+    #[Test]
     public function discoverWebmentionEndpointOnOwnDomain(): void
     {
         $note = new Note;
@@ -23,7 +24,7 @@ class SendWebMentionJobTest extends TestCase
         $this->assertNull($job->discoverWebmentionEndpoint('/notes/tagged/test'));
     }
 
-    /** @test */
+    #[Test]
     public function discoverWebmentionEndpointFromHeaderLinks(): void
     {
         $url = 'https://example.org/webmention';
@@ -38,7 +39,7 @@ class SendWebMentionJobTest extends TestCase
         $this->assertEquals($url, $job->discoverWebmentionEndpoint('https://example.org'));
     }
 
-    /** @test */
+    #[Test]
     public function discoverWebmentionEndpointFromHtmlLinkTags(): void
     {
         $html = '<link rel="webmention" href="https://example.org/webmention">';
@@ -56,7 +57,7 @@ class SendWebMentionJobTest extends TestCase
         );
     }
 
-    /** @test */
+    #[Test]
     public function discoverWebmentionEndpointFromLegacyHtmlMarkup(): void
     {
         $html = '<link rel="http://webmention.org/" href="https://example.org/webmention">';
@@ -74,14 +75,14 @@ class SendWebMentionJobTest extends TestCase
         );
     }
 
-    /** @test */
+    #[Test]
     public function ensureEmptyNoteDoesNotTriggerAnyActions(): void
     {
         $job = new SendWebMentions(new Note);
         $this->assertNull($job->handle());
     }
 
-    /** @test */
+    #[Test]
     public function weResolveRelativeUris(): void
     {
         $uri = '/blog/post';
@@ -90,7 +91,7 @@ class SendWebMentionJobTest extends TestCase
         $this->assertEquals('https://example.org/blog/post', $job->resolveUri($uri, $base));
     }
 
-    /** @test */
+    #[Test]
     public function weSendAWebmentionForANote(): void
     {
         $html = '<link rel="http://webmention.org/" href="https://example.org/webmention">';
@@ -110,7 +111,7 @@ class SendWebMentionJobTest extends TestCase
         $this->assertTrue(true);
     }
 
-    /** @test */
+    #[Test]
     public function linksInNotesCanNotSupportWebmentions(): void
     {
         $mock = new MockHandler([

tests/Unit/Jobs/SyndicateNoteToBlueskyJobTest.php

@@ -11,13 +11,14 @@ use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Middleware;
 use GuzzleHttp\Psr7\Response;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class SyndicateNoteToBlueskyJobTest extends TestCase
 {
     use RefreshDatabase;
 
-    /** @test */
+    #[Test]
     public function weSyndicateNotesToBluesky(): void
     {
         config(['bridgy.bluesky_token' => 'test']);
@@ -38,7 +39,7 @@ class SyndicateNoteToBlueskyJobTest extends TestCase
         ]);
     }
 
-    /** @test */
+    #[Test]
     public function weSyndicateTheOriginalMarkdownToBluesky(): void
     {
         config(['bridgy.bluesky_token' => 'test']);

tests/Unit/Jobs/SyndicateNoteToMastodonJobTest.php

@@ -11,13 +11,14 @@ use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Middleware;
 use GuzzleHttp\Psr7\Response;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class SyndicateNoteToMastodonJobTest extends TestCase
 {
     use RefreshDatabase;
 
-    /** @test */
+    #[Test]
     public function weSyndicateNotesToMastodon(): void
     {
         config(['bridgy.mastodon_token' => 'test']);
@@ -38,7 +39,7 @@ class SyndicateNoteToMastodonJobTest extends TestCase
         ]);
     }
 
-    /** @test */
+    #[Test]
     public function weSyndicateTheOriginalMarkdown(): void
     {
         config(['bridgy.mastodon_token' => 'test']);

tests/Unit/LikesTest.php

@@ -6,13 +6,14 @@ namespace Tests\Unit;
 
 use App\Models\Like;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class LikesTest extends TestCase
 {
     use RefreshDatabase;
 
-    /** @test */
+    #[Test]
     public function weCanSetTheAuthorUrl(): void
     {
         $like = new Like;
@@ -20,7 +21,7 @@ class LikesTest extends TestCase
         $this->assertEquals('https://joe.bloggs', $like->author_url);
     }
 
-    /** @test */
+    #[Test]
     public function weDoNotModifyPlainTextContent(): void
     {
         $like = new Like;
@@ -31,7 +32,7 @@ class LikesTest extends TestCase
         $this->assertEquals('some plaintext content', $like->content);
     }
 
-    /** @test */
+    #[Test]
     public function weCanHandleBlankContent(): void
     {
         $like = new Like;
@@ -42,7 +43,7 @@ class LikesTest extends TestCase
         $this->assertNull($like->content);
     }
 
-    /** @test */
+    #[Test]
     public function htmlLikeContentIsFiltered(): void
     {
         $htmlEvil = <<<'HTML'

tests/Unit/MediaTest.php

@@ -7,13 +7,14 @@ namespace Tests\Unit;
 use App\Models\Media;
 use App\Models\Note;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class MediaTest extends TestCase
 {
     use RefreshDatabase;
 
-    /** @test */
+    #[Test]
     public function getTheNoteThatMediaInstanceBelongsTo(): void
     {
         $media = Media::factory()->for(Note::factory())->create();
@@ -21,7 +22,7 @@ class MediaTest extends TestCase
         $this->assertInstanceOf(Note::class, $media->note);
     }
 
-    /** @test */
+    #[Test]
     public function absoluteUrlsAreReturnedUnmodified(): void
     {
         $absoluteUrl = 'https://instagram-cdn.com/image/uuid';

tests/Unit/MicropubClientsTest.php

@@ -7,13 +7,14 @@ namespace Tests\Unit;
 use App\Models\MicropubClient;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class MicropubClientsTest extends TestCase
 {
     use RefreshDatabase;
 
-    /** @test */
+    #[Test]
     public function weCanGetNotesRelatingToClient(): void
     {
         $client = MicropubClient::factory()->make();

tests/Unit/NotesTest.php

@@ -16,6 +16,7 @@ use GuzzleHttp\Psr7\Response;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Cache;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class NotesTest extends TestCase
@@ -25,9 +26,8 @@ class NotesTest extends TestCase
     /**
      * Test the getNoteAttribute method. This will then also call the
      * relevant sub-methods.
-     *
-     * @test
      */
+    #[Test]
     public function getNoteAttributeMethodCallsSubMethods(): void
     {
         // phpcs:ignore
@@ -40,9 +40,8 @@ class NotesTest extends TestCase
 
     /**
      * Look for a default image in the contact’s h-card for the makeHCards method.
-     *
-     * @test
      */
+    #[Test]
     public function defaultImageUsedAsFallbackInMakehcardsMethod(): void
     {
         // phpcs:ignore
@@ -70,9 +69,8 @@ class NotesTest extends TestCase
 
     /**
      * Look for a specific profile image in the contact’s h-card.
-     *
-     * @test
      */
+    #[Test]
     public function specificProfileImageUsedInMakehcardsMethod(): void
     {
         Contact::factory()->create([
@@ -106,9 +104,8 @@ class NotesTest extends TestCase
 
     /**
      * Look for twitter URL when there’s no associated contact.
-     *
-     * @test
      */
+    #[Test]
     public function twitterLinkIsCreatedWhenNoContactFound(): void
     {
         $expected = '<p>Hi <a href="https://twitter.com/bob">@bob</a></p>' . PHP_EOL;
@@ -118,7 +115,7 @@ class NotesTest extends TestCase
         $this->assertEquals($expected, $note->note);
     }
 
-    /** @test */
+    #[Test]
     public function shorturlMethodReturnsExpectedValue(): void
     {
         $note = Note::factory()->make();
@@ -126,7 +123,7 @@ class NotesTest extends TestCase
         $this->assertEquals(config('url.shorturl') . '/notes/E', $note->shorturl);
     }
 
-    /** @test */
+    #[Test]
     public function weGetLatitudeLongitudeValuesOfAssociatedPlaceOfNote(): void
     {
         $place = Place::factory()->create([
@@ -140,7 +137,7 @@ class NotesTest extends TestCase
         $this->assertEquals('-2.3805', $note->longitude);
     }
 
-    /** @test */
+    #[Test]
     public function whenNoAssociatedPlaceWeGetNullForLatitudeLongitudeValues(): void
     {
         $note = Note::factory()->create();
@@ -148,7 +145,7 @@ class NotesTest extends TestCase
         $this->assertNull($note->longitude);
     }
 
-    /** @test */
+    #[Test]
     public function weCanGetAddressAttributeForAssociatedPlace(): void
     {
         $place = Place::factory()->create([
@@ -162,7 +159,7 @@ class NotesTest extends TestCase
         $this->assertEquals('The Bridgewater Pub', $note->address);
     }
 
-    /** @test */
+    #[Test]
     public function deletingNotesAlsoDeletesTagsViaTheEventObserver(): void
     {
         // first we’ll create a temporary note to delete
@@ -177,7 +174,7 @@ class NotesTest extends TestCase
         ]);
     }
 
-    /** @test */
+    #[Test]
     public function saveBlankNotesAsNull(): void
     {
         $note = new Note(['note' => '']);
@@ -185,7 +182,7 @@ class NotesTest extends TestCase
         $this->assertNull($note->note);
     }
 
-    /** @test */
+    #[Test]
     public function reverseGeocodeAnAttraction(): void
     {
         // phpcs:disable Generic.Files.LineLength.TooLong
@@ -210,7 +207,7 @@ class NotesTest extends TestCase
         );
     }
 
-    /** @test */
+    #[Test]
     public function reverseGeocodeASuburb(): void
     {
         // phpcs:disable Generic.Files.LineLength.TooLong
@@ -235,7 +232,7 @@ class NotesTest extends TestCase
         );
     }
 
-    /** @test */
+    #[Test]
     public function reverseGeocodeACity(): void
     {
         // Note I’ve modified this JSON response so it only contains the
@@ -262,7 +259,7 @@ class NotesTest extends TestCase
         );
     }
 
-    /** @test */
+    #[Test]
     public function reverseGeocodeACounty(): void
     {
         // Note I’ve removed everything below county to test for queries where
@@ -286,7 +283,7 @@ class NotesTest extends TestCase
         $this->assertEquals('<span class="p-region">Kent</span>, <span class="p-country-name">UK</span>', $address);
     }
 
-    /** @test */
+    #[Test]
     public function reverseGeocodeACountry(): void
     {
         // Note I’ve removed everything below country to test for querires where
@@ -310,7 +307,7 @@ class NotesTest extends TestCase
         $this->assertEquals('<span class="p-country-name">Ireland</span>', $address);
     }
 
-    /** @test */
+    #[Test]
     public function addImageElementToNoteContentWhenMediaAssociated(): void
     {
         $media = Media::factory()->create([
@@ -327,7 +324,7 @@ class NotesTest extends TestCase
         $this->assertEquals($expected, $note->content);
     }
 
-    /** @test */
+    #[Test]
     public function addVideoElementToNoteContentWhenMediaAssociated(): void
     {
         $media = Media::factory()->create([
@@ -344,7 +341,7 @@ class NotesTest extends TestCase
         $this->assertEquals($expected, $note->content);
     }
 
-    /** @test */
+    #[Test]
     public function addAudioElementToNoteContentWhenMediaAssociated(): void
     {
         $media = Media::factory()->create([
@@ -362,10 +359,9 @@ class NotesTest extends TestCase
     }
 
     /**
-     * @test
-     *
      * @todo Why do we need to provide text?
      */
+    #[Test]
     public function provideTextForBlankContent(): void
     {
         $note = new Note;
@@ -382,9 +378,8 @@ class NotesTest extends TestCase
 
         $this->assertNull($note->twitter);
     }*/
-
+    #[Test]
-    /** @test */
+    public function markdown_content_gets_converted(): void
-    public function markdownContentGetsConverted(): void
     {
         $note = Note::factory()->create([
             'note' => 'The best search engine? https://duckduckgo.com',
@@ -398,9 +393,8 @@ class NotesTest extends TestCase
 
     /**
      * For now, just reply on a cached object instead of actually querying Twitter.
-     *
-     * @test
      */
+    #[Test]
     public function checkInReplyToIsTwitterLink(): void
     {
         $tempContent = (object) [
@@ -415,7 +409,7 @@ class NotesTest extends TestCase
         $this->assertEquals($tempContent, $note->twitter);
     }
 
-    /** @test */
+    #[Test]
     public function latitudeAndLongitudeCanBeParsedFromPlainLocation(): void
     {
         $note = Note::factory()->create([
@@ -426,7 +420,7 @@ class NotesTest extends TestCase
         $this->assertSame(4.56, $note->longitude);
     }
 
-    /** @test */
+    #[Test]
     public function addressAttributeCanBeRetrievedFromPlainLocation(): void
     {
         Cache::put('1.23,4.56', '<span class="p-country-name">Antarctica</span>');
@@ -438,7 +432,7 @@ class NotesTest extends TestCase
         $this->assertSame('<span class="p-country-name">Antarctica</span>', $note->address);
     }
 
-    /** @test */
+    #[Test]
     public function mastodonUsernamesAreParsedCorrectly(): void
     {
         $expected = '<p>Hi <a href="https://phpc.social/@freekmurze">@freekmurze@phpc.social</a> how are you?</p>' . PHP_EOL;

tests/Unit/PlacesTest.php

@@ -10,13 +10,14 @@ use App\Services\PlaceService;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use InvalidArgumentException;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class PlacesTest extends TestCase
 {
     use RefreshDatabase;
 
-    /** @test */
+    #[Test]
     public function canRetrieveAssociatedNotes(): void
     {
         $place = Place::factory()->create();
@@ -27,7 +28,7 @@ class PlacesTest extends TestCase
         $this->assertCount(5, $place->notes);
     }
 
-    /** @test */
+    #[Test]
     public function nearMethodReturnsCollection(): void
     {
         Place::factory()->create([
@@ -39,7 +40,7 @@ class PlacesTest extends TestCase
         $this->assertEquals('the-bridgewater-pub', $nearby[0]->slug);
     }
 
-    /** @test */
+    #[Test]
     public function getLongurl(): void
     {
         $place = Place::factory()->create([
@@ -48,7 +49,7 @@ class PlacesTest extends TestCase
         $this->assertEquals(config('app.url') . '/places/the-bridgewater-pub', $place->longurl);
     }
 
-    /** @test */
+    #[Test]
     public function getShorturl()
     {
         $place = Place::factory()->create([
@@ -57,7 +58,7 @@ class PlacesTest extends TestCase
         $this->assertEquals(config('url.shorturl') . '/places/the-bridgewater-pub', $place->shorturl);
     }
 
-    /** @test */
+    #[Test]
     public function getUri(): void
     {
         $place = Place::factory()->create([
@@ -66,7 +67,7 @@ class PlacesTest extends TestCase
         $this->assertEquals(config('app.url') . '/places/the-bridgewater-pub', $place->uri);
     }
 
-    /** @test */
+    #[Test]
     public function placeServiceReturnsExistingPlaceBasedOnExternalUrlsSearch(): void
     {
         Place::factory(10)->create();
@@ -86,7 +87,7 @@ class PlacesTest extends TestCase
         $this->assertCount(11, Place::all());
     }
 
-    /** @test */
+    #[Test]
     public function placeServiceRequiresNameWhenCreatingNewPlace(): void
     {
         $this->expectException(InvalidArgumentException::class);
@@ -96,7 +97,7 @@ class PlacesTest extends TestCase
         $service->createPlaceFromCheckin(['foo' => 'bar']);
     }
 
-    /** @test */
+    #[Test]
     public function placeServiceRequiresLatitudeWhenCreatingNewPlace(): void
     {
         $this->expectException(InvalidArgumentException::class);
@@ -106,7 +107,7 @@ class PlacesTest extends TestCase
         $service->createPlaceFromCheckin(['properties' => ['name' => 'bar']]);
     }
 
-    /** @test */
+    #[Test]
     public function placeServiceCanUpdateExternalUrls(): void
     {
         $place = Place::factory()->create([

tests/Unit/TagsTest.php

@@ -8,13 +8,15 @@ use App\Models\Bookmark;
 use App\Models\Note;
 use App\Models\Tag;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class TagsTest extends TestCase
 {
     use RefreshDatabase;
 
-    /** @test */
+    #[Test]
     public function canGetAssociatedNotes(): void
     {
         $note = Note::factory()->create();
@@ -23,7 +25,7 @@ class TagsTest extends TestCase
         $this->assertCount(1, $tag->notes);
     }
 
-    /** @test */
+    #[Test]
     public function canGetAssociatedBookmarks(): void
     {
         $bookmark = Bookmark::factory()->create();
@@ -32,11 +34,8 @@ class TagsTest extends TestCase
         $this->assertCount(1, $tag->bookmarks);
     }
 
-    /**
+    #[Test]
-     * @test
+    #[DataProvider('tagsProvider')]
-     *
-     * @dataProvider tagsProvider
-     */
     public function canNormalize(string $input, string $expected): void
     {
         $this->assertSame($expected, Tag::normalize($input));