Split no-default off from SerdeError.

ordago · Nov 2, 2023 · 0dbadc8 · 0dbadc8
1 parent 365df16
commit 0dbadc8
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/src/Attributes/Field.php b/src/Attributes/Field.php
@@ -14,6 +14,7 @@
 use Crell\fp\Evolvable;
 use Crell\Serde\FieldTypeIncompatible;
 use Crell\Serde\IntersectionTypesNotSupported;
+use Crell\Serde\PropValue;
 use Crell\Serde\Renaming\LiteralName;
 use Crell\Serde\Renaming\RenamingStrategy;
 use Crell\Serde\SerdeError;
@@ -144,7 +145,7 @@ class Field implements FromReflectionProperty, HasSubAttributes, Excludable, Sup
     public function __construct(
         ?string $serializedName = null,
         ?RenamingStrategy $renameWith = null,
-        mixed $default = SerdeError::Missing,
+        mixed $default = PropValue::None,
         protected readonly bool $useDefault = true,
         public readonly bool $flatten = false,
         public readonly bool $exclude = false,
@@ -153,7 +154,7 @@ public function __construct(
         ?bool $requireValue = null,
         protected readonly array $scopes = [null],
     ) {
-        if ($default !== SerdeError::Missing) {
+        if ($default !== PropValue::None) {
             $this->defaultValue = $default;
             $this->shouldUseDefault = true;
         }
@@ -192,7 +193,7 @@ public function fromReflection(\ReflectionProperty $subject): void
             $constructorDefault = $this->getDefaultValueFromConstructor($subject);
 
             $this->shouldUseDefault
-                ??= $this->useDefault && $constructorDefault !== SerdeError::NoDefaultValue;
+                ??= $this->useDefault && $constructorDefault !== PropValue::None;
 
             if ($this->shouldUseDefault) {
                 $this->defaultValue ??= $constructorDefault;
@@ -225,8 +226,7 @@ protected function getDefaultValueFromConstructor(\ReflectionProperty $subject):
 
         return $param?->isDefaultValueAvailable()
             ? $param->getDefaultValue()
-            : SerdeError::NoDefaultValue;
-
+            : PropValue::None;
     }
 
     public function finalize(): void

diff --git a/src/SerdeError.php → src/DeformatterResult.php b/src/SerdeError.php → src/DeformatterResult.php
@@ -7,5 +7,4 @@
 enum SerdeError
 {
     case Missing;
-    case NoDefaultValue;
 }
diff --git a/src/PropValue.php b/src/PropValue.php
@@ -0,0 +1,9 @@
+<?php
+declare(strict_types=1);
+
+namespace Crell\Serde;
+
+enum PropValue
+{
+    case None;
+}
diff --git a/src/PropertyHandler/DictionaryExporter.php b/src/PropertyHandler/DictionaryExporter.php
@@ -104,8 +104,6 @@ public function importValue(Deserializer $deserializer, Field $field, mixed $sou
         // We cannot easily tell them apart at the moment.
         if ($typeField instanceof DictionaryField && $typeField->implodeOn) {
             $val = $deserializer->deformatter->deserializeString($source, $field);
-            // This is already an exhaustive match, but PHPStan doesn't know that.
-            // @phpstan-ignore-next-line
             return $val === SerdeError::Missing ? null : $typeField->explode($val);
         }
 

diff --git a/src/PropertyHandler/SequenceExporter.php b/src/PropertyHandler/SequenceExporter.php
@@ -76,8 +76,6 @@ public function importValue(Deserializer $deserializer, Field $field, mixed $sou
         // We cannot easily tell them apart at the moment.
         if ($typeField instanceof SequenceField && $typeField->implodeOn) {
             $val = $deserializer->deformatter->deserializeString($source, $field);
-            // This is already an exhaustive match, but PHPStan doesn't know that.
-            // @phpstan-ignore-next-line
             return $val === SerdeError::Missing ? null : $typeField->explode($val);
         }