Replace tap by transform

Author: nyamsprod

components/Components/URLSearchParams.php

@@ -21,6 +21,7 @@
 use Iterator;
 use IteratorAggregate;
 use League\Uri\Contracts\QueryInterface;
+use League\Uri\Contracts\Transformable;
 use League\Uri\Contracts\UriComponentInterface;
 use League\Uri\Contracts\UriException;
 use League\Uri\Contracts\UriInterface;
@@ -57,7 +58,7 @@
  *
  * @implements IteratorAggregate<array{0:string, 1:string}>
  */
-final class URLSearchParams implements Countable, IteratorAggregate, UriComponentInterface
+final class URLSearchParams implements Countable, IteratorAggregate, UriComponentInterface, Transformable
 {
     private QueryInterface $pairs;
 
@@ -583,13 +584,11 @@ public function when(callable|bool $condition, callable $onSuccess, ?callable $o
      * Executes the given callback with the current instance
      * and returns the current instance.
      *
-     * @param callable(self): void $callback
+     * @param callable(self): self $callback
      */
-    public function tap(callable $callback): self
+    public function transform(callable $callback): static
     {
-        $callback($this);
-
-        return $this;
+        return $callback($this);
     }
 
     /**

interfaces/StringCoercionMode.php

@@ -15,7 +15,6 @@
 
 use BackedEnum;
 use DateTimeInterface;
-use IntlDateFormatter;
 use League\Uri\Contracts\FragmentDirective;
 use League\Uri\Contracts\UriComponentInterface;
 use League\Uri\Contracts\UriInterface;
@@ -26,7 +25,6 @@
 
 use function array_is_list;
 use function array_map;
-use function extension_loaded;
 use function get_debug_type;
 use function implode;
 use function is_array;

uri/Builder.php

@@ -16,6 +16,7 @@
 use BackedEnum;
 use League\Uri\Contracts\Conditionable;
 use League\Uri\Contracts\FragmentDirective;
+use League\Uri\Contracts\Transformable;
 use League\Uri\Contracts\UriComponentInterface;
 use League\Uri\Exceptions\SyntaxError;
 use SensitiveParameter;
@@ -29,7 +30,7 @@
 use function str_replace;
 use function strpos;
 
-final class Builder implements Conditionable
+final class Builder implements Conditionable, Transformable
 {
     private ?string $scheme = null;
     private ?string $username = null;
@@ -206,13 +207,11 @@ public function reset(): self
      * Executes the given callback with the current instance
      * and returns the current instance.
      *
-     * @param callable(self): void $callback
+     * @param callable(self): self $callback
      */
-    public function tap(callable $callback): self
+    public function transform(callable $callback): static
     {
-        $callback($this);
-
-        return $this;
+        return $callback($this);
     }
 
     public function when(callable|bool $condition, callable $onSuccess, ?callable $onFail = null): static

uri/BuilderTest.php

@@ -141,28 +141,19 @@ public function test_tap_calls_callback_with_self_and_returns_same_instance(): v
         $builder = new Builder();
 
         $called = false;
-        $callback = function (Builder $b) use (&$called, $builder) {
+        $callback = function (Builder $b) use (&$called, $builder): Builder {
             $called = true;
             self::assertSame($builder, $b);
+
+            return $b->authority('example.com');
         };
 
-        $result = $builder->tap($callback);
+        $result = $builder->transform($callback);
 
         self::assertTrue($called);
         self::assertSame($builder, $result);
-    }
-
-    public function test_tap_allows_builder_mutation(): void
-    {
-        $builder = (new Builder())->scheme('http');
-        $builder->tap(function (Builder $b) {
-            $b->host('example.com');
-        });
-
-        $uri = $builder->build();
-
-        self::assertSame('example.com', $uri->getHost());
-        self::assertSame('http', $uri->getScheme());
+        self::assertSame('example.com', $builder->build()->getHost());
+        self::assertNull($builder->build()->getScheme());
     }
 
     public function test_authority_with_host_only(): void