Skip to content

Commit c36daac

Browse files
keiserjbkeiserjb
committed
change symphony/http-client
1 parent b9bda37 commit c36daac

Some content is hidden

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

50 files changed

+658
-446
lines changed

‎vendor/composer/autoload_classmap.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,6 +485,7 @@
485485
'Symfony\\Component\\HttpClient\\Internal\\CurlClientState' => $vendorDir . '/symfony/http-client/Internal/CurlClientState.php',
486486
'Symfony\\Component\\HttpClient\\Internal\\DnsCache' => $vendorDir . '/symfony/http-client/Internal/DnsCache.php',
487487
'Symfony\\Component\\HttpClient\\Internal\\HttplugWaitLoop' => $vendorDir . '/symfony/http-client/Internal/HttplugWaitLoop.php',
488+
'Symfony\\Component\\HttpClient\\Internal\\LegacyHttplugInterface' => $vendorDir . '/symfony/http-client/Internal/LegacyHttplugInterface.php',
488489
'Symfony\\Component\\HttpClient\\Internal\\NativeClientState' => $vendorDir . '/symfony/http-client/Internal/NativeClientState.php',
489490
'Symfony\\Component\\HttpClient\\Internal\\PushedResponse' => $vendorDir . '/symfony/http-client/Internal/PushedResponse.php',
490491
'Symfony\\Component\\HttpClient\\Messenger\\PingWebhookMessage' => $vendorDir . '/symfony/http-client/Messenger/PingWebhookMessage.php',
@@ -512,7 +513,6 @@
512513
'Symfony\\Component\\HttpClient\\RetryableHttpClient' => $vendorDir . '/symfony/http-client/RetryableHttpClient.php',
513514
'Symfony\\Component\\HttpClient\\ScopingHttpClient' => $vendorDir . '/symfony/http-client/ScopingHttpClient.php',
514515
'Symfony\\Component\\HttpClient\\Test\\HarFileResponseFactory' => $vendorDir . '/symfony/http-client/Test/HarFileResponseFactory.php',
515-
'Symfony\\Component\\HttpClient\\ThrottlingHttpClient' => $vendorDir . '/symfony/http-client/ThrottlingHttpClient.php',
516516
'Symfony\\Component\\HttpClient\\TraceableHttpClient' => $vendorDir . '/symfony/http-client/TraceableHttpClient.php',
517517
'Symfony\\Component\\HttpClient\\UriTemplateHttpClient' => $vendorDir . '/symfony/http-client/UriTemplateHttpClient.php',
518518
'Symfony\\Contracts\\HttpClient\\ChunkInterface' => $vendorDir . '/symfony/http-client-contracts/ChunkInterface.php',

‎vendor/composer/autoload_static.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -588,6 +588,7 @@ class ComposerStaticInit9ae48ead3f78e67310d7c813cefc8849
588588
'Symfony\\Component\\HttpClient\\Internal\\CurlClientState' => __DIR__ . '/..' . '/symfony/http-client/Internal/CurlClientState.php',
589589
'Symfony\\Component\\HttpClient\\Internal\\DnsCache' => __DIR__ . '/..' . '/symfony/http-client/Internal/DnsCache.php',
590590
'Symfony\\Component\\HttpClient\\Internal\\HttplugWaitLoop' => __DIR__ . '/..' . '/symfony/http-client/Internal/HttplugWaitLoop.php',
591+
'Symfony\\Component\\HttpClient\\Internal\\LegacyHttplugInterface' => __DIR__ . '/..' . '/symfony/http-client/Internal/LegacyHttplugInterface.php',
591592
'Symfony\\Component\\HttpClient\\Internal\\NativeClientState' => __DIR__ . '/..' . '/symfony/http-client/Internal/NativeClientState.php',
592593
'Symfony\\Component\\HttpClient\\Internal\\PushedResponse' => __DIR__ . '/..' . '/symfony/http-client/Internal/PushedResponse.php',
593594
'Symfony\\Component\\HttpClient\\Messenger\\PingWebhookMessage' => __DIR__ . '/..' . '/symfony/http-client/Messenger/PingWebhookMessage.php',
@@ -615,7 +616,6 @@ class ComposerStaticInit9ae48ead3f78e67310d7c813cefc8849
615616
'Symfony\\Component\\HttpClient\\RetryableHttpClient' => __DIR__ . '/..' . '/symfony/http-client/RetryableHttpClient.php',
616617
'Symfony\\Component\\HttpClient\\ScopingHttpClient' => __DIR__ . '/..' . '/symfony/http-client/ScopingHttpClient.php',
617618
'Symfony\\Component\\HttpClient\\Test\\HarFileResponseFactory' => __DIR__ . '/..' . '/symfony/http-client/Test/HarFileResponseFactory.php',
618-
'Symfony\\Component\\HttpClient\\ThrottlingHttpClient' => __DIR__ . '/..' . '/symfony/http-client/ThrottlingHttpClient.php',
619619
'Symfony\\Component\\HttpClient\\TraceableHttpClient' => __DIR__ . '/..' . '/symfony/http-client/TraceableHttpClient.php',
620620
'Symfony\\Component\\HttpClient\\UriTemplateHttpClient' => __DIR__ . '/..' . '/symfony/http-client/UriTemplateHttpClient.php',
621621
'Symfony\\Contracts\\HttpClient\\ChunkInterface' => __DIR__ . '/..' . '/symfony/http-client-contracts/ChunkInterface.php',

‎vendor/composer/installed.json‎

Lines changed: 41 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -977,23 +977,23 @@
977977
},
978978
{
979979
"name": "symfony/deprecation-contracts",
980-
"version": "v3.5.0",
981-
"version_normalized": "3.5.0.0",
980+
"version": "v3.5.1",
981+
"version_normalized": "3.5.1.0",
982982
"source": {
983983
"type": "git",
984984
"url": "https://github.com/symfony/deprecation-contracts.git",
985-
"reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1"
985+
"reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6"
986986
},
987987
"dist": {
988988
"type": "zip",
989-
"url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1",
990-
"reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1",
989+
"url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6",
990+
"reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6",
991991
"shasum": ""
992992
},
993993
"require": {
994994
"php": ">=8.1"
995995
},
996-
"time": "2024-04-18T09:32:20+00:00",
996+
"time": "2024-09-25T14:20:29+00:00",
997997
"type": "library",
998998
"extra": {
999999
"branch-alias": {
@@ -1027,7 +1027,7 @@
10271027
"description": "A generic function and convention to trigger deprecation notices",
10281028
"homepage": "https://symfony.com",
10291029
"support": {
1030-
"source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0"
1030+
"source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.1"
10311031
},
10321032
"funding": [
10331033
{
@@ -1047,29 +1047,29 @@
10471047
},
10481048
{
10491049
"name": "symfony/http-client",
1050-
"version": "v7.1.8",
1051-
"version_normalized": "7.1.8.0",
1050+
"version": "v6.4.16",
1051+
"version_normalized": "6.4.16.0",
10521052
"source": {
10531053
"type": "git",
10541054
"url": "https://github.com/symfony/http-client.git",
1055-
"reference": "c30d91a1deac0dc3ed5e604683cf2e1dfc635b8a"
1055+
"reference": "60a113666fa67e598abace38e5f46a0954d8833d"
10561056
},
10571057
"dist": {
10581058
"type": "zip",
1059-
"url": "https://api.github.com/repos/symfony/http-client/zipball/c30d91a1deac0dc3ed5e604683cf2e1dfc635b8a",
1060-
"reference": "c30d91a1deac0dc3ed5e604683cf2e1dfc635b8a",
1059+
"url": "https://api.github.com/repos/symfony/http-client/zipball/60a113666fa67e598abace38e5f46a0954d8833d",
1060+
"reference": "60a113666fa67e598abace38e5f46a0954d8833d",
10611061
"shasum": ""
10621062
},
10631063
"require": {
1064-
"php": ">=8.2",
1064+
"php": ">=8.1",
10651065
"psr/log": "^1|^2|^3",
10661066
"symfony/deprecation-contracts": "^2.5|^3",
1067-
"symfony/http-client-contracts": "^3.4.1",
1067+
"symfony/http-client-contracts": "~3.4.3|^3.5.1",
10681068
"symfony/service-contracts": "^2.5|^3"
10691069
},
10701070
"conflict": {
10711071
"php-http/discovery": "<1.15",
1072-
"symfony/http-foundation": "<6.4"
1072+
"symfony/http-foundation": "<6.3"
10731073
},
10741074
"provide": {
10751075
"php-http/async-client-implementation": "*",
@@ -1086,14 +1086,13 @@
10861086
"nyholm/psr7": "^1.0",
10871087
"php-http/httplug": "^1.0|^2.0",
10881088
"psr/http-client": "^1.0",
1089-
"symfony/dependency-injection": "^6.4|^7.0",
1090-
"symfony/http-kernel": "^6.4|^7.0",
1091-
"symfony/messenger": "^6.4|^7.0",
1092-
"symfony/process": "^6.4|^7.0",
1093-
"symfony/rate-limiter": "^6.4|^7.0",
1094-
"symfony/stopwatch": "^6.4|^7.0"
1095-
},
1096-
"time": "2024-11-13T13:40:27+00:00",
1089+
"symfony/dependency-injection": "^5.4|^6.0|^7.0",
1090+
"symfony/http-kernel": "^5.4|^6.0|^7.0",
1091+
"symfony/messenger": "^5.4|^6.0|^7.0",
1092+
"symfony/process": "^5.4|^6.0|^7.0",
1093+
"symfony/stopwatch": "^5.4|^6.0|^7.0"
1094+
},
1095+
"time": "2024-11-27T11:52:33+00:00",
10971096
"type": "library",
10981097
"installation-source": "dist",
10991098
"autoload": {
@@ -1124,7 +1123,7 @@
11241123
"http"
11251124
],
11261125
"support": {
1127-
"source": "https://github.com/symfony/http-client/tree/v7.1.8"
1126+
"source": "https://github.com/symfony/http-client/tree/v6.4.16"
11281127
},
11291128
"funding": [
11301129
{
@@ -1144,31 +1143,31 @@
11441143
},
11451144
{
11461145
"name": "symfony/http-client-contracts",
1147-
"version": "v3.5.0",
1148-
"version_normalized": "3.5.0.0",
1146+
"version": "v3.5.2",
1147+
"version_normalized": "3.5.2.0",
11491148
"source": {
11501149
"type": "git",
11511150
"url": "https://github.com/symfony/http-client-contracts.git",
1152-
"reference": "20414d96f391677bf80078aa55baece78b82647d"
1151+
"reference": "ee8d807ab20fcb51267fdace50fbe3494c31e645"
11531152
},
11541153
"dist": {
11551154
"type": "zip",
1156-
"url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/20414d96f391677bf80078aa55baece78b82647d",
1157-
"reference": "20414d96f391677bf80078aa55baece78b82647d",
1155+
"url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/ee8d807ab20fcb51267fdace50fbe3494c31e645",
1156+
"reference": "ee8d807ab20fcb51267fdace50fbe3494c31e645",
11581157
"shasum": ""
11591158
},
11601159
"require": {
11611160
"php": ">=8.1"
11621161
},
1163-
"time": "2024-04-18T09:32:20+00:00",
1162+
"time": "2024-12-07T08:49:48+00:00",
11641163
"type": "library",
11651164
"extra": {
1165+
"thanks": {
1166+
"url": "https://github.com/symfony/contracts",
1167+
"name": "symfony/contracts"
1168+
},
11661169
"branch-alias": {
11671170
"dev-main": "3.5-dev"
1168-
},
1169-
"thanks": {
1170-
"name": "symfony/contracts",
1171-
"url": "https://github.com/symfony/contracts"
11721171
}
11731172
},
11741173
"installation-source": "dist",
@@ -1205,7 +1204,7 @@
12051204
"standards"
12061205
],
12071206
"support": {
1208-
"source": "https://github.com/symfony/http-client-contracts/tree/v3.5.0"
1207+
"source": "https://github.com/symfony/http-client-contracts/tree/v3.5.2"
12091208
},
12101209
"funding": [
12111210
{
@@ -1225,17 +1224,17 @@
12251224
},
12261225
{
12271226
"name": "symfony/service-contracts",
1228-
"version": "v3.5.0",
1229-
"version_normalized": "3.5.0.0",
1227+
"version": "v3.5.1",
1228+
"version_normalized": "3.5.1.0",
12301229
"source": {
12311230
"type": "git",
12321231
"url": "https://github.com/symfony/service-contracts.git",
1233-
"reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f"
1232+
"reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0"
12341233
},
12351234
"dist": {
12361235
"type": "zip",
1237-
"url": "https://api.github.com/repos/symfony/service-contracts/zipball/bd1d9e59a81d8fa4acdcea3f617c581f7475a80f",
1238-
"reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f",
1236+
"url": "https://api.github.com/repos/symfony/service-contracts/zipball/e53260aabf78fb3d63f8d79d69ece59f80d5eda0",
1237+
"reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0",
12391238
"shasum": ""
12401239
},
12411240
"require": {
@@ -1246,7 +1245,7 @@
12461245
"conflict": {
12471246
"ext-psr": "<1.1|>=2"
12481247
},
1249-
"time": "2024-04-18T09:32:20+00:00",
1248+
"time": "2024-09-25T14:20:29+00:00",
12501249
"type": "library",
12511250
"extra": {
12521251
"branch-alias": {
@@ -1291,7 +1290,7 @@
12911290
"standards"
12921291
],
12931292
"support": {
1294-
"source": "https://github.com/symfony/service-contracts/tree/v3.5.0"
1293+
"source": "https://github.com/symfony/service-contracts/tree/v3.5.1"
12951294
},
12961295
"funding": [
12971296
{

‎vendor/composer/installed.php‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
'name' => 'backdrop/openai',
44
'pretty_version' => 'dev-1.x-1.x',
55
'version' => 'dev-1.x-1.x',
6-
'reference' => '8d9ef06d99bdc07c5d6c746ffae51409be83a304',
6+
'reference' => 'b9bda37a54827a06008c1bae9f8d512873449612',
77
'type' => 'project',
88
'install_path' => __DIR__ . '/../../',
99
'aliases' => array(),
@@ -13,7 +13,7 @@
1313
'backdrop/openai' => array(
1414
'pretty_version' => 'dev-1.x-1.x',
1515
'version' => 'dev-1.x-1.x',
16-
'reference' => '8d9ef06d99bdc07c5d6c746ffae51409be83a304',
16+
'reference' => 'b9bda37a54827a06008c1bae9f8d512873449612',
1717
'type' => 'project',
1818
'install_path' => __DIR__ . '/../../',
1919
'aliases' => array(),
@@ -176,27 +176,27 @@
176176
'dev_requirement' => false,
177177
),
178178
'symfony/deprecation-contracts' => array(
179-
'pretty_version' => 'v3.5.0',
180-
'version' => '3.5.0.0',
181-
'reference' => '0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1',
179+
'pretty_version' => 'v3.5.1',
180+
'version' => '3.5.1.0',
181+
'reference' => '74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6',
182182
'type' => 'library',
183183
'install_path' => __DIR__ . '/../symfony/deprecation-contracts',
184184
'aliases' => array(),
185185
'dev_requirement' => false,
186186
),
187187
'symfony/http-client' => array(
188-
'pretty_version' => 'v7.1.8',
189-
'version' => '7.1.8.0',
190-
'reference' => 'c30d91a1deac0dc3ed5e604683cf2e1dfc635b8a',
188+
'pretty_version' => 'v6.4.16',
189+
'version' => '6.4.16.0',
190+
'reference' => '60a113666fa67e598abace38e5f46a0954d8833d',
191191
'type' => 'library',
192192
'install_path' => __DIR__ . '/../symfony/http-client',
193193
'aliases' => array(),
194194
'dev_requirement' => false,
195195
),
196196
'symfony/http-client-contracts' => array(
197-
'pretty_version' => 'v3.5.0',
198-
'version' => '3.5.0.0',
199-
'reference' => '20414d96f391677bf80078aa55baece78b82647d',
197+
'pretty_version' => 'v3.5.2',
198+
'version' => '3.5.2.0',
199+
'reference' => 'ee8d807ab20fcb51267fdace50fbe3494c31e645',
200200
'type' => 'library',
201201
'install_path' => __DIR__ . '/../symfony/http-client-contracts',
202202
'aliases' => array(),
@@ -209,9 +209,9 @@
209209
),
210210
),
211211
'symfony/service-contracts' => array(
212-
'pretty_version' => 'v3.5.0',
213-
'version' => '3.5.0.0',
214-
'reference' => 'bd1d9e59a81d8fa4acdcea3f617c581f7475a80f',
212+
'pretty_version' => 'v3.5.1',
213+
'version' => '3.5.1.0',
214+
'reference' => 'e53260aabf78fb3d63f8d79d69ece59f80d5eda0',
215215
'type' => 'library',
216216
'install_path' => __DIR__ . '/../symfony/service-contracts',
217217
'aliases' => array(),

‎vendor/composer/platform_check.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
$issues = array();
66

7-
if (!(PHP_VERSION_ID >= 80200)) {
8-
$issues[] = 'Your Composer dependencies require a PHP version ">= 8.2.0". You are running ' . PHP_VERSION . '.';
7+
if (!(PHP_VERSION_ID >= 80100)) {
8+
$issues[] = 'Your Composer dependencies require a PHP version ">= 8.1.0". You are running ' . PHP_VERSION . '.';
99
}
1010

1111
if ($issues) {

‎vendor/symfony/http-client-contracts/HttpClientInterface.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ interface HttpClientInterface
4646
'buffer' => true, // bool|resource|\Closure - whether the content of the response should be buffered or not,
4747
// or a stream resource where the response body should be written,
4848
// or a closure telling if/where the response should be buffered based on its headers
49-
'on_progress' => null, // callable(int $dlNow, int $dlSize, array $info) - throwing any exceptions MUST abort
50-
// the request; it MUST be called on DNS resolution, on arrival of headers and on
51-
// completion; it SHOULD be called on upload/download of data and at least 1/s
49+
'on_progress' => null, // callable(int $dlNow, int $dlSize, array $info) - throwing any exceptions MUST abort the
50+
// request; it MUST be called on connection, on headers and on completion; it SHOULD be
51+
// called on upload/download of data and at least 1/s
5252
'resolve' => [], // string[] - a map of host to IP address that SHOULD replace DNS resolution
5353
'proxy' => null, // string - by default, the proxy-related env vars handled by curl SHOULD be honored
5454
'no_proxy' => null, // string - a comma separated list of hosts that do not require a proxy to be reached

‎vendor/symfony/http-client-contracts/Test/Fixtures/web/index.php‎

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,30 +12,37 @@
1212
$_POST['content-type'] = $_SERVER['HTTP_CONTENT_TYPE'] ?? '?';
1313
}
1414

15+
$headers = [
16+
'SERVER_PROTOCOL',
17+
'SERVER_NAME',
18+
'REQUEST_URI',
19+
'REQUEST_METHOD',
20+
'PHP_AUTH_USER',
21+
'PHP_AUTH_PW',
22+
'REMOTE_ADDR',
23+
'REMOTE_PORT',
24+
];
25+
26+
foreach ($headers as $k) {
27+
if (isset($_SERVER[$k])) {
28+
$vars[$k] = $_SERVER[$k];
29+
}
30+
}
31+
1532
foreach ($_SERVER as $k => $v) {
16-
switch ($k) {
17-
default:
18-
if (!str_starts_with($k, 'HTTP_')) {
19-
continue 2;
20-
}
21-
// no break
22-
case 'SERVER_NAME':
23-
case 'SERVER_PROTOCOL':
24-
case 'REQUEST_URI':
25-
case 'REQUEST_METHOD':
26-
case 'PHP_AUTH_USER':
27-
case 'PHP_AUTH_PW':
28-
$vars[$k] = $v;
33+
if (str_starts_with($k, 'HTTP_')) {
34+
$vars[$k] = $v;
2935
}
3036
}
3137

3238
$json = json_encode($vars, \JSON_PRETTY_PRINT | \JSON_UNESCAPED_SLASHES | \JSON_UNESCAPED_UNICODE);
3339

34-
switch ($vars['REQUEST_URI']) {
40+
switch (parse_url($vars['REQUEST_URI'], \PHP_URL_PATH)) {
3541
default:
3642
exit;
3743

3844
case '/head':
45+
header('X-Request-Vars: '.json_encode($vars, \JSON_UNESCAPED_SLASHES | \JSON_UNESCAPED_UNICODE));
3946
header('Content-Length: '.strlen($json), true);
4047
break;
4148

@@ -94,7 +101,8 @@
94101

95102
case '/302':
96103
if (!isset($vars['HTTP_AUTHORIZATION'])) {
97-
header('Location: http://localhost:8057/', true, 302);
104+
$location = $_GET['location'] ?? 'http://localhost:8057/';
105+
header('Location: '.$location, true, 302);
98106
}
99107
break;
100108

0 commit comments

Comments
 (0)