Drop --taint-analysis from psalm run

Author: simPod

.github/workflows/static-analysis.yml

@@ -57,7 +57,7 @@ jobs:
         uses: "ramsey/composer-install@v2"
 
       - name: "Run a static analysis with vimeo/psalm"
-        run: "vendor/bin/psalm --output-format=github --shepherd --taint-analysis --report=results.sarif"
+        run: "vendor/bin/psalm --output-format=github --shepherd --report=results.sarif"
 
       - name: "Upload Security Analysis results to GitHub"
         uses: "github/codeql-action/upload-sarif@v1"

phpstan-baseline.neon

@@ -1,12 +0,0 @@
-parameters:
-	ignoreErrors:
-		-
-			message: "#^Cannot access offset 'defaultValue' on mixed\\.$#"
-			count: 1
-			path: src/Builder/FieldBuilder.php
-
-		-
-			message: "#^Cannot access offset string on mixed\\.$#"
-			count: 1
-			path: src/Builder/FieldBuilder.php
-

psalm-baseline.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<files psalm-version="4.19.0@a2ad69ae4f5ab1f7d225a8dc4e2ec2d9415ed599">
+  <file src="src/Builder/FieldBuilder.php">
+    <MixedAssignment occurrences="1">
+      <code>$value['defaultValue']</code>
+    </MixedAssignment>
+  </file>
+</files>

psalm.xml.dist

@@ -4,6 +4,7 @@
     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"
+    errorBaseline="psalm-baseline.xml"
 >
     <projectFiles>
         <directory name="src" />

src/Builder/FieldBuilder.php

@@ -9,13 +9,24 @@
 
 class FieldBuilder
 {
-    /** @var array<string, mixed|array<string|mixed>> */
-    private array $parameters = [];
+    private string $name;
+
+    private Type $type;
+
+    private string|null $description = null;
+
+    private string|null $deprecationReason = null;
+
+    /** @psalm-var callable(mixed, array<mixed>, mixed, ResolveInfo) : mixed|null */
+    private $resolve;
+
+    /** @psalm-var array<string, array<string, mixed>>|null */
+    private array|null $args = null;
 
     final private function __construct(string $name, Type $type)
     {
-        $this->parameters['name'] = $name;
-        $this->parameters['type'] = $type;
+        $this->name = $name;
+        $this->type = $type;
     }
 
     /**
@@ -31,7 +42,7 @@ public static function create(string $name, Type $type): self
      */
     public function setDescription(string $description): self
     {
-        $this->parameters['description'] = $description;
+        $this->description = $description;
 
         return $this;
     }
@@ -41,16 +52,22 @@ public function setDescription(string $description): self
      */
     public function addArgument(string $name, Type $type, ?string $description = null, mixed $defaultValue = null): self
     {
-        $this->parameters['args'][$name] = ['type' => $type];
+        if ($this->args === null) {
+            $this->args = [];
+        }
+
+        $value = ['type' => $type];
 
         if ($description !== null) {
-            $this->parameters['args'][$name]['description'] = $description;
+            $value['description'] = $description;
         }
 
         if ($defaultValue !== null) {
-            $this->parameters['args'][$name]['defaultValue'] = $defaultValue;
+            $value['defaultValue'] = $defaultValue;
         }
 
+        $this->args[$name] = $value;
+
         return $this;
     }
 
@@ -63,7 +80,7 @@ public function addArgument(string $name, Type $type, ?string $description = nul
      */
     public function setResolver(callable $resolver): self
     {
-        $this->parameters['resolve'] = $resolver;
+        $this->resolve = $resolver;
 
         return $this;
     }
@@ -73,7 +90,7 @@ public function setResolver(callable $resolver): self
      */
     public function setDeprecationReason(string $reason): self
     {
-        $this->parameters['deprecationReason'] = $reason;
+        $this->deprecationReason = $reason;
 
         return $this;
     }
@@ -83,6 +100,13 @@ public function setDeprecationReason(string $reason): self
      */
     public function build(): array
     {
-        return $this->parameters;
+        return [
+            'args' => $this->args,
+            'name' => $this->name,
+            'description' => $this->description,
+            'deprecationReason' => $this->deprecationReason,
+            'resolve' => $this->resolve,
+            'type' => $this->type,
+        ];
     }
 }