chore: Rename BodyResolver to ValueResolver.

README.md

@@ -128,14 +128,14 @@ You can combine different `Resolver` and let the configured body pass through
 all the methods and be enriched. This library come with a specific `Faker`
 resolver to generate data easily with providers (see [Faker doc](https://fakerphp.github.io/formatters/)).
 
-You can build your own resolvers using the `BodyResolverInterface`.
+You can build your own resolvers using the `ValueResolverInterface`.
 
 ```php
 <?php
 
-use CHStudio\Raven\Http\Factory\Body\ArrayValueResolver;
-use CHStudio\Raven\Http\Factory\Body\FakerValueResolver;
-use CHStudio\Raven\Http\Factory\Body\PassThroughValueResolver;
+use CHStudio\Raven\Http\Factory\Resolver\ArrayValueResolver;
+use CHStudio\Raven\Http\Factory\Resolver\FakerValueResolver;
+use CHStudio\Raven\Http\Factory\Resolver\PassThroughValueResolver;
 
 $generator = \Faker\Factory::create();
 

src/Http/Factory/RequestBodyResolver.php

@@ -2,13 +2,13 @@
 
 namespace CHStudio\Raven\Http\Factory;
 
-use CHStudio\Raven\Http\Factory\Body\BodyResolverInterface;
+use CHStudio\Raven\Http\Factory\Resolver\ValueResolverInterface;
 use Psr\Http\Message\RequestInterface;
 
 class RequestBodyResolver implements RequestFactoryInterface
 {
     public function __construct(
-        private readonly BodyResolverInterface $resolver,
+        private readonly ValueResolverInterface $resolver,
         private readonly RequestFactoryInterface $decorated
     ) {
     }

src/Http/Factory/Body/ArrayValueResolver.php → src/Http/Factory/Resolver/ArrayValueResolver.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace CHStudio\Raven\Http\Factory\Body;
+namespace CHStudio\Raven\Http\Factory\Resolver;
 
-class ArrayValueResolver implements BodyResolverInterface
+class ArrayValueResolver implements ValueResolverInterface
 {
     public function __construct(
-        private readonly BodyResolverInterface $resolver
+        private readonly ValueResolverInterface $resolver
     ) {
     }
 

src/Http/Factory/Body/FakerValueResolver.php → src/Http/Factory/Resolver/FakerValueResolver.php

@@ -1,16 +1,16 @@
 <?php
 
-namespace CHStudio\Raven\Http\Factory\Body;
+namespace CHStudio\Raven\Http\Factory\Resolver;
 
 use Faker\Generator;
 use InvalidArgumentException;
 use JsonException;
 
-class FakerValueResolver implements BodyResolverInterface
+class FakerValueResolver implements ValueResolverInterface
 {
     public function __construct(
         private readonly Generator $faker,
-        private readonly BodyResolverInterface $resolver
+        private readonly ValueResolverInterface $resolver
     ) {
     }
 

src/Http/Factory/Resolver/PassThroughValueResolver.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace CHStudio\Raven\Http\Factory\Resolver;
+
+class PassThroughValueResolver implements ValueResolverInterface
+{
+    public function resolve(mixed $value): mixed
+    {
+        return $value;
+    }
+}

src/Http/Factory/Resolver/ValueResolverInterface.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace CHStudio\Raven\Http\Factory\Resolver;
+
+interface ValueResolverInterface
+{
+    public function resolve(mixed $value): mixed;
+}

tests/unit/Http/Factory/RequestBodyResolverTest.php

@@ -4,7 +4,7 @@
 
 namespace CHStudio\RavenTest\Http\Factory;
 
-use CHStudio\Raven\Http\Factory\Body\BodyResolverInterface;
+use CHStudio\Raven\Http\Factory\Resolver\ValueResolverInterface;
 use CHStudio\Raven\Http\Factory\RequestBodyResolver;
 use CHStudio\Raven\Http\Factory\RequestFactoryInterface;
 use PHPUnit\Framework\TestCase;
@@ -14,7 +14,7 @@ final class RequestBodyResolverTest extends TestCase
 {
     public function testItCanBeBuilt(): void
     {
-        $bodyResolver = $this->createMock(BodyResolverInterface::class);
+        $bodyResolver = $this->createMock(ValueResolverInterface::class);
         $decorated = $this->createMock(RequestFactoryInterface::class);
 
         $factory = new RequestBodyResolver($bodyResolver, $decorated);
@@ -24,7 +24,7 @@ public function testItCanBeBuilt(): void
 
     public function testItResolvesBodyWhenThereIsOne(): void
     {
-        $bodyResolver = $this->createMock(BodyResolverInterface::class);
+        $bodyResolver = $this->createMock(ValueResolverInterface::class);
         $decorated = $this->createMock(RequestFactoryInterface::class);
 
         $bodyResolver
@@ -45,7 +45,7 @@ public function testItResolvesBodyWhenThereIsOne(): void
 
     public function testItDoesntCallResolverOnEmptyBody(): void
     {
-        $bodyResolver = $this->createMock(BodyResolverInterface::class);
+        $bodyResolver = $this->createMock(ValueResolverInterface::class);
         $decorated = $this->createMock(RequestFactoryInterface::class);
 
         $bodyResolver->expects(static::never())->method('resolve');

tests/unit/Http/Factory/Body/ArrayValueResolverTest.php → tests/unit/Http/Factory/Resolver/ArrayValueResolverTest.php

@@ -2,20 +2,20 @@
 
 declare(strict_types=1);
 
-namespace CHStudio\RavenTest\Http\Factory\Body;
+namespace CHStudio\RavenTest\Http\Factory\Resolver;
 
-use CHStudio\Raven\Http\Factory\Body\ArrayValueResolver;
-use CHStudio\Raven\Http\Factory\Body\BodyResolverInterface;
+use CHStudio\Raven\Http\Factory\Resolver\ArrayValueResolver;
+use CHStudio\Raven\Http\Factory\Resolver\ValueResolverInterface;
 use PHPUnit\Framework\TestCase;
 
 final class ArrayValueResolverTest extends TestCase
 {
     public function testItCanBeBuilt(): void
     {
-        $decorated = $this->createMock(BodyResolverInterface::class);
+        $decorated = $this->createMock(ValueResolverInterface::class);
         $arrayResolver = new ArrayValueResolver($decorated);
 
-        static::assertInstanceOf(BodyResolverInterface::class, $arrayResolver);
+        static::assertInstanceOf(ValueResolverInterface::class, $arrayResolver);
     }
 
     public function testItResolveEachInnerArrayRecursively(): void
@@ -30,7 +30,7 @@ public function testItResolveEachInnerArrayRecursively(): void
             ]
         ];
 
-        $decorated = $this->createMock(BodyResolverInterface::class);
+        $decorated = $this->createMock(ValueResolverInterface::class);
         $decorated
             ->expects(static::exactly(3))
             ->method('resolve')

tests/unit/Http/Factory/Body/FakerValueResolverTest.php → tests/unit/Http/Factory/Resolver/FakerValueResolverTest.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace CHStudio\RavenTest\Http\Factory\Body;
+namespace CHStudio\RavenTest\Http\Factory\Resolver;
 
-use CHStudio\Raven\Http\Factory\Body\BodyResolverInterface;
-use CHStudio\Raven\Http\Factory\Body\FakerValueResolver;
+use CHStudio\Raven\Http\Factory\Resolver\ValueResolverInterface;
+use CHStudio\Raven\Http\Factory\Resolver\FakerValueResolver;
 use Faker\Generator;
 use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
@@ -16,18 +16,18 @@ public function testItCanBeBuilt(): void
     {
         $resolver = new FakerValueResolver(
             $this->createMock(Generator::class),
-            $this->createMock(BodyResolverInterface::class)
+            $this->createMock(ValueResolverInterface::class)
         );
 
-        static::assertInstanceOf(BodyResolverInterface::class, $resolver);
+        static::assertInstanceOf(ValueResolverInterface::class, $resolver);
     }
 
     /**
      * @dataProvider giveNonResolvableValues
      */
     public function testItPassTheValueToNextResolverInDifferent(mixed $parameter): void
     {
-        $decorated = $this->createMock(BodyResolverInterface::class);
+        $decorated = $this->createMock(ValueResolverInterface::class);
         $decorated
             ->expects(static::once())
             ->method('resolve')
@@ -57,7 +57,7 @@ public function giveNonResolvableValues(): \Generator
      */
     public function testItResolveTheValueThroughFakerGenerator(string $parameter, string $method, array $arguments): void
     {
-        $decorated = $this->createMock(BodyResolverInterface::class);
+        $decorated = $this->createMock(ValueResolverInterface::class);
         $decorated
             ->expects(static::never())
             ->method('resolve');
@@ -85,7 +85,7 @@ public function giveResolvableValues(): \Generator
 
     public function testItCaptureFakerInvalidArguments(): void
     {
-        $decorated = $this->createMock(BodyResolverInterface::class);
+        $decorated = $this->createMock(ValueResolverInterface::class);
         $decorated
             ->expects(static::never())
             ->method('resolve');
@@ -109,7 +109,7 @@ public function testItFailsOnFunctionArgumentThatCantBeJsonDecoded(): void
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessageMatches('/^Can\'t extract the arguments to call method/');
 
-        $decorated = $this->createMock(BodyResolverInterface::class);
+        $decorated = $this->createMock(ValueResolverInterface::class);
         $decorated
             ->expects(static::never())
             ->method('resolve');

tests/unit/Http/Factory/Body/PassThroughValueResolverTest.php → tests/unit/Http/Factory/Resolver/PassThroughValueResolverTest.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace CHStudio\RavenTest\Http\Factory\Body;
+namespace CHStudio\RavenTest\Http\Factory\Resolver;
 
-use CHStudio\Raven\Http\Factory\Body\BodyResolverInterface;
-use CHStudio\Raven\Http\Factory\Body\PassThroughValueResolver;
+use CHStudio\Raven\Http\Factory\Resolver\ValueResolverInterface;
+use CHStudio\Raven\Http\Factory\Resolver\PassThroughValueResolver;
 use PHPUnit\Framework\TestCase;
 
 final class PassThroughValueResolverTest extends TestCase
@@ -14,7 +14,7 @@ public function testItCanBeBuilt(): void
     {
         $resolver = new PassThroughValueResolver();
 
-        static::assertInstanceOf(BodyResolverInterface::class, $resolver);
+        static::assertInstanceOf(ValueResolverInterface::class, $resolver);
     }
 
     public function testItReturnGivenValue(): void