Skip to content

Commit 333b9bd

Browse files
Merge branch '6.4' into 7.3
* 6.4: [HttpClient] Fix PHP 8.5 deprecation using str_increment() [FrameworkBundle] Don’t collect CLI profiles if the profiler is disabled
2 parents a97cfe6 + b8e9dce commit 333b9bd

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

Response/AmpResponseV4.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,8 @@ public function __construct(
101101

102102
$throttleWatcher = null;
103103

104-
$this->id = $id = self::$nextId++;
104+
$this->id = $id = self::$nextId;
105+
self::$nextId = str_increment(self::$nextId);
105106
Loop::defer(static function () use ($request, $multi, $id, &$info, &$headers, $canceller, &$options, $onProgress, &$handle, $logger, &$pause) {
106107
return new Coroutine(self::generateResponse($request, $multi, $id, $info, $headers, $canceller, $options, $onProgress, $handle, $logger, $pause));
107108
});

Response/AmpResponseV5.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@ public function __construct(
9696
};
9797

9898
$pause = 0.0;
99-
$this->id = $id = self::$nextId++;
99+
$this->id = $id = self::$nextId;
100+
self::$nextId = str_increment(self::$nextId);
100101

101102
$info['pause_handler'] = static function (float $duration) use (&$pause) {
102103
$pause = $duration;

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
"psr/log": "^1|^2|^3",
2727
"symfony/deprecation-contracts": "^2.5|^3",
2828
"symfony/http-client-contracts": "~3.4.4|^3.5.2",
29+
"symfony/polyfill-php83": "^1.29",
2930
"symfony/service-contracts": "^2.5|^3"
3031
},
3132
"require-dev": {

0 commit comments

Comments
 (0)