test for Laravel 12

Dockerfile

@@ -1,4 +1,4 @@
-FROM composer:2.3 as composer
+FROM composer:2.9 as composer
 
 COPY ./composer.json /tmp/src1/composer.json
 COPY ./composer.lock /tmp/src1/composer.lock
@@ -12,7 +12,7 @@
 RUN composer install --no-dev --no-progress --optimize-autoloader --ignore-platform-req=ext-pcntl
 
 
-FROM php:8.2-apache
+FROM php:8.4-apache
 
 RUN apt-get update \
 	# Needed for the imagick php extension install
@@ -27,12 +27,9 @@
 	&& docker-php-ext-install pdo pdo_mysql \
 	# For rewrite rules
 	&& a2enmod rewrite \
-	# Needed for gluedev/laravel-stackdriver
-	&& pecl install opencensus-alpha \
-	&& docker-php-ext-enable opencensus \
 	&& rm -rf /var/lib/apt/lists/*
 
 ENV APACHE_DOCUMENT_ROOT /var/www/html/public
 
 # Change the document root
 RUN sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf \

app/Console/Commands/Invitation/Create.php

@@ -17,7 +17,7 @@ class Create extends Command {
      */
     public function handle() {
         $code = trim($this->argument('code'));
-        $jobResult = (new InvitationCreateJob($code))->handle();
+        $jobResult = new InvitationCreateJob($code)->handle();
 
         if ($jobResult) {
             $this->line('Successfully created invitation: ' . $code);

app/Console/Commands/Invitation/CreateBulk.php

@@ -22,7 +22,7 @@ public function handle() {
 
         for ($i = 0; $i < $numCodes; $i++) {
             $code = $helper->generate();
-            $jobResult = (new InvitationCreateJob($code))->handle();
+            $jobResult = new InvitationCreateJob($code)->handle();
 
             if ($jobResult) {
                 $this->line('Successfully created invitation: ' . $code);

app/Console/Commands/Invitation/Delete.php

@@ -17,7 +17,7 @@ class Delete extends Command {
      */
     public function handle() {
         $code = trim($this->argument('code'));
-        (new InvitationDeleteJob($code))->handle();
+        new InvitationDeleteJob($code)->handle();
 
         return 0;
     }

app/Console/Commands/RebuildQueryserviceData.php

@@ -93,7 +93,7 @@ private function getEntitiesForWiki(Wiki $wiki): array {
             : [];
 
         $merged = array_merge($items, $properties, $lexemes);
-        $this->stripPrefixes($merged);
+        self::stripPrefixes($merged);
 
         return $merged;
     }
@@ -111,7 +111,7 @@ private function getSparqlUrl(Wiki $wiki): string {
 
     private static function stripPrefixes(array &$items): void {
         foreach ($items as &$item) {
-            $e = explode(':', $item);
+            $e = explode(':', (string) $item);
             $item = end($e);
         }
     }

app/Console/Kernel.php

@@ -24,6 +24,7 @@ class Kernel extends ConsoleKernel {
     /**
      * Define the application's command schedule.
      */
+    #[\Override]
     protected function schedule(Schedule $schedule): void {
         // Make sure that the DB and QS pools are always populated somewhat.
         // This will create at most 1 new entry for each per minute...
@@ -66,6 +67,7 @@ protected function schedule(Schedule $schedule): void {
     /**
      * Register the commands for the application.
      */
+    #[\Override]
     protected function commands(): void {
         $this->load(__DIR__ . '/Commands');
         $this->load(__DIR__ . '/Commands/User');

app/Exceptions/Handler.php

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

app/Helper/DomainHelper.php

@@ -17,23 +17,19 @@
 class DomainHelper {
     // @return string - the domain name encoded in ASCII-compatible form
     public static function encode($string) {
-        $result = idn_to_ascii($string);
-
-        // return the original input if encoding failed
-        if ($result === false) {
-            $result = $string;
+        $result = $string;
+        if (!empty($string)) {
+            $result = idn_to_ascii($string);
         }
 
         return $result;
     }
 
     // @return string - the domain name in Unicode, encoded in UTF-8
     public static function decode($string) {
-        $result = idn_to_utf8($string);
-
-        // return the original input if decoding failed
-        if ($result === false) {
-            $result = $string;
+        $result = $string;
+        if (!empty($string)) {
+            $result = idn_to_utf8($string);
         }
 
         return $result;

app/Helper/DomainValidator.php

@@ -6,13 +6,8 @@
 use Illuminate\Support\Facades\Validator;
 
 class DomainValidator {
-    public array $subdomainRules;
-
-    public string $subDomainSuffix;
-
-    public function __construct(string $subDomainSuffix, array $subdomainRules) {
-        $this->subDomainSuffix = $subDomainSuffix;
-        $this->subdomainRules = $subdomainRules;
+    public function __construct(public string $subDomainSuffix, public array $subdomainRules)
+    {
     }
 
     public function getValidator($domain): \Illuminate\Contracts\Validation\Validator {

app/Helper/ElasticSearchHelper.php

@@ -5,13 +5,8 @@
 use App\Http\Curl\HttpRequest;
 
 class ElasticSearchHelper {
-    private $elasticSearchHost;
-
-    private $elasticSearchBaseName;
-
-    public function __construct(string $elasticSearchHost, string $elasticSearchBaseName) {
-        $this->elasticSearchHost = $elasticSearchHost;
-        $this->elasticSearchBaseName = $elasticSearchBaseName;
+    public function __construct(private readonly string $elasticSearchHost, private readonly string $elasticSearchBaseName)
+    {
     }
 
     public function hasIndices(HttpRequest $request): bool {
@@ -44,7 +39,7 @@ public function hasIndices(HttpRequest $request): bool {
         // index\n
         // site1.localhost_content_blabla\n
         // site1.localhost_general_bla\n
-        $wikiIndices = array_filter(explode("\n", $rawResponse));
+        $wikiIndices = array_filter(explode("\n", (string) $rawResponse));
 
         // no indices to delete only index header
         if (count($wikiIndices) <= 1) {

app/Helper/InviteHelper.php

@@ -3,23 +3,17 @@
 namespace App\Helper;
 
 class InviteHelper {
-    private $segments;
-
-    private $segmentLength;
-
     private $prefix;
 
-    public function __construct(int $numSegments = 2, int $segmentLength = 4) {
+    public function __construct(private readonly int $segments = 2, private readonly int $segmentLength = 4) {
         $this->prefix = 'wbcloud-';
-        $this->segments = $numSegments;
-        $this->segmentLength = $segmentLength;
     }
 
     private function generateSegment(int &$counter): string {
         $segment = '';
 
         for ($i = 0; $i < $this->segmentLength; $i++) {
-            $segment .= rand(0, 9);
+            $segment .= random_int(0, 9);
         }
 
         $counter++;

app/Helper/MWTimestampHelper.php

@@ -12,7 +12,7 @@
 use Carbon\Exceptions\InvalidFormatException;
 
 class MWTimestampHelper {
-    private const MWTimestampFormat = 'YmdHis';
+    private const string MWTimestampFormat = 'YmdHis';
 
     public static function getCarbonFromMWTimestamp(string $MWTimestamp): CarbonImmutable {
         $carbon = CarbonImmutable::createFromFormat(self::MWTimestampFormat, $MWTimestamp);

app/Http/Controllers/Auth/LoginController.php

@@ -50,7 +50,7 @@ public function deleteLogin(Request $request) {
         return response()
             ->json()
             ->setStatusCode(204)
-            ->withCookie($this->deleteCookie());
+            ->withCookie(self::deleteCookie());
     }
 
     public function postLogin(Request $request): ?JsonResponse {
@@ -84,7 +84,7 @@ public function postLogin(Request $request): ?JsonResponse {
             return response()->json([
                 'user' => $user, // <- we're sending the user info for frontend usage
             ])->withCookie(
-                $this->getCookie($user->createToken('yourAppName')->accessToken)
+                self::getCookie($user->createToken('yourAppName')->accessToken)
             );
         } else {
             $this->incrementLoginAttempts($request);

app/Http/Controllers/Auth/RegisterController.php

@@ -33,10 +33,10 @@ public function register(Request $request) {
 
         $user = null;
         DB::transaction(function () use (&$user, $request): void {
-            $user = (new UserCreateJob(
+            $user = new UserCreateJob(
                 $request->input('email'),
                 $request->input('password')
-            ))->handle();
+            )->handle();
             (UserVerificationCreateTokenAndSendJob::newForAccountCreation($user))->handle();
         });
 

app/Http/Controllers/Backend/MediaWikiHostsController.php

@@ -15,9 +15,9 @@ public function getWikiHostsForDomain(Request $request): JsonResponse {
         $domain = $request->query('domain');
         try {
             $hosts = $mediawikiHostResolver->getHostsForDomain($domain);
-        } catch (UnknownWikiDomainException $e) {
+        } catch (UnknownWikiDomainException) {
             return response()->json(['error' => 'Domain not found.'], 404);
-        } catch (UnknownDBVersionException $e) {
+        } catch (UnknownDBVersionException) {
             return response()->json(['error' => 'Unknown database version.'], 500);
         }
 

app/Http/Controllers/Backend/QsController.php

@@ -36,7 +36,7 @@ public function getBatches(Request $request): Response {
 
     public function markBatchesDone(Request $request): Response {
         $batches = (array) $request->json()->all('batches');
-        QsBatch::whereIn('id', $batches)->increment(
+        QsBatch::whereIn('id')->increment(
             'processing_attempts', 1,
             ['done' => 1, 'pending_since' => null]
         );
@@ -46,7 +46,7 @@ public function markBatchesDone(Request $request): Response {
 
     public function markBatchesNotDone(Request $request): Response {
         $batches = (array) $request->json()->all('batches');
-        QsBatch::whereIn('id', $batches)->increment(
+        QsBatch::whereIn('id')->increment(
             'processing_attempts', 1,
             ['done' => 0, 'pending_since' => null]
         );

app/Http/Controllers/ComplaintController.php

@@ -81,8 +81,8 @@ public function sendMessage(Request $request): JsonResponse {
      * Get a validator for an incoming complaint report page request.
      */
     protected function validator(array $data): \Illuminate\Contracts\Validation\Validator {
-        $data['name'] = $data['name'] ?? '';
-        $data['email'] = $data['email'] ?? '';
+        $data['name'] ??= '';
+        $data['email'] ??= '';
 
         $validation = [
             'recaptcha' => ['required', 'string', 'bail', $this->recaptchaValidation],

app/Http/Controllers/ConversionMetricController.php

@@ -68,9 +68,9 @@ public function index(Request $request) {
     private function returnCsv($output) {
         ob_start();
         $handle = fopen('php://output', 'r+');
-        fputcsv($handle, ['domain_name', 'time_to_engage_days', 'time_before_wiki_abandoned_days', 'number_of_active_editors', 'wiki_creation_time', 'first_edited_time', 'last_edited_time']);
+        fputcsv($handle, ['domain_name', 'time_to_engage_days', 'time_before_wiki_abandoned_days', 'number_of_active_editors', 'wiki_creation_time', 'first_edited_time', 'last_edited_time'], escape: '\\');
         foreach ($output as $wikiMetrics) {
-            fputcsv($handle, array_values($wikiMetrics));
+            fputcsv($handle, array_values($wikiMetrics), escape: '\\');
         }
         $csv = ob_get_clean();
 

app/Http/Controllers/DeletedWikiMetricsController.php

@@ -30,9 +30,10 @@ private function returnCsv($output) {
             'number_of_users_for_wiki',
             'wiki_creation_time',
             'wiki_deletion_time',
-        ]);
+        ],
+        escape: '\\');
         foreach ($output as $deletedWikiMetrics) {
-            fputcsv($handle, array_values($deletedWikiMetrics));
+            fputcsv($handle, array_values($deletedWikiMetrics), escape: '\\');
         }
         $csv = ob_get_clean();
 

app/Http/Controllers/WikiController.php

@@ -27,13 +27,8 @@
 use Illuminate\Validation\Rule;
 
 class WikiController extends Controller {
-    private $domainValidator;
-
-    private $profileValidator;
-
-    public function __construct(DomainValidator $domainValidator, ProfileValidator $profileValidator) {
-        $this->profileValidator = $profileValidator;
-        $this->domainValidator = $domainValidator;
+    public function __construct(private readonly DomainValidator $domainValidator, private readonly ProfileValidator $profileValidator)
+    {
     }
 
     public function create(Request $request): Response {
@@ -46,16 +41,17 @@ public function create(Request $request): Response {
         }
         $user = $request->user();
 
-        $submittedDomain = strtolower($request->input('domain'));
+        $submittedDomain = strtolower((string) $request->input('domain'));
         $submittedDomain = DomainHelper::encode($submittedDomain);
 
         $domainValidator = $this->domainValidator->getValidator($submittedDomain);
-        $isSubdomain = $this->isSubDomain($submittedDomain);
+        $isSubdomain = static::isSubDomain($submittedDomain);
 
         $domainValidator->validateWithBag('post');
 
         // TODO extra validation that username is correct?
         $request->validate([
+            'domain' => 'required',
             'sitename' => 'required|min:3',
             'username' => 'required',
             'profile' => 'nullable|json',
@@ -72,7 +68,7 @@ public function create(Request $request): Response {
 
         $rawProfile = false;
         if ($request->filled('profile')) {
-            $rawProfile = json_decode($request->input('profile'), true);
+            $rawProfile = json_decode((string) $request->input('profile'), true);
             $profileValidator = $this->profileValidator->getValidator($rawProfile);
             $profileValidator->validateWithBag('post');
         }
@@ -240,8 +236,8 @@ public function getWikiDetailsForIdForOwner(Request $request): Response {
     }
 
     public static function isSubDomain(string $domain, ?string $subDomainSuffix = null): bool {
-        $subDomainSuffix = $subDomainSuffix ?? Config::get('wbstack.subdomain_suffix');
+        $subDomainSuffix ??= Config::get('wbstack.subdomain_suffix');
 
-        return preg_match('/' . preg_quote($subDomainSuffix) . '$/', $domain) === 1;
+        return preg_match('/' . preg_quote((string) $subDomainSuffix) . '$/', $domain) === 1;
     }
 }

app/Http/Controllers/WikiEntityImportController.php

@@ -13,9 +13,9 @@
 use Prometheus\Counter;
 
 class WikiEntityImportController extends Controller {
-    private Counter $successfulCounter;
+    private readonly Counter $successfulCounter;
 
-    private Counter $failedCounter;
+    private readonly Counter $failedCounter;
 
     public function __construct(CollectorRegistry $registry) {
         $this->successfulCounter = $registry->getOrRegisterCounter(
@@ -75,7 +75,7 @@ public function create(Request $request): JsonResponse {
             wikiId: $wiki->id,
             sourceWikiUrl: $validatedInput['source_wiki_url'],
             importId: $import->id,
-            entityIds: explode(',', $validatedInput['entity_ids']),
+            entityIds: explode(',', (string) $validatedInput['entity_ids']),
         ));
 
         return response()->json(['data' => $import]);

app/Http/Controllers/WikiLogoController.php

@@ -24,7 +24,7 @@ public function update(Request $request) {
         $wiki = $request->attributes->get('wiki');
 
         // run the job to set the wiki logo
-        (new SetWikiLogo('id', $wiki->id, $request->file('logo')->getRealPath()))->handle();
+        new SetWikiLogo('id', $wiki->id, $request->file('logo')->getRealPath())->handle();
 
         // get the logo URL from the settings
         $wgLogoSetting = $wiki->settings()->firstWhere(['name' => WikiSetting::wgLogo])->value;