Add types to ViewInterface::setParameter() and ViewInterface::addToParameter() parameters (#261)

vjik · web-flow · commit b48a14da2399 · 2024-05-27T16:04:10.000+03:00
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -29,7 +29,7 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.1', '8.2', '8.3']
+        ['8.1', '8.2']
   psalm80:
     uses: yiisoft/actions/.github/workflows/psalm.yml@master
     with:
@@ -38,3 +38,11 @@ jobs:
         ['ubuntu-latest']
       php: >-
         ['8.0']
+  psalm83:
+    uses: yiisoft/actions/.github/workflows/psalm.yml@master
+    with:
+      psalm-config: psalm83.xml
+      os: >-
+        ['ubuntu-latest']
+      php: >-
+        ['8.3']
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@
 - New #242: Add `View::getLocale()` and `WebView::getLocale()` methods (@Tigrov)
 - Enh #250: Make event dispatcher in `View` and `WebView` optional (@vjik)
 - Enh #251: Make base path in `View` and `WebView` optional (@vjik)
+- Enh #248: Add types to `ViewInterface::setParameter()` and `ViewInterface::addToParameter()` parameters (@vjik)
 
 ## 8.0.0 February 16, 2023
 
diff --git a/composer.json b/composer.json
@@ -39,7 +39,7 @@
     "require-dev": {
         "maglnet/composer-require-checker": "^4.2",
         "phpunit/phpunit": "^9.5",
-        "rector/rector": "^1.0",
+        "rector/rector": "1.0.*",
         "roave/infection-static-analysis-plugin": "^1.25",
         "spatie/phpunit-watcher": "^1.23",
         "vimeo/psalm": "^4.30|^5.20",
diff --git a/psalm83.xml b/psalm83.xml
@@ -0,0 +1,21 @@
+<?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" />
+        <RiskyTruthyFalsyComparison errorLevel="suppress" />
+        <MissingClassConstType errorLevel="suppress" />
+    </issueHandlers>
+</psalm>
diff --git a/rector.php b/rector.php
@@ -5,7 +5,6 @@
 use Rector\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector;
 use Rector\Config\RectorConfig;
 use Rector\Php71\Rector\FuncCall\RemoveExtraParametersRector;
-use Rector\Php80\Rector\FunctionLike\MixedTypeRector;
 use Rector\Set\ValueObject\LevelSetList;
 
 return static function (RectorConfig $rectorConfig): void {
@@ -23,7 +22,6 @@
     ]);
 
     $rectorConfig->skip([
-        MixedTypeRector::class,
         RemoveExtraParametersRector::class => [__DIR__ . '/src/PhpTemplateRenderer.php'],
     ]);
 };
diff --git a/src/ViewInterface.php b/src/ViewInterface.php
@@ -156,7 +156,7 @@ public function setParameters(array $parameters): static;
      * @param string $id The unique identifier of the parameter.
      * @param mixed $value The value of the parameter.
      */
-    public function setParameter(string $id, $value): static;
+    public function setParameter(string $id, mixed $value): static;
 
     /**
      * Add values to end of common array parameter. If specified parameter does not exist or him is not array,
@@ -167,7 +167,7 @@ public function setParameter(string $id, $value): static;
      *
      * @throws InvalidArgumentException When specified parameter already exists and is not an array.
      */
-    public function addToParameter(string $id, ...$value): static;
+    public function addToParameter(string $id, mixed ...$value): static;
 
     /**
      * Removes a common parameter.
