fix: cannot encode full url on send request

phppkg · Jan 11, 2023 · 05373b7 · 05373b7
1 parent 4cfd9e1
commit 05373b7
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 14 deletions.
diff --git a/src/AbstractClient.php b/src/AbstractClient.php
@@ -909,7 +909,7 @@ public function getArrayData(): array
     }
 
     /**
-     * get JSON body as array data
+     * get JSON body and decode to array data
      *
      * @return array
      */
@@ -939,11 +939,11 @@ public function getJsonObject(): bool|stdClass
      *
      * @param object $obj
      *
-     * @return void
+     * @return object
      */
-    public function bindBodyTo(object $obj): void
+    public function bindBodyTo(object $obj): object
     {
-        Obj::init($obj, $this->getArrayData());
+        return Obj::init($obj, $this->getArrayData());
     }
 
     /**

diff --git a/src/ClientInterface.php b/src/ClientInterface.php
@@ -186,7 +186,7 @@ public function trace(string $url, array $params = [], array $headers = [], arra
      * Send request to remote URL
      *
      * @param string            $url
-     * @param array|string|null $data
+     * @param array|string|null $data Body data or query data.
      * @param string            $method
      * @param array             $headers
      * @param array             $options = AbstractClient::$defaultOptions

diff --git a/src/Curl/CurlClient.php b/src/Curl/CurlClient.php
@@ -18,7 +18,6 @@
 use PhpPkg\Http\Client\Traits\ParseRawResponseTrait;
 use Toolkit\Stdlib\Arr\ArrayHelper;
 use Toolkit\Stdlib\Helper\Assert;
-use Toolkit\Stdlib\Str\UrlHelper;
 use function array_merge;
 use function curl_close;
 use function curl_errno;
@@ -46,7 +45,6 @@
 use const CURLAUTH_BASIC;
 use const CURLE_COULDNT_CONNECT;
 use const CURLE_COULDNT_RESOLVE_HOST;
-use const CURLE_HTTP_NOT_FOUND;
 use const CURLE_HTTP_POST_ERROR;
 use const CURLE_OPERATION_TIMEOUTED;
 use const CURLE_READ_ERROR;
@@ -118,7 +116,7 @@ class CurlClient extends AbstractClient implements CurlClientInterface
     private static array $canRetryErrorCodes = [
         CURLE_COULDNT_RESOLVE_HOST,
         CURLE_COULDNT_CONNECT,
-        CURLE_HTTP_NOT_FOUND,
+        // CURLE_HTTP_NOT_FOUND,
         CURLE_READ_ERROR,
         CURLE_OPERATION_TIMEOUTED,
         CURLE_HTTP_POST_ERROR,
@@ -402,7 +400,7 @@ protected function prepareRequest(string $url, mixed $data, array $headers, arra
         CurlUtil::setMethodToOption($curlOptions, $method);
 
         // set request url
-        $curlOptions[CURLOPT_URL] = UrlHelper::encode2($url);
+        $curlOptions[CURLOPT_URL] = $url;
 
         // append http headers
         if ($headers = array_merge($this->headers, $options['headers'], $headers)) {

diff --git a/src/FOpenClient.php b/src/FOpenClient.php
@@ -13,7 +13,6 @@
 use PhpPkg\Http\Client\Traits\ParseRawResponseTrait;
 use PhpPkg\Http\Client\Traits\StreamContextBuildTrait;
 use Throwable;
-use Toolkit\Stdlib\Str\UrlHelper;
 use function array_merge;
 use function fclose;
 use function feof;
@@ -101,9 +100,8 @@ public function request(
         try {
             $ctx = $this->buildStreamContext($url, $headers, $options, $data);
 
-            $fullUrl = UrlHelper::encode2($this->fullUrl);
             // send request
-            $this->handle = fopen($fullUrl, 'rb', false, $ctx);
+            $this->handle = fopen($this->fullUrl, 'rb', false, $ctx);
         } catch (Throwable $e) {
             throw new ClientException($e->getMessage(), $e->getCode(), $e);
         }

diff --git a/src/FileClient.php b/src/FileClient.php
@@ -13,7 +13,6 @@
 use PhpPkg\Http\Client\Traits\ParseRawResponseTrait;
 use PhpPkg\Http\Client\Traits\StreamContextBuildTrait;
 use Throwable;
-use Toolkit\Stdlib\Str\UrlHelper;
 use function array_merge;
 use function file_get_contents;
 use function function_exists;
@@ -70,7 +69,7 @@ public function request(
 
         try {
             $reqCtx  = $this->buildStreamContext($url, $headers, $options, $data);
-            $fullUrl = UrlHelper::encode2($this->fullUrl);
+            $fullUrl = $this->fullUrl;
 
             // send request
             $this->responseBody = file_get_contents($fullUrl, false, $reqCtx);