[pull] master from guzzle:master

.github/FUNDING.yml

@@ -1,3 +1,2 @@
-# These are supported funding model platforms
-
-github: [Nyholm, gmponos, alexeyshockov, GrahamCampbell]
+github: [Nyholm, GrahamCampbell]
+tidelift: "packagist/guzzlehttp/guzzle"

LICENSE

@@ -1,4 +1,12 @@
-Copyright (c) 2011 Michael Dowling, https://github.com/mtdowling <mtdowling@gmail.com>
+The MIT License (MIT)
+
+Copyright (c) 2011 Michael Dowling <mtdowling@gmail.com>
+Copyright (c) 2012 Jeremy Lindblom <jeremeamia@gmail.com>
+Copyright (c) 2014 Graham Campbell <hello@gjcampbell.co.uk>
+Copyright (c) 2015 Márk Sági-Kazár <mark.sagikazar@gmail.com>
+Copyright (c) 2015 Tobias Schultze <webmaster@tubo-world.de>
+Copyright (c) 2016 Tobias Nyholm <tobias.nyholm@gmail.com>
+Copyright (c) 2016 George Mponos <gmponos@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -77,3 +77,18 @@ composer require guzzlehttp/guzzle
 [guzzle-5-docs]: http://docs.guzzlephp.org/en/5.3/
 [guzzle-6-docs]: http://docs.guzzlephp.org/en/6.5/
 [guzzle-7-docs]: http://docs.guzzlephp.org/en/latest/
+
+
+## Security
+
+If you discover a security vulnerability within this package, please send an email to security@tidelift.com. All security vulnerabilities will be promptly addressed. Please do not disclose security-related issues publicly until a fix has been announced. Please see [Security Policy](https://github.com/guzzle/guzzle/security/policy) for more information.
+
+## License
+
+Guzzle is made available under the MIT License (MIT). Please see [License File](LICENSE) for more information.
+
+## For Enterprise
+
+Available as part of the Tidelift Subscription
+
+The maintainers of Guzzle and thousands of other packages are working with Tidelift to deliver commercial support and maintenance for the open source dependencies you use to build your applications. Save time, reduce risk, and improve code health, while paying the maintainers of the exact dependencies you use. [Learn more.](https://tidelift.com/subscription/pkg/packagist-guzzlehttp-guzzle?utm_source=packagist-guzzlehttp-guzzle&utm_medium=referral&utm_campaign=enterprise&utm_term=repo)

composer.json

@@ -1,6 +1,5 @@
 {
     "name": "guzzlehttp/guzzle",
-    "type": "library",
     "description": "Guzzle is a PHP HTTP client library",
     "keywords": [
         "framework",
@@ -13,18 +12,42 @@
         "PSR-7",
         "PSR-18"
     ],
-    "homepage": "http://guzzlephp.org/",
     "license": "MIT",
     "authors": [
+        {
+            "name": "Graham Campbell",
+            "email": "hello@gjcampbell.co.uk",
+            "homepage": "https://github.com/GrahamCampbell"
+        },
         {
             "name": "Michael Dowling",
             "email": "mtdowling@gmail.com",
             "homepage": "https://github.com/mtdowling"
         },
+        {
+            "name": "Jeremy Lindblom",
+            "email": "jeremeamia@gmail.com",
+            "homepage": "https://github.com/jeremeamia"
+        },
+        {
+            "name": "George Mponos",
+            "email": "gmponos@gmail.com",
+            "homepage": "https://github.com/gmponos"
+        },
+        {
+            "name": "Tobias Nyholm",
+            "email": "tobias.nyholm@gmail.com",
+            "homepage": "https://github.com/Nyholm"
+        },
         {
             "name": "Márk Sági-Kazár",
             "email": "mark.sagikazar@gmail.com",
-            "homepage": "https://sagikazarmark.hu"
+            "homepage": "https://github.com/sagikazarmark"
+        },
+        {
+            "name": "Tobias Schultze",
+            "email": "webmaster@tubo-world.de",
+            "homepage": "https://github.com/Tobion"
         }
     ],
     "require": {
@@ -51,6 +74,7 @@
         "psr/log": "Required for using the Log middleware"
     },
     "config": {
+        "preferred-install": "dist",
         "sort-packages": true
     },
     "extra": {

docs/quickstart.rst

@@ -547,26 +547,6 @@ on each other.
 
 Guzzle throws exceptions for errors that occur during a transfer.
 
-- In the event of a networking error (connection timeout, DNS errors, etc.),
-  a ``GuzzleHttp\Exception\RequestException`` is thrown. This exception
-  extends from ``GuzzleHttp\Exception\TransferException``. Catching this
-  exception will catch any exception that can be thrown while transferring
-  requests.
-
-  .. code-block:: php
-
-      use GuzzleHttp\Psr7;
-      use GuzzleHttp\Exception\RequestException;
-
-      try {
-          $client->request('GET', 'https://github.com/_abc_123_404');
-      } catch (RequestException $e) {
-          echo Psr7\Message::toString($e->getRequest());
-          if ($e->hasResponse()) {
-              echo Psr7\Message::toString($e->getResponse());
-          }
-      }
-
 - A ``GuzzleHttp\Exception\ConnectException`` exception is thrown in the
   event of a networking error. This exception extends from
   ``GuzzleHttp\Exception\TransferException``.

src/Handler/CurlHandler.php

@@ -24,9 +24,9 @@ class CurlHandler
     /**
      * Accepts an associative array of options:
      *
-     * - factory: Optional curl factory used to create cURL handles.
+     * - handle_factory: Optional curl factory used to create cURL handles.
      *
-     * @param array $options Array of options to use with the handler
+     * @param array{handle_factory?: ?CurlFactoryInterface} $options Array of options to use with the handler
      */
     public function __construct(array $options = [])
     {