Fix psalm (#185)

yiisoft · Feb 7, 2024 · 1d85b7d · 1d85b7d
1 parent 26b8708
commit 1d85b7d
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 5 deletions.
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -29,4 +29,12 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.0', '8.1', '8.2']
+        ['8.1', '8.2', '8.3']
+  psalm80:
+    uses: yiisoft/actions/.github/workflows/psalm.yml@master
+    with:
+      psalm-config: psalm80.xml
+      os: >-
+        ['ubuntu-latest']
+      php: >-
+        ['8.0']
diff --git a/composer.json b/composer.json
@@ -36,7 +36,7 @@
         "rector/rector": "^1.0.0",
         "roave/infection-static-analysis-plugin": "^1.16",
         "spatie/phpunit-watcher": "^1.23",
-        "vimeo/psalm": "^4.18|^5.0"
+        "vimeo/psalm": "^4.30|^5.21"
     },
     "autoload": {
         "psr-4": {

diff --git a/psalm.xml b/psalm.xml
@@ -9,5 +9,12 @@
 >
     <projectFiles>
         <directory name="src" />
+        <ignoreFiles>
+            <directory name="vendor" />
+        </ignoreFiles>
     </projectFiles>
+    <issueHandlers>
+        <MixedAssignment errorLevel="suppress" />
+        <RiskyTruthyFalsyComparison errorLevel="suppress" />
+    </issueHandlers>
 </psalm>
diff --git a/psalm80.xml b/psalm80.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<psalm
+    errorLevel="1"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="https://getpsalm.org/schema/config"
+    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+>
+    <projectFiles>
+        <directory name="src" />
+        <ignoreFiles>
+            <directory name="vendor" />
+        </ignoreFiles>
+    </projectFiles>
+    <issueHandlers>
+        <MixedAssignment errorLevel="suppress" />
+    </issueHandlers>
+</psalm>
diff --git a/src/Html.php b/src/Html.php
@@ -1592,7 +1592,6 @@ public static function renderTagAttributes(array $attributes): string
             $sorted = [];
             foreach (self::ATTRIBUTE_ORDER as $name) {
                 if (isset($attributes[$name])) {
-                    /** @var mixed */
                     $sorted[$name] = $attributes[$name];
                 }
             }
@@ -1602,7 +1601,6 @@ public static function renderTagAttributes(array $attributes): string
         $html = '';
         /**
          * @var string $name
-         * @var mixed $value
          */
         foreach ($attributes as $name => $value) {
             if (is_bool($value)) {

diff --git a/src/Tag/Option.php b/src/Tag/Option.php
@@ -57,7 +57,6 @@ public function disabled(bool $disabled = true): self
      */
     public function getValue(): ?string
     {
-        /** @var mixed $value */
         $value = ArrayHelper::getValue($this->attributes, 'value');
         return $value === null ? null : (string)$value;
     }