Allow weak mode to apply to values in an array, not just the array it…

…self.

README.md

@@ -286,6 +286,8 @@ This key only applies on deserialization.  If set to `true`, a type mismatch in
 
 For sequence fields, `strict` set to `true` will reject a non-sequence value.  (It must pass an `array_is_list()` check.)  If `strict` is `false`, any array-ish value will be accepted but passed through `array_values()` to discard any keys and reindex it.
 
+Additionally, in non-`strict` mode, numeric strings in the incoming array will be cast to ints or floats as appropriate in both sequence fields and dictionary fields.  In `strict` mode, numeric strings will still be rejected.
+
 The exact handling of this setting may vary slightly depending on the incoming format, as some formats handle their own types differently.  (For instance, everything is a string in XML.)
 
 ### `requireValue` (bool, default false)

src/Formatter/ArrayBasedDeformatter.php

@@ -144,6 +144,9 @@ public function deserializeSequence(mixed $decoded, Field $field, Deserializer $
         // @phpstan-ignore-next-line
         $class = $field?->typeField?->arrayType ?? '';
         if ($class instanceof ValueType) {
+            if (!$field->strict) {
+                $data = $class->coerce($data);
+            }
             if ($class->assert($data)) {
                 return $data;
             } else {
@@ -179,6 +182,9 @@ public function deserializeDictionary(mixed $decoded, Field $field, Deserializer
         // @phpstan-ignore-next-line
         $class = $field?->typeField?->arrayType ?? '';
         if ($class instanceof ValueType) {
+            if (!$field->strict) {
+                $data = $class->coerce($data);
+            }
             if ($class->assert($data)) {
                 return $data;
             } else {

src/ValueType.php

@@ -4,6 +4,7 @@
 namespace Crell\Serde;
 
 use function Crell\fp\all;
+use function Crell\fp\amap;
 
 enum ValueType
 {
@@ -24,4 +25,14 @@ public function assert(array $values): bool
             self::Array => all(is_array(...))($values),
         };
     }
+
+    public function coerce(array $values): array
+    {
+        return match ($this) {
+            self::String => $values,
+            self::Int => amap(intval(...))($values),
+            self::Float => amap(floatval(...))($values),
+            self::Array => $values,
+        };
+    }
 }

tests/ArrayFormatterTest.php

@@ -53,6 +53,11 @@ public function setUp(): void
             'strict' => ['A', 'B'],
             'nonstrict' => ['a' => 'A', 'b' => 'B'],
         ];
+
+        $this->weakModeLists = [
+            'seq' => [1, '2', 3],
+            'dict' => ['a' => 1, 'b' => '2'],
+        ];
     }
 
     protected function arrayify(mixed $serialized): array

tests/JsonFormatterTest.php

@@ -40,6 +40,11 @@ public function setUp(): void
             'strict' => ['A', 'B'],
             'nonstrict' => ['a' => 'A', 'b' => 'B'],
         ]);
+
+        $this->weakModeLists = json_encode([
+            'seq' => [1, '2', 3],
+            'dict' => ['a' => 1, 'b' => '2'],
+        ]);
     }
 
     protected function arrayify(mixed $serialized): array

tests/Records/WeakLists.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Crell\Serde\Records;
+
+use Crell\Serde\Attributes\DictionaryField;
+use Crell\Serde\Attributes\Field;
+use Crell\Serde\Attributes\SequenceField;
+use Crell\Serde\KeyType;
+use Crell\Serde\ValueType;
+
+class WeakLists
+{
+    public function __construct(
+        #[Field(strict: false), SequenceField(ValueType::Int)]
+        public array $seq,
+        #[Field(strict: false), DictionaryField(arrayType: ValueType::Int, keyType: KeyType::String)]
+        public array $dict,
+    ) {}
+}

tests/SerdeTestCases.php

@@ -99,6 +99,7 @@
 use Crell\Serde\Records\ValueObjects\JobEntryFlattenedPrefixed;
 use Crell\Serde\Records\ValueObjects\Person;
 use Crell\Serde\Records\Visibility;
+use Crell\Serde\Records\WeakLists;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Attributes\Test;
@@ -159,6 +160,13 @@ abstract class SerdeTestCases extends TestCase
      */
     protected mixed $dictsInSequenceShouldFail;
 
+    /**
+     * Data to deserialize that contains numeric-string lists, which should still coerce into an integer list safely.
+     *
+     * @see lists_in_weak_mode_coerce_elements())
+     */
+    protected mixed $weakModeLists;
+
     /**
      * Data to deserialize that should pass, because the strict is valid and non-strict gets coerced to a list.
      * @see non_sequence_arrays_in_weak_mode_are_coerced
@@ -1281,7 +1289,7 @@ public function nullable_null_properties_are_allowed(): void
         self::assertEquals($data, $result);
     }
 
-    #[Test]
+    #[Test, Group('flattening')]
     public function nullable_properties_flattened(): void
     {
         $s = new SerdeCommon(formatters: $this->formatters);
@@ -1298,6 +1306,22 @@ public function nullable_properties_flattened(): void
         self::assertEquals($data, $result);
     }
 
+    #[Test]
+    public function lists_in_weak_mode_coerce_elements(): void
+    {
+        $s = new SerdeCommon(formatters: $this->formatters);
+
+        /** @var WeakLists $result */
+        $result = $s->deserialize($this->weakModeLists, $this->format, WeakLists::class);
+
+        self::assertIsArray($result->seq);
+        self::assertIsArray($result->dict);
+
+        foreach ([...$result->seq, ...$result->dict] as $val) {
+            self::assertIsInt($val);
+        }
+    }
+
     #[Test]
     public function non_sequence_arrays_are_normalized_to_sequences(): void
     {

tests/YamlFormatterTest.php

@@ -49,6 +49,11 @@ public function setUp(): void
             'strict' => ['A', 'B'],
             'nonstrict' => ['a' => 'A', 'b' => 'B'],
         ]);
+
+        $this->weakModeLists = YAML::dump([
+            'seq' => [1, '2', 3],
+            'dict' => ['a' => 1, 'b' => '2'],
+        ]);
     }
 
     protected function arrayify(mixed $serialized): array