Merge branch 'master' into merge-3.2

Author: limingxinleo

src/Response.php

@@ -47,14 +47,21 @@
 
 class Response implements PsrResponseInterface, ResponseInterface
 {
-    use Macroable;
+    use Macroable {
+        Macroable::__call as macroCall;
+        Macroable::__callStatic as macroCallStatic;
+    }
 
     public function __construct(protected ?ResponsePlusInterface $response = null)
     {
     }
 
     public function __call(string $name, array $arguments): mixed
     {
+        if (static::hasMacro($method)) {
+            return $this->macroCall($method, $parameters);
+        }
+
         $response = $this->getResponse();
         if (! method_exists($response, $name)) {
             throw new BadMethodCallException(sprintf('Call to undefined method %s::%s()', get_class($this), $name));
@@ -64,6 +71,10 @@ public function __call(string $name, array $arguments): mixed
 
     public static function __callStatic($method, $parameters)
     {
+        if (static::hasMacro($method)) {
+            return static::macroCallStatic($method, $parameters);
+        }
+
         $response = Context::get(PsrResponseInterface::class);
         if (! method_exists($response, $method)) {
             throw new BadMethodCallException(sprintf('Call to undefined static method %s::%s()', self::class, $method));

tests/ResponseTest.php

@@ -38,10 +38,6 @@
  * @coversNothing
  */
 #[CoversNothing]
-/**
- * @internal
- * @coversNothing
- */
 class ResponseTest extends TestCase
 {
     protected function tearDown(): void
@@ -231,6 +227,7 @@ public function testPsrResponse()
 
         $this->assertInstanceOf(PsrResponseInterface::class, $response);
         $this->assertInstanceOf(ResponseInterface::class, $response);
+        $this->assertSame('xxx', (string) $response->getBody());
     }
 
     public function testCookiesAndHeaders()
@@ -278,4 +275,23 @@ public function testCookiesAndHeaders()
 
         $this->assertSame($psrResponse, Context::get(PsrResponseInterface::class));
     }
+
+    public function testCallMacro()
+    {
+        Response::macro('testMacro', function () {
+            return 'testMacro';
+        });
+
+        $response = new Response();
+        $this->assertSame('testMacro', $response->testMacro());
+    }
+
+    public function testCallStaticMacro()
+    {
+        Response::macro('testStaticMacro', function () {
+            return 'testStaticMacro';
+        });
+
+        $this->assertSame('testStaticMacro', Response::testStaticMacro());
+    }
 }