Resolved conflicts with 6.5

guzzle · Dec 18, 2019 · a5a84c3 · a5a84c3
2 parents d56612f + 2eda2b9
commit a5a84c3
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 48 deletions.
diff --git a/docs/request-options.rst b/docs/request-options.rst
@@ -554,14 +554,14 @@ http_errors
 
 
 idn_conversion
----
+--------------
 
 :Summary: Internationalized Domain Name (IDN) support (enabled by default if
     ``intl`` extension is available).
 :Types:
     - bool
     - int
-:Default: ``true`` if ``intl`` extension is available, ``false`` otherwise
+:Default: ``true`` if ``intl`` extension is available (and ICU library is 4.6+ for PHP 7.2+), ``false`` otherwise
 :Constant: ``GuzzleHttp\RequestOptions::IDN_CONVERSION``
 
 .. code-block:: php

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -16,7 +16,7 @@ parameters:
 			path: src/Client.php
 
 		-
-			message: "#^Method GuzzleHttp\\\\Client\\:\\:__call\\(\\) should return GuzzleHttp\\\\Promise\\\\PromiseInterface but returns GuzzleHttp\\\\PromiseInterface\\|Psr\\\\Http\\\\Message\\\\ResponseInterface\\.$#"
+			message: "#^Method GuzzleHttp\\\\Client\\:\\:__call\\(\\) should return GuzzleHttp\\\\Promise\\\\PromiseInterface but returns GuzzleHttp\\\\Promise\\\\PromiseInterface\\|Psr\\\\Http\\\\Message\\\\ResponseInterface\\.$#"
 			count: 1
 			path: src/Client.php
 
@@ -25,16 +25,6 @@ parameters:
 			count: 1
 			path: src/Client.php
 
-		-
-			message: "#^Return typehint of method GuzzleHttp\\\\Client\\:\\:sendAsync\\(\\) has invalid type GuzzleHttp\\\\PromiseInterface\\.$#"
-			count: 1
-			path: src/Client.php
-
-		-
-			message: "#^Method GuzzleHttp\\\\Client\\:\\:sendAsync\\(\\) should return GuzzleHttp\\\\PromiseInterface but returns GuzzleHttp\\\\Promise\\\\PromiseInterface\\.$#"
-			count: 1
-			path: src/Client.php
-
 		-
 			message: "#^Method GuzzleHttp\\\\Client\\:\\:send\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -45,26 +35,11 @@ parameters:
 			count: 2
 			path: src/Client.php
 
-		-
-			message: "#^Call to method wait\\(\\) on an unknown class GuzzleHttp\\\\PromiseInterface\\.$#"
-			count: 2
-			path: src/Client.php
-
 		-
 			message: "#^Method GuzzleHttp\\\\Client\\:\\:requestAsync\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1
 			path: src/Client.php
 
-		-
-			message: "#^Return typehint of method GuzzleHttp\\\\Client\\:\\:requestAsync\\(\\) has invalid type GuzzleHttp\\\\PromiseInterface\\.$#"
-			count: 1
-			path: src/Client.php
-
-		-
-			message: "#^Method GuzzleHttp\\\\Client\\:\\:requestAsync\\(\\) should return GuzzleHttp\\\\PromiseInterface but returns GuzzleHttp\\\\Promise\\\\PromiseInterface\\.$#"
-			count: 1
-			path: src/Client.php
-
 		-
 			message: "#^Method GuzzleHttp\\\\Client\\:\\:request\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -1125,16 +1100,6 @@ parameters:
 			count: 1
 			path: src/Pool.php
 
-		-
-			message: "#^Return typehint of method GuzzleHttp\\\\Pool\\:\\:promise\\(\\) has invalid type GuzzleHttp\\\\GuzzleHttp\\\\Promise\\\\Promise\\.$#"
-			count: 1
-			path: src/Pool.php
-
-		-
-			message: "#^Method GuzzleHttp\\\\Pool\\:\\:promise\\(\\) should return GuzzleHttp\\\\GuzzleHttp\\\\Promise\\\\Promise but returns GuzzleHttp\\\\Promise\\\\PromiseInterface\\.$#"
-			count: 1
-			path: src/Pool.php
-
 		-
 			message: "#^Method GuzzleHttp\\\\Pool\\:\\:batch\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -1155,11 +1120,6 @@ parameters:
 			count: 1
 			path: src/Pool.php
 
-		-
-			message: "#^Call to method wait\\(\\) on an unknown class GuzzleHttp\\\\GuzzleHttp\\\\Promise\\\\Promise\\.$#"
-			count: 1
-			path: src/Pool.php
-
 		-
 			message: "#^Method GuzzleHttp\\\\Pool\\:\\:cmpCallback\\(\\) has parameter \\$name with no typehint specified\\.$#"
 			count: 1

diff --git a/src/Client.php b/src/Client.php
@@ -102,7 +102,7 @@ public function __call($method, $args)
      * @param array $options Request options to apply to the given
      *                       request and to the transfer. See \GuzzleHttp\RequestOptions.
      *
-     * @return PromiseInterface
+     * @return Promise\PromiseInterface
      */
     public function sendAsync(RequestInterface $request, array $options = [])
     {
@@ -142,7 +142,7 @@ public function send(RequestInterface $request, array $options = [])
      * @param string|UriInterface $uri     URI object or string.
      * @param array               $options Request options to apply. See \GuzzleHttp\RequestOptions.
      *
-     * @return PromiseInterface
+     * @return Promise\PromiseInterface
      */
     public function requestAsync($method, $uri = '', array $options = [])
     {
@@ -240,7 +240,14 @@ private function configureDefaults(array $config)
         ];
 
         // idn_to_ascii() is a part of ext-intl and might be not available
-        $defaults['idn_conversion'] = function_exists('idn_to_ascii');
+        $defaults['idn_conversion'] = function_exists('idn_to_ascii')
+            // Old ICU versions don't have this constant, so we are basically stuck (see https://github.com/guzzle/guzzle/pull/2424
+            // and https://github.com/guzzle/guzzle/issues/2448 for details)
+            && (
+                defined('INTL_IDNA_VARIANT_UTS46')
+                ||
+                PHP_VERSION_ID < 70200
+            );
 
         // Use the standard Linux HTTP_PROXY and HTTPS_PROXY if set.
 

diff --git a/src/Pool.php b/src/Pool.php
@@ -2,6 +2,7 @@
 namespace GuzzleHttp;
 
 use GuzzleHttp\Promise\EachPromise;
+use GuzzleHttp\Promise\PromiseInterface;
 use GuzzleHttp\Promise\PromisorInterface;
 use Psr\Http\Message\RequestInterface;
 
@@ -71,7 +72,8 @@ public function __construct(
 
     /**
      * Get promise
-     * @return GuzzleHttp\Promise\Promise
+     *
+     * @return PromiseInterface
      */
     public function promise()
     {

diff --git a/src/functions.php b/src/functions.php
@@ -358,7 +358,8 @@ function _current_time()
 function _idn_uri_convert(UriInterface $uri, $options = 0)
 {
     if ($uri->getHost()) {
-        $asciiHost = idn_to_ascii($uri->getHost(), $options, INTL_IDNA_VARIANT_UTS46, $info);
+        $idnaVariant = defined('INTL_IDNA_VARIANT_UTS46') ? INTL_IDNA_VARIANT_UTS46 : 0;
+        $asciiHost = idn_to_ascii($uri->getHost(), $options, $idnaVariant, $info);
         if ($asciiHost === false) {
             $errorBitSet = isset($info['errors']) ? $info['errors'] : 0;