Fixed http client does not works when using guzzle 7.0 and curl hook for hyperf/testing. (#2624)

* Update HttpClient.php

* Create HttpClientTest.php

* Update HttpClientTest.php

* Update CHANGELOG-2.0.md

Author: limingxinleo

src/HttpClient.php

@@ -13,7 +13,9 @@
 
 use GuzzleHttp\Client;
 use Hyperf\Contract\PackerInterface;
+use Hyperf\Guzzle\CoroutineHandler;
 use Hyperf\Utils\Arr;
+use Hyperf\Utils\Coroutine;
 use Hyperf\Utils\Packer\JsonPacker;
 use Psr\Container\ContainerInterface;
 
@@ -38,9 +40,14 @@ public function __construct(ContainerInterface $container, PackerInterface $pack
     {
         $this->container = $container;
         $this->packer = $packer ?? new JsonPacker();
+        $handler = null;
+        if (Coroutine::inCoroutine()) {
+            $handler = new CoroutineHandler();
+        }
         $this->client = new Client([
             'base_uri' => $baseUri,
             'timeout' => 2,
+            'handler' => $handler,
         ]);
     }
 

tests/HttpClientTest.php

@@ -0,0 +1,55 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of Hyperf.
+ *
+ * @link     https://www.hyperf.io
+ * @document https://hyperf.wiki
+ * @contact  [email protected]
+ * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
+ */
+namespace tests;
+
+use Hyperf\Testing\HttpClient;
+use Mockery;
+use PHPUnit\Framework\TestCase;
+use Psr\Container\ContainerInterface;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+class HttpClientTest extends TestCase
+{
+    protected function tearDown()
+    {
+        Mockery::close();
+    }
+
+    /**
+     * @group NonCoroutine
+     */
+    public function testJsonRequest()
+    {
+        run(function () {
+            $client = new HttpClient(Mockery::mock(ContainerInterface::class), null, 'http://127.0.0.1:4151');
+
+            $data = $client->get('/stats', [
+                'format' => 'json',
+            ]);
+
+            $this->assertIsArray($data);
+        }, SWOOLE_HOOK_ALL);
+
+        run(function () {
+            $client = new HttpClient(Mockery::mock(ContainerInterface::class), null, 'http://127.0.0.1:4151');
+
+            $data = $client->get('/stats', [
+                'format' => 'json',
+            ]);
+
+            $this->assertIsArray($data);
+        }, SWOOLE_HOOK_ALL & ~SWOOLE_HOOK_CURL);
+    }
+}