Merge branch 'develop'

* develop:
  specify next release
  CS
  fix Each not keeping the mapped content

Author: Baptouuuu

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.1.1 - 2024-02-24
+
+### Fixed
+
+- `Innmind\Validation\Each` now returns the validated data instead of the original content
+
 ## 1.1.0 - 2023-11-22
 
 ### Added

proofs/each.php

@@ -52,4 +52,27 @@ static function($assert, $ints, $strings) {
             );
         },
     );
+
+    yield proof(
+        'Each::of() returns the mapped content',
+        given(
+            Set\Sequence::of(Set\Integers::any()),
+        ),
+        static function($assert, $ints) {
+            $doubles = \array_map(
+                static fn($i) => $i * 2,
+                $ints,
+            );
+
+            $assert->same(
+                $doubles,
+                Each::of(
+                    Is::int()->map(static fn($i) => $i * 2),
+                )($ints)->match(
+                    static fn($value) => $value,
+                    static fn() => null,
+                ),
+            );
+        },
+    );
 };

proofs/instance.php

@@ -9,23 +9,23 @@
         'Instance::of()',
         given(Set\Type::any()),
         static function($assert, $other) {
-            $std = new \stdClass;
+            $std = new stdClass;
             $assert->true(
-                Instance::of(\stdClass::class)->asPredicate()($std),
+                Instance::of(stdClass::class)->asPredicate()($std),
             );
             $assert->same(
                 $std,
-                Instance::of(\stdClass::class)($std)->match(
+                Instance::of(stdClass::class)($std)->match(
                     static fn($value) => $value,
                     static fn() => null,
                 ),
             );
             $assert->false(
-                Instance::of(\stdClass::class)->asPredicate()($other),
+                Instance::of(stdClass::class)->asPredicate()($other),
             );
             $assert->same(
                 [['$', 'Value is not an instance of stdClass']],
-                Instance::of(\stdClass::class)($other)->match(
+                Instance::of(stdClass::class)($other)->match(
                     static fn() => null,
                     static fn($failures) => $failures
                         ->map(static fn($failure) => [

proofs/is.php

@@ -16,7 +16,7 @@
                     true,
                     false,
                     null,
-                    new \stdClass,
+                    new stdClass,
                 ),
                 Set\Sequence::of(Set\Strings::any()),
             ),
@@ -61,7 +61,7 @@ static function($assert, $string, $other) {
                     true,
                     false,
                     null,
-                    new \stdClass,
+                    new stdClass,
                 ),
                 Set\Sequence::of(Set\Strings::any()),
             ),
@@ -106,7 +106,7 @@ static function($assert, $int, $other) {
                     true,
                     false,
                     null,
-                    new \stdClass,
+                    new stdClass,
                 ),
                 Set\Sequence::of(Set\Strings::any()),
             ),
@@ -152,7 +152,7 @@ static function($assert, $float, $other) {
                         true,
                         false,
                         null,
-                        new \stdClass,
+                        new stdClass,
                     ),
                 )),
                 Set\Composite::immutable(
@@ -175,7 +175,7 @@ static function($assert, $float, $other) {
                     true,
                     false,
                     null,
-                    new \stdClass,
+                    new stdClass,
                 ),
             ),
         ),
@@ -218,7 +218,7 @@ static function($assert, $array, $other) {
                 Set\RealNumbers::any(),
                 Set\Elements::of(
                     null,
-                    new \stdClass,
+                    new stdClass,
                 ),
                 Set\Sequence::of(Set\Either::any(
                     Set\Strings::any(),
@@ -228,7 +228,7 @@ static function($assert, $array, $other) {
                         true,
                         false,
                         null,
-                        new \stdClass,
+                        new stdClass,
                     ),
                 )),
             ),
@@ -272,7 +272,7 @@ static function($assert, $bool, $other) {
                 Set\Elements::of(
                     true,
                     false,
-                    new \stdClass,
+                    new stdClass,
                 ),
                 Set\Sequence::of(Set\Either::any(
                     Set\Strings::any(),
@@ -282,7 +282,7 @@ static function($assert, $bool, $other) {
                         true,
                         false,
                         null,
-                        new \stdClass,
+                        new stdClass,
                     ),
                 )),
             ),
@@ -326,7 +326,7 @@ static function($assert, $other) {
                     true,
                     false,
                     null,
-                    new \stdClass,
+                    new stdClass,
                 ),
             )),
             Set\Composite::immutable(

src/Each.php

@@ -29,13 +29,13 @@ private function __construct(Constraint $constraint)
     public function __invoke(mixed $value): Validation
     {
         /** @var Validation<Failure, list<T>> */
-        $validation = Validation::success($value);
+        $validation = Validation::success([]);
 
         /** @var mixed $element */
         foreach ($value as $element) {
             $validation = $validation->flatMap(
-                fn($value) => ($this->constraint)($element)->map(
-                    static fn() => $value,
+                fn($carry) => ($this->constraint)($element)->map(
+                    static fn($value) => \array_merge($carry, [$value]),
                 ),
             );
         }