Merge branch 'hotfix/phpstan-var' into main

craftcms · May 9, 2023 · 0c111e4 · 0c111e4
2 parents 2ad31e6 + 1203286
commit 0c111e4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/src/config/GeneralConfig.php b/src/config/GeneralConfig.php
@@ -2469,7 +2469,8 @@ class GeneralConfig extends BaseConfig
     public bool $sanitizeCpImageUploads = true;
 
     /**
-     * @var 'None'|'Lax'|'Strict'|null The [SameSite](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie/SameSite) value that should be set on Craft cookies, if any.
+     * @var string|null  The [SameSite](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie/SameSite) value that should be set on Craft cookies, if any.
+     * @phpstan-var 'None'|'Lax'|'Strict'|null
      *
      * This can be set to `'None'`, `'Lax'`, `'Strict'`, or `null`.
      *

diff --git a/src/fields/PlainText.php b/src/fields/PlainText.php
@@ -42,7 +42,8 @@ public static function valueType(): string
     }
 
     /**
-     * @var 'normal'|'enlarged' The UI mode of the field.
+     * @var string The UI mode of the field.
+     * @phpstan-var 'normal'|'enlarged'
      * @since 3.5.0
      */
     public string $uiMode = 'normal';

diff --git a/src/models/FsListing.php b/src/models/FsListing.php
@@ -35,7 +35,8 @@ class FsListing extends Model
     private string $basename;
 
     /**
-     * @var 'file'|'dir' Type of listing. Can be "file" or "dir".
+     * @var string Type of listing. Can be "file" or "dir".
+     * @phpstan-var 'file'|'dir'
      */
     private string $type;
 

diff --git a/src/models/ImageTransform.php b/src/models/ImageTransform.php
@@ -73,12 +73,14 @@ class ImageTransform extends Model
     public string $mode = 'crop';
 
     /**
-     * @var 'top-left'|'top-center'|'top-right'|'center-left'|'center-center'|'center-right'|'bottom-left'|'bottom-center'|'bottom-right' Position
+     * @var string Position
+     * @phpstan-var 'top-left'|'top-center'|'top-right'|'center-left'|'center-center'|'center-right'|'bottom-left'|'bottom-center'|'bottom-right'
      */
     public string $position = 'center-center';
 
     /**
-     * @var 'none'|'line'|'plane'|'partition' Interlace
+     * @var string Interlace
+     * @phpstan-var 'none'|'line'|'plane'|'partition'
      */
     public string $interlace = 'none';