Fix PhpStan test

.gitignore

@@ -8,3 +8,4 @@ phpunit.xml
 .phpunit.result.cache
 .php-cs-fixer.cache
 phpstan.neon
+tests/Support/temp/

phpstan-baseline.neon

@@ -30,26 +30,6 @@ parameters:
 			count: 1
 			path: src/Conversions/Commands/RegenerateCommand.php
 
-		-
-			message: "#^Parameter \\#1 \\$modelType of method Spatie\\\\MediaLibrary\\\\MediaCollections\\\\MediaRepository\\:\\:getByModelType\\(\\) expects string, array\\|string given\\.$#"
-			count: 1
-			path: src/Conversions/Commands/RegenerateCommand.php
-
-		-
-			message: "#^Parameter \\#2 \\$excludeStartingId of method Spatie\\\\MediaLibrary\\\\MediaCollections\\\\MediaRepository\\:\\:getByIdGreaterThan\\(\\) expects bool, array\\|bool\\|string given\\.$#"
-			count: 1
-			path: src/Conversions/Commands/RegenerateCommand.php
-
-		-
-			message: "#^Parameter \\#2 \\$string of function explode expects string, bool\\|string\\|null given\\.$#"
-			count: 1
-			path: src/Conversions/Commands/RegenerateCommand.php
-
-		-
-			message: "#^Parameter \\#3 \\$modelType of method Spatie\\\\MediaLibrary\\\\MediaCollections\\\\MediaRepository\\:\\:getByIdGreaterThan\\(\\) expects string, array\\|string given\\.$#"
-			count: 1
-			path: src/Conversions/Commands/RegenerateCommand.php
-
 		-
 			message: "#^Parameter \\#3 \\$onlyMissing of method Spatie\\\\MediaLibrary\\\\Conversions\\\\FileManipulator\\:\\:createDerivedFiles\\(\\) expects bool, array\\|bool\\|string\\|null given\\.$#"
 			count: 1
@@ -275,11 +255,6 @@ parameters:
 			count: 1
 			path: src/Conversions/ImageGenerators/ImageGeneratorFactory.php
 
-		-
-			message: "#^Unable to resolve the template type TMapValue in call to method Illuminate\\\\Support\\\\Collection\\<\\(int\\|string\\),mixed\\>\\:\\:map\\(\\)$#"
-			count: 1
-			path: src/Conversions/ImageGenerators/ImageGeneratorFactory.php
-
 		-
 			message: "#^Unable to resolve the template type TValue in call to function collect$#"
 			count: 1
@@ -465,11 +440,6 @@ parameters:
 			count: 1
 			path: src/MediaCollections/Commands/CleanCommand.php
 
-		-
-			message: "#^Parameter \\#1 \\$collectionName of method Spatie\\\\MediaLibrary\\\\MediaCollections\\\\MediaRepository\\:\\:getByCollectionName\\(\\) expects string, array\\|string given\\.$#"
-			count: 1
-			path: src/MediaCollections/Commands/CleanCommand.php
-
 		-
 			message: "#^Parameter \\#1 \\$microseconds of function usleep expects int, float\\|int\\<min, \\-1000000\\>\\|int\\<1000000, max\\> given\\.$#"
 			count: 1
@@ -480,21 +450,6 @@ parameters:
 			count: 1
 			path: src/MediaCollections/Commands/CleanCommand.php
 
-		-
-			message: "#^Parameter \\#1 \\$modelType of method Spatie\\\\MediaLibrary\\\\MediaCollections\\\\MediaRepository\\:\\:getByModelType\\(\\) expects string, array\\|string given\\.$#"
-			count: 1
-			path: src/MediaCollections/Commands/CleanCommand.php
-
-		-
-			message: "#^Parameter \\#1 \\$modelType of method Spatie\\\\MediaLibrary\\\\MediaCollections\\\\MediaRepository\\:\\:getByModelTypeAndCollectionName\\(\\) expects string, array\\|string given\\.$#"
-			count: 1
-			path: src/MediaCollections/Commands/CleanCommand.php
-
-		-
-			message: "#^Parameter \\#2 \\$collectionName of method Spatie\\\\MediaLibrary\\\\MediaCollections\\\\MediaRepository\\:\\:getByModelTypeAndCollectionName\\(\\) expects string, array\\|string given\\.$#"
-			count: 1
-			path: src/MediaCollections/Commands/CleanCommand.php
-
 		-
 			message: "#^Property Spatie\\\\MediaLibrary\\\\MediaCollections\\\\Commands\\\\CleanCommand\\:\\:\\$isDryRun \\(bool\\) does not accept array\\|bool\\|string\\|null\\.$#"
 			count: 1
@@ -505,26 +460,6 @@ parameters:
 			count: 1
 			path: src/MediaCollections/Commands/ClearCommand.php
 
-		-
-			message: "#^Parameter \\#1 \\$collectionName of method Spatie\\\\MediaLibrary\\\\MediaCollections\\\\MediaRepository\\:\\:getByCollectionName\\(\\) expects string, array\\|string given\\.$#"
-			count: 1
-			path: src/MediaCollections/Commands/ClearCommand.php
-
-		-
-			message: "#^Parameter \\#1 \\$modelType of method Spatie\\\\MediaLibrary\\\\MediaCollections\\\\MediaRepository\\:\\:getByModelType\\(\\) expects string, array\\|string given\\.$#"
-			count: 1
-			path: src/MediaCollections/Commands/ClearCommand.php
-
-		-
-			message: "#^Parameter \\#1 \\$modelType of method Spatie\\\\MediaLibrary\\\\MediaCollections\\\\MediaRepository\\:\\:getByModelTypeAndCollectionName\\(\\) expects string, array\\|string given\\.$#"
-			count: 1
-			path: src/MediaCollections/Commands/ClearCommand.php
-
-		-
-			message: "#^Parameter \\#2 \\$collectionName of method Spatie\\\\MediaLibrary\\\\MediaCollections\\\\MediaRepository\\:\\:getByModelTypeAndCollectionName\\(\\) expects string, array\\|string given\\.$#"
-			count: 1
-			path: src/MediaCollections/Commands/ClearCommand.php
-
 		-
 			message: "#^Method Spatie\\\\MediaLibrary\\\\MediaCollections\\\\Contracts\\\\MediaLibraryRequest\\:\\:mediaLibraryRequestItems\\(\\) return type with generic class Illuminate\\\\Support\\\\Collection does not specify its types\\: TKey, TValue$#"
 			count: 1
@@ -1230,11 +1165,6 @@ parameters:
 			count: 1
 			path: src/MediaCollections/Models/Media.php
 
-		-
-			message: "#^Access to an undefined property Spatie\\\\MediaLibrary\\\\MediaCollections\\\\Models\\\\Media\\:\\:\\$conversions_disk\\.$#"
-			count: 1
-			path: src/MediaCollections/Models/Media.php
-
 		-
 			message: "#^Access to an undefined property Spatie\\\\MediaLibrary\\\\MediaCollections\\\\Models\\\\Media\\:\\:\\$custom_properties\\.$#"
 			count: 7
@@ -1252,7 +1182,7 @@ parameters:
 
 		-
 			message: "#^Access to an undefined property Spatie\\\\MediaLibrary\\\\MediaCollections\\\\Models\\\\Media\\:\\:\\$generated_conversions\\.$#"
-			count: 5
+			count: 4
 			path: src/MediaCollections/Models/Media.php
 
 		-
@@ -1285,11 +1215,6 @@ parameters:
 			count: 2
 			path: src/MediaCollections/Models/Media.php
 
-		-
-			message: "#^Access to an undefined property Spatie\\\\MediaLibrary\\\\MediaCollections\\\\Models\\\\Media\\:\\:\\$sortable\\.$#"
-			count: 2
-			path: src/MediaCollections/Models/Media.php
-
 		-
 			message: "#^Cannot call method determineOrderColumnName\\(\\) on Illuminate\\\\Database\\\\Eloquent\\\\Collection\\<int, Spatie\\\\MediaLibrary\\\\MediaCollections\\\\Models\\\\Media\\>\\|Spatie\\\\MediaLibrary\\\\MediaCollections\\\\Models\\\\Media\\|null\\.$#"
 			count: 1
@@ -1557,7 +1482,7 @@ parameters:
 
 		-
 			message: "#^Access to an undefined property Spatie\\\\MediaLibrary\\\\MediaCollections\\\\Models\\\\Media\\:\\:\\$responsive_images\\.$#"
-			count: 4
+			count: 2
 			path: src/ResponsiveImages/RegisteredResponsiveImages.php
 
 		-

src/Conversions/Commands/RegenerateCommand.php

@@ -77,16 +77,16 @@ public function handle(MediaRepository $mediaRepository, FileManipulator $fileMa
     public function getMediaToBeRegenerated(): Collection
     {
         // Get this arg first as it can also be passed to the greater-than-id branch
-        $modelType = $this->argument('modelType') ?? '';
+        $modelType = $this->argument('modelType');
 
         $startingFromId = (int)$this->option('starting-from-id');
         if ($startingFromId !== 0) {
-            $excludeStartingId = $this->option('exclude-starting-id') ?? false;
+            $excludeStartingId = (bool) $this->option('exclude-starting-id') ?: false;
 
-            return $this->mediaRepository->getByIdGreaterThan($startingFromId, $excludeStartingId, $modelType);
+            return $this->mediaRepository->getByIdGreaterThan($startingFromId, $excludeStartingId, is_string($modelType) ? $modelType : '');
         }
 
-        if ($modelType !== '') {
+        if (is_string($modelType)) {
             return $this->mediaRepository->getByModelType($modelType);
         }
 
@@ -103,11 +103,11 @@ protected function getMediaIds(): array
         $mediaIds = $this->option('ids');
 
         if (! is_array($mediaIds)) {
-            $mediaIds = explode(',', $mediaIds);
+            $mediaIds = explode(',', (string) $mediaIds);
         }
 
         if (count($mediaIds) === 1 && Str::contains($mediaIds[0], ',')) {
-            $mediaIds = explode(',', $mediaIds[0]);
+            $mediaIds = explode(',', (string) $mediaIds[0]);
         }
 
         return $mediaIds;

src/MediaCollections/Commands/CleanCommand.php

@@ -73,18 +73,18 @@ public function getMediaItems(): Collection
         $modelType = $this->argument('modelType');
         $collectionName = $this->argument('collectionName');
 
-        if (! is_null($modelType) && ! is_null($collectionName)) {
+        if (is_string($modelType) && is_string($collectionName)) {
             return $this->mediaRepository->getByModelTypeAndCollectionName(
                 $modelType,
                 $collectionName
             );
         }
 
-        if (! is_null($modelType)) {
+        if (is_string($modelType)) {
             return $this->mediaRepository->getByModelType($modelType);
         }
 
-        if (! is_null($collectionName)) {
+        if (is_string($collectionName)) {
             return $this->mediaRepository->getByCollectionName($collectionName);
         }
 

src/MediaCollections/Commands/ClearCommand.php

@@ -47,18 +47,18 @@ public function getMediaItems(): Collection
         $modelType = $this->argument('modelType');
         $collectionName = $this->argument('collectionName');
 
-        if (! is_null($modelType) && ! is_null($collectionName)) {
+        if (is_string($modelType) && is_string($collectionName)) {
             return $this->mediaRepository->getByModelTypeAndCollectionName(
                 $modelType,
                 $collectionName
             );
         }
 
-        if (! is_null($modelType)) {
+        if (is_string($modelType)) {
             return $this->mediaRepository->getByModelType($modelType);
         }
 
-        if (! is_null($collectionName)) {
+        if (is_string($collectionName)) {
             return $this->mediaRepository->getByCollectionName($collectionName);
         }