Skip to content

Commit f5ea9a2

Browse files
wouterjwouterj
committed
Merge branch '6.4' into 7.1
* 6.4: Bump Symfony version to 6.4.13 Update VERSION for 6.4.12 Update CHANGELOG for 6.4.12 Bump Symfony version to 5.4.45 Update VERSION for 5.4.44 Update CONTRIBUTORS for 5.4.44 Update CHANGELOG for 5.4.44 allow the Novu bridge to be used with symfony/notifier 7.x [6.4][Routing][Uid] Mention RFC 9562 [Runtime] Adapt test to support the --silent option introduced in Symfony 7.2
2 parents 5565a56 + eb88eb3 commit f5ea9a2

File tree

6 files changed

+32
-20
lines changed

6 files changed

+32
-20
lines changed

‎CONTRIBUTORS.md

+25-13
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ The Symfony Connect username in parenthesis allows to get more information
8989
- Guilhem N (guilhemn)
9090
- Bilal Amarni (bamarni)
9191
- Eriksen Costa
92-
- Florin Patan (florinpatan)
9392
- Dariusz Ruminski
93+
- Florin Patan (florinpatan)
9494
- Vladimir Reznichenko (kalessil)
9595
- Peter Rehm (rpet)
9696
- Henrik Bjørnskov (henrikbjorn)
@@ -148,6 +148,7 @@ The Symfony Connect username in parenthesis allows to get more information
148148
- Jérôme Vasseur (jvasseur)
149149
- Peter Kokot (peterkokot)
150150
- Brice BERNARD (brikou)
151+
- Martin Auswöger
151152
- Michal Piotrowski
152153
- marc.weistroff
153154
- Lars Strojny (lstrojny)
@@ -157,16 +158,15 @@ The Symfony Connect username in parenthesis allows to get more information
157158
- Włodzimierz Gajda (gajdaw)
158159
- Nicolas Philippe (nikophil)
159160
- Javier Spagnoletti (phansys)
160-
- Martin Auswöger
161161
- Adrien Brault (adrienbrault)
162162
- Florian Voutzinos (florianv)
163163
- Teoh Han Hui (teohhanhui)
164164
- Przemysław Bogusz (przemyslaw-bogusz)
165+
- Valtteri R (valtzu)
165166
- Colin Frei
166167
- excelwebzone
167168
- Paráda József (paradajozsef)
168169
- Maximilian Beckers (maxbeckers)
169-
- Valtteri R (valtzu)
170170
- Baptiste Clavié (talus)
171171
- Alexander Schwenn (xelaris)
172172
- Fabien Pennequin (fabienpennequin)
@@ -329,6 +329,7 @@ The Symfony Connect username in parenthesis allows to get more information
329329
- Guilliam Xavier
330330
- Pierre Minnieur (pminnieur)
331331
- Dominique Bongiraud
332+
- Stiven Llupa (sllupa)
332333
- Hugo Monteiro (monteiro)
333334
- Bram Leeda (bram123)
334335
- Dmitrii Poddubnyi (karser)
@@ -407,7 +408,6 @@ The Symfony Connect username in parenthesis allows to get more information
407408
- Danny Berger (dpb587)
408409
- Alif Rachmawadi
409410
- Anton Chernikov (anton_ch1989)
410-
- Stiven Llupa (sllupa)
411411
- Pierre-Yves Lebecq (pylebecq)
412412
- Benjamin Leveque (benji07)
413413
- Jordan Samouh (jordansamouh)
@@ -475,6 +475,7 @@ The Symfony Connect username in parenthesis allows to get more information
475475
- Michael Holm (hollo)
476476
- Robert Meijers
477477
- Blanchon Vincent (blanchonvincent)
478+
- Cédric Anne
478479
- Christian Schmidt
479480
- Ben Hakim
480481
- Marco Petersen (ocrampete16)
@@ -532,6 +533,7 @@ The Symfony Connect username in parenthesis allows to get more information
532533
- Thibaut Cheymol (tcheymol)
533534
- Aurélien Pillevesse (aurelienpillevesse)
534535
- Erin Millard
536+
- Matthieu Lempereur (mryamous)
535537
- Matthew Lewinski (lewinski)
536538
- Islam Israfilov (islam93)
537539
- Ricard Clau (ricardclau)
@@ -557,7 +559,6 @@ The Symfony Connect username in parenthesis allows to get more information
557559
- Harm van Tilborg (hvt)
558560
- Thomas Perez (scullwm)
559561
- Gwendolen Lynch
560-
- Cédric Anne
561562
- smoench
562563
- Felix Labrecque
563564
- mondrake (mondrake)
@@ -578,6 +579,7 @@ The Symfony Connect username in parenthesis allows to get more information
578579
- hossein zolfi (ocean)
579580
- Alexander Menshchikov
580581
- Clément Gautier (clementgautier)
582+
- roman joly (eltharin)
581583
- Jordane VASPARD (elementaire)
582584
- James Gilliland (neclimdul)
583585
- Sanpi (sanpi)
@@ -680,7 +682,6 @@ The Symfony Connect username in parenthesis allows to get more information
680682
- Niklas Fiekas
681683
- Mark Challoner (markchalloner)
682684
- Markus Bachmann (baachi)
683-
- Matthieu Lempereur (mryamous)
684685
- Gunnstein Lye (glye)
685686
- Erkhembayar Gantulga (erheme318)
686687
- Sergey Melesh (sergex)
@@ -728,6 +729,7 @@ The Symfony Connect username in parenthesis allows to get more information
728729
- Vitaliy Tverdokhlib (vitaliytv)
729730
- Ariel Ferrandini (aferrandini)
730731
- BASAK Semih (itsemih)
732+
- Jan Böhmer
731733
- Dirk Pahl (dirkaholic)
732734
- Cédric Lombardot (cedriclombardot)
733735
- Jérémy REYNAUD (babeuloula)
@@ -744,7 +746,6 @@ The Symfony Connect username in parenthesis allows to get more information
744746
- Vadim Borodavko (javer)
745747
- Tavo Nieves J (tavoniievez)
746748
- Luc Vieillescazes (iamluc)
747-
- roman joly (eltharin)
748749
- Erik Saunier (snickers)
749750
- François Dume (franek)
750751
- Jerzy Lekowski (jlekowski)
@@ -967,6 +968,7 @@ The Symfony Connect username in parenthesis allows to get more information
967968
- Noémi Salaün (noemi-salaun)
968969
- Sinan Eldem (sineld)
969970
- Gennady Telegin
971+
- Yi-Jyun Pan
970972
- ampaze
971973
- Alexandre Dupuy (satchette)
972974
- Michel Hunziker
@@ -1057,6 +1059,7 @@ The Symfony Connect username in parenthesis allows to get more information
10571059
- Mickaël Buliard (mbuliard)
10581060
- Cornel Cruceru (amne)
10591061
- Richard Bradley
1062+
- Jan Walther (janwalther)
10601063
- Ulumuddin Cahyadi Yunus (joenoez)
10611064
- rtek
10621065
- Mickaël Isaert (misaert)
@@ -1090,7 +1093,6 @@ The Symfony Connect username in parenthesis allows to get more information
10901093
- Marek Pietrzak (mheki)
10911094
- “Filip
10921095
- Mickaël Andrieu (mickaelandrieu)
1093-
- Jan Böhmer
10941096
- Simon Watiau (simonwatiau)
10951097
- Ruben Jacobs (rubenj)
10961098
- Simon Schick (simonsimcity)
@@ -1140,6 +1142,7 @@ The Symfony Connect username in parenthesis allows to get more information
11401142
- Raphaëll Roussel
11411143
- Michael Lutz
11421144
- jochenvdv
1145+
- Oriol Viñals
11431146
- Reedy
11441147
- Arturas Smorgun (asarturas)
11451148
- Aleksandr Volochnev (exelenz)
@@ -1160,6 +1163,7 @@ The Symfony Connect username in parenthesis allows to get more information
11601163
- victor-prdh
11611164
- Davide Borsatto (davide.borsatto)
11621165
- Florian Hermann (fhermann)
1166+
- Vitaliy Zhuk (zhukv)
11631167
- zenas1210
11641168
- Gert de Pagter
11651169
- Julien DIDIER (juliendidier)
@@ -1212,6 +1216,7 @@ The Symfony Connect username in parenthesis allows to get more information
12121216
- Gladhon
12131217
- Maximilian.Beckers
12141218
- Alex Kalineskou
1219+
- Evan Shaw
12151220
- stoccc
12161221
- Grégoire Penverne (gpenverne)
12171222
- Venu
@@ -1226,6 +1231,7 @@ The Symfony Connect username in parenthesis allows to get more information
12261231
- Thorry84
12271232
- Romanavr
12281233
- michaelwilliams
1234+
- Raphaël Geffroy (raphael-geffroy)
12291235
- Alexandre Parent
12301236
- 1emming
12311237
- Nykopol (nykopol)
@@ -1573,6 +1579,7 @@ The Symfony Connect username in parenthesis allows to get more information
15731579
- Thomas Ferney (thomasf)
15741580
- Pieter
15751581
- Louis-Proffit
1582+
- Dennis Tobar
15761583
- Michael Tibben
15771584
- Hallison Boaventura (hallisonboaventura)
15781585
- Mas Iting
@@ -1679,6 +1686,7 @@ The Symfony Connect username in parenthesis allows to get more information
16791686
- Sortex
16801687
- chispita
16811688
- Wojciech Sznapka
1689+
- Emmanuel Dreyfus
16821690
- Luis Pabon (luispabon)
16831691
- boulei_n
16841692
- Anna Filina (afilina)
@@ -1894,6 +1902,7 @@ The Symfony Connect username in parenthesis allows to get more information
18941902
- Gordienko Vladislav
18951903
- Joas Schilling
18961904
- Ener-Getick
1905+
- Markus Thielen
18971906
- Moza Bogdan (bogdan_moza)
18981907
- johan Vlaar
18991908
- Viacheslav Sychov
@@ -1926,6 +1935,7 @@ The Symfony Connect username in parenthesis allows to get more information
19261935
- Jorrit Schippers (jorrit)
19271936
- Yann (yann_eugone)
19281937
- Matthias Neid
1938+
- danilovict2
19291939
- Yannick
19301940
- Kuzia
19311941
- spdionis
@@ -1949,12 +1959,10 @@ The Symfony Connect username in parenthesis allows to get more information
19491959
- Arend Hummeling
19501960
- Makdessi Alex
19511961
- fduch (fduch)
1952-
- Jan Walther (janwalther)
19531962
- Juan Miguel Besada Vidal (soutlink)
19541963
- Takashi Kanemoto (ttskch)
19551964
- Aleksei Lebedev
19561965
- dlorek
1957-
- Oriol Viñals
19581966
- Stuart Fyfe
19591967
- Jason Schilling (chapterjason)
19601968
- David de Boer (ddeboer)
@@ -2061,7 +2069,6 @@ The Symfony Connect username in parenthesis allows to get more information
20612069
- Tobias Stöckler
20622070
- Mario Young
20632071
- martkop26
2064-
- Evan Shaw
20652072
- Raphaël Davaillaud
20662073
- Sander Hagen
20672074
- cilefen (cilefen)
@@ -2117,7 +2124,6 @@ The Symfony Connect username in parenthesis allows to get more information
21172124
- Junaid Farooq (junaidfarooq)
21182125
- Lars Ambrosius Wallenborn (larsborn)
21192126
- Oriol Mangas Abellan (oriolman)
2120-
- Raphaël Geffroy (raphael-geffroy)
21212127
- Sebastian Göttschkes (sgoettschkes)
21222128
- Marcin Nowak
21232129
- Frankie Wittevrongel
@@ -2501,6 +2507,7 @@ The Symfony Connect username in parenthesis allows to get more information
25012507
- Mephistofeles
25022508
- Oleh Korneliuk
25032509
- Emmanuelpcg
2510+
- Attila Szeremi
25042511
- Evgeny Ruban
25052512
- Hoffmann András
25062513
- LubenZA
@@ -2590,7 +2597,6 @@ The Symfony Connect username in parenthesis allows to get more information
25902597
- Anton Sukhachev (mrsuh)
25912598
- Pavlo Pelekh (pelekh)
25922599
- Stefan Kleff (stefanxl)
2593-
- Vitaliy Zhuk (zhukv)
25942600
- Marcel Siegert
25952601
- ryunosuke
25962602
- Bruno BOUTAREL
@@ -2751,6 +2757,7 @@ The Symfony Connect username in parenthesis allows to get more information
27512757
- Grayson Koonce
27522758
- Ruben Jansen
27532759
- Wissame MEKHILEF
2760+
- Mihai Stancu
27542761
- shreypuranik
27552762
- NanoSector
27562763
- Thibaut Salanon
@@ -2803,6 +2810,7 @@ The Symfony Connect username in parenthesis allows to get more information
28032810
- Aarón Nieves Fernández
28042811
- Mikolaj Czajkowski
28052812
- Ahto Türkson
2813+
- Paweł Stasicki
28062814
- Ph3nol
28072815
- Kirill Saksin
28082816
- Shiro
@@ -3011,6 +3019,7 @@ The Symfony Connect username in parenthesis allows to get more information
30113019
- Mateusz Lerczak
30123020
- Tim Porter
30133021
- Richard Quadling
3022+
- Will Rowe
30143023
- Rainrider
30153024
- David Zuelke
30163025
- Adrian
@@ -3201,6 +3210,7 @@ The Symfony Connect username in parenthesis allows to get more information
32013210
- Michael Pohlers (mick_the_big)
32023211
- Misha Klomp (mishaklomp)
32033212
- mlpo (mlpo)
3213+
- Marcel Pociot (mpociot)
32043214
- Mikhail Prosalov (mprosalov)
32053215
- Ulrik Nielsen (mrbase)
32063216
- Marek Šimeček (mssimi)
@@ -3390,6 +3400,7 @@ The Symfony Connect username in parenthesis allows to get more information
33903400
- omerida
33913401
- Andras Ratz
33923402
- andreabreu98
3403+
- Marcus
33933404
- gechetspr
33943405
- brian978
33953406
- Michael Schneider
@@ -3630,6 +3641,7 @@ The Symfony Connect username in parenthesis allows to get more information
36303641
- Jose Manuel Gonzalez (jgonzalez)
36313642
- Joachim Krempel (jkrempel)
36323643
- Jorge Maiden (jorgemaiden)
3644+
- Joshua Behrens (joshuabehrens)
36333645
- Joao Paulo V Martins (jpjoao)
36343646
- Justin Rainbow (jrainbow)
36353647
- Juan Luis (juanlugb)

‎src/Symfony/Component/Notifier/Bridge/Novu/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"require": {
1919
"php": ">=8.1",
2020
"symfony/http-client": "^5.4|^6.0|^7.0",
21-
"symfony/notifier": "^6.4"
21+
"symfony/notifier": "^6.4|^7.0"
2222
},
2323
"autoload": {
2424
"psr-4": { "Symfony\\Component\\Notifier\\Bridge\\Novu\\": "" },

‎src/Symfony/Component/Routing/Requirement/Requirement.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ enum Requirement
2323
public const POSITIVE_INT = '[1-9][0-9]*';
2424
public const UID_BASE32 = '[0-9A-HJKMNP-TV-Z]{26}';
2525
public const UID_BASE58 = '[1-9A-HJ-NP-Za-km-z]{22}';
26-
public const UID_RFC4122 = '[0-9a-f]{8}(?:-[0-9a-f]{4}){3}-[0-9a-f]{12}';
26+
public const UID_RFC4122 = '[0-9a-f]{8}(?:-[0-9a-f]{4}){3}-[0-9a-f]{12}'; // RFC 9562 obsoleted RFC 4122 but the format is the same
2727
public const ULID = '[0-7][0-9A-HJKMNP-TV-Z]{25}';
2828
public const UUID = '[0-9a-f]{8}-[0-9a-f]{4}-[13-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}';
2929
public const UUID_V1 = '[0-9a-f]{8}-[0-9a-f]{4}-1[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}';

‎src/Symfony/Component/Runtime/Tests/phpt/command_list.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ Usage:
2323
command [options] [arguments]
2424

2525
Options:
26-
-h, --help Display %s
27-
-q, --quiet Do not output any message
26+
-h, --help Display %A
27+
-q, --quiet %s
2828
-V, --version Display this application version
2929
--ansi%A
3030
-n, --no-interaction Do not ask any interactive question

‎src/Symfony/Component/Uid/AbstractUid.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public function toBase32(): string
124124
/**
125125
* Returns the identifier as a RFC 9562/4122 case-insensitive string.
126126
*
127-
* @see https://tools.ietf.org/html/rfc4122#section-3
127+
* @see https://datatracker.ietf.org/doc/html/rfc9562/#section-4
128128
*
129129
* @example 09748193-048a-4bfb-b825-8528cf74fdc1 (len=36)
130130
*/

‎src/Symfony/Component/Uid/Uuid.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,9 @@ public function toBinary(): string
153153
}
154154

155155
/**
156-
* Returns the identifier as a RFC4122 case insensitive string.
156+
* Returns the identifier as a RFC 9562/4122 case insensitive string.
157157
*
158-
* @see https://tools.ietf.org/html/rfc4122#section-3
158+
* @see https://datatracker.ietf.org/doc/html/rfc9562/#section-4
159159
*
160160
* @example 09748193-048a-4bfb-b825-8528cf74fdc1 (len=36)
161161
*/

0 commit comments

Comments
 (0)