优化代码

Author: Yurunsoft

src/HttpRequest.php

@@ -226,20 +226,6 @@ class HttpRequest
      */
     public $websocketCompression = false;
 
-    /**
-     * 代理认证方式.
-     *
-     * @var array
-     */
-    public static $proxyAuths = [];
-
-    /**
-     * 代理类型.
-     *
-     * @var array
-     */
-    public static $proxyType = [];
-
     /**
      * 自动扩展名标志.
      */
@@ -912,6 +898,7 @@ protected function parseRequestBody($requestBody, $contentType)
                         }
                     }
                     $body = http_build_query($body, '', '&');
+                    break;
             }
         }
         else
@@ -943,9 +930,8 @@ public function buildRequest($url = null, $requestBody = null, $method = null, $
             $method = $this->method;
         }
         list($body, $files) = $this->parseRequestBody(null === $requestBody ? $this->content : $requestBody, $contentType);
-        $request = new Request($url, $this->headers, $body, $method);
         $saveFileOption = $this->saveFileOption;
-        $request = $request->withUploadedFiles($files)
+        $request = (new Request($url, $this->headers, $body, $method))->withUploadedFiles($files)
                             ->withCookieParams($this->cookies)
                             ->withAttribute(Attributes::MAX_REDIRECTS, $this->maxRedirects)
                             ->withAttribute(Attributes::IS_VERIFY_CA, $this->isVerifyCA)
@@ -1127,7 +1113,7 @@ public function download($fileName, $url = null, $requestBody = null, $method =
         $result = $this->saveFile($fileName)->send($url, $requestBody, $method);
         if ($isAutoExt)
         {
-            self::parseDownloadAutoExt($result, $fileName);
+            $result = self::parseDownloadAutoExt($result, $fileName);
         }
         $this->saveFileOption = [];
 
@@ -1174,9 +1160,9 @@ public static function checkDownloadIsAutoExt($fileName, &$tempFileName)
      * @param \Yurun\Util\YurunHttp\Http\Response $response
      * @param string                              $tempFileName
      *
-     * @return void
+     * @return \Yurun\Util\YurunHttp\Http\Response
      */
-    public static function parseDownloadAutoExt(&$response, $tempFileName)
+    public static function parseDownloadAutoExt($response, $tempFileName)
     {
         $ext = MediaType::getExt($response->getHeaderLine('Content-Type'));
         if (null === $ext)
@@ -1185,23 +1171,7 @@ public static function parseDownloadAutoExt(&$response, $tempFileName)
         }
         $savedFileName = substr($tempFileName, 0, -\strlen(self::AUTO_EXT_TEMP_EXT)) . '.' . $ext;
         rename($tempFileName, $savedFileName);
-        $response = $response->withSavedFileName($savedFileName);
-    }
-}
 
-if (\extension_loaded('curl'))
-{
-    // 代理认证方式
-    HttpRequest::$proxyAuths = [
-        'basic' => \CURLAUTH_BASIC,
-        'ntlm'  => \CURLAUTH_NTLM,
-    ];
-
-    // 代理类型
-    HttpRequest::$proxyType = [
-        'http'      => \CURLPROXY_HTTP,
-        'socks4'    => \CURLPROXY_SOCKS4,
-        'socks4a'   => 6,    // CURLPROXY_SOCKS4A
-        'socks5'    => \CURLPROXY_SOCKS5,
-    ];
+        return $response->withSavedFileName($savedFileName);
+    }
 }

src/YurunHttp/Co/Batch.php

@@ -53,17 +53,8 @@ public static function run($requests, $timeout = null, $handlerClass = null, $op
         {
             if (isset($result[$i]))
             {
-                $response = &$result[$i];
+                HttpRequest::parseDownloadAutoExt($result[$i], $result[$i]->getRequest()->getAttribute(Attributes::SAVE_FILE_PATH));
             }
-            else
-            {
-                $response = null;
-            }
-            if ($response)
-            {
-                HttpRequest::parseDownloadAutoExt($response, $response->getRequest()->getAttribute(Attributes::SAVE_FILE_PATH));
-            }
-            unset($response);
         }
 
         return $result;

src/YurunHttp/Handler/Curl.php

@@ -119,7 +119,7 @@ public function close()
             {
                 CurlHttpConnectionManager::getInstance()->release($this->poolKey, $this->handler);
             }
-            else
+            elseif (\PHP_VERSION_ID < 80000)
             {
                 curl_close($this->handler);
             }
@@ -203,7 +203,6 @@ public function send(&$request)
                     $bodyContent = false;
                 }
                 $this->buildCurlHandlerEx($request, $handler, $uri, $method, $bodyContent);
-                $result = null;
                 for ($i = 0; $i <= $retry; ++$i)
                 {
                     $receiveHeaders = [];
@@ -227,7 +226,7 @@ public function send(&$request)
                         }
                     }
                 }
-                if ($request->getAttribute(Attributes::FOLLOW_LOCATION, true) && ($statusCode >= 300 && $statusCode < 400) && $result && '' !== ($location = $result->getHeaderLine('location')))
+                if ($request->getAttribute(Attributes::FOLLOW_LOCATION, true) && ($statusCode >= 300 && $statusCode < 400) && isset($result) && '' !== ($location = $result->getHeaderLine('location')))
                 {
                     $maxRedirects = $request->getAttribute(Attributes::MAX_REDIRECTS, 10);
                     if (++$redirectCount <= $maxRedirects)
@@ -366,6 +365,7 @@ private function buildCurlHandlerEx(&$request, $handler, $uri = null, $method =
                 break;
             default:
                 $httpVersion = \CURL_HTTP_VERSION_1_1;
+                break;
         }
         $requestOptions = [
             \CURLOPT_URL             => (string) $uri,
@@ -817,7 +817,10 @@ public function coBatch($requests, $timeout = null)
             foreach ($curlHandlers as $curlHandler)
             {
                 curl_multi_remove_handle($mh, $curlHandler);
-                curl_close($curlHandler);
+                if (\PHP_VERSION_ID < 80000)
+                {
+                    curl_close($curlHandler);
+                }
             }
             curl_multi_close($mh);
         }

src/YurunHttp/Handler/Curl/CurlConnectionPool.php

@@ -39,9 +39,12 @@ public function close()
         $connections = $this->connections;
         $this->connections = [];
         $this->queue = new \SplQueue();
-        foreach ($connections as $connection)
+        if (\PHP_VERSION_ID < 80000)
         {
-            curl_close($connection);
+            foreach ($connections as $connection)
+            {
+                curl_close($connection);
+            }
         }
     }
 

src/YurunHttp/Handler/Swoole.php

@@ -803,16 +803,16 @@ public function coBatch($requests, $timeout = null)
         $handlers = [];
         $results = [];
         $beginTime = microtime(true);
-        foreach ($requests as $i => &$request)
+        foreach ($requests as $i => &$request1)
         {
             $results[$i] = null;
             $handlers[$i] = $handler = new self();
-            $request = $handler->sendDefer($request);
+            $request1 = $handler->sendDefer($request1);
         }
-        unset($request);
+        unset($request1);
         $beginTime = microtime(true);
         $recvTimeout = null;
-        foreach ($requests as $i => $request)
+        foreach ($requests as $i => $request2)
         {
             if (null !== $timeout)
             {
@@ -822,7 +822,7 @@ public function coBatch($requests, $timeout = null)
                     break;
                 }
             }
-            $results[$i] = $handlers[$i]->recvDefer($request, $recvTimeout)->withTotalTime(microtime(true) - $beginTime);
+            $results[$i] = $handlers[$i]->recvDefer($request2, $recvTimeout)->withTotalTime(microtime(true) - $beginTime);
         }
 
         return $results;