Skip to content

Commit 902186a

Browse files
authored
Merge pull request #583 from elmsln/renovate/packagist-guzzlehttp/guzzle-vulnerability
Update dependency guzzlehttp/guzzle to v6.5.8 [SECURITY]
2 parents ff23fa6 + 5eabeb0 commit 902186a

File tree

137 files changed

+23652
-1568
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+23652
-1568
lines changed

system/backend/php/composer.lock

Lines changed: 401 additions & 43 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

system/backend/php/vendor/composer/installed.json

Lines changed: 403 additions & 45 deletions
Large diffs are not rendered by default.
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?php
2+
3+
$config = PhpCsFixer\Config::create()
4+
->setRiskyAllowed(true)
5+
->setRules([
6+
'@PSR2' => true,
7+
'array_syntax' => ['syntax' => 'short'],
8+
'declare_strict_types' => false,
9+
'concat_space' => ['spacing'=>'one'],
10+
'php_unit_test_case_static_method_calls' => ['call_type' => 'self'],
11+
'ordered_imports' => true,
12+
// 'phpdoc_align' => ['align'=>'vertical'],
13+
// 'native_function_invocation' => true,
14+
])
15+
->setFinder(
16+
PhpCsFixer\Finder::create()
17+
->in(__DIR__.'/src')
18+
->in(__DIR__.'/tests')
19+
->name('*.php')
20+
)
21+
;
22+
23+
return $config;

system/backend/php/vendor/guzzlehttp/guzzle/CHANGELOG.md

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,70 @@
11
# Change Log
22

3+
## 6.5.8 - 2022-06-20
4+
5+
* Fix change in port should be considered a change in origin
6+
* Fix `CURLOPT_HTTPAUTH` option not cleared on change of origin
7+
8+
## 6.5.7 - 2022-06-09
9+
10+
* Fix failure to strip Authorization header on HTTP downgrade
11+
* Fix failure to strip the Cookie header on change in host or HTTP downgrade
12+
13+
## 6.5.6 - 2022-05-25
14+
15+
* Fix cross-domain cookie leakage
16+
17+
## 6.5.5 - 2020-06-16
18+
19+
* Unpin version constraint for `symfony/polyfill-intl-idn` [#2678](https://github.com/guzzle/guzzle/pull/2678)
20+
21+
## 6.5.4 - 2020-05-25
22+
23+
* Fix various intl icu issues [#2626](https://github.com/guzzle/guzzle/pull/2626)
24+
25+
## 6.5.3 - 2020-04-18
26+
27+
* Use Symfony intl-idn polyfill [#2550](https://github.com/guzzle/guzzle/pull/2550)
28+
* Remove use of internal functions [#2548](https://github.com/guzzle/guzzle/pull/2548)
29+
30+
## 6.5.2 - 2019-12-23
31+
32+
* idn_to_ascii() fix for old PHP versions [#2489](https://github.com/guzzle/guzzle/pull/2489)
33+
34+
## 6.5.1 - 2019-12-21
35+
36+
* Better defaults for PHP installations with old ICU lib [#2454](https://github.com/guzzle/guzzle/pull/2454)
37+
* IDN support for redirects [#2424](https://github.com/guzzle/guzzle/pull/2424)
38+
39+
## 6.5.0 - 2019-12-07
40+
41+
* Improvement: Added support for reset internal queue in MockHandler. [#2143](https://github.com/guzzle/guzzle/pull/2143)
42+
* Improvement: Added support to pass arbitrary options to `curl_multi_init`. [#2287](https://github.com/guzzle/guzzle/pull/2287)
43+
* Fix: Gracefully handle passing `null` to the `header` option. [#2132](https://github.com/guzzle/guzzle/pull/2132)
44+
* Fix: `RetryMiddleware` did not do exponential delay between retries due unit mismatch. [#2132](https://github.com/guzzle/guzzle/pull/2132)
45+
Previously, `RetryMiddleware` would sleep for 1 millisecond, then 2 milliseconds, then 4 milliseconds.
46+
**After this change, `RetryMiddleware` will sleep for 1 second, then 2 seconds, then 4 seconds.**
47+
`Middleware::retry()` accepts a second callback parameter to override the default timeouts if needed.
48+
* Fix: Prevent undefined offset when using array for ssl_key options. [#2348](https://github.com/guzzle/guzzle/pull/2348)
49+
* Deprecated `ClientInterface::VERSION`
50+
51+
## 6.4.1 - 2019-10-23
52+
53+
* No `guzzle.phar` was created in 6.4.0 due expired API token. This release will fix that
54+
* Added `parent::__construct()` to `FileCookieJar` and `SessionCookieJar`
55+
56+
## 6.4.0 - 2019-10-23
57+
58+
* Improvement: Improved error messages when using curl < 7.21.2 [#2108](https://github.com/guzzle/guzzle/pull/2108)
59+
* Fix: Test if response is readable before returning a summary in `RequestException::getResponseBodySummary()` [#2081](https://github.com/guzzle/guzzle/pull/2081)
60+
* Fix: Add support for GUZZLE_CURL_SELECT_TIMEOUT environment variable [#2161](https://github.com/guzzle/guzzle/pull/2161)
61+
* Improvement: Added `GuzzleHttp\Exception\InvalidArgumentException` [#2163](https://github.com/guzzle/guzzle/pull/2163)
62+
* Improvement: Added `GuzzleHttp\_current_time()` to use `hrtime()` if that function exists. [#2242](https://github.com/guzzle/guzzle/pull/2242)
63+
* Improvement: Added curl's `appconnect_time` in `TransferStats` [#2284](https://github.com/guzzle/guzzle/pull/2284)
64+
* Improvement: Make GuzzleException extend Throwable wherever it's available [#2273](https://github.com/guzzle/guzzle/pull/2273)
65+
* Fix: Prevent concurrent writes to file when saving `CookieJar` [#2335](https://github.com/guzzle/guzzle/pull/2335)
66+
* Improvement: Update `MockHandler` so we can test transfer time [#2362](https://github.com/guzzle/guzzle/pull/2362)
67+
368
## 6.3.3 - 2018-04-22
469

570
* Fix: Default headers when decode_content is specified
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
FROM composer:latest as setup
2+
3+
RUN mkdir /guzzle
4+
5+
WORKDIR /guzzle
6+
7+
RUN set -xe \
8+
&& composer init --name=guzzlehttp/test --description="Simple project for testing Guzzle scripts" --author="Márk Sági-Kazár <mark.sagikazar@gmail.com>" --no-interaction \
9+
&& composer require guzzlehttp/guzzle
10+
11+
12+
FROM php:7.3
13+
14+
RUN mkdir /guzzle
15+
16+
WORKDIR /guzzle
17+
18+
COPY --from=setup /guzzle /guzzle

system/backend/php/vendor/guzzlehttp/guzzle/LICENSE

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
Copyright (c) 2011-2018 Michael Dowling, https://github.com/mtdowling <mtdowling@gmail.com>
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2011 Michael Dowling <mtdowling@gmail.com>
4+
Copyright (c) 2012 Jeremy Lindblom <jeremeamia@gmail.com>
5+
Copyright (c) 2014 Graham Campbell <hello@gjcampbell.co.uk>
6+
Copyright (c) 2015 Márk Sági-Kazár <mark.sagikazar@gmail.com>
7+
Copyright (c) 2015 Tobias Schultze <webmaster@tubo-world.de>
8+
Copyright (c) 2016 Tobias Nyholm <tobias.nyholm@gmail.com>
9+
Copyright (c) 2016 George Mponos <gmponos@gmail.com>
210

311
Permission is hereby granted, free of charge, to any person obtaining a copy
412
of this software and associated documentation files (the "Software"), to deal
Lines changed: 33 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
Guzzle, PHP HTTP client
2-
=======================
1+
![Guzzle](.github/logo.png?raw=true)
2+
3+
# Guzzle, PHP HTTP client
34

45
[![Latest Version](https://img.shields.io/github/release/guzzle/guzzle.svg?style=flat-square)](https://github.com/guzzle/guzzle/releases)
5-
[![Build Status](https://img.shields.io/travis/guzzle/guzzle.svg?style=flat-square)](https://travis-ci.org/guzzle/guzzle)
6+
[![Build Status](https://img.shields.io/github/workflow/status/guzzle/guzzle/CI?label=ci%20build&style=flat-square)](https://github.com/guzzle/guzzle/actions?query=workflow%3ACI)
67
[![Total Downloads](https://img.shields.io/packagist/dt/guzzlehttp/guzzle.svg?style=flat-square)](https://packagist.org/packages/guzzlehttp/guzzle)
78

89
Guzzle is a PHP HTTP client that makes it easy to send HTTP requests and
@@ -21,33 +22,35 @@ trivial to integrate with web services.
2122

2223
```php
2324
$client = new \GuzzleHttp\Client();
24-
$res = $client->request('GET', 'https://api.github.com/repos/guzzle/guzzle');
25-
echo $res->getStatusCode();
26-
// 200
27-
echo $res->getHeaderLine('content-type');
28-
// 'application/json; charset=utf8'
29-
echo $res->getBody();
30-
// '{"id": 1420053, "name": "guzzle", ...}'
31-
32-
// Send an asynchronous request.
25+
$response = $client->request('GET', 'https://api.github.com/repos/guzzle/guzzle');
26+
27+
echo $response->getStatusCode(); # 200
28+
echo $response->getHeaderLine('content-type'); # 'application/json; charset=utf8'
29+
echo $response->getBody(); # '{"id": 1420053, "name": "guzzle", ...}'
30+
31+
# Send an asynchronous request.
3332
$request = new \GuzzleHttp\Psr7\Request('GET', 'http://httpbin.org');
3433
$promise = $client->sendAsync($request)->then(function ($response) {
3534
echo 'I completed! ' . $response->getBody();
3635
});
36+
3737
$promise->wait();
3838
```
3939

4040
## Help and docs
4141

42-
- [Documentation](http://guzzlephp.org/)
43-
- [Stack Overflow](http://stackoverflow.com/questions/tagged/guzzle)
42+
We use GitHub issues only to discuss bugs and new features. For support please refer to:
43+
44+
- [Documentation](https://docs.guzzlephp.org)
45+
- [Stack Overflow](https://stackoverflow.com/questions/tagged/guzzle)
46+
- [#guzzle](https://app.slack.com/client/T0D2S9JCT/CE6UAAKL4) channel on [PHP-HTTP Slack](https://slack.httplug.io/)
4447
- [Gitter](https://gitter.im/guzzle/guzzle)
4548

4649

4750
## Installing Guzzle
4851

4952
The recommended way to install Guzzle is through
50-
[Composer](http://getcomposer.org).
53+
[Composer](https://getcomposer.org/).
5154

5255
```bash
5356
# Install Composer
@@ -57,7 +60,7 @@ curl -sS https://getcomposer.org/installer | php
5760
Next, run the Composer command to install the latest stable version of Guzzle:
5861

5962
```bash
60-
php composer.phar require guzzlehttp/guzzle
63+
composer require guzzlehttp/guzzle
6164
```
6265

6366
After installing, you need to require Composer's autoloader:
@@ -69,23 +72,26 @@ require 'vendor/autoload.php';
6972
You can then later update Guzzle using composer:
7073

7174
```bash
72-
composer.phar update
75+
composer update
7376
```
7477

7578

7679
## Version Guidance
7780

78-
| Version | Status | Packagist | Namespace | Repo | Docs | PSR-7 | PHP Version |
79-
|---------|------------|---------------------|--------------|---------------------|---------------------|-------|-------------|
80-
| 3.x | EOL | `guzzle/guzzle` | `Guzzle` | [v3][guzzle-3-repo] | [v3][guzzle-3-docs] | No | >= 5.3.3 |
81-
| 4.x | EOL | `guzzlehttp/guzzle` | `GuzzleHttp` | [v4][guzzle-4-repo] | N/A | No | >= 5.4 |
82-
| 5.x | Maintained | `guzzlehttp/guzzle` | `GuzzleHttp` | [v5][guzzle-5-repo] | [v5][guzzle-5-docs] | No | >= 5.4 |
83-
| 6.x | Latest | `guzzlehttp/guzzle` | `GuzzleHttp` | [v6][guzzle-6-repo] | [v6][guzzle-6-docs] | Yes | >= 5.5 |
81+
| Version | Status | Packagist | Namespace | Repo | Docs | PSR-7 | PHP Version |
82+
|---------|----------------|---------------------|--------------|---------------------|---------------------|-------|--------------|
83+
| 3.x | EOL | `guzzle/guzzle` | `Guzzle` | [v3][guzzle-3-repo] | [v3][guzzle-3-docs] | No | >=5.3.3,<7.0 |
84+
| 4.x | EOL | `guzzlehttp/guzzle` | `GuzzleHttp` | [v4][guzzle-4-repo] | N/A | No | >=5.4,<7.0 |
85+
| 5.x | EOL | `guzzlehttp/guzzle` | `GuzzleHttp` | [v5][guzzle-5-repo] | [v5][guzzle-5-docs] | No | >=5.4,<7.4 |
86+
| 6.x | Security fixes | `guzzlehttp/guzzle` | `GuzzleHttp` | [v6][guzzle-6-repo] | [v6][guzzle-6-docs] | Yes | >=5.5,<8.0 |
87+
| 7.x | Latest | `guzzlehttp/guzzle` | `GuzzleHttp` | [v7][guzzle-7-repo] | [v7][guzzle-7-docs] | Yes | >=7.2.5,<8.2 |
8488

8589
[guzzle-3-repo]: https://github.com/guzzle/guzzle3
8690
[guzzle-4-repo]: https://github.com/guzzle/guzzle/tree/4.x
8791
[guzzle-5-repo]: https://github.com/guzzle/guzzle/tree/5.3
88-
[guzzle-6-repo]: https://github.com/guzzle/guzzle
89-
[guzzle-3-docs]: http://guzzle3.readthedocs.org/en/latest/
90-
[guzzle-5-docs]: http://guzzle.readthedocs.org/en/5.3/
91-
[guzzle-6-docs]: http://guzzle.readthedocs.org/en/latest/
92+
[guzzle-6-repo]: https://github.com/guzzle/guzzle/tree/6.5
93+
[guzzle-7-repo]: https://github.com/guzzle/guzzle
94+
[guzzle-3-docs]: https://guzzle3.readthedocs.io/
95+
[guzzle-5-docs]: https://docs.guzzlephp.org/en/5.3/
96+
[guzzle-6-docs]: https://docs.guzzlephp.org/en/6.5/
97+
[guzzle-7-docs]: https://docs.guzzlephp.org/en/latest/

system/backend/php/vendor/guzzlehttp/guzzle/composer.json

Lines changed: 63 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,43 +2,91 @@
22
"name": "guzzlehttp/guzzle",
33
"type": "library",
44
"description": "Guzzle is a PHP HTTP client library",
5-
"keywords": ["framework", "http", "rest", "web service", "curl", "client", "HTTP client"],
5+
"keywords": [
6+
"framework",
7+
"http",
8+
"rest",
9+
"web service",
10+
"curl",
11+
"client",
12+
"HTTP client"
13+
],
614
"homepage": "http://guzzlephp.org/",
715
"license": "MIT",
816
"authors": [
17+
{
18+
"name": "Graham Campbell",
19+
"email": "hello@gjcampbell.co.uk",
20+
"homepage": "https://github.com/GrahamCampbell"
21+
},
922
{
1023
"name": "Michael Dowling",
1124
"email": "mtdowling@gmail.com",
1225
"homepage": "https://github.com/mtdowling"
26+
},
27+
{
28+
"name": "Jeremy Lindblom",
29+
"email": "jeremeamia@gmail.com",
30+
"homepage": "https://github.com/jeremeamia"
31+
},
32+
{
33+
"name": "George Mponos",
34+
"email": "gmponos@gmail.com",
35+
"homepage": "https://github.com/gmponos"
36+
},
37+
{
38+
"name": "Tobias Nyholm",
39+
"email": "tobias.nyholm@gmail.com",
40+
"homepage": "https://github.com/Nyholm"
41+
},
42+
{
43+
"name": "Márk Sági-Kazár",
44+
"email": "mark.sagikazar@gmail.com",
45+
"homepage": "https://github.com/sagikazarmark"
46+
},
47+
{
48+
"name": "Tobias Schultze",
49+
"email": "webmaster@tubo-world.de",
50+
"homepage": "https://github.com/Tobion"
1351
}
1452
],
1553
"require": {
1654
"php": ">=5.5",
17-
"guzzlehttp/psr7": "^1.4",
18-
"guzzlehttp/promises": "^1.0"
55+
"ext-json": "*",
56+
"symfony/polyfill-intl-idn": "^1.17",
57+
"guzzlehttp/promises": "^1.0",
58+
"guzzlehttp/psr7": "^1.9"
1959
},
2060
"require-dev": {
2161
"ext-curl": "*",
22-
"phpunit/phpunit": "^8.0.0",
23-
"psr/log": "^1.0"
62+
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
63+
"psr/log": "^1.1"
64+
},
65+
"suggest": {
66+
"psr/log": "Required for using the Log middleware"
67+
},
68+
"config": {
69+
"sort-packages": true,
70+
"allow-plugins": {
71+
"bamarni/composer-bin-plugin": true
72+
}
73+
},
74+
"extra": {
75+
"branch-alias": {
76+
"dev-master": "6.5-dev"
77+
}
2478
},
2579
"autoload": {
26-
"files": ["src/functions_include.php"],
2780
"psr-4": {
2881
"GuzzleHttp\\": "src/"
29-
}
82+
},
83+
"files": [
84+
"src/functions_include.php"
85+
]
3086
},
3187
"autoload-dev": {
3288
"psr-4": {
3389
"GuzzleHttp\\Tests\\": "tests/"
3490
}
35-
},
36-
"suggest": {
37-
"psr/log": "Required for using the Log middleware"
38-
},
39-
"extra": {
40-
"branch-alias": {
41-
"dev-master": "6.3-dev"
42-
}
4391
}
4492
}

0 commit comments

Comments
 (0)