[6.x] Raise PHPStan to level 6

packages/craftcms-ui/src/components/nav-item/nav-item.styles.ts

@@ -18,7 +18,7 @@ export default css`
     border-radius: var(--c-radius-md);
     position: relative;
   }
-  
+
   craft-badge-indicator {
       position: absolute;
       inset-inline-end: 0;
@@ -34,7 +34,7 @@ export default css`
   .nav-item--flush {
     margin-inline-start: calc(var(--_padding-inline) * -1);
   }
-  
+
   :host([group]) {
     margin-block-start: var(--c-spacing-sm);
   }

phpstan.neon

@@ -4,11 +4,12 @@ includes:
 
 parameters:
     phpVersion: 80500
-    level: 5
+    level: 6
     paths:
         - src
         - config
     stubFiles:
+        - yii2-adapter/stubs/laravel-ruleset-validation.stub
         - yii2-adapter/stubs/_generated.stub
         - yii2-adapter/stubs/GraphQL/Type/Definition/FieldDefinition.stub
         - yii2-adapter/stubs/GraphQL/Type/Definition/ResolveInfo.stub
@@ -30,5 +31,3 @@ parameters:
     configDirectories:
         - tests
     tmpDir: /tmp/phpstan
-    ignoreErrors:
-        - '#^Call to function class_exists\(\) with .* will always evaluate to false.$#'

resources/js/pages/users/Index.vue

@@ -27,7 +27,7 @@
       }
     };
 
-    collect(page.props.sources ?? []);
+    collect((page.props.sources ?? []) as Source[]);
 
     return slugs;
   });

src/Address/Addresses.php

@@ -71,6 +71,10 @@ public function getAddressFormatRepository(): AddressFormatRepository
 
     /**
      * Returns subdivisions for a field based on its parents.
+     *
+     * @param  list<string>  $parents
+     * @param  array<string, string>  $options
+     * @return array<string, string>
      */
     public function defineAddressSubdivisions(array $parents, array $options = []): array
     {
@@ -81,6 +85,8 @@ public function defineAddressSubdivisions(array $parents, array $options = []):
 
     /**
      * Returns a list of countries to be used as options for selection.
+     *
+     * @return array<string, string>
      */
     public function getCountryList(?string $locale = null): array
     {
@@ -155,6 +161,8 @@ public function getFieldLabel(string $field, string $countryCode): string
 
     /**
      * Formats the address model into the correct sequence and format in HTML.
+     *
+     * @param  array{locale?: string, html?: bool, html_tag?: string, html_attributes?: array<string, string>}  $options
      */
     public function formatAddress(Address $address, array $options = [], ?FormatterInterface $formatter = null): string
     {

src/Address/Concerns/LegacyConstants.php

@@ -4,7 +4,7 @@
 
 namespace CraftCms\Cms\Address\Concerns;
 
-if (! class_exists(LegacyConstants::class)) {
+if (! trait_exists(LegacyConstants::class)) {
     /**
      * @internal This is a hook for the yii2-adapter to define its constants.
      */

src/Address/Conditions/AdministrativeAreaConditionRule.php

@@ -22,6 +22,7 @@ class AdministrativeAreaConditionRule extends BaseMultiSelectConditionRule imple
 {
     public string $countryCode = 'US';
 
+    /** @return array<string, mixed> */
     #[Override]
     public function getConfig(): array
     {

src/Address/Conditions/FieldConditionRule.php

@@ -68,7 +68,7 @@ public function matchElement(ElementInterface $element): bool
     }
 
     /**
-     * @return Collection<Addresses>
+     * @return Collection<int, Addresses>
      */
     private function addressFields(): Collection
     {

src/Address/Elements/Address.php

@@ -129,7 +129,8 @@ class Address extends Element implements AddressInterface, NestedElementInterfac
     #[AllowedInSandbox]
     public ?string $longitude = null;
 
-    public function __construct($config = [])
+    /** @param array<string, mixed>|object $config */
+    public function __construct(object|array $config = [])
     {
         parent::__construct($config);
 
@@ -188,6 +189,7 @@ public static function createCondition(): ElementConditionInterface
         return new AddressCondition(self::class);
     }
 
+    /** @return list<class-string<Copy>> */
     #[Override]
     protected static function defineActions(string $source): array
     {
@@ -196,6 +198,7 @@ protected static function defineActions(string $source): array
         ];
     }
 
+    /** @return array<string, array{label: string}> */
     #[Override]
     protected static function defineTableAttributes(): array
     {
@@ -224,6 +227,7 @@ protected function attributeHtml(string $attribute): string
         };
     }
 
+    /** @return list<array{label: string, orderBy: string, attribute?: string, defaultDir?: 'asc'|'desc'}> */
     #[Override]
     protected static function defineSortOptions(): array
     {
@@ -293,6 +297,7 @@ public static function addressAttributes(): array
         ];
     }
 
+    /** @return list<string> */
     #[Override]
     public function safeAttributes(): array
     {
@@ -323,7 +328,7 @@ public function setAttributes($values): void
     }
 
     #[Override]
-    public function getAttributeLabel($attribute): string
+    public function getAttributeLabel(string $attribute): string
     {
         if (AddressField::exists($attribute)) {
             /** @phpstan-var AddressField::* $attribute */
@@ -353,6 +358,7 @@ public function getBelongsToCurrentUser(): bool
         return $owner instanceof User && $owner->getIsCurrent();
     }
 
+    /** @return list<array<string, mixed>> */
     #[Override]
     protected function safeActionMenuItems(): array
     {

src/Address/Events/AddressCountriesResolving.php

@@ -8,7 +8,7 @@ class AddressCountriesResolving
 {
     public function __construct(
         public string $locale,
-        /** @var array list of countries keyed by their country code. */
+        /** @var array<string, string> List of countries keyed by their country code. */
         public array $countries,
     ) {}
 }

src/Address/Events/AddressSubdivisionsResolving.php

@@ -8,10 +8,10 @@ class AddressSubdivisionsResolving
 {
     public function __construct(
         /**
-         * @var array The field's parents; always in order of: countryCode, administrativeArea, locality
+         * @var list<string> The field's parents; always in order of: countryCode, administrativeArea, locality
          */
         public array $parents,
-        /** @var string[] $subdivisions The subdivisions */
+        /** @var array<string, string> $subdivisions The subdivisions */
         public array $subdivisions,
     ) {}
 }

src/Address/Models/Address.php

@@ -4,6 +4,7 @@
 
 namespace CraftCms\Cms\Address\Models;
 
+use CraftCms\Cms\Database\Factories\AddressFactory;
 use CraftCms\Cms\Database\Table;
 use CraftCms\Cms\Shared\BaseModel;
 use CraftCms\Cms\User\Models\User;
@@ -12,6 +13,7 @@
 
 class Address extends BaseModel
 {
+    /** @use HasFactory<AddressFactory> */
     use HasFactory;
 
     #[\Override]

src/Address/Repositories/SubdivisionRepository.php

@@ -17,6 +17,10 @@
  */
 class SubdivisionRepository extends BaseSubdivisionRepository
 {
+    /**
+     * @param  list<string>  $parents
+     * @return array<string, string>
+     */
     #[Override]
     public function getList(array $parents, $locale = null): array
     {
@@ -34,6 +38,9 @@ public function getList(array $parents, $locale = null): array
 
     /**
      * Get a list of extra subdivision options
+     *
+     * @param  list<string>  $parents
+     * @return array<string, string>
      */
     private function getExtraOptions(array $parents, ?string $lang = null): array
     {

src/Address/Validation/AddressRules.php

@@ -72,6 +72,7 @@ public function prepareForValidation(): void
         }
     }
 
+    /** @return array<string, array<int, mixed>> */
     #[Override]
     public function rules(): array
     {
@@ -85,6 +86,10 @@ public function rules(): array
         return $this->addCoordinateValidation($rules);
     }
 
+    /**
+     * @param  array<string, array<int, mixed>>  $rules
+     * @return array<string, array<int, mixed>>
+     */
     private function addAddressAttributeRules(array $rules): array
     {
         $rules['fieldId'] = ['nullable', 'integer'];
@@ -110,6 +115,10 @@ private function addAddressAttributeRules(array $rules): array
         return $rules;
     }
 
+    /**
+     * @param  array<string, array<int, mixed>>  $rules
+     * @return array<string, array<int, mixed>>
+     */
     private function addCountryCodeValidation(array $rules): array
     {
         $countryCodes = array_keys(app(Addresses::class)->getCountryRepository()->getList());
@@ -118,6 +127,10 @@ private function addCountryCodeValidation(array $rules): array
         return $rules;
     }
 
+    /**
+     * @param  array<string, array<int, mixed>>  $rules
+     * @return array<string, array<int, mixed>>
+     */
     private function addAddressFormatRequirements(array $rules): array
     {
         foreach (Address::addressAttributes() as $attribute) {
@@ -145,6 +158,10 @@ private function isRequiredByAddressFormat(string $attribute): bool
         return in_array($attribute, $formatter->getRequiredFields());
     }
 
+    /**
+     * @param  array<string, array<int, mixed>>  $rules
+     * @return array<string, array<int, mixed>>
+     */
     private function addFieldLayoutRequirements(array $rules): array
     {
         $fieldLayout = $this->subject->getFieldLayout();
@@ -182,6 +199,10 @@ private function resolveFieldAttributes(BaseNativeField $field): array
         };
     }
 
+    /**
+     * @param  array<string, array<int, mixed>>  $rules
+     * @return array<string, array<int, mixed>>
+     */
     private function addCoordinateValidation(array $rules): array
     {
         $coordinateScenarios = $this->inScenarios(self::SCENARIO_LIVE, self::SCENARIO_DEFAULT);

src/Announcement/Announcements.php

@@ -52,6 +52,8 @@ public function push(string $heading, string $body, ?string $pluginHandle = null
 
     /**
      * Returns any announcements for the logged-in user.
+     *
+     * @return list<array{id: int, icon: string|false, label: string, heading: string, body: string, unread: bool}>
      */
     public function get(): array
     {

src/Announcement/Models/Announcement.php

@@ -4,6 +4,7 @@
 
 namespace CraftCms\Cms\Announcement\Models;
 
+use CraftCms\Cms\Database\Factories\AnnouncementFactory;
 use CraftCms\Cms\Plugin\Models\Plugin;
 use CraftCms\Cms\Shared\BaseModel;
 use CraftCms\Cms\User\Models\User;
@@ -14,6 +15,7 @@
 
 class Announcement extends BaseModel
 {
+    /** @use HasFactory<AnnouncementFactory> */
     use HasFactory;
 
     public const ?string UPDATED_AT = null;
@@ -38,6 +40,10 @@ public function plugin(): BelongsTo
         return $this->belongsTo(Plugin::class, 'pluginId');
     }
 
+    /**
+     * @param  Builder<Announcement>  $query
+     * @return Builder<Announcement>
+     */
     #[Scope]
     protected function visible(Builder $query): Builder
     {

src/Asset/Actions/EditImage.php

@@ -13,6 +13,7 @@ class EditImage extends ElementAction
 {
     public string $label;
 
+    /** @param array<string, mixed>|object $config */
     public function __construct(array|object $config = [])
     {
         parent::__construct($config);

src/Asset/Actions/PreviewAsset.php

@@ -13,6 +13,7 @@ class PreviewAsset extends ElementAction
 {
     public ?string $label = null;
 
+    /** @param array<string, mixed>|object $config */
     public function __construct(array|object $config = [])
     {
         parent::__construct($config);

src/Asset/AssetFileKinds.php

@@ -27,7 +27,7 @@
 #[Singleton]
 class AssetFileKinds
 {
-    /** @var array<string, array|Closure> */
+    /** @var array<string, array{label?:string, extensions?:list<string>}|Closure():array{label?:string, extensions?:list<string>}> */
     private array $fileKinds = [];
 
     /** @var array<string, true> */

src/Asset/AssetIndexer.php

@@ -48,6 +48,7 @@
 #[Singleton]
 class AssetIndexer
 {
+    /** @var Collection<int, IndexingSession> */
     public Collection $existingIndexingSessions {
         get => $this->getExistingIndexingSessions();
     }
@@ -58,6 +59,7 @@ public function __construct(
         private readonly Volumes $volumes,
     ) {}
 
+    /** @return Generator<int, FsListing> */
     public function getIndexListOnVolume(Volume $volume, string $directory = ''): Generator
     {
         try {
@@ -109,7 +111,7 @@ public function getIndexListOnVolume(Volume $volume, string $directory = ''): Ge
         }
     }
 
-    /** @return Collection<IndexingSession> */
+    /** @return Collection<int, IndexingSession> */
     public function getExistingIndexingSessions(): Collection
     {
         return AssetIndexingSessionModel::query()
@@ -467,6 +469,7 @@ public function getNextIndexEntry(IndexingSession $session): ?AssetIndexEntry
         return $result ? new AssetIndexEntry((array) $result) : null;
     }
 
+    /** @param array{inProgress?:bool, completed?:bool, recordId?:int, isSkipped?:bool, processedEntries?:int} $data */
     public function updateIndexEntry(int $entryId, array $data): void
     {
         $data = array_intersect_key(