.env.example

@@ -12,9 +12,7 @@ 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
 
@@ -41,7 +39,7 @@ FILESYSTEM_DISK=local
 QUEUE_CONNECTION=database
 
 CACHE_STORE=database
-# CACHE_PREFIX=
+CACHE_PREFIX=
 
 MEMCACHED_HOST=127.0.0.1
 
@@ -51,7 +49,6 @@ 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/Jobs/ProcessMedia.php

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

composer.json

@@ -1,8 +1,7 @@
 {
-    "$schema": "https://getcomposer.org/schema.json",
     "name": "jonnybarnes/jonnybarnes.uk",
     "type": "project",
-    "description": "The code for jonnybarnes.uk, based on Laravel 11",
+    "description": "The code for jonnybarnes.uk, based on Laravel 10",
     "keywords": ["laravel", "framework", "indieweb"],
     "license": "CC0-1.0",
     "require": {
@@ -12,14 +11,14 @@
         "ext-json": "*",
         "ext-pgsql": "*",
         "ext-sodium": "*",
-        "cviebrock/eloquent-sluggable": "^12.0",
+        "cviebrock/eloquent-sluggable": "^11.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": "^12.0",
+        "laravel/framework": "^11.0",
         "laravel/horizon": "^5.0",
         "laravel/sanctum": "^4.0",
         "laravel/scout": "^10.1",
@@ -41,15 +40,16 @@
         "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": "^11.0",
+        "phpunit/php-code-coverage": "^10.0",
-        "phpunit/phpunit": "^11.0",
+        "phpunit/phpunit": "^10.1",
-        "spatie/laravel-ray": "^1.12"
+        "psalm/plugin-laravel": "^2.8",
+        "spatie/laravel-ray": "^1.12",
+        "vimeo/psalm": "^5.0"
     },
     "autoload": {
         "psr-4": {
@@ -78,13 +78,7 @@
             "@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' => 'UTC',
+    'timezone' => env('APP_TIMEZONE', 'UTC'),
 
     /*
     |--------------------------------------------------------------------------

config/database.php

@@ -37,9 +37,6 @@ 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' => [
@@ -148,7 +145,6 @@ 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/filesystems.php

@@ -32,10 +32,8 @@ return [
 
         'local' => [
             'driver' => 'local',
-            'root' => storage_path('app/private'),
+            'root' => storage_path('app'),
-            'serve' => true,
             'throw' => false,
-            'report' => false,
         ],
 
         'public' => [
@@ -44,7 +42,6 @@ return [
             'url' => env('APP_URL').'/storage',
             'visibility' => 'public',
             'throw' => false,
-            'report' => false,
         ],
 
         's3' => [
@@ -57,7 +54,6 @@ 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', parse_url(env('APP_URL', 'http://localhost'), PHP_URL_HOST)),
+            'local_domain' => env('MAIL_EHLO_DOMAIN'),
         ],
 
         'ses' => [

config/session.php

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

package-lock.json

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

public/index.php

@@ -1,20 +1,55 @@
 <?php
 
-use Illuminate\Foundation\Application;
+use Illuminate\Contracts\Http\Kernel;
 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';
 
-$app->handleRequest(Request::capture());
+$kernel = $app->make(Kernel::class);
+
+$response = $kernel->handle(
+    $request = Request::capture()
+)->send();
+
+$kernel->terminate($request, $response);

scripts/compress.sh

@@ -1,41 +1,13 @@
 #!/usr/bin/env zsh
 
-if ! (( $+commands[fd] )) &> /dev/null; then
+if ! type fd &> /dev/null; then
     echo "fd not installed"
     exit 1
 fi
 
-if ! (( $+commands[brotli] )) &> /dev/null; then
+if ! type brotli &> /dev/null; then
     echo "brotli not installed"
     exit 1
 fi
 
-if ! (( $+commands[zstd] )) &> /dev/null; then
+fd -e css -e js --search-path ./public/assets --type f -x brotli --force --best --output={}.br {}
-    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 test_basic_example()
+    public function testBasicExample()
     {
         $this->browse(function (Browser $browser) {
             $browser->visit('/')

tests/Feature/Admin/AdminHomeControllerTest.php

@@ -6,14 +6,13 @@ 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,26 +5,25 @@ 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', [
@@ -34,7 +33,7 @@ class AdminTest extends TestCase
         $response->assertRedirect('/login');
     }
 
-    #[Test]
+    /** @test */
     public function loginSucceeds(): void
     {
         User::factory([
@@ -50,7 +49,7 @@ class AdminTest extends TestCase
         $response->assertRedirect('/admin');
     }
 
-    #[Test]
+    /** @test */
     public function whenLoggedInRedirectsToAdminPage(): void
     {
         $user = User::factory()->create();
@@ -58,14 +57,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();
@@ -73,7 +72,7 @@ class AdminTest extends TestCase
         $response->assertViewIs('logout');
     }
 
-    #[Test]
+    /** @test */
     public function loggedInUsersCanLogout(): void
     {
         $user = User::factory()->create();

tests/Feature/Admin/ArticlesTest.php

@@ -9,14 +9,13 @@ 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();
@@ -26,7 +25,7 @@ class ArticlesTest extends TestCase
         $response->assertSeeText('Select article to edit:');
     }
 
-    #[Test]
+    /** @test */
     public function adminCanLoadFormToCreateArticle(): void
     {
         $user = User::factory()->make();
@@ -36,7 +35,7 @@ class ArticlesTest extends TestCase
         $response->assertSeeText('Title (URL)');
     }
 
-    #[Test]
+    /** @test */
     public function admiNCanCreateNewArticle(): void
     {
         $user = User::factory()->make();
@@ -49,7 +48,7 @@ class ArticlesTest extends TestCase
         $this->assertDatabaseHas('articles', ['title' => 'Test Title']);
     }
 
-    #[Test]
+    /** @test */
     public function adminCanCreateNewArticleWithFile(): void
     {
         $user = User::factory()->make();
@@ -74,7 +73,7 @@ class ArticlesTest extends TestCase
         ]);
     }
 
-    #[Test]
+    /** @test */
     public function articleCanLoadFormToEditArticle(): void
     {
         $user = User::factory()->make();
@@ -87,7 +86,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();
@@ -105,7 +104,7 @@ class ArticlesTest extends TestCase
         ]);
     }
 
-    #[Test]
+    /** @test */
     public function adminCanDeleteArticle(): void
     {
         $user = User::factory()->make();

tests/Feature/Admin/BioTest.php

@@ -7,14 +7,13 @@ 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();
@@ -24,7 +23,7 @@ class BioTest extends TestCase
         $response->assertSeeText('Edit bio');
     }
 
-    #[Test]
+    /** @test */
     public function adminCanCreateBio(): void
     {
         $user = User::factory()->make();
@@ -37,7 +36,7 @@ class BioTest extends TestCase
         $this->assertDatabaseHas('bios', ['content' => 'Bio content']);
     }
 
-    #[Test]
+    /** @test */
     public function adminCanLoadExistingBio(): void
     {
         $user = User::factory()->make();
@@ -50,7 +49,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,14 +7,13 @@ 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();
@@ -24,7 +23,7 @@ class ClientsTest extends TestCase
         $response->assertSeeText('Clients');
     }
 
-    #[Test]
+    /** @test */
     public function adminCanLoadFormToCreateClient(): void
     {
         $user = User::factory()->make();
@@ -34,7 +33,7 @@ class ClientsTest extends TestCase
         $response->assertSeeText('New Client');
     }
 
-    #[Test]
+    /** @test */
     public function adminCanCreateNewClient(): void
     {
         $user = User::factory()->make();
@@ -50,7 +49,7 @@ class ClientsTest extends TestCase
         ]);
     }
 
-    #[Test]
+    /** @test */
     public function adminCanLoadEditFormForClient(): void
     {
         $user = User::factory()->make();
@@ -63,7 +62,7 @@ class ClientsTest extends TestCase
         $response->assertSee('https://jbl5.dev/notes/new');
     }
 
-    #[Test]
+    /** @test */
     public function adminCanEditClient(): void
     {
         $user = User::factory()->make();
@@ -81,7 +80,7 @@ class ClientsTest extends TestCase
         ]);
     }
 
-    #[Test]
+    /** @test */
     public function adminCanDeleteClient(): void
     {
         $user = User::factory()->make();

tests/Feature/Admin/ContactsTest.php

@@ -12,7 +12,6 @@ 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
@@ -28,7 +27,7 @@ class ContactsTest extends TestCase
         parent::tearDown();
     }
 
-    #[Test]
+    /** @test */
     public function contactIndexPageLoads(): void
     {
         $user = User::factory()->make();
@@ -37,7 +36,7 @@ class ContactsTest extends TestCase
         $response->assertViewIs('admin.contacts.index');
     }
 
-    #[Test]
+    /** @test */
     public function contactCreatePageLoads(): void
     {
         $user = User::factory()->make();
@@ -46,7 +45,7 @@ class ContactsTest extends TestCase
         $response->assertViewIs('admin.contacts.create');
     }
 
-    #[Test]
+    /** @test */
     public function adminCanCreateNewContact(): void
     {
         $user = User::factory()->make();
@@ -63,7 +62,7 @@ class ContactsTest extends TestCase
         ]);
     }
 
-    #[Test]
+    /** @test */
     public function adminCanSeeFormToEditContact(): void
     {
         $user = User::factory()->make();
@@ -73,7 +72,7 @@ class ContactsTest extends TestCase
         $response->assertViewIs('admin.contacts.edit');
     }
 
-    #[Test]
+    /** @test */
     public function adminCanUpdateContact(): void
     {
         $user = User::factory()->make();
@@ -92,7 +91,7 @@ class ContactsTest extends TestCase
         ]);
     }
 
-    #[Test]
+    /** @test */
     public function adminCanEditContactAndUploadAvatar(): void
     {
         copy(__DIR__ . '/../../aaron.png', sys_get_temp_dir() . '/tantek.png');
@@ -115,7 +114,7 @@ class ContactsTest extends TestCase
         );
     }
 
-    #[Test]
+    /** @test */
     public function adminCanDeleteContact(): void
     {
         $user = User::factory()->make();
@@ -133,7 +132,7 @@ class ContactsTest extends TestCase
         ]);
     }
 
-    #[Test]
+    /** @test */
     public function adminCanTriggerRetrievalOfRemoteAvatar(): void
     {
         $html = <<<'HTML'
@@ -162,7 +161,7 @@ class ContactsTest extends TestCase
         );
     }
 
-    #[Test]
+    /** @test */
     public function gettingRemoteAvatarFailsGracefullyWithRemoteNotFound(): void
     {
         $mock = new MockHandler([
@@ -179,7 +178,7 @@ class ContactsTest extends TestCase
         $response->assertRedirect('/admin/contacts/' . $contact->id . '/edit');
     }
 
-    #[Test]
+    /** @test */
     public function gettingRemoteAvatarFailsGracefullyWithRemoteError(): void
     {
         $html = <<<'HTML'
@@ -202,7 +201,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,14 +9,13 @@ 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();
@@ -26,7 +25,7 @@ class LikesTest extends TestCase
         $response->assertSeeText('Likes');
     }
 
-    #[Test]
+    /** @test */
     public function likeCreateFormLoads(): void
     {
         $user = User::factory()->make();
@@ -36,7 +35,7 @@ class LikesTest extends TestCase
         $response->assertSeeText('New Like');
     }
 
-    #[Test]
+    /** @test */
     public function adminCanCreateLike(): void
     {
         Queue::fake();
@@ -52,7 +51,7 @@ class LikesTest extends TestCase
         Queue::assertPushed(ProcessLike::class);
     }
 
-    #[Test]
+    /** @test */
     public function likeEditFormLoads(): void
     {
         $user = User::factory()->make();
@@ -63,7 +62,7 @@ class LikesTest extends TestCase
         $response->assertSee('Edit Like');
     }
 
-    #[Test]
+    /** @test */
     public function adminCanEditLike(): void
     {
         Queue::fake();
@@ -81,7 +80,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,14 +9,13 @@ 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();
@@ -25,7 +24,7 @@ class NotesTest extends TestCase
         $response->assertViewIs('admin.notes.index');
     }
 
-    #[Test]
+    /** @test */
     public function noteCreatePageLoads(): void
     {
         $user = User::factory()->make();
@@ -34,7 +33,7 @@ class NotesTest extends TestCase
         $response->assertViewIs('admin.notes.create');
     }
 
-    #[Test]
+    /** @test */
     public function adminCanCreateNewNote(): void
     {
         $user = User::factory()->make();
@@ -48,7 +47,7 @@ class NotesTest extends TestCase
         ]);
     }
 
-    #[Test]
+    /** @test */
     public function noteEditFormLoads(): void
     {
         $user = User::factory()->make();
@@ -58,7 +57,7 @@ class NotesTest extends TestCase
         $response->assertViewIs('admin.notes.edit');
     }
 
-    #[Test]
+    /** @test */
     public function adminCanEditNote(): void
     {
         Queue::fake();
@@ -77,7 +76,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,14 +7,13 @@ 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();
@@ -23,7 +22,7 @@ class PlacesTest extends TestCase
         $response->assertViewIs('admin.places.index');
     }
 
-    #[Test]
+    /** @test */
     public function createPlacePageLoads(): void
     {
         $user = User::factory()->make();
@@ -32,7 +31,7 @@ class PlacesTest extends TestCase
         $response->assertViewIs('admin.places.create');
     }
 
-    #[Test]
+    /** @test */
     public function adminCanCreateNewPlace(): void
     {
         $user = User::factory()->make();
@@ -49,7 +48,7 @@ class PlacesTest extends TestCase
         ]);
     }
 
-    #[Test]
+    /** @test */
     public function editPlacePageLoads(): void
     {
         $user = User::factory()->make();
@@ -59,7 +58,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,21 +7,20 @@ 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();
@@ -29,7 +28,7 @@ class ArticlesTest extends TestCase
         $response->assertViewIs('articles.show');
     }
 
-    #[Test]
+    /** @test */
     public function wrongDateInUrlRedirectsToCorrectDate()
     {
         $article = Article::factory()->create();
@@ -37,7 +36,7 @@ class ArticlesTest extends TestCase
         $response->assertRedirect('/blog/' . date('Y') . '/' . date('m') . '/' . $article->titleurl);
     }
 
-    #[Test]
+    /** @test */
     public function oldUrlsWithIdAreRedirected()
     {
         $article = Article::factory()->create();
@@ -46,21 +45,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,7 +8,6 @@ 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;
 
@@ -16,14 +15,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();
@@ -31,7 +30,7 @@ class BookmarksTest extends TestCase
         $response->assertViewIs('bookmarks.show');
     }
 
-    #[Test]
+    /** @test */
     public function whenBookmarkIsAddedUsingHttpSyntaxCheckJobToTakeScreenshotIsInvoked(): void
     {
         Queue::fake();
@@ -49,7 +48,7 @@ class BookmarksTest extends TestCase
         $this->assertDatabaseHas('bookmarks', ['url' => 'https://example.org/blog-post']);
     }
 
-    #[Test]
+    /** @test */
     public function whenBookmarkIsAddedUsingJsonSyntaxCheckJobToTakeScreenshotIsInvoked(): void
     {
         Queue::fake();
@@ -69,7 +68,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,7 +6,6 @@ namespace Tests\Feature;
 
 use App\Models\Contact;
 use Illuminate\Foundation\Testing\RefreshDatabase;
-use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class ContactsTest extends TestCase
@@ -15,8 +14,9 @@ class ContactsTest extends TestCase
 
     /**
      * Check the `/contacts` page gives a good response.
+     *
+     * @test
      */
-    #[Test]
     public function contactsPageLoadsWithoutError(): void
     {
         $response = $this->get('/contacts');
@@ -25,8 +25,9 @@ class ContactsTest extends TestCase
 
     /**
      * Test an individual contact page with default profile image.
+     *
+     * @test
      */
-    #[Test]
     public function contactPageShouldFallbackToDefaultProfilePic(): void
     {
         Contact::factory()->create([
@@ -38,8 +39,9 @@ class ContactsTest extends TestCase
 
     /**
      * Test an individual contact page with a specific profile image.
+     *
+     * @test
      */
-    #[Test]
     public function contactPageShouldUseSpecificProfilePicIfPresent(): void
     {
         Contact::factory()->create([
@@ -50,7 +52,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,7 +4,6 @@ declare(strict_types=1);
 
 namespace Tests\Feature;
 
-use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 use Tests\TestToken;
 
@@ -12,7 +11,7 @@ class CorsHeadersTest extends TestCase
 {
     use TestToken;
 
-    #[Test]
+    /** @test */
     public function checkCorsHeadersOnMediaEndpoint(): void
     {
         $response = $this->call(
@@ -26,7 +25,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,7 +8,6 @@ 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
@@ -17,8 +16,9 @@ class FeedsTest extends TestCase
 
     /**
      * Test the blog RSS feed.
+     *
+     * @test
      */
-    #[Test]
     public function blogRssFeedIsPresent(): void
     {
         Article::factory()->count(3)->create();
@@ -29,8 +29,9 @@ class FeedsTest extends TestCase
 
     /**
      * Test the notes RSS feed.
+     *
+     * @test
      */
-    #[Test]
     public function notesRssFeedIsPresent(): void
     {
         Note::factory()->count(3)->create();
@@ -41,8 +42,9 @@ class FeedsTest extends TestCase
 
     /**
      * Test the blog RSS feed.
+     *
+     * @test
      */
-    #[Test]
     public function blogAtomFeedIsPresent(): void
     {
         Article::factory()->count(3)->create();
@@ -51,7 +53,7 @@ class FeedsTest extends TestCase
         $response->assertOk();
     }
 
-    #[Test]
+    /** @test */
     public function blogJf2FeedIsPresent(): void
     {
         Article::factory()->count(3)->create();
@@ -75,8 +77,9 @@ class FeedsTest extends TestCase
 
     /**
      * Test the notes RSS feed.
+     *
+     * @test
      */
-    #[Test]
     public function notesAtomFeedIsPresent(): void
     {
         Note::factory()->count(3)->create();
@@ -87,8 +90,9 @@ class FeedsTest extends TestCase
 
     /**
      * Test the blog JSON feed.
+     *
+     * @test
      */
-    #[Test]
     public function blogJsonFeedIsPresent(): void
     {
         Article::factory()->count(3)->create();
@@ -99,8 +103,9 @@ class FeedsTest extends TestCase
 
     /**
      * Test the notes JSON feed.
+     *
+     * @test
      */
-    #[Test]
     public function notesJsonFeedIsPresent(): void
     {
         Note::factory()->count(3)->create();
@@ -109,7 +114,7 @@ class FeedsTest extends TestCase
         $response->assertOk();
     }
 
-    #[Test]
+    /** @test */
     public function notesJf2FeedIsPresent(): void
     {
         Note::factory()->count(3)->create();
@@ -134,8 +139,9 @@ 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();
@@ -155,7 +161,7 @@ class FeedsTest extends TestCase
         }
     }
 
-    #[Test]
+    /** @test */
     public function jsonNoteFeedLoadsPlaceDataWithoutLazyLoading(): void
     {
         $place = Place::factory()->create();

tests/Feature/FrontPageTest.php

@@ -7,14 +7,13 @@ 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/LikesTest.php

@@ -14,7 +14,6 @@ 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;
 
@@ -23,14 +22,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();
@@ -38,7 +37,7 @@ class LikesTest extends TestCase
         $response->assertViewIs('likes.show');
     }
 
-    #[Test]
+    /** @test */
     public function checkLikeCreatedFromMicropubApiRequests(): void
     {
         Queue::fake();
@@ -58,7 +57,7 @@ class LikesTest extends TestCase
         $this->assertDatabaseHas('likes', ['url' => 'https://example.org/blog-post']);
     }
 
-    #[Test]
+    /** @test */
     public function checkLikeCreatedFromMicropubWebRequests(): void
     {
         Queue::fake();
@@ -76,7 +75,7 @@ class LikesTest extends TestCase
         $this->assertDatabaseHas('likes', ['url' => 'https://example.org/blog-post']);
     }
 
-    #[Test]
+    /** @test */
     public function likeWithSimpleAuthor(): void
     {
         $like = new Like;
@@ -115,7 +114,7 @@ class LikesTest extends TestCase
         $this->assertEquals('Fred Bloggs', Like::find($id)->author_name);
     }
 
-    #[Test]
+    /** @test */
     public function likeWithHCard(): void
     {
         $like = new Like;
@@ -158,7 +157,7 @@ class LikesTest extends TestCase
         $this->assertEquals('Fred Bloggs', Like::find($id)->author_name);
     }
 
-    #[Test]
+    /** @test */
     public function likeWithoutMicroformats(): void
     {
         $like = new Like;
@@ -194,7 +193,7 @@ class LikesTest extends TestCase
         $this->assertNull(Like::find($id)->author_name);
     }
 
-    #[Test]
+    /** @test */
     public function likeThatIsATweet(): void
     {
         $like = new Like;
@@ -220,9 +219,10 @@ class LikesTest extends TestCase
             'author_url' => 'https://twitter.com/jonnybarnes',
             'html' => '<div>HTML of the tweet embed</div>',
         ];
-        $codebirdMock = $this->createPartialMock(Codebird::class, ['__call']);
+        $codebirdMock = $this->getMockBuilder(Codebird::class)
-        $codebirdMock->method('__call')
+            ->addMethods(['statuses_oembed'])
-            ->with('statuses_oembed', $this->anything())
+            ->getMock();
+        $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,9 +257,10 @@ class LikesTest extends TestCase
             'author_url' => 'https://twitter.com/jonnybarnes',
             'html' => '<div>HTML of the tweet embed</div>',
         ];
-        $codebirdMock = $this->createPartialMock(Codebird::class, ['__call']);
+        $codebirdMock = $this->getMockBuilder(Codebird::class)
-        $codebirdMock->method('__call')
+            ->addMethods(['statuses_oembed'])
-            ->with('statuses_oembed', $this->anything())
+            ->getMock();
+        $codebirdMock->method('statuses_oembed')
             ->willReturn($info);
         $this->app->instance(Codebird::class, $codebirdMock);
 
@@ -270,7 +271,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,7 +15,6 @@ 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;
 
@@ -24,7 +23,7 @@ class MicropubControllerTest extends TestCase
     use RefreshDatabase;
     use TestToken;
 
-    #[Test]
+    /** @test */
     public function micropubGetRequestWithoutTokenReturnsErrorResponse(): void
     {
         $response = $this->get('/api/post');
@@ -32,7 +31,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']);
@@ -43,8 +42,9 @@ 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,6 +80,8 @@ class MicropubControllerTest extends TestCase
     }
 
     /**
+     * @test
+     *
      * @todo Add uncertainty parameter
      *
     public function micropubClientsCanRequestKnownNearbyPlacesWithUncertaintyParameter(): void
@@ -87,21 +89,22 @@ 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();
@@ -120,7 +123,7 @@ class MicropubControllerTest extends TestCase
         $this->assertDatabaseHas('notes', ['note' => $note]);
     }
 
-    #[Test]
+    /** @test */
     public function micropubClientCanRequestTheNewNoteIsSyndicatedToMastodonAndBluesky(): void
     {
         Queue::fake();
@@ -154,7 +157,7 @@ class MicropubControllerTest extends TestCase
         Queue::assertPushed(SyndicateNoteToBluesky::class);
     }
 
-    #[Test]
+    /** @test */
     public function micropubClientsCanCreateNewPlaces(): void
     {
         $response = $this->post(
@@ -170,7 +173,7 @@ class MicropubControllerTest extends TestCase
         $this->assertDatabaseHas('places', ['slug' => 'the-barton-arms']);
     }
 
-    #[Test]
+    /** @test */
     public function micropubClientsCanCreateNewPlacesWithOldLocationSyntax(): void
     {
         $response = $this->post(
@@ -187,7 +190,7 @@ class MicropubControllerTest extends TestCase
         $this->assertDatabaseHas('places', ['slug' => 'the-barton-arms']);
     }
 
-    #[Test]
+    /** @test */
     public function micropubClientWebRequestWithInvalidTokenReturnsErrorResponse(): void
     {
         $response = $this->post(
@@ -202,7 +205,7 @@ class MicropubControllerTest extends TestCase
         $response->assertJson(['error' => 'invalid_token']);
     }
 
-    #[Test]
+    /** @test */
     public function micropubClientWebRequestWithTokenWithoutAnyScopesReturnsErrorResponse(): void
     {
         $response = $this->post(
@@ -217,7 +220,7 @@ class MicropubControllerTest extends TestCase
         $response->assertJson(['error_description' => 'The provided token has no scopes']);
     }
 
-    #[Test]
+    /** @test */
     public function micropubClientWebRequestWithTokenWithoutCreateScopesReturnsErrorResponse(): void
     {
         $response = $this->post(
@@ -235,8 +238,9 @@ class MicropubControllerTest extends TestCase
 
     /**
      * Test a valid micropub requests using JSON syntax creates a new note.
+     *
+     * @test
      */
-    #[Test]
     public function micropubClientApiRequestCreatesNewNote(): void
     {
         Queue::fake();
@@ -282,8 +286,9 @@ 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;
@@ -312,8 +317,9 @@ 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();
@@ -347,8 +353,9 @@ 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();
@@ -380,8 +387,9 @@ 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();
@@ -406,8 +414,9 @@ 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();
@@ -430,7 +439,7 @@ class MicropubControllerTest extends TestCase
             ->assertStatus(401);
     }
 
-    #[Test]
+    /** @test */
     public function micropubClientApiRequestForUnsupportedPostTypeReturnsError(): void
     {
         $response = $this->postJson(
@@ -451,7 +460,7 @@ class MicropubControllerTest extends TestCase
             ->assertStatus(500);
     }
 
-    #[Test]
+    /** @test */
     public function micropubClientApiRequestCreatesNewPlace(): void
     {
         $faker = Factory::create();
@@ -471,7 +480,7 @@ class MicropubControllerTest extends TestCase
             ->assertStatus(201);
     }
 
-    #[Test]
+    /** @test */
     public function micropubClientApiRequestCreatesNewPlaceWithUncertaintyParameter(): void
     {
         $faker = Factory::create();
@@ -491,7 +500,7 @@ class MicropubControllerTest extends TestCase
             ->assertStatus(201);
     }
 
-    #[Test]
+    /** @test */
     public function micropubClientApiRequestUpdatesExistingNote(): void
     {
         $note = Note::factory()->create();
@@ -511,7 +520,7 @@ class MicropubControllerTest extends TestCase
             ->assertStatus(200);
     }
 
-    #[Test]
+    /** @test */
     public function micropubClientApiRequestUpdatesNoteSyndicationLinks(): void
     {
         $note = Note::factory()->create();
@@ -538,7 +547,7 @@ class MicropubControllerTest extends TestCase
         ]);
     }
 
-    #[Test]
+    /** @test */
     public function micropubClientApiRequestAddsImageToNote(): void
     {
         $note = Note::factory()->create();
@@ -561,7 +570,7 @@ class MicropubControllerTest extends TestCase
         ]);
     }
 
-    #[Test]
+    /** @test */
     public function micropubClientApiRequestReturnsErrorTryingToUpdateNonNoteModel(): void
     {
         $response = $this->postJson(
@@ -580,7 +589,7 @@ class MicropubControllerTest extends TestCase
             ->assertStatus(500);
     }
 
-    #[Test]
+    /** @test */
     public function micropubClientApiRequestReturnsErrorTryingToUpdateNonExistingNote(): void
     {
         $response = $this->postJson(
@@ -599,7 +608,7 @@ class MicropubControllerTest extends TestCase
             ->assertStatus(404);
     }
 
-    #[Test]
+    /** @test */
     public function micropubClientApiRequestReturnsErrorWhenTryingToUpdateUnsupportedProperty(): void
     {
         $note = Note::factory()->create();
@@ -619,7 +628,7 @@ class MicropubControllerTest extends TestCase
             ->assertStatus(500);
     }
 
-    #[Test]
+    /** @test */
     public function micropubClientApiRequestWithTokenWithInsufficientScopeReturnsError(): void
     {
         $response = $this->postJson(
@@ -638,7 +647,7 @@ class MicropubControllerTest extends TestCase
             ->assertJson(['error' => 'insufficient_scope']);
     }
 
-    #[Test]
+    /** @test */
     public function micropubClientApiRequestCanReplaceNoteSyndicationTargets(): void
     {
         $note = Note::factory()->create();
@@ -665,7 +674,7 @@ class MicropubControllerTest extends TestCase
         ]);
     }
 
-    #[Test]
+    /** @test */
     public function micropubClientWebRequestCanEncodeTokenWithinTheForm(): void
     {
         $faker = Factory::create();
@@ -683,7 +692,7 @@ class MicropubControllerTest extends TestCase
         $this->assertDatabaseHas('notes', ['note' => $note]);
     }
 
-    #[Test]
+    /** @test */
     public function micropubClientApiRequestCreatesArticlesWhenItIncludesTheNameProperty(): void
     {
         $faker = Factory::create();

tests/Feature/MicropubMediaTest.php

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

tests/Feature/NotesControllerTest.php

@@ -6,7 +6,6 @@ namespace Tests\Feature;
 
 use App\Models\Note;
 use Illuminate\Foundation\Testing\RefreshDatabase;
-use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class NotesControllerTest extends TestCase
@@ -16,8 +15,9 @@ 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,8 +26,9 @@ class NotesControllerTest extends TestCase
 
     /**
      * Test a specific note.
+     *
+     * @test
      */
-    #[Test]
     public function specificNotePageLoads(): void
     {
         $note = Note::factory()->create();
@@ -45,8 +46,9 @@ class NotesControllerTest extends TestCase
 
     /**
      * Test that `/note/{decID}` redirects to `/notes/{nb60id}`.
+     *
+     * @test
      */
-    #[Test]
     public function oldNoteUrlsRedirect(): void
     {
         $note = Note::factory()->create();
@@ -56,22 +58,23 @@ 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,7 +6,6 @@ namespace Tests\Feature;
 
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Carbon;
-use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 use Tests\TestToken;
 
@@ -15,7 +14,7 @@ class OwnYourGramTest extends TestCase
     use RefreshDatabase;
     use TestToken;
 
-    #[Test]
+    /** @test */
     public function postingInstagramUrlSavesMediaPath(): void
     {
         $response = $this->json(

tests/Feature/ParseCachedWebMentionsTest.php

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

tests/Feature/ReDownloadWebMentionsTest.php

@@ -9,14 +9,13 @@ 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,12 +5,11 @@ 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,33 +4,32 @@ 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,7 +8,6 @@ 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;
 
@@ -19,8 +18,9 @@ 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,8 +66,9 @@ 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();
@@ -108,8 +109,9 @@ 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();
@@ -148,7 +150,7 @@ class SwarmTest extends TestCase
         Queue::assertPushed(SendWebMentions::class);
     }
 
-    #[Test]
+    /** @test */
     public function mockedOwnyourswarmRequestWithNoTextContent(): void
     {
         $response = $this->json(
@@ -185,7 +187,7 @@ class SwarmTest extends TestCase
         $this->get($response->__get('headers')->get('location'))->assertSee('📍');
     }
 
-    #[Test]
+    /** @test */
     public function mockedOwnyourswarmRequestSavesJustThePostWhenAnErrorOccursInTheCheckinData(): void
     {
         Queue::fake();
@@ -223,7 +225,7 @@ class SwarmTest extends TestCase
         Queue::assertPushed(SendWebMentions::class);
     }
 
-    #[Test]
+    /** @test */
     public function mockedOwnyourswarmRequestWithHAdrLocation(): void
     {
         Queue::fake();
@@ -269,7 +271,7 @@ class SwarmTest extends TestCase
         Queue::assertPushed(SendWebMentions::class);
     }
 
-    #[Test]
+    /** @test */
     public function ownyourswarmCheckinTestUsingRealData(): void
     {
         $response = $this->json(

tests/Feature/TokenServiceTest.php

@@ -9,7 +9,6 @@ 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
@@ -17,8 +16,9 @@ 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,7 +37,11 @@ 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,14 +8,13 @@ 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');
@@ -24,8 +23,9 @@ 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,8 +36,9 @@ 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', [
@@ -49,8 +50,9 @@ 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', [
@@ -62,8 +64,9 @@ 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', [
@@ -73,7 +76,7 @@ class WebMentionsControllerTest extends TestCase
         $response->assertStatus(400);
     }
 
-    #[Test]
+    /** @test */
     public function legitimateWebmentionTriggersProcessWebmentionJob(): void
     {
         Queue::fake();

tests/Unit/ArticlesTest.php

@@ -7,14 +7,13 @@ 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;
@@ -25,7 +24,7 @@ class ArticlesTest extends TestCase
         $this->assertEquals('my-title', $article->titleurl);
     }
 
-    #[Test]
+    /** @test */
     public function markdownContentIsConverted(): void
     {
         $article = new Article;
@@ -34,7 +33,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([
@@ -48,7 +47,7 @@ class ArticlesTest extends TestCase
         $this->assertEquals($article->pubdate, $article->updated_at->toRSSString());
     }
 
-    #[Test]
+    /** @test */
     public function weGenerateTheArticleLinkFromTheSlug(): void
     {
         $article = Article::create([
@@ -63,7 +62,7 @@ class ArticlesTest extends TestCase
         );
     }
 
-    #[Test]
+    /** @test */
     public function dateScopeReturnsExpectedArticles(): void
     {
         Article::factory()->create([
@@ -82,7 +81,7 @@ class ArticlesTest extends TestCase
         $this->assertCount(2, $emptyScope);
     }
 
-    #[Test]
+    /** @test */
     public function dateScopeReturnsExpectedArticlesForDecember(): void
     {
         Article::factory()->create([

tests/Unit/BookmarksTest.php

@@ -10,15 +10,14 @@ 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()
     {
@@ -26,7 +25,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([
@@ -39,7 +38,7 @@ class BookmarksTest extends TestCase
         $this->assertEquals('/web/1234/example.org', $url);
     }
 
-    #[Test]
+    /** @test */
     public function archiveLinkMethodThrowsAnExceptionOnError(): void
     {
         $this->expectException(InternetArchiveException::class);
@@ -53,7 +52,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,27 +4,28 @@ 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]
+    /**
-    #[DataProvider('urlProvider')]
+     * @test
+     *
+     * @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,14 +6,13 @@ 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,7 +10,6 @@ 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
@@ -24,7 +23,7 @@ class DownloadWebMentionJobTest extends TestCase
         parent::tearDown();
     }
 
-    #[Test]
+    /** @test */
     public function htmlIsSavedByJob(): void
     {
         $this->assertFileDoesNotExist(storage_path('HTML/https'));
@@ -52,7 +51,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'));
@@ -87,7 +86,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,14 +11,13 @@ 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();
@@ -39,7 +38,7 @@ class ProcessBookmarkJobTest extends TestCase
         Queue::assertPushed(SaveScreenshot::class);
     }
 
-    #[Test]
+    /** @test */
     public function archiveLinkSavedAsNullWhenExceptionThrown(): void
     {
         Queue::fake();

tests/Unit/Jobs/ProcessMediaJobTest.php

@@ -7,12 +7,11 @@ 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);
@@ -23,7 +22,7 @@ class ProcessMediaJobTest extends TestCase
         $this->assertFileDoesNotExist(storage_path('app/media/') . 'file.txt');
     }
 
-    #[Test]
+    /** @test */
     public function smallImagesAreNotResized(): void
     {
         $manager = app()->make(ImageManager::class);
@@ -38,7 +37,7 @@ class ProcessMediaJobTest extends TestCase
         Storage::disk('local')->delete('public/media');
     }
 
-    #[Test]
+    /** @test */
     public function largeImagesHaveSmallerImagesCreated(): void
     {
         $manager = app()->make(ImageManager::class);
@@ -46,17 +45,16 @@ class ProcessMediaJobTest extends TestCase
         $job = new ProcessMedia('test-image.jpg');
         $job->handle($manager);
 
-        // These need to look in public disk
+        Storage::disk('local')->assertExists('public/media/test-image.jpg');
-        Storage::disk('public')->assertExists('media/test-image.jpg');
+        Storage::disk('local')->assertExists('public/media/test-image-small.jpg');
-        Storage::disk('public')->assertExists('media/test-image-small.jpg');
+        Storage::disk('local')->assertExists('public/media/test-image-medium.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('public')->delete('media/test-image.jpg');
+        Storage::disk('local')->delete('public/media/test-image.jpg');
-        Storage::disk('public')->delete('media/test-image-small.jpg');
+        Storage::disk('local')->delete('public/media/test-image-small.jpg');
-        Storage::disk('public')->delete('media/test-image-medium.jpg');
+        Storage::disk('local')->delete('public/media/test-image-medium.jpg');
         $this->removeDirIfEmpty(storage_path('app/public/media'));
         $this->removeDirIfEmpty(storage_path('app/media'));
     }

tests/Unit/Jobs/ProcessWebMentionJobTest.php

@@ -17,7 +17,6 @@ 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
@@ -33,7 +32,7 @@ class ProcessWebMentionJobTest extends TestCase
         parent::tearDown();
     }
 
-    #[Test]
+    /** @test */
     public function failureGettingWebmentionThrowsAnException(): void
     {
         $this->expectException(RemoteContentNotFoundException::class);
@@ -52,7 +51,7 @@ class ProcessWebMentionJobTest extends TestCase
         $job->handle($parser, $client);
     }
 
-    #[Test]
+    /** @test */
     public function newWebmentionGetsSavedByJob(): void
     {
         Queue::fake();
@@ -84,7 +83,7 @@ class ProcessWebMentionJobTest extends TestCase
         ]);
     }
 
-    #[Test]
+    /** @test */
     public function existingWebmentionGetsUpdatedByJob(): void
     {
         Queue::fake();
@@ -121,7 +120,7 @@ class ProcessWebMentionJobTest extends TestCase
         ]);
     }
 
-    #[Test]
+    /** @test */
     public function webmentionReplyGetsDeletedWhenReplyToValueChanges(): void
     {
         $parser = new Parser;
@@ -158,7 +157,7 @@ class ProcessWebMentionJobTest extends TestCase
         ]);
     }
 
-    #[Test]
+    /** @test */
     public function webmentionLikeGetsDeletedWhenLikeOfValueChanges(): void
     {
         $parser = new Parser;
@@ -195,7 +194,7 @@ class ProcessWebMentionJobTest extends TestCase
         ]);
     }
 
-    #[Test]
+    /** @test */
     public function webmentionRepostGetsDeletedWhenRepostOfValueChanges(): void
     {
         $parser = new Parser;

tests/Unit/Jobs/SaveProfileImageJobTest.php

@@ -11,7 +11,6 @@ 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
@@ -25,7 +24,7 @@ class SaveProfileImageJobTest extends TestCase
         parent::tearDown();
     }
 
-    #[Test]
+    /** @test */
     public function authorshipAlgorithmReturnsNullOnException(): void
     {
         $mf = ['items' => []];
@@ -37,7 +36,7 @@ class SaveProfileImageJobTest extends TestCase
         $this->assertNull($job->handle($authorship));
     }
 
-    #[Test]
+    /** @test */
     public function weDoNotProcessTwitterImages(): void
     {
         $mf = ['items' => []];
@@ -55,7 +54,7 @@ class SaveProfileImageJobTest extends TestCase
         $this->assertNull($job->handle($authorship));
     }
 
-    #[Test]
+    /** @test */
     public function remoteAuthorImagesAreSavedLocally(): void
     {
         $mock = new MockHandler([
@@ -80,7 +79,7 @@ class SaveProfileImageJobTest extends TestCase
         $this->assertFileExists(public_path() . '/assets/profile-images/example.org/image');
     }
 
-    #[Test]
+    /** @test */
     public function localDefaultAuthorImageIsUsedAsFallback(): void
     {
         $mock = new MockHandler([
@@ -108,7 +107,7 @@ class SaveProfileImageJobTest extends TestCase
         );
     }
 
-    #[Test]
+    /** @test */
     public function weGetUrlFromPhotoObjectIfAltTextIsProvided(): void
     {
         $mock = new MockHandler([
@@ -136,7 +135,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,14 +13,13 @@ 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');
@@ -85,7 +84,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,12 +10,11 @@ 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;
@@ -24,7 +23,7 @@ class SendWebMentionJobTest extends TestCase
         $this->assertNull($job->discoverWebmentionEndpoint('/notes/tagged/test'));
     }
 
-    #[Test]
+    /** @test */
     public function discoverWebmentionEndpointFromHeaderLinks(): void
     {
         $url = 'https://example.org/webmention';
@@ -39,7 +38,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">';
@@ -57,7 +56,7 @@ class SendWebMentionJobTest extends TestCase
         );
     }
 
-    #[Test]
+    /** @test */
     public function discoverWebmentionEndpointFromLegacyHtmlMarkup(): void
     {
         $html = '<link rel="http://webmention.org/" href="https://example.org/webmention">';
@@ -75,14 +74,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';
@@ -91,7 +90,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">';
@@ -111,7 +110,7 @@ class SendWebMentionJobTest extends TestCase
         $this->assertTrue(true);
     }
 
-    #[Test]
+    /** @test */
     public function linksInNotesCanNotSupportWebmentions(): void
     {
         $mock = new MockHandler([

tests/Unit/Jobs/SyndicateNoteToBlueskyJobTest.php

@@ -11,14 +11,13 @@ 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']);
@@ -39,7 +38,7 @@ class SyndicateNoteToBlueskyJobTest extends TestCase
         ]);
     }
 
-    #[Test]
+    /** @test */
     public function weSyndicateTheOriginalMarkdownToBluesky(): void
     {
         config(['bridgy.bluesky_token' => 'test']);

tests/Unit/Jobs/SyndicateNoteToMastodonJobTest.php

@@ -11,14 +11,13 @@ 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']);
@@ -39,7 +38,7 @@ class SyndicateNoteToMastodonJobTest extends TestCase
         ]);
     }
 
-    #[Test]
+    /** @test */
     public function weSyndicateTheOriginalMarkdown(): void
     {
         config(['bridgy.mastodon_token' => 'test']);

tests/Unit/LikesTest.php

@@ -6,14 +6,13 @@ 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;
@@ -21,7 +20,7 @@ class LikesTest extends TestCase
         $this->assertEquals('https://joe.bloggs', $like->author_url);
     }
 
-    #[Test]
+    /** @test */
     public function weDoNotModifyPlainTextContent(): void
     {
         $like = new Like;
@@ -32,7 +31,7 @@ class LikesTest extends TestCase
         $this->assertEquals('some plaintext content', $like->content);
     }
 
-    #[Test]
+    /** @test */
     public function weCanHandleBlankContent(): void
     {
         $like = new Like;
@@ -43,7 +42,7 @@ class LikesTest extends TestCase
         $this->assertNull($like->content);
     }
 
-    #[Test]
+    /** @test */
     public function htmlLikeContentIsFiltered(): void
     {
         $htmlEvil = <<<'HTML'

tests/Unit/MediaTest.php

@@ -7,14 +7,13 @@ 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();
@@ -22,7 +21,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,14 +7,13 @@ 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,7 +16,6 @@ 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
@@ -26,8 +25,9 @@ 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,8 +40,9 @@ 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
@@ -69,8 +70,9 @@ 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([
@@ -104,8 +106,9 @@ 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;
@@ -115,7 +118,7 @@ class NotesTest extends TestCase
         $this->assertEquals($expected, $note->note);
     }
 
-    #[Test]
+    /** @test */
     public function shorturlMethodReturnsExpectedValue(): void
     {
         $note = Note::factory()->make();
@@ -123,7 +126,7 @@ class NotesTest extends TestCase
         $this->assertEquals(config('url.shorturl') . '/notes/E', $note->shorturl);
     }
 
-    #[Test]
+    /** @test */
     public function weGetLatitudeLongitudeValuesOfAssociatedPlaceOfNote(): void
     {
         $place = Place::factory()->create([
@@ -137,7 +140,7 @@ class NotesTest extends TestCase
         $this->assertEquals('-2.3805', $note->longitude);
     }
 
-    #[Test]
+    /** @test */
     public function whenNoAssociatedPlaceWeGetNullForLatitudeLongitudeValues(): void
     {
         $note = Note::factory()->create();
@@ -145,7 +148,7 @@ class NotesTest extends TestCase
         $this->assertNull($note->longitude);
     }
 
-    #[Test]
+    /** @test */
     public function weCanGetAddressAttributeForAssociatedPlace(): void
     {
         $place = Place::factory()->create([
@@ -159,7 +162,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
@@ -174,7 +177,7 @@ class NotesTest extends TestCase
         ]);
     }
 
-    #[Test]
+    /** @test */
     public function saveBlankNotesAsNull(): void
     {
         $note = new Note(['note' => '']);
@@ -182,7 +185,7 @@ class NotesTest extends TestCase
         $this->assertNull($note->note);
     }
 
-    #[Test]
+    /** @test */
     public function reverseGeocodeAnAttraction(): void
     {
         // phpcs:disable Generic.Files.LineLength.TooLong
@@ -207,7 +210,7 @@ class NotesTest extends TestCase
         );
     }
 
-    #[Test]
+    /** @test */
     public function reverseGeocodeASuburb(): void
     {
         // phpcs:disable Generic.Files.LineLength.TooLong
@@ -232,7 +235,7 @@ class NotesTest extends TestCase
         );
     }
 
-    #[Test]
+    /** @test */
     public function reverseGeocodeACity(): void
     {
         // Note I’ve modified this JSON response so it only contains the
@@ -259,7 +262,7 @@ class NotesTest extends TestCase
         );
     }
 
-    #[Test]
+    /** @test */
     public function reverseGeocodeACounty(): void
     {
         // Note I’ve removed everything below county to test for queries where
@@ -283,7 +286,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
@@ -307,7 +310,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([
@@ -324,7 +327,7 @@ class NotesTest extends TestCase
         $this->assertEquals($expected, $note->content);
     }
 
-    #[Test]
+    /** @test */
     public function addVideoElementToNoteContentWhenMediaAssociated(): void
     {
         $media = Media::factory()->create([
@@ -341,7 +344,7 @@ class NotesTest extends TestCase
         $this->assertEquals($expected, $note->content);
     }
 
-    #[Test]
+    /** @test */
     public function addAudioElementToNoteContentWhenMediaAssociated(): void
     {
         $media = Media::factory()->create([
@@ -359,9 +362,10 @@ class NotesTest extends TestCase
     }
 
     /**
+     * @test
+     *
      * @todo Why do we need to provide text?
      */
-    #[Test]
     public function provideTextForBlankContent(): void
     {
         $note = new Note;
@@ -378,8 +382,9 @@ class NotesTest extends TestCase
 
         $this->assertNull($note->twitter);
     }*/
-    #[Test]
+
-    public function markdown_content_gets_converted(): void
+    /** @test */
+    public function markdownContentGetsConverted(): void
     {
         $note = Note::factory()->create([
             'note' => 'The best search engine? https://duckduckgo.com',
@@ -393,8 +398,9 @@ 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) [
@@ -409,7 +415,7 @@ class NotesTest extends TestCase
         $this->assertEquals($tempContent, $note->twitter);
     }
 
-    #[Test]
+    /** @test */
     public function latitudeAndLongitudeCanBeParsedFromPlainLocation(): void
     {
         $note = Note::factory()->create([
@@ -420,7 +426,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>');
@@ -432,7 +438,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,14 +10,13 @@ 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();
@@ -28,7 +27,7 @@ class PlacesTest extends TestCase
         $this->assertCount(5, $place->notes);
     }
 
-    #[Test]
+    /** @test */
     public function nearMethodReturnsCollection(): void
     {
         Place::factory()->create([
@@ -40,7 +39,7 @@ class PlacesTest extends TestCase
         $this->assertEquals('the-bridgewater-pub', $nearby[0]->slug);
     }
 
-    #[Test]
+    /** @test */
     public function getLongurl(): void
     {
         $place = Place::factory()->create([
@@ -49,7 +48,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([
@@ -58,7 +57,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([
@@ -67,7 +66,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();
@@ -87,7 +86,7 @@ class PlacesTest extends TestCase
         $this->assertCount(11, Place::all());
     }
 
-    #[Test]
+    /** @test */
     public function placeServiceRequiresNameWhenCreatingNewPlace(): void
     {
         $this->expectException(InvalidArgumentException::class);
@@ -97,7 +96,7 @@ class PlacesTest extends TestCase
         $service->createPlaceFromCheckin(['foo' => 'bar']);
     }
 
-    #[Test]
+    /** @test */
     public function placeServiceRequiresLatitudeWhenCreatingNewPlace(): void
     {
         $this->expectException(InvalidArgumentException::class);
@@ -107,7 +106,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,15 +8,13 @@ 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();
@@ -25,7 +23,7 @@ class TagsTest extends TestCase
         $this->assertCount(1, $tag->notes);
     }
 
-    #[Test]
+    /** @test */
     public function canGetAssociatedBookmarks(): void
     {
         $bookmark = Bookmark::factory()->create();
@@ -34,8 +32,11 @@ class TagsTest extends TestCase
         $this->assertCount(1, $tag->bookmarks);
     }
 
-    #[Test]
+    /**
-    #[DataProvider('tagsProvider')]
+     * @test
+     *
+     * @dataProvider tagsProvider
+     */
     public function canNormalize(string $input, string $expected): void
     {
         $this->assertSame($expected, Tag::normalize($input));

tests/Unit/WebMentionTest.php

@@ -10,14 +10,13 @@ use Codebird\Codebird;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Cache;
-use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
 
 class WebMentionTest extends TestCase
 {
     use RefreshDatabase;
 
-    #[Test]
+    /** @test */
     public function commentableMethodLinksToNotes(): void
     {
         $note = Note::factory()->create();
@@ -28,7 +27,7 @@ class WebMentionTest extends TestCase
         $this->assertInstanceOf(Note::class, $webmention->commentable);
     }
 
-    #[Test]
+    /** @test */
     public function publishedAttributeUsesUpdatedAtWhenNoRelevantMf2Data(): void
     {
         $webmention = new WebMention;
@@ -37,7 +36,7 @@ class WebMentionTest extends TestCase
         $this->assertEquals($updated_at->toDayDateTimeString(), $webmention->published);
     }
 
-    #[Test]
+    /** @test */
     public function publishedAttributeUsesUpdatedAtWhenErrorParsingMf2Data(): void
     {
         $webmention = new WebMention;
@@ -55,7 +54,7 @@ class WebMentionTest extends TestCase
         $this->assertEquals($updated_at->toDayDateTimeString(), $webmention->published);
     }
 
-    #[Test]
+    /** @test */
     public function createPhotoLinkDoesNothingWithGenericUrlAndNoLocallySavedImage(): void
     {
         $webmention = new WebMention;
@@ -64,7 +63,7 @@ class WebMentionTest extends TestCase
         $this->assertEquals($expected, $webmention->createPhotoLink($homepage));
     }
 
-    #[Test]
+    /** @test */
     public function createPhotoLinkReturnsLocallySavedImageUrlIfItExists(): void
     {
         $webmention = new WebMention;
@@ -73,7 +72,7 @@ class WebMentionTest extends TestCase
         $this->assertEquals($expected, $webmention->createPhotoLink($homepage));
     }
 
-    #[Test]
+    /** @test */
     public function createPhotoLinkDealsWithSpecialCaseOfDirectTwitterPhotoLinks(): void
     {
         $webmention = new WebMention;
@@ -82,7 +81,7 @@ class WebMentionTest extends TestCase
         $this->assertEquals($expected, $webmention->createPhotoLink($twitterProfileImage));
     }
 
-    #[Test]
+    /** @test */
     public function createPhotoLinkReturnsCachedTwitterPhotoLinks(): void
     {
         $webmention = new WebMention;
@@ -92,15 +91,16 @@ class WebMentionTest extends TestCase
         $this->assertEquals($expected, $webmention->createPhotoLink($twitterURL));
     }
 
-    #[Test]
+    /** @test */
     public function createPhotoLinkResolvesTwitterPhotoLinks(): void
     {
         $info = (object) [
             'profile_image_url_https' => 'https://pbs.twimg.com/static_profile_link.jpg',
         ];
-        $codebirdMock = $this->createPartialMock(Codebird::class, ['__call']);
+        $codebirdMock = $this->getMockBuilder(Codebird::class)
-        $codebirdMock->method('__call')
+            ->addMethods(['users_show'])
-            ->with('users_show', $this->anything())
+            ->getMock();
+        $codebirdMock->method('users_show')
             ->willReturn($info);
         $this->app->instance(Codebird::class, $codebirdMock);
 
@@ -117,14 +117,14 @@ class WebMentionTest extends TestCase
         $this->assertEquals($expected, $webmention->createPhotoLink($twitterURL));
     }
 
-    #[Test]
+    /** @test */
     public function getReplyAttributeDefaultsToNull(): void
     {
         $webmention = new WebMention;
         $this->assertNull($webmention->reply);
     }
 
-    #[Test]
+    /** @test */
     public function getReplyAttributeWithMf2WithoutHtmlReturnsNull(): void
     {
         $webmention = new WebMention;