Add rector config and fixes

app/Console/Commands/ScheduleStatsUpdates.php

@@ -51,7 +51,7 @@ public function handle() {
 
         Bus::batch($siteStatsUpdateJobs)
             ->allowFailures()
-            ->finally(function () {
+            ->finally(function (): void {
                 dispatch(new PlatformStatsSummaryJob);
             })->dispatch();
 

app/Exceptions/Handler.php

@@ -21,7 +21,7 @@ class Handler extends ExceptionHandler {
      * Register the exception handling callbacks for the application.
      */
     public function register(): void {
-        $this->reportable(function (Throwable $e) {
+        $this->reportable(function (Throwable $e): void {
             (new ErrorReporting)->report($e);
         });
     }

app/Helper/DomainValidator.php

@@ -15,7 +15,7 @@ public function __construct(string $subDomainSuffix, array $subdomainRules) {
         $this->subdomainRules = $subdomainRules;
     }
 
-    public function getValidator($domain): \Illuminate\Validation\Validator {
+    public function getValidator($domain): \Illuminate\Contracts\Validation\Validator {
 
         $isSubdomain = WikiController::isSubDomain($domain, $this->subDomainSuffix);
 

app/Helper/ProfileValidator.php

@@ -5,7 +5,7 @@
 use Illuminate\Support\Facades\Validator;
 
 class ProfileValidator {
-    public function getValidator($profile): \Illuminate\Validation\Validator {
+    public function getValidator($profile): \Illuminate\Contracts\Validation\Validator {
 
         return Validator::make($profile, [
             'purpose' => 'in:data_hub,data_lab,tool_lab,test_drive,decide_later,other',

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -5,6 +5,7 @@
 use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
 
 class ForgotPasswordController extends Controller {
     /*
@@ -29,7 +30,7 @@ public function __construct() {
         $this->middleware('guest');
     }
 
-    protected function sendResetLinkResponse(): JsonResponse {
+    protected function sendResetLinkResponse(?Request $request = null): JsonResponse {
         return response()->json('Success', 200);
     }
 

app/Http/Controllers/Auth/RegisterController.php

@@ -32,7 +32,7 @@ public function register(Request $request) {
         $this->validator($request->all())->validate();
 
         $user = null;
-        DB::transaction(function () use (&$user, $request) {
+        DB::transaction(function () use (&$user, $request): void {
             $user = (new UserCreateJob(
                 $request->input('email'),
                 $request->input('password')

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -5,6 +5,7 @@
 use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\ResetsPasswords;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
 
 class ResetPasswordController extends Controller {
     /*
@@ -36,7 +37,7 @@ public function __construct() {
         $this->middleware('guest');
     }
 
-    protected function sendResetResponse(): JsonResponse {
+    protected function sendResetResponse(?Request $request = null): JsonResponse {
         return response()->json('Success', 200);
     }
 

app/Http/Controllers/ComplaintController.php

@@ -80,7 +80,7 @@ public function sendMessage(Request $request): JsonResponse {
     /**
      * Get a validator for an incoming complaint report page request.
      */
-    protected function validator(array $data): \Illuminate\Validation\Validator {
+    protected function validator(array $data): \Illuminate\Contracts\Validation\Validator {
         $data['name'] = $data['name'] ?? '';
         $data['email'] = $data['email'] ?? '';
 

app/Http/Controllers/ContactController.php

@@ -55,7 +55,7 @@ public function sendMessage(Request $request): JsonResponse {
     /**
      * Get a validator for an incoming contact page request.
      */
-    protected function validator(array $data): \Illuminate\Validation\Validator {
+    protected function validator(array $data): \Illuminate\Contracts\Validation\Validator {
         if (!isset($data['contactDetails'])) {
             $data['contactDetails'] = ''; // could we skip this using some feature of the validator?
         }

app/Http/Controllers/Sandbox/SandboxController.php

@@ -37,7 +37,7 @@ public function create(Request $request): Response {
         $dataSet = $request->get('dataSet');
 
         $wiki = null;
-        DB::transaction(function () use (&$wiki, $domain) {
+        DB::transaction(function () use (&$wiki, $domain): void {
             $wikiDbCondition = ['wiki_id' => null, 'version' => self::MW_VERSION];
 
             // Fail if there is not enough storage ready

app/Http/Controllers/WikiController.php

@@ -83,7 +83,7 @@ public function create(Request $request): Response {
         $dbAssignment = null;
 
         // TODO create with some sort of owner etc?
-        DB::transaction(function () use ($user, $request, &$wiki, &$dbAssignment, $submittedDomain, $rawProfile, $rawKnowledgeEquityResponse) {
+        DB::transaction(function () use ($user, $request, &$wiki, &$dbAssignment, $submittedDomain, $rawProfile, $rawKnowledgeEquityResponse): void {
             $dbVersion = Config::get('wbstack.wiki_db_use_version');
             $wikiDbCondition = ['wiki_id' => null, 'version' => $dbVersion];
 

app/Http/Controllers/WikiEntityImportController.php

@@ -40,7 +40,7 @@ public function get(Request $request): JsonResponse {
     public function create(Request $request): JsonResponse {
         $validatedInput = $request->validate([
             'source_wiki_url' => ['required', 'url'],
-            'entity_ids' => ['required', 'string', function (string $attr, mixed $value, \Closure $fail) {
+            'entity_ids' => ['required', 'string', function (string $attr, mixed $value, \Closure $fail): void {
                 $chunks = explode(',', $value);
                 foreach ($chunks as $chunk) {
                     if (!preg_match("/^[A-Z]\d+(@\d+)?$/", $chunk)) {

app/Jobs/CreateQueryserviceBatchesJob.php

@@ -21,7 +21,7 @@ public function __construct() {
     }
 
     public function handle(): void {
-        DB::transaction(function () {
+        DB::transaction(function (): void {
             $latestCheckpoint = QsCheckpoint::get();
 
             [$newEntities, $latestEventId] = $this->getNewEntities($latestCheckpoint);
@@ -53,7 +53,7 @@ private function getNewEntities(int $latestCheckpoint): array {
         )
             ->whereIn('namespace', [MediawikiNamespace::item, MediawikiNamespace::property, MediawikiNamespace::lexeme])
             ->has('wiki')
-            ->chunk(100, function (Collection $chunk) use (&$newEntitiesFromEvents, &$latestEventId) {
+            ->chunk(100, function (Collection $chunk) use (&$newEntitiesFromEvents, &$latestEventId): void {
                 foreach ($chunk as $event) {
                     $newEntitiesFromEvents[$event->wiki_id][] = $event->title;
                     $latestEventId = max($event->id, $latestEventId);

app/Jobs/DeleteWikiDispatcherJob.php

@@ -72,7 +72,7 @@ public function handle() {
 
             Bus::chain([
                 ...$jobs,
-            ])->catch(function (Throwable $e) use ($wiki) {
+            ])->catch(function (Throwable $e) use ($wiki): void {
                 Log::error(__METHOD__ . "An error occured when deleting {$wiki->id}: " . $e->getMessage());
             })->dispatch();
 

app/Jobs/FailStalledEntityImportsJob.php

@@ -5,15 +5,12 @@
 use App\WikiEntityImport;
 use App\WikiEntityImportStatus;
 use Carbon\Carbon;
-use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
+use Illuminate\Foundation\Queue\Queueable;
 use Illuminate\Support\Facades\Log;
 
 class FailStalledEntityImportsJob implements ShouldQueue {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Queueable;
 
     public function handle(): void {
         $deadline = Carbon::now()->subHours(24);

app/Jobs/GenerateOAuth2KeysJob.php

@@ -4,15 +4,12 @@
 
 use App\Wiki;
 use App\WikiSetting;
-use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
+use Illuminate\Foundation\Queue\Queueable;
 use Illuminate\Support\Facades\Log;
 
 class GenerateOAuth2KeysJob extends Job implements ShouldQueue {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Queueable;
 
     public function handle() {
         $allWikis = Wiki::all();

app/Jobs/UpdateWikiSiteStatsJob.php

@@ -50,7 +50,7 @@ private function updateLifecycleEvents(Wiki $wiki): void {
             $update['last_edited'] = Carbon::parse($lastEdited);
         }
 
-        DB::transaction(function () use ($wiki, $update) {
+        DB::transaction(function () use ($wiki, $update): void {
             $wiki->wikiLifecycleEvents()->lockForUpdate()->updateOrCreate(['wiki_id' => $wiki->id], $update);
         });
     }
@@ -74,7 +74,7 @@ private function updateSiteStats(Wiki $wiki): void {
                 $update[$field] = $value;
             }
         }
-        DB::transaction(function () use ($wiki, $update) {
+        DB::transaction(function () use ($wiki, $update): void {
             $wiki->wikiSiteStats()->lockForUpdate()->updateOrCreate(['wiki_id' => $wiki->id], $update);
         });
     }

app/Jobs/WikiEntityImportJob.php

@@ -7,19 +7,16 @@
 use App\WikiEntityImport;
 use App\WikiEntityImportStatus;
 use Carbon\Carbon;
-use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
+use Illuminate\Foundation\Queue\Queueable;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Log;
 use Maclof\Kubernetes\Client;
 use Maclof\Kubernetes\Models\Job as KubernetesJob;
 
 class WikiEntityImportJob implements ShouldQueue {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Queueable;
 
     /**
      * Create a new job instance.

app/Providers/AppServiceProvider.php

@@ -20,7 +20,7 @@ public function register(): void {
      * Bootstrap any application services.
      */
     public function boot(): void {
-        Queue::failing(function (JobFailed $event) {
+        Queue::failing(function (JobFailed $event): void {
             $name = data_get($event->job->payload(), 'data.commandName');
             $wrappedException = new \Exception("Executing Job '$name' failed.", 1, $event->exception);
             report($wrappedException);

app/QsBatch.php

@@ -44,11 +44,13 @@ class QsBatch extends Model {
         'processing_attempts',
     ];
 
-    protected $casts = [
-        'pending_since' => 'datetime',
-    ];
-
     public function wiki(): BelongsTo {
         return $this->belongsTo(Wiki::class);
     }
+
+    protected function casts(): array {
+        return [
+            'pending_since' => 'datetime',
+        ];
+    }
 }

app/TermsOfUseVersion.php

@@ -24,12 +24,14 @@ class TermsOfUseVersion extends Model {
 
     protected $visible = self::FIELDS;
 
-    protected $casts = [
-        'version' => 'string',
-        'active' => 'boolean',
-    ];
-
     public static function latestActiveVersion(): ?self {
         return self::query()->where('active', true)->latest()->first();
     }
+
+    protected function casts(): array {
+        return [
+            'version' => 'string',
+            'active' => 'boolean',
+        ];
+    }
 }

app/User.php

@@ -85,16 +85,6 @@ class User extends Authenticatable implements MustVerifyEmail {
         'card_last_four',
     ];
 
-    /**
-     * The attributes that should be cast.
-     *
-     * @var array<string, string>
-     */
-    protected $casts = [
-        'email_verified_at' => 'datetime',
-        'password' => 'hashed',
-    ];
-
     public function sendPasswordResetNotification($token) {
         $this->notify(new ResetPasswordNotification($token));
     }
@@ -129,4 +119,16 @@ public function sendEmailVerificationNotification() {
     public function getEmailForVerification() {
         return $this->email;
     }
+
+    /**
+     * The attributes that should be cast.
+     *
+     * @return array<string, string>
+     */
+    protected function casts(): array {
+        return [
+            'email_verified_at' => 'datetime',
+            'password' => 'hashed',
+        ];
+    }
 }

app/UserTermsOfUseAcceptance.php

@@ -19,14 +19,16 @@ class UserTermsOfUseAcceptance extends Model {
 
     protected $visible = self::FIELDS;
 
-    protected $casts = [
-        'tou_version' => 'string',
-        'tou_accepted_at' => 'datetime',
-    ];
-
     protected $table = 'tou_acceptances';
 
     public function user(): BelongsTo {
         return $this->belongsTo(User::class);
     }
+
+    protected function casts(): array {
+        return [
+            'tou_version' => 'string',
+            'tou_accepted_at' => 'datetime',
+        ];
+    }
 }

app/Wiki.php

@@ -3,6 +3,7 @@
 namespace App;
 
 use App\Helper\DomainHelper;
+use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -69,10 +70,6 @@ class Wiki extends Model {
         'domain_decoded',
     ];
 
-    protected $casts = [
-        'deleted_at' => 'datetime',
-    ];
-
     public function wikiDbVersion() {
         return $this->hasOne(WikiDb::class)->select(['id', 'wiki_id', 'version']);
     }
@@ -156,8 +153,10 @@ public static function getSiteDirectory(int $wiki_id): string {
     /**
      * Convert the IDN formatted domain name to it's Unicode representation.
      */
-    public function getDomainDecodedAttribute(): string {
-        return DomainHelper::decode($this->domain);
+    protected function domainDecoded(): Attribute {
+        return Attribute::make(get: function () {
+            return DomainHelper::decode($this->domain);
+        });
     }
 
     public function wikiLatestProfile() {
@@ -174,4 +173,10 @@ public function setSetting(string $name, string $value): void {
     public function deleteSetting(string $name): ?string {
         return $this->settings()->where('name', $name)->delete();
     }
+
+    protected function casts(): array {
+        return [
+            'deleted_at' => 'datetime',
+        ];
+    }
 }

app/WikiEntityImport.php

@@ -19,8 +19,10 @@ class WikiEntityImport extends Model {
 
     protected $visible = self::FIELDS;
 
-    protected $casts = [
-        'status' => WikiEntityImportStatus::class,
-        'payload' => 'array',
-    ];
+    protected function casts(): array {
+        return [
+            'status' => WikiEntityImportStatus::class,
+            'payload' => 'array',
+        ];
+    }
 }