8000 Merge branch '5.4' into 6.3 · symfony/symfony@0b0484f · GitHub
[go: up one dir, main page]
Skip to content

Commit 0b0484f

Browse files
derrabusderrabus
committed
Merge branch '5.4' into 6.3
* 5.4: always pass microseconds to usleep as integers Bump Symfony version to 5.4.34 Update VERSION for 5.4.33 Update CONTRIBUTORS for 5.4.33 Update CHANGELOG for 5.4.33
2 parents aff2a1c + a0e10fd commit 0b0484f

File tree

5 files changed

+18
-17
lines changed

5 files changed

+18
-17
lines changed

‎CONTRIBUTORS.md

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ The Symfony Connect username in parenthesis allows to get more information
1818
- Jordi Boggiano (seldaek)
1919
- Maxime Steinhausser (ogizanagi)
2020
- Kévin Dunglas (dunglas)
21+
- Alexandre Daubois (alexandre-daubois)
2122
- Victor Berchet (victor)
2223
- Ryan Weaver (weaverryan)
23-
- Alexandre Daubois (alexandre-daubois)
2424
- Javier Eguiluz (javier.eguiluz)
2525
- Jérémy DERUSSÉ (jderusse)
2626
- Roland Franssen
@@ -33,8 +33,8 @@ The Symfony Connect username in parenthesis allows to get more information
3333
- Hugo Hamon (hhamon)
3434
- Tobias Nyholm (tobias)
3535
- Samuel ROZE (sroze)
36-
- Pascal Borreli (pborreli)
3736
- Jérôme Tamarelle (gromnan)
37+
- Pascal Borreli (pborreli)
3838
- Romain Neutron
3939
- Antoine Lamirault (alamirault)
4040
- Joseph Bielawski (stloyd)
@@ -90,9 +90,9 @@ The Symfony Connect username in parenthesis allows to get more information
9090
- Vladimir Reznichenko (kalessil)
9191
- Peter Rehm (rpet)
9292
- Henrik Bjørnskov (henrikbjorn)
93+
- Mathias Arlaud (mtarld)
9394
- Andrej Hudec (pulzarraider)
9495
- Jáchym Toušek (enumag)
95-
- Mathias Arlaud (mtarld)
9696
- David Buchmann (dbu)
9797
- Dariusz Ruminski
9898
- Christian Raue
@@ -101,11 +101,11 @@ The Symfony Connect username in parenthesis allows to get more information
101101
- Michel Weimerskirch (mweimerskirch)
102102
- Issei Murasawa (issei_m)
103103
- Douglas Greenshields (shieldo)
104+
- Frank A. Fiebig (fafiebig)
105+
- Baldini
104106
- Alex Pott
105107
- Fran Moreno (franmomu)
106108
- Arnout Boks (aboks)
107-
- Frank A. Fiebig (fafiebig)
108-
- Baldini
109109
- Charles Sarrazin (csarrazi)
110110
- Ruud Kamphuis (ruudk)
111111
- Henrik Westphal (snc)
@@ -149,21 +149,21 @@ The Symfony Connect username in parenthesis allows to get more information
149149
- Rokas Mikalkėnas (rokasm)
150150
- Lars Strojny (lstrojny)
151151
- lenar
152+
- Vladimir Tsykun (vtsykun)
152153
- Jacob Dreesen (jdreesen)
154+
- Tac Tacelosky (tacman1123)
153155
- Włodzimierz Gajda (gajdaw)
154156
- Adrien Brault (adrienbrault)
155-
- Tac Tacelosky (tacman1123)
156157
- Théo FIDRY
157158
- Florian Voutzinos (florianv)
158159
- Teoh Han Hui (teohhanhui)
159160
- Przemysław Bogusz (przemyslaw-bogusz)
160161
- Colin Frei
162+
- Martin Auswöger
161163
- Javier Spagnoletti (phansys)
162164
- excelwebzone
163-
- Vladimir Tsykun (vtsykun)
164165
- Paráda József (paradajozsef)
165166
- Baptiste Clavié (talus)
166-
- Martin Auswöger
167167
- Alexander Schwenn (xelaris)
168168
- Fabien Pennequin (fabienpennequin)
169169
- Gordon Franke (gimler)
@@ -319,6 +319,7 @@ The Symfony Connect username in parenthesis allows to get more information
319319
- Pierre Minnieur (pminnieur)
320320
- Dominique Bongiraud
321321
- Hugo Monteiro (monteiro)
322+
- Bram Leeda (bram123)
322323
- Timo Bakx (timobakx)
323324
- Dmitrii Poddubnyi (karser)
324325
- Julien Pauli
@@ -365,7 +366,6 @@ The Symfony Connect username in parenthesis allows to get more information
365366
- Florent Morselli (spomky_)
366367
- dFayet
367368
- Rob Frawley 2nd (robfrawley)
368-
- Bram Leeda (bram123)
369369
- Nikita Konstantinov (unkind)
370370
- Dariusz
371371
- Francois Zaninotto
@@ -405,6 +405,7 @@ The Symfony Connect username in parenthesis allows to get more information
405405
- Eugene Leonovich (rybakit)
406406
- Joseph Rouff (rouffj)
407407
- Félix Labrecque (woodspire)
408+
- Marvin Petker
408409
- GordonsLondon
409410
- Ray
410411
- Philipp Cordes (corphi)
@@ -426,6 +427,7 @@ The Symfony Connect username in parenthesis allows to get more information
426427
- Matthieu Auger (matthieuauger)
427428
- Sergey Belyshkin (sbelyshkin)
428429
- Kévin THERAGE (kevin_therage)
430+
- Herberto Graca
429431
- Yoann RENARD (yrenard)
430432
- Josip Kruslin (jkruslin)
431433
- Daniel Gorgan
@@ -474,7 +476,6 @@ The Symfony Connect username in parenthesis allows to get more information
474476
- Warxcell (warxcell)
475477
- Atsuhiro KUBO (iteman)
476478
- rudy onfroy (ronfroy)
477-
- Marvin Petker
478479
- Serkan Yildiz (srknyldz)
479480
- Andrew Moore (finewolf)
480481
- Bertrand Zuchuat (garfield-fr)
@@ -493,6 +494,7 @@ The Symfony Connect username in parenthesis allows to get more information
493494
- Aurelijus Valeiša (aurelijus)
494495
- Jan Decavele (jandc)
495496
- Gustavo Piltcher
497+
- Evert Harmeling (evertharmeling)
496498
- Lee Rowlands
497499
- Stepan Tanasiychuk (stfalcon)
498500
- Ivan Kurnosov
@@ -517,7 +519,6 @@ The Symfony Connect username in parenthesis allows to get more information
517519
- Ahmed Raafat
518520
- Philippe Segatori
519521
- Thibaut Cheymol (tcheymol)
520-
- Herberto Graca
521522
- Erin Millard
522523
- Matthew Lewinski (lewinski)
523524
- Islam Israfilov (islam93)
@@ -600,7 +601,6 @@ The Symfony Connect username in parenthesis allows to get more information
600601
- Matthias Althaus (althaus)
601602
- Saif Eddin G
602603
- Endre Fejes
603-
- Evert Harmeling (evertharmeling)
604604
- Tobias Naumann (tna)
605605
- Daniel Beyer
606606
- flack (flack)
@@ -804,6 +804,7 @@ The Symfony Connect username in parenthesis allows to get more information
804804
- Greg ORIOL
805805
- Jakub Škvára (jskvara)
806806
- Andrew Udvare (audvare)
807+
- Ivan Sarastov (isarastov)
807808
- siganushka (siganushka)
808809
- alexpods
809810
- Adam Szaraniec
@@ -1313,7 +1314,6 @@ The Symfony Connect username in parenthesis allows to get more information
13131314
- Gerard van Helden (drm)
13141315
- Florent Destremau (florentdestremau)
13151316
- Florian Wolfsjaeger (flowolf)
1316-
- Ivan Sarastov (isarastov)
13171317
- Johnny Peck (johnnypeck)
13181318
- Jordi Sala Morales (jsala)
13191319
- Sander De la Marche (sanderdlm)
@@ -3043,6 +3043,7 @@ The Symfony Connect username in parenthesis allows to get more information
30433043
- Olivier Laviale (olvlvl)
30443044
- Pierre Gasté (pierre_g)
30453045
- Pablo Monterde Perez (plebs)
3046+
- Jakub Podhorsky (podhy)
30463047
- Pierre-Olivier Vares (povares)
30473048
- Jimmy Leger (redpanda)
30483049
- Ronny López (ronnylt)

‎src/Symfony/Component/HttpClient/Response/AsyncContext.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public function pause(float $duration): void
9595
if (\is_callable($pause = $this->response->getInfo('pause_handler'))) {
9696
$pause($duration);
9797
} elseif (0 < $duration) {
98-
usleep(1E6 * $duration);
98+
usleep((int) (1E6 * $duration));
9999
}
100100
}
101101

‎src/Symfony/Component/HttpClient/Response/TransportResponseTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ public static function stream(iterable $responses, float $timeout = null): \Gene
296296
}
297297

298298
if (-1 === self::select($multi, min($timeoutMin, $timeoutMax - $elapsedTimeout))) {
299-
usleep(min(500, 1E6 * $timeoutMin));
299+
usleep((int) min(500, 1E6 * $timeoutMin));
300300
}
301301

302302
$elapsedTimeout = microtime(true) - $lastActivity;

‎src/Symfony/Component/Mailer/Transport/AbstractTransport.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ private function checkThrottling(): void
129129
$sleep = (1 / $this->rate) - (microtime(true) - $this->lastSent);
130130
if (0 < $sleep) {
131131
$this->logger->debug(sprintf('Email transport "%s" sleeps for %.2f seconds', __CLASS__, $sleep));
132-
usleep($sleep * 1000000);
132+
usleep((int) ($sleep * 1000000));
133133
}
134134
$this->lastSent = microtime(true);
135135
}

‎src/Symfony/Component/Process/Pipes/WindowsPipes.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ public function readAndWrite(bool $blocking, bool $close = false): array
140140
if ($w) {
141141
@stream_select($r, $w, $e, 0, Process::TIMEOUT_PRECISION * 1E6);
142142
} elseif ($this->fileHandles) {
143-
usleep(Process::TIMEOUT_PRECISION * 1E6);
143+
usleep((int) (Process::TIMEOUT_PRECISION * 1E6));
144144
}
145145
}
146146
foreach ($this->fileHandles as $type => $fileHandle) {

0 commit comments

Comments
 (0)
0