♻️ fix new fully_qualified_strict_types rule (#4573)

Author: MrKrisKrisu

app/Console/Commands/DatabaseCleaner/PolylinesBrouter.php

@@ -32,17 +32,17 @@ public function handle(): void
         }
     }
 
-    private function updateTrips(string $ids, Polyline $polyline): void
+    private function updateTrips(string $ids, PolyLine $polyline): void
     {
         Trip::whereIn('polyline_id', explode(',', $ids))
             ->orderBy('id', 'desc')
             ->get()
             ->each(fn ($trip) => $trip->update(['polyline_id' => $polyline->id]));
     }
 
-    private function fetchAndUpdatePolyline(int $parent_id): Polyline
+    private function fetchAndUpdatePolyline(int $parent_id): PolyLine
     {
-        $polyline = Polyline::where('parent_id', $parent_id)->orderBy('id', 'desc')->first();
+        $polyline = PolyLine::where('parent_id', $parent_id)->orderBy('id', 'desc')->first();
         $geoJson = json_decode($polyline->polyline, true);
         foreach ($geoJson['features'] as $key => $feature) {
             if (empty($feature['properties'])) {

app/Dto/ConfigurationInformation/Language.php

@@ -2,6 +2,7 @@
 
 namespace App\Dto\ConfigurationInformation;
 
+use App\Traits\JsonResponseObject;
 use OpenApi\Attributes as OA;
 
 #[OA\Schema(
@@ -26,7 +27,7 @@
 )]
 readonly class Language
 {
-    use \App\Traits\JsonResponseObject;
+    use JsonResponseObject;
 
     public function __construct(
         public string $code,

app/Http/Controllers/API/v1/ConfigurationInfoController.php

@@ -32,7 +32,7 @@ public function __construct(\App\Http\Controllers\Backend\ConfigurationInfoContr
             ),
         ]
     )]
-    public function getConfigurationInfo(): \App\Dto\ConfigurationInformation\ConfigurationInformation
+    public function getConfigurationInfo(): ConfigurationInformation
     {
         return $this->backendController->getConfigurationInfo();
     }

app/Http/Controllers/API/v1/RouteSegmentController.php

@@ -14,6 +14,7 @@
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
 use Illuminate\Validation\ValidationException;
 use OpenApi\Attributes as OA;
 use Traewelling\GooglePolyline\PolylineTranscoder;
@@ -48,7 +49,7 @@ class RouteSegmentController extends Controller
             new OA\Response(response: 422, description: self::OA_DESC_UNPROCESSABLE),
         ],
     )]
-    public function index(Request $request): \Illuminate\Http\Resources\Json\AnonymousResourceCollection
+    public function index(Request $request): AnonymousResourceCollection
     {
         $this->authorize('viewAny', RouteSegment::class);
 

app/Http/Controllers/API/v1/TransportController.php

@@ -5,6 +5,7 @@
 use App\Dto\Coordinate;
 use App\Dto\Internal\CheckInRequestDto;
 use App\Dto\Internal\CheckinSuccessDto;
+use App\Dto\Internal\Departure;
 use App\Dto\Transport\Station as StationDto;
 use App\Enum\Business;
 use App\Enum\StationIdentifierType;
@@ -202,11 +203,11 @@ public function getDepartures(Request $request, int $stationId): JsonResponse
                 localtime: isset($validated['when']) && !preg_match('(\+|Z)', $validated['when'])
             );
 
-            $departures = $filtered->departures->sortBy(function (\App\Dto\Internal\Departure $departure) {
+            $departures = $filtered->departures->sortBy(function (Departure $departure) {
                 return ($departure->realDeparture ?? $departure->plannedDeparture)->toIso8601String();
             });
 
-            $times = $departures->map(fn (\App\Dto\Internal\Departure $d) => $d->realDeparture ?? $d->plannedDeparture)->filter()->sort();
+            $times = $departures->map(fn (Departure $d) => $d->realDeparture ?? $d->plannedDeparture)->filter()->sort();
             $prev = $timestamp->clone()->subMinutes(15);
             $next = $times->isNotEmpty() ? $times->last()->clone()->addMinute() : $timestamp->clone()->addMinutes(15);
 

app/Http/Controllers/API/v1/WebhookController.php

@@ -10,7 +10,7 @@
 use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
 use OpenApi\Attributes as OA;
 
-class WebhookController extends Controller
+class WebhookController extends APIController
 {
     #[OA\Get(
         path: '/webhooks',

app/Http/Kernel.php

@@ -3,10 +3,38 @@
 namespace App\Http;
 
 use App\Http\Middleware\Api\JsonMiddleware;
+use App\Http\Middleware\Authenticate;
+use App\Http\Middleware\CheckForMaintenanceMode;
+use App\Http\Middleware\EncryptCookies;
+use App\Http\Middleware\Language;
+use App\Http\Middleware\PrivacyInterceptionMiddleware;
+use App\Http\Middleware\PrivacyPolicyInterceptionMiddleware;
+use App\Http\Middleware\RedirectIfAuthenticated;
 use App\Http\Middleware\SemiScope;
+use App\Http\Middleware\TrimStrings;
+use App\Http\Middleware\TrustProxies;
+use App\Http\Middleware\VerifyCsrfToken;
+use Illuminate\Auth\Middleware\AuthenticateWithBasicAuth;
+use Illuminate\Auth\Middleware\Authorize;
+use Illuminate\Auth\Middleware\EnsureEmailIsVerified;
+use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse;
 use Illuminate\Foundation\Http\Kernel as HttpKernel;
+use Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull;
+use Illuminate\Foundation\Http\Middleware\ValidatePostSize;
+use Illuminate\Http\Middleware\HandleCors;
+use Illuminate\Http\Middleware\SetCacheHeaders;
+use Illuminate\Routing\Middleware\SubstituteBindings;
+use Illuminate\Routing\Middleware\ThrottleRequests;
+use Illuminate\Routing\Middleware\ValidateSignature;
+use Illuminate\Session\Middleware\AuthenticateSession;
+use Illuminate\Session\Middleware\StartSession;
+use Illuminate\View\Middleware\ShareErrorsFromSession;
 use Laravel\Passport\Http\Middleware\CheckToken;
 use Laravel\Passport\Http\Middleware\CheckTokenForAnyScope;
+use Laravel\Passport\Http\Middleware\CreateFreshApiToken;
+use Spatie\Permission\Middleware\PermissionMiddleware;
+use Spatie\Permission\Middleware\RoleMiddleware;
+use Spatie\Permission\Middleware\RoleOrPermissionMiddleware;
 
 class Kernel extends HttpKernel
 {
@@ -18,12 +46,12 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $middleware = [
-        \App\Http\Middleware\CheckForMaintenanceMode::class,
-        \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
-        \App\Http\Middleware\TrimStrings::class,
-        \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
-        \App\Http\Middleware\TrustProxies::class,
-        \Illuminate\Http\Middleware\HandleCors::class,
+        CheckForMaintenanceMode::class,
+        ValidatePostSize::class,
+        TrimStrings::class,
+        ConvertEmptyStringsToNull::class,
+        TrustProxies::class,
+        HandleCors::class,
     ];
 
     /**
@@ -33,22 +61,22 @@ class Kernel extends HttpKernel
      */
     protected $middlewareGroups = [
         'web' => [
-            \App\Http\Middleware\EncryptCookies::class,
-            \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
-            \Illuminate\Session\Middleware\StartSession::class,
+            EncryptCookies::class,
+            AddQueuedCookiesToResponse::class,
+            StartSession::class,
             // \Illuminate\Session\Middleware\AuthenticateSession::class,
-            \Illuminate\View\Middleware\ShareErrorsFromSession::class,
-            \App\Http\Middleware\VerifyCsrfToken::class,
-            \Illuminate\Routing\Middleware\SubstituteBindings::class,
-            \App\Http\Middleware\Language::class,
-            \Laravel\Passport\Http\Middleware\CreateFreshApiToken::class,
+            ShareErrorsFromSession::class,
+            VerifyCsrfToken::class,
+            SubstituteBindings::class,
+            Language::class,
+            CreateFreshApiToken::class,
         ],
 
         'api' => [
             'throttle:500,5', // 500 requests per 5 minutes
             JsonMiddleware::class,
             'bindings',
-            \App\Http\Middleware\Language::class,
+            Language::class,
         ],
     ];
 
@@ -60,24 +88,24 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $routeMiddleware = [
-        'auth' => \App\Http\Middleware\Authenticate::class,
-        'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
-        'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
-        'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
-        'can' => \Illuminate\Auth\Middleware\Authorize::class,
-        'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
-        'privacy' => \App\Http\Middleware\PrivacyInterceptionMiddleware::class,
-        'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
-        'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
-        'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
+        'auth' => Authenticate::class,
+        'auth.basic' => AuthenticateWithBasicAuth::class,
+        'bindings' => SubstituteBindings::class,
+        'cache.headers' => SetCacheHeaders::class,
+        'can' => Authorize::class,
+        'guest' => RedirectIfAuthenticated::class,
+        'privacy' => PrivacyInterceptionMiddleware::class,
+        'signed' => ValidateSignature::class,
+        'throttle' => ThrottleRequests::class,
+        'verified' => EnsureEmailIsVerified::class,
         'return-json' => JsonMiddleware::class,
-        'privacy-policy' => \App\Http\Middleware\PrivacyPolicyInterceptionMiddleware::class,
+        'privacy-policy' => PrivacyPolicyInterceptionMiddleware::class,
         'scopes' => CheckToken::class,
         'scope' => CheckTokenForAnyScope::class,
         'semiscope' => SemiScope::class,
-        'role' => \Spatie\Permission\Middleware\RoleMiddleware::class,
-        'permission' => \Spatie\Permission\Middleware\PermissionMiddleware::class,
-        'role_or_permission' => \Spatie\Permission\Middleware\RoleOrPermissionMiddleware::class,
+        'role' => RoleMiddleware::class,
+        'permission' => PermissionMiddleware::class,
+        'role_or_permission' => RoleOrPermissionMiddleware::class,
     ];
 
     /**
@@ -88,11 +116,11 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $middlewarePriority = [
-        \Illuminate\Session\Middleware\StartSession::class,
-        \Illuminate\View\Middleware\ShareErrorsFromSession::class,
-        \App\Http\Middleware\Authenticate::class,
-        \Illuminate\Session\Middleware\AuthenticateSession::class,
-        \Illuminate\Routing\Middleware\SubstituteBindings::class,
-        \Illuminate\Auth\Middleware\Authorize::class,
+        StartSession::class,
+        ShareErrorsFromSession::class,
+        Authenticate::class,
+        AuthenticateSession::class,
+        SubstituteBindings::class,
+        Authorize::class,
     ];
 }

app/Http/Resources/EventResource.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Resources;
 
+use App\Models\Event;
 use Illuminate\Http\Resources\Json\JsonResource;
 use OpenApi\Attributes as OA;
 
@@ -25,7 +26,7 @@ class EventResource extends JsonResource
 {
     public function toArray($request): array
     {
-        /** @var \App\Models\Event $this */
+        /** @var Event $this */
         return [
             'id' => $this->id,
             'name' => $this->name,

app/Models/Alert.php

@@ -2,19 +2,21 @@
 
 namespace App\Models;
 
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Concerns\HasUuids;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Support\Carbon;
 
 /**
  * @property string $id
  * @property string $type
  * @property string|null $url
- * @property \Illuminate\Support\Carbon $active_from
- * @property \Illuminate\Support\Carbon|null $active_until
- * @property \Illuminate\Support\Carbon|null $created_at
- * @property \Illuminate\Support\Carbon|null $updated_at
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\AlertTranslation> $translations
+ * @property Carbon $active_from
+ * @property Carbon|null $active_until
+ * @property Carbon|null $created_at
+ * @property Carbon|null $updated_at
+ * @property-read Collection<int, AlertTranslation> $translations
  * @property-read int|null $translations_count
  *
  * @method static \Illuminate\Database\Eloquent\Builder<static>|Alert newModelQuery()

app/Models/AlertTranslation.php

@@ -5,6 +5,7 @@
 use Illuminate\Database\Eloquent\Concerns\HasUuids;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Support\Carbon;
 
 /**
  * @property string $id
@@ -13,9 +14,9 @@
  * @property string $title
  * @property string $content
  * @property string|null $url
- * @property \Illuminate\Support\Carbon|null $created_at
- * @property \Illuminate\Support\Carbon|null $updated_at
- * @property-read \App\Models\Alert|null $banner
+ * @property Carbon|null $created_at
+ * @property Carbon|null $updated_at
+ * @property-read Alert|null $banner
  *
  * @method static \Illuminate\Database\Eloquent\Builder<static>|AlertTranslation newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|AlertTranslation newQuery()