Keep immutable

src/Filter/Model/FilterData.php

@@ -13,9 +13,12 @@
 
 namespace Sonata\AdminBundle\Filter\Model;
 
+/**
+ * @psalm-immutable
+ */
 final class FilterData
 {
-    private ?int $type = null;
+    private ?int $type;
 
     /**
      * @var mixed
@@ -24,18 +27,26 @@ final class FilterData
 
     private bool $hasValue;
 
-    private function __construct()
+    /**
+     * @param mixed $value
+     */
+    private function __construct(?int $type, bool $hasValue, $value = null)
     {
-        $this->hasValue = false;
+        $this->type = $type;
+        $this->hasValue = $hasValue;
+
+        if ($hasValue) {
+            $this->value = $value;
+        }
     }
 
     /**
      * @param array{type?: int|numeric-string|null, value?: mixed} $data
+     *
+     * @psalm-pure
      */
     public static function fromArray(array $data): self
     {
-        $filterData = new self();
-
         if (isset($data['type'])) {
             if (!\is_int($data['type']) && (!\is_string($data['type']) || !is_numeric($data['type']))) {
                 throw new \InvalidArgumentException(sprintf(
@@ -44,15 +55,12 @@ public static function fromArray(array $data): self
                 ));
             }
 
-            $filterData->type = (int) $data['type'];
-        }
-
-        if (\array_key_exists('value', $data)) {
-            $filterData->value = $data['value'];
-            $filterData->hasValue = true;
+            $type = (int) $data['type'];
+        } else {
+            $type = null;
         }
 
-        return $filterData;
+        return new self($type, \array_key_exists('value', $data), $data['value'] ?? null);
     }
 
     /**

tests/Filter/Model/FilterDataTest.php

@@ -33,6 +33,7 @@ public function testTypeMustBeNumericOrNull($type): void
             \is_object($type) ? 'instance of "'.\get_class($type).'"' : '"'.\gettype($type).'"'
         ));
 
+        // @phpstan-ignore-next-line
         FilterData::fromArray(['type' => $type]);
     }