Merge pull request #16 from wiz-develop/endou-mame/issue15

Author: endou-mame

src/Collection/ArrayList.php

@@ -91,7 +91,8 @@ final public static function from(array $elements): static
     #[Override]
     final public static function tryFrom(array $elements): Result
     {
-        return static::isValidCount($elements)
+        return static::isValid($elements)
+            ->andThen(static fn () => static::isValidCount($elements))
             ->andThen(static fn () => Result\ok(static::from($elements)));
     }
 

src/Collection/Base/CollectionBase.php

@@ -27,6 +27,7 @@
      */
     protected function __construct(protected array $elements)
     {
+        assert(static::isValid($elements)->isOk());
         assert(static::isValidCount($elements)->isOk());
     }
 
@@ -103,4 +104,18 @@ className: static::class,
 
         return Result\ok(true);
     }
+
+    /**
+     * 有効な値かどうか
+     * NOTE: 実装クラスでのオーバーライド用メソッド
+     *
+     * @template TIsValidKey of TKey|array-key
+     * @template TIsValidValue of TValue
+     * @param  array<TIsValidKey,TIsValidValue> $elements
+     * @return Result<bool,ValueObjectError>
+     */
+    protected static function isValid(array $elements): Result
+    {
+        return Result\ok(true);
+    }
 }

src/Collection/Map.php

@@ -147,8 +147,8 @@ final public static function from(Pair ...$values): static
     #[Override]
     final public static function tryFrom(Pair ...$values): Result
     {
-        // @phpstan-ignore-next-line
-        return static::isValidCount($values)
+        return static::isValid($values) // @phpstan-ignore argument.type
+            ->andThen(static fn () => static::isValidCount($values)) // @phpstan-ignore argument.type
             ->andThen(static fn () => Result\ok(static::from(...$values)));
     }