8000 Merge branch '6.0' into 6.1 · symfony/symfony@5b24890 · GitHub
[go: up one dir, main page]
Skip to content

Commit 5b24890

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '6.0' into 6.1
* 6.0: [Notifier] Fix markdown [Security] Fix outdated docblock Update PR template Bump Symfony version to 6.0.17 Update VERSION for 6.0.16 Update CHANGELOG for 6.0.16 Bump Symfony version to 5.4.17 Update VERSION for 5.4.16 Update CHANGELOG for 5.4.16 Update VERSION for 4.4.49 Update CONTRIBUTORS for 4.4.49 Update CHANGELOG for 4.4.49 [Security][LoginLink] Throw InvalidLoginLinkException on missing parameter
2 parents f7a74ee + 52b95df commit 5b24890

File tree

8 files changed

+94
-28
lines changed

8 files changed

+94
-28
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
| Q | A
22
| ------------- | ---
3-
| Branch? | 6.3 for features / 4.4, 5.4, 6.0, 6.1, or 6.2 for bug fixes <!-- see below -->
3+
| Branch? | 6.3 for features / 5.4, 6.0, 6.1, or 6.2 for bug fixes <!-- see below -->
44
| Bug fix? | yes/no
55
| New feature? | yes/no <!-- please update src/**/CHANGELOG.md files -->
66
| Deprecations? | yes/no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files -->
@@ -16,7 +16,7 @@ Additionally (see https://symfony.com/releases):
1616
- Bug fixes must be submitted against the lowest maintained branch where they apply
1717
(lowest branches are regularly merged to upper ones so they get the fixes too).
1818
- Features and deprecations must be submitted against the latest branch.
19-
- For new features, provide some code snippets to help understand usage.
19+
- For new features, provide some code snippets to help understand usage.
2020
- Changelog entry should follow https://symfony.com/doc/current/contributing/code/conventions.html#writing-a-changelog-entry
2121
- Never break backward compatibility (see https://symfony.com/bc).
2222
-->

‎CHANGELOG-6.0.md

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,35 @@ in 6.0 minor versions.
77
To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
88
To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v6.0.0...v6.0.1
99

10+
* 6.0.16 (2022-11-28)
11+
12+
* bug #48333 [Yaml] parse unquoted digits in tag values as integers (xabbuh)
13+
* bug #48330 [FrameworkBundle] do not wire the MercureTransportFactory if the MercureBundle is not enabled (xabbuh)
14+
* bug #48262 [Notifier] [SMSBiuras] `true`/`false` mismatch for `test_mode` option (StaffNowa)
15+
* bug #48273 [HttpKernel] Fix message for unresovable arguments of invokable controllers (fancyweb)
16+
* bug #48251 [PropertyInfo] ignore const expressions 6D40 read by phpdocumentor (xabbuh)
17+
* bug #48224 [DependencyInjection] Process bindings in `ServiceLocatorTagPass` (MatTheCat)
18+
* bug #48179 [Console] Support completion for bash functions (Chi-teck)
19+
* bug #48217 [Console] Improve error message when shell is not detected in completion command (GromNaN)
20+
* bug #48222 [Translation] [Lokalize] Configure `replace_breaks` to prevent issues with multilines translations (Kocal)
21+
* bug #48210 [Console]  Fix signal handlers called after event listeners and skip exit (GromNaN)
22+
* bug #48198 [Messenger] Fix time-limit check exception (alamirault)
23+
* bug #48122 [PhpUnitBridge] Fix language deprecations incorrectly marked as direct (wouterj)
24+
* bug #47998 [Console] Fix console `ProgressBar::override()` after manual `ProgressBar::cleanup()` (maxbeckers)
25+
* bug #48173 [HttpClient] Handle Amp HTTP client v5 incompatibility gracefully (fancyweb)
26+
* bug #48172 [HttpKernel] Don’t try to wire Response argument with controller.service_arguments (MatTheCat)
27+
* bug #48085 [Messenger] Tell about messenger:consume invalid limit options (MatTheCat)
28+
* bug #48120 [Messenger] Do not throw 'no handlers' exception when skipping handlers due to duplicate handling (wouterj)
29+
* bug #48112 [HttpFoundation] Compare cookie with null value as empty string in ResponseCookieValueSame (fancyweb)
30+
* bug #48119 [FrameworkBundle][Lock] Allow to disable lock without defining a resource (MatTheCat)
31+
* bug #48093 [DependencyInjection] don't move locator tag for service subscriber (RobertMe)
32+
* bug #48075 [Mailer] Stream timeout not detected fgets returns false (Sezil)
33+
* bug #48092 Fix the notification email theme for asynchronously dispatched emails (krisbuist)
34+
* bug #48097 Fix search scope when performing fallback mapping driver detection (spideyfusion)
35+
* bug #48103 [HttpClient] Do not set http_version instead of setting it to null (Tetragramat)
36+
* bug #48027 [DependencyInjection] Don't autoconfigure tag when it's already set with attributes (nicolas-grekas)
37+
* bug #48050 [HttpFoundation] Check IPv6 is valid before comparing it (PhilETaylor)
38+
1039
* 6.0.15 (2022-10-28)
1140

1241
* bug #47990 [HttpClient] Fix retrying requests when the content is used by the strategy (nicolas-grekas)

‎CONTRIBUTORS.md

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ The Symfony Connect username in parenthesis allows to get more information
8989
- Eriksen Costa
9090
- Florin Patan (florinpatan)
9191
- Peter Rehm (rpet)
92+
- Mathieu Lechat (mat_the_cat)
9293
- Henrik Bjørnskov (henrikbjorn)
9394
- David Buchmann (dbu)
9495
- Konstantin Myakshin (koc)
@@ -105,18 +106,17 @@ The Symfony Connect username in parenthesis allows to get more information
105106
- Issei Murasawa (issei_m)
106107
- Fran Moreno (franmomu)
107108
- Malte Schlüter (maltemaltesich)
109+
- Antoine Lamirault
108110
- Vasilij Dusko
109111
- Denis (yethee)
110112
- Arnout Boks (aboks)
111113
- Charles Sarrazin (csarrazi)
112114
- Przemysław Bogusz (przemyslaw-bogusz)
113115
- Henrik Westphal (snc)
114116
- Dariusz Górecki (canni)
115-
- Mathieu Lechat (mat_the_cat)
116117
- Maxime Helias (maxhelias)
117118
- Ener-Getick
118119
- Ruud Kamphuis (ruudk)
119-
- Antoine Lamirault
120120
- Sebastiaan Stok (sstok)
121121
- Jérôme Vasseur (jvasseur)
122122
- Ion Bazan (ionbazan)
@@ -159,25 +159,26 @@ The Symfony Connect username in parenthesis allows to get more information
159159
- Jesse Rushlow (geeshoe)
160160
- Théo FIDRY
161161
- jeremyFreeAgent (jeremyfreeagent)
162+
- Jeroen Spee (jeroens)
162163
- Michael Babker (mbabker)
163164
- Włodzimierz Gajda (gajdaw)
164165
- Christian Scheb
165166
- Guillaume (guill)
166167
- Tugdual Saunier (tucksaun)
167168
- Jacob Dreesen (jdreesen)
168-
- Jeroen Spee (jeroens)
169169
- Joel Wurtz (brouznouf)
170170
- Olivier Dolbeau (odolbeau)
171171
- Florian Voutzinos (florianv)
172172
- zairig imad (zairigimad)
173173
- Colin Frei
174+
- Christopher Hertel (chertel)
174175
- Javier Spagnoletti (phansys)
175176
- excelwebzone
177+
- Phil Taylor (prazgod)
176178
- Jérôme Parmentier (lctrs)
177179
- HeahDude
178180
- Richard van Laak (rvanlaak)
179181
- Paráda József (paradajozsef)
180-
- Christopher Hertel (chertel)
181182
- Alessandro Lai (jean85)
182183
- Alexander Schwenn (xelaris)
183184
- Fabien Pennequin (fabienpennequin)
@@ -192,6 +193,7 @@ The Symfony Connect username in parenthesis allows to get more information
192193
- Baptiste Leduc (korbeil)
193194
- Marco Pivetta (ocramius)
194195
- Robert Schönthal (digitalkaoz)
196+
- Hugo Alliaume (kocal)
195197
- Võ Xuân Tiến (tienvx)
196198
- fd6130 (fdtvui)
197199
- Tigran Azatyan (tigranazatyan)
@@ -209,13 +211,13 @@ The Symfony Connect username in parenthesis allows to get more information
209211
- Jhonny Lidfors (jhonne)
210212
- Martin Hujer (martinhujer)
211213
- Wouter J
214+
- Chi-teck
212215
- Guilliam Xavier
213216
- Antonio Pauletich (x-coder264)
214217
- Timo Bakx (timobakx)
215218
- Juti Noppornpitak (shiroyuki)
216219
- Joe Bennett (kralos)
217220
- Nate Wiebe (natewiebe13)
218-
- Hugo Alliaume (kocal)
219221
- Anthony MARTIN
220222
- Colin O&#039;Dell (colinodell)
221223
- Sebastian Hörl (blogsh)
@@ -227,11 +229,11 @@ The Symfony Connect username in parenthesis allows to get more information
227229
- Albert Casademont (acasademont)
228230
- Arnaud Kleinpeter (nanocom)
229231
- Guilherme Blanco (guilhermeblanco)
230-
- Chi-teck
231232
- Michael Voříšek
232233
- Farhad Safarov (safarov)
233234
- SpacePossum
234235
- Pablo Godel (pgodel)
236+
- Denis Brumann (dbrumann)
235237
- Romaric Drigon (romaricdrigon)
236238
- Andréia Bohner (andreia)
237239
- Jannik Zschiesche
@@ -249,7 +251,6 @@ The Symfony Connect username in parenthesis allows to get more information
249251
- Hubert Lenoir (hubert_lenoir)
250252
- Florent Mata (fmata)
251253
- mcfedr (mcfedr)
252-
- Denis Brumann (dbrumann)
253254
- Maciej Malarz (malarzm)
254255
- Soner Sayakci
255256
- Artem Lopata
@@ -288,7 +289,6 @@ The Symfony Connect username in parenthesis allows to get more information
288289
- Artur Kotyrba
289290
- Tyson Andre
290291
- Thomas Landauer (thomas-landauer)
291-
- Phil Taylor (prazgod)
292292
- GDIBass
293293
- Samuel NELA (snela)
294294
- dFayet
@@ -543,6 +543,7 @@ The Symfony Connect username in parenthesis allows to get more information
543543
- Chris Smith (cs278)
544544
- Florian Klein (docteurklein)
545545
- Bilge
546+
- Cătălin Dan (dancatalin)
546547
- Rhodri Pugh (rodnaph)
547548
- Manuel Kiessling (manuelkiessling)
548549
- Patrick Reimers (preimers)
@@ -570,6 +571,7 @@ The Symfony Connect username in parenthesis allows to get more information
570571
- Evert Harmeling (evertharmeling)
571572
- Jan Decavele (jandc)
572573
- Gustavo Piltcher
574+
- Shakhobiddin
573575
- Grenier Kévin (mcsky_biig)
574576
- Stepan Tanasiychuk (stfalcon)
575577
- Tiago Ribeiro (fixe)
@@ -677,6 +679,7 @@ The Symfony Connect username in parenthesis allows to get more information
677679
- Tomasz Kusy
678680
- Jakub Kucharovic (jkucharovic)
679681
- Kristen Gilden
682+
- Oleksiy (alexndlm)
680683
- Robbert Klarenbeek (robbertkl)
681684
- Eric Masoero (eric-masoero)
682685
- Michael Lutz
@@ -701,7 +704,6 @@ The Symfony Connect username in parenthesis allows to get more information
701704
- ShinDarth
702705
- Arun Philip
703706
- Stéphane PY (steph_py)
704-
- Cătălin Dan (dancatalin)
705707
- Philipp Kräutli (pkraeutli)
706708
- Carl Casbolt (carlcasbolt)
707709
- battye
@@ -770,7 +772,6 @@ The Symfony Connect username in parenthesis allows to get more information
770772
- Tomasz Ignatiuk
771773
- Joachim Løvgaard (loevgaard)
772774
- vladimir.reznichenko
773-
- Shakhobiddin
774775
- Kai
775776
- Lee Rowlands
776777
- Alain Hippolyte (aloneh)
@@ -811,6 +812,7 @@ The Symfony Connect username in parenthesis allows to get more information
811812
- Rimas Kudelis
812813
- Ben Scott (bpscott)
813814
- Andrii Dembitskyi
815+
- a.dmitryuk
814816
- Pavol Tuka
815817
- Paulo Ribeiro (paulo)
816818
- Marc Laporte
@@ -1014,7 +1016,6 @@ The Symfony Connect username in parenthesis allows to get more information
10141016
- Elan Ruusamäe (glen)
10151017
- Brad Jones
10161018
- Nicolas de Marqué (nicola)
1017-
- a.dmitryuk
10181019
- Jannik Zschiesche
10191020
- Jan Ole Behrens (deegital)
10201021
- Mantas Var (mvar)
@@ -1188,6 +1189,7 @@ The Symfony Connect username in parenthesis allows to get more information
11881189
- Timothée BARRAY
11891190
- Nilmar Sanchez Muguercia
11901191
- Ivo Bathke (ivoba)
1192+
- Lukas Mencl
11911193
- Strate
11921194
- Anton A. Sumin
11931195
- Atthaphon Urairat
@@ -1336,7 +1338,6 @@ The Symfony Connect username in parenthesis allows to get more information
13361338
- Massimiliano Braglia (massimilianobraglia)
13371339
- Swen van Zanten (swenvanzanten)
13381340
- Frankie Wittevrongel
1339-
- Oleksiy (alexndlm)
13401341
- Richard Quadling
13411342
- James Hudson (mrthehud)
13421343
- Adam Prickett
@@ -2069,7 +2070,6 @@ The Symfony Connect username in parenthesis allows to get more information
20692070
- Pablo Borowicz
20702071
- Ondřej Frei
20712072
- Máximo Cuadros (mcuadros)
2072-
- Lukas Mencl
20732073
- EXT - THERAGE Kevin
20742074
- tamirvs
20752075
- gauss
@@ -2252,6 +2252,7 @@ The Symfony Connect username in parenthesis allows to get more information
22522252
- Alain Flaus (halundra)
22532253
- tsufeki
22542254
- Philipp Strube
2255+
- Petar Obradović
22552256
- Clement Herreman (clemherreman)
22562257
- Dan Ionut Dumitriu (danionut90)
22572258
- Evgeny (disparity)
@@ -2278,6 +2279,7 @@ The Symfony Connect username in parenthesis allows to get more information
22782279
- cilefen (cilefen)
22792280
- Mo Di (modi)
22802281
- Pablo Schläpfer
2282+
- Robert Meijers
22812283
- Xavier RENAUDIN
22822284
- Christian Wahler (christian)
22832285
- Jelte Steijaert (jelte)
@@ -2325,6 +2327,7 @@ The Symfony Connect username in parenthesis allows to get more information
23252327
- Balázs Benyó (duplabe)
23262328
- Erika Heidi Reinaldo (erikaheidi)
23272329
- Marc J. Schmidt (marcjs)
2330+
- Maximilian Beckers (maxbeckers)
23282331
- Sebastian Schwarz
23292332
- karolsojko
23302333
- Marco Jantke
@@ -2631,6 +2634,7 @@ The Symfony Connect username in parenthesis allows to get more information
26312634
- Bert Hekman
26322635
- Luis Muñoz
26332636
- Matthew Donadio
2637+
- Kris Buist
26342638
- Houziaux mike
26352639
- Phobetor
26362640
- Markus
@@ -2728,6 +2732,7 @@ The Symfony Connect username in parenthesis allows to get more information
27282732
- Rénald Casagraude (rcasagraude)
27292733
- Robin Duval (robin-duval)
27302734
- Mohammad Ali Sarbanha (sarbanha)
2735+
- Steeve Titeca (stiteca)
27312736
- Artem Lopata (bumz)
27322737
- alex
27332738
- Roman Orlov
@@ -2825,6 +2830,7 @@ The Symfony Connect username in parenthesis allows to get more information
28252830
- pf
28262831
- Zoli Konta
28272832
- Vincent Chalnot
2833+
- Roeland Jago Douma
28282834
- Patrizio Bekerle
28292835
- Tom Maguire
28302836
- Mateusz Lerczak
@@ -2849,6 +2855,7 @@ The Symfony Connect username in parenthesis allows to get more information
28492855
- Omar Yepez (oyepez003)
28502856
- Jonny Schmid (schmidjon)
28512857
- Götz Gottwald
2858+
- Christoph Krapp
28522859
- Nick Chiu
28532860
- Robert Campbell
28542861
- Matt Lehner
@@ -3009,6 +3016,7 @@ The Symfony Connect username in parenthesis allows to get more information
30093016
- Mantas Urnieža
30103017
- temperatur
30113018
- Paul Andrieux
3019+
- Sezil
30123020
- Cas
30133021
- ghazy ben ahmed
30143022
- Karolis
@@ -3076,6 +3084,7 @@ The Symfony Connect username in parenthesis allows to get more information
30763084
- Markus Tacker
30773085
- Kasperki
30783086
- Tammy D
3087+
- Adrien Foulon
30793088
- Ryan Rud
30803089
- Ondrej Slinták
30813090
- vlechemin
@@ -3122,6 +3131,7 @@ The Symfony Connect username in parenthesis allows to get more information
31223131
- zorn
31233132
- Yuriy Potemkin
31243133
- Emilie Lorenzo
3134+
- prudhomme victor
31253135
- enomotodev
31263136
- Vincent
31273137
- Benjamin Long
@@ -3166,6 +3176,7 @@ The Symfony Connect username in parenthesis allows to get more information
31663176
- Lin Lu
31673177
- arduanov
31683178
- sualko
3179+
- Fabien
31693180
- Martin Komischke
31703181
- ADmad
31713182
- Nicolas Roudaire

‎src/Symfony/Component/Notifier/Bridge/AmazonSns/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ AMAZON_SNS_DSN=sns://ACCESS_ID:ACCESS_KEY@default?region=REGION
1313
Resources
1414
---------
1515

16-
* [Contributing](https://symfony.com/doc/current/contributing/index.html)
17-
* [Report issues](https://github.com/symfony/symfony/issues) and
18-
[send Pull Requests](https://github.com/symfony/symfony/pulls)
19-
in the [main Symfony repository](https://github.com/symfony/symfony)
16+
* [Contributing](https://symfony.com/doc/current/contributing/index.html)
17+
* [Report issues](https://github.com/symfony/symfony/issues) and
18+
[send Pull Requests](https://github.com/symfony/symfony/pulls)
19+
in the [main Symfony repository](https://github.com/symfony/symfony)

‎src/Symfony/Component/Notifier/Bridge/Telnyx/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ where:
1818
Resources
1919
---------
2020

21-
* [Contributing](https://symfony.com/doc/current/contributing/index.html)
22-
* [Report issues](https://github.com/symfony/symfony/issues) and
23-
[send Pull Requests](https://github.com/symfony/symfony/pulls)
24-
in the [main Symfony repository](https://github.com/symfony/symfony)
21+
* [Contributing](https://symfony.com/doc/current/contributing/index.html)
22+
* [Report issues](https://github.com/symfony/symfony/issues) and
23+
[send Pull Requests](https://github.com/symfony/symfony/pulls)
24+
in the [main Symfony repository](https://github.com/symfony/symfony)

‎src/Symfony/Component/Security/Http/Authentication/AuthenticationSuccessHandlerInterface.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@
2727
interface AuthenticationSuccessHandlerInterface
2828
{
2929
/**
30-
* This is called when an interactive authentication attempt succeeds. This
31-
* is called by authentication listeners inheriting from
32-
* AbstractAuthenticationListener.
30+
* Usually called by AuthenticatorInterface::onAuthenticationSuccess() implementations.
3331
*/
3432
public function onAuthenticationSuccess(Request $request, TokenInterface $token): Response;
3533
}

‎src/Symfony/Component/Security/Http/LoginLink/LoginLinkHandler.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,12 @@ public function consumeLoginLink(Request $request): UserInterface
8989
throw new InvalidLoginLinkException('User not found.', 0, $exception);
9090
}
9191

92-
$hash = $request->get('hash');
93-
$expires = $request->get('expires');
92+
if (!$hash = $request->get('hash')) {
93+
throw new InvalidLoginLinkException('Missing "hash" parameter.');
94+
}
95+
if (!$expires = $request->get('expires')) {
96+
throw new InvalidLoginLinkException('Missing "expires" parameter.');
97+
}
9498

9599
try {
96100
$this->signatureHasher->verifySignatureHash($user, $expires, $hash);

0 commit comments

Comments
 (0)
0