8000 Merge branch '7.1' into 7.2 · symfony/symfony@5938c51 · GitHub
[go: up one dir, main page]
Skip to content

Commit 5938c51

Browse files
xabbuhxabbuh
committed
Merge branch '7.1' into 7.2
* 7.1: Adjust PR template [HttpClient] Disable HTTP/2 PUSH by default when using curl Bump Symfony version to 7.1.4 Update VERSION for 7.1.3 Update CHANGELOG for 7.1.3 Bump Symfony version to 6.4.11 Update VERSION for 6.4.10 Update CHANGELOG for 6.4.10 Bump Symfony version to 5.4.43 Update VERSION for 5.4.42 Update CONTRIBUTORS for 5.4.42 Update CHANGELOG for 5.4.42 [DoctrineBridge] Make `EntityValueResolver` return `null` if a composite ID value is `null`
2 parents d489cfc + 1a09bff commit 5938c51

File tree

7 files changed

+85
-24
lines changed

7 files changed

+85
-24
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
| Q | A
22
| ------------- | ---
3-
| Branch? | 7.2 for features / 5.4, 6.4, 7.0, and 7.1 for bug fixes <!-- see below -->
3+
| Branch? | 7.2 for features / 5.4, 6.4, and 7.1 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 -->

‎CHANGELOG-7.1.md‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,35 @@ in 7.1 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/v7.1.0...v7.1.1
99

10+
* 7.1.3 (2024-07-26)
11+
12+
* bug #57803 [FrameworkBundle] move adding detailed JSON error messages to the validate phase (xabbuh)
13+
* bug #57815 [Console][PhpUnitBridge][VarDumper] Fix `NO_COLOR` empty value handling (alexandre-daubois)
14+
* bug #57828 [Translation] Fix CSV escape char in `CsvFileLoader` on PHP >= 7.4 (alexandre-daubois)
15+
* bug #57812 [Validator] treat uninitialized properties referenced by property paths as null (xabbuh)
16+
* bug #57816 [DoctrineBridge] fix messenger bus dispatch inside an active transaction (IndraGunawan)
17+
* bug #57799 [ErrorHandler][VarDumper] Remove PHP 8.4 deprecations (alexandre-daubois)
18+
* bug #57772 [WebProfilerBundle] Add word wrap in tables in dialog to see all the text in workflow listeners dialog (SpartakusMd)
19+
* bug #57708 [PropertyInfo] Check if property is nullable when using `ReflectionExtractor` (benjilebon)
20+
* bug #57802 [PropertyInfo] Fix nullable value returned from extractFromMutator on CollectionType (benjilebon)
21+
* bug #57832 [DependencyInjection] Do not try to load default method name on interface (lyrixx)
22+
* bug #57748 [SecurityBundle] use firewall-specific user checkers when manually logging in users (xabbuh)
23+
* bug #57753 [ErrorHandler] restrict the maximum length of the X-Debug-Exception header (xabbuh)
24+
* bug #57646 [Serializer] Raise correct exception in `ArrayDenormalizer` when called without a nested denormalizer (derrabus)
25+
* bug #57674 [Cache] Improve `dbindex` DSN parameter parsing (constantable)
26+
* bug #57678 [Validator] Add `setGroupProvider` to `AttributeLoader` (Maximilian Zumbansen)
27+
* bug #57679 [WebProfilerBundle] Change incorrect check for the `stateless` request attribute (themasch)
28+
* bug #57663 [Cache] use copy() instead of rename() on Windows (xabbuh)
29+
* bug #57617 [PropertyInfo] Handle collection in PhpStan same as PhpDoc (mtarld)
30+
* bug #54057 [Messenger] Passing actual `Envelope` to `WorkerMessageRetriedEvent` (daffoxdev)
31+
* bug #57645 [Routing] Discard in-memory cache of routes when writing the file-based cache (mpdude)
32+
* bug #57621 [Mailer]  force HTTP 1.1 for Mailgun API requests (xabbuh)
33+
* bug #57616 [String] Revert "Fixed u()->snake(), b()->snake() and s()->snake() methods" (nicolas-grekas)
34+
* bug #57593 [SecurityBundle] Compare paths after realpath() has been applied to both (xabbuh)
35+
* bug #57594 [String] Normalize underscores in snake() (xabbuh)
36+
* bug #57585 [HttpFoundation] Fix MockArraySessionStorage to generate more conform ids (Seldaek)
37+
* bug #57589 [FrameworkBundle] fix AssetMapper usage without assets enabled (xabbuh)
38+
1039
* 7.1.2 (2024-06-28)
1140

1241
* bug #57345 [DependencyInjection] Fix regression in ordering service locators by priority (longwave)

‎CONTRIBUTORS.md‎

Lines changed: 30 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ The Symfony Connect username in parenthesis allows to get more information
2525
- Jérémy DERUSSÉ (jderusse)
2626
- Roland Franssen
2727
- Jules Pietri (heah)
28-
- Johannes S (johannes)
2928
- Oskar Stark (oskarstark)
29+
- Johannes S (johannes)
3030
- Kris Wallsmith (kriswallsmith)
3131
- Jakub Zalas (jakubzalas)
3232
- Yonel Ceruto (yonelceruto)
@@ -57,25 +57,25 @@ The Symfony Connect username in parenthesis allows to get more information
5757
- Vincent Langlet (deviling)
5858
- Valentin Udaltsov (vudaltsov)
5959
- Alexandre Salomé (alexandresalome)
60+
- Simon André (simonandre)
6061
- Grégoire Paris (greg0ire)
6162
- William DURAND
6263
- ornicar
6364
- Dany Maillard (maidmaid)
64-
- Simon André (simonandre)
6565
- Eriksen Costa
6666
- Diego Saint Esteben (dosten)
6767
- stealth35 ‏ (stealth35)
6868
- Alexander Mols (asm89)
6969
- Gábor Egyed (1ed)
7070
- Francis Besset (francisbesset)
71+
- Mathias Arlaud (mtarld)
7172
- Titouan Galopin (tgalopin)
7273
- Pierre du Plessis (pierredup)
7374
- David Maicher (dmaicher)
7475
- Bulat Shakirzyanov (avalanche123)
75-
- Mathias Arlaud (mtarld)
76+
- Tomasz Kowalczyk (thunderer)
7677
- Iltar van der Berg
7778
- Miha Vrhovnik (mvrhov)
78-
- Tomasz Kowalczyk (thunderer)
7979
- Gary PEGEOT (gary-p)
8080
- Saša Stamenković (umpirsky)
8181
- Allison Guilhem (a_guilhem)
@@ -98,6 +98,7 @@ The Symfony Connect username in parenthesis allows to get more information
9898
- Ruud Kamphuis (ruudk)
9999
- Andrej Hudec (pulzarraider)
100100
- Jáchym Toušek (enumag)
101+
- Tomas Norkūnas (norkunas)
101102
- Christian Raue
102103
- Eric Clemmons (ericclemmons)
103104
- Denis (yethee)
@@ -107,7 +108,6 @@ The Symfony Connect username in parenthesis allows to get more information
107108
- Douglas Greenshields (shieldo)
108109
- Frank A. Fiebig (fafiebig)
109110
- Baldini
110-
- Tomas Norkūnas (norkunas)
111111
- Alex Pott
112112
- Fran Moreno (franmomu)
113113
- Charles Sarrazin (csarrazi)
@@ -132,10 +132,10 @@ The Symfony Connect username in parenthesis allows to get more information
132132
- Phil E. Taylor (philetaylor)
133133
- Joel Wurtz (brouznouf)
134134
- John Wards (johnwards)
135+
- Yanick Witschi (toflar)
135136
- Théo FIDRY
136137
- Antoine Hérault (herzult)
137138
- Konstantin.Myakshin
138-
- Yanick Witschi (toflar)
139139
- Jeroen Spee (jeroens)
140140
- Arnaud Le Blanc (arnaud-lb)
141141
- Sebastiaan Stok (sstok)
@@ -155,24 +155,24 @@ The Symfony Connect username in parenthesis allows to get more information
155155
- Vladimir Tsykun (vtsykun)
156156
- Jacob Dreesen (jdreesen)
157157
- Włodzimierz Gajda (gajdaw)
158+
- Nicolas Philippe (nikophil)
158159
- Javier Spagnoletti (phansys)
159160
- Martin Auswöger
160161
- Adrien Brault (adrienbrault)
161162
- Florian Voutzinos (florianv)
162163
- Teoh Han Hui (teohhanhui)
163164
- Przemysław Bogusz (przemyslaw-bogusz)
164165
- Colin Frei
165-
- Nicolas Philippe (nikophil)
166166
- excelwebzone
167167
- Paráda József (paradajozsef)
168+
- Maximilian Beckers (maxbeckers)
168169
- Baptiste Clavié (talus)
169170
- Alexander Schwenn (xelaris)
170171
- Fabien Pennequin (fabienpennequin)
171172
- Gordon Franke (gimler)
172173
- Malte Schlüter (maltemaltesich)
173174
- jeremyFreeAgent (jeremyfreeagent)
174175
- Michael Babker (mbabker)
175-
- Maximilian Beckers (maxbeckers)
176176
- Valtteri R (valtzu)
177177
- Joshua Thijssen
178178
- Vasilij Dusko
@@ -235,6 +235,7 @@ The Symfony Connect username in parenthesis allows to get more information
235235
- Roland Franssen :)
236236
- Romain Monteil (ker0x)
237237
- Sergey (upyx)
238+
- Florent Morselli (spomky_)
238239
- Marco Pivetta (ocramius)
239240
- Antonio Pauletich (x-coder264)
240241
- Vincent Touzet (vincenttouzet)
@@ -265,7 +266,7 @@ The Symfony Connect username in parenthesis allows to get more information
265266
- Tyson Andre
266267
- GDIBass
267268
- Samuel NELA (snela)
268-
- Florent Morselli (spomky_)
269+
- Baptiste Leduc (korbeil)
269270
- Vincent AUBERT (vincent)
270271
- Michael Voříšek
271272
- zairig imad (zairigimad)
@@ -289,6 +290,8 @@ The Symfony Connect username in parenthesis allows to get more information
289290
- Martin Hujer (martinhujer)
290291
- Sergey Linnik (linniksa)
291292
- Richard Miller
293+
- Quynh Xuan Nguyen (seriquynh)
294+
- Victor Bocharsky (bocharsky_bw)
292295
- Aleksandar Jakovljevic (ajakov)
293296
- Mario A. Alvarez Garcia (nomack84)
294297
- Thomas Rabaix (rande)
@@ -297,7 +300,7 @@ The Symfony Connect username in parenthesis allows to get more information
297300
- DQNEO
298301
- Chi-teck
299302
- Andre Rømcke (andrerom)
300-
- Baptiste Leduc (korbeil)
303+
- Patrick Landolt (scube)
301304
- Karoly Gossler (connorhu)
302305
- Timo Bakx (timobakx)
303306
- Giorgio Premi
@@ -319,7 +322,6 @@ The Symfony Connect username in parenthesis allows to get more information
319322
- sun (sun)
320323
- Larry Garfield (crell)
321324
- Leo Feyer
322-
- Victor Bocharsky (bocharsky_bw)
323325
- Nikolay Labinskiy (e-moe)
324326
- Asis Pattisahusiwa
325327
- Martin Schuhfuß (usefulthink)
@@ -355,7 +357,6 @@ The Symfony Connect username in parenthesis allows to get more information
355357
- Maxime Veber (nek-)
356358
- Valentine Boineau (valentineboineau)
357359
- Rui Marinho (ruimarinho)
358-
- Patrick Landolt (scube)
359360
- Filippo Tessarotto (slamdunk)
360361
- Jeroen Noten (jeroennoten)
361362
- Possum
@@ -492,7 +493,6 @@ The Symfony Connect username in parenthesis allows to get more information
492493
- Andrew Moore (finewolf)
493494
- Bertrand Zuchuat (garfield-fr)
494495
- Marc Morera (mmoreram)
495-
- Quynh Xuan Nguyen (seriquynh)
496496
- Gabor Toth (tgabi333)
497497
- realmfoo
498498
- Fabien S (bafs)
@@ -549,6 +549,7 @@ The Symfony Connect username in parenthesis allows to get more information
549549
- Martin Herndl (herndlm)
550550
- Dmytro Borysovskyi (dmytr0)
551551
- Johann Pardanaud
552+
- Pierre Rineau
552553
- Kai Dederichs
553554
- Pavel Kirpitsov (pavel-kirpichyov)
554555
- Robert Meijers
@@ -738,6 +739,7 @@ The Symfony Connect username in parenthesis allows to get more information
738739
- Miro Michalicka
739740
- M. Vondano
740741
- Dominik Zogg
742+
- Maximilian Zumbansen
741743
- Vadim Borodavko (javer)
742744
- Tavo Nieves J (tavoniievez)
743745
- Luc Vieillescazes (iamluc)
@@ -750,7 +752,6 @@ The Symfony Connect username in parenthesis allows to get more information
750752
- Giso Stallenberg (gisostallenberg)
751753
- Rob Bast
752754
- Roberto Espinoza (respinoza)
753-
- Pierre Rineau
754755
- Soufian EZ ZANTAR (soezz)
755756
- Marek Zajac
756757
- Adam Harvey
@@ -889,6 +890,7 @@ The Symfony Connect username in parenthesis allows to get more information
889890
- Marcin Chyłek (songoq)
890891
- Ned Schwartz
891892
- Ziumin
893+
- Daniel Tiringer
892894
- Lenar Lõhmus
893895
- Ilija Tovilo (ilijatovilo)
894896
- Sander Toonen (xatoo)
@@ -925,6 +927,7 @@ The Symfony Connect username in parenthesis allows to get more information
925927
- Ninos
926928
- julien57
927929
- Mátyás Somfai (smatyas)
930+
- MrMicky
928931
- Bastien DURAND (deamon)
929932
- Dmitry Simushev
930933
- alcaeus
@@ -1390,7 +1393,6 @@ The Symfony Connect username in parenthesis allows to get more information
13901393
- Jason Woods
13911394
- mwsaz
13921395
- bogdan
1393-
- Daniel Tiringer
13941396
- Geert De Deckere
13951397
- grizlik
13961398
- Derek ROTH
@@ -1505,7 +1507,6 @@ The Symfony Connect username in parenthesis allows to get more information
15051507
- Valérian Galliat
15061508
- Sorin Pop (sorinpop)
15071509
- d-ph
1508-
- MrMicky
15091510
- Stewart Malik
15101511
- Renan Taranto (renan-taranto)
15111512
- Ninos Ego
@@ -1522,6 +1523,7 @@ The Symfony Connect username in parenthesis allows to get more information
15221523
- Amaury Leroux de Lens (amo__)
15231524
- Rene de Lima Barbosa (renedelima)
15241525
- Christian Jul Jensen
1526+
- Lukas Kaltenbach
15251527
- Alexandre GESLIN
15261528
- The Whole Life to Learn
15271529
- Pierre Tondereau
@@ -1772,6 +1774,7 @@ The Symfony Connect username in parenthesis allows to get more information
17721774
- benatespina (benatespina)
17731775
- Denis Kop
17741776
- Fabrice Locher
1777+
- Konstantin Chigakov
17751778
- Kamil Szalewski (szal1k)
17761779
- Jean-Guilhem Rouel (jean-gui)
17771780
- Yoann MOROCUTTI
@@ -1830,7 +1833,6 @@ The Symfony Connect username in parenthesis allows to get more information
18301833
- Atthaphon Urairat
18311834
- Benoit Garret
18321835
- HellFirePvP
1833-
- Maximilian Zumbansen
18341836
- Maximilian Ruta (deltachaos)
18351837
- Jon Green (jontjs)
18361838
- Jakub Sacha
@@ -1898,6 +1900,7 @@ The Symfony Connect username in parenthesis allows to get more information
18981900
- Albert Ganiev (helios-ag)
18991901
- Neil Katin
19001902
- Oleg Mifle
1903+
- V1nicius00
19011904
- David Otton
19021905
- Will Donohoe
19031906
- peter
@@ -1966,6 +1969,7 @@ The Symfony Connect username in parenthesis allows to get more information
19661969
- Roger Webb
19671970
- Dmitriy Simushev
19681971
- Pawel Smolinski
1972+
- Yury (daffox)
19691973
- John Espiritu (johnillo)
19701974
- Tomasz (timitao)
19711975
- Nguyen Tuan Minh (tuanminhgp)
@@ -2407,6 +2411,7 @@ The Symfony Connect username in parenthesis allows to get more information
24072411
- Alex Silcock
24082412
- Raphael Hardt
24092413
- Ivan Nemets
2414+
- Dave Long
24102415
- Qingshan Luo
24112416
- Michael Olšavský
24122417
- Ergie Gonzaga
@@ -2526,6 +2531,7 @@ The Symfony Connect username in parenthesis allows to get more information
25262531
- Wouter de Wild
25272532
- Peter Potrowl
25282533
- povilas
2534+
- andreybolonin1989@gmail.com
25292535
- Gavin Staniforth
25302536
- bahram
25312537
- Alessandro Tagliapietra (alex88)
@@ -2540,6 +2546,7 @@ The Symfony Connect username in parenthesis allows to get more information
25402546
- Tiago Garcia (tiagojsag)
25412547
- Artiom
25422548
- Jakub Simon
2549+
- Petrisor Ciprian Daniel
25432550
- Eviljeks
25442551
- robin.de.croock
25452552
- Brandon Antonio Lorenzo
@@ -2706,6 +2713,7 @@ The Symfony Connect username in parenthesis allows to get more information
27062713
- Nil Borodulia
27072714
- Adam Katz
27082715
- Almog Baku (almogbaku)
2716+
- Boris Grishenko (arczinosek)
27092717
- Arrakis (arrakis)
27102718
- Danil Khaliullin (bifidokk)
27112719
- Benjamin Schultz (bschultz)
@@ -2893,6 +2901,7 @@ The Symfony Connect username in parenthesis allows to get more information
28932901
- Markus Staab
28942902
- Ryan Hendrickson
28952903
- Valentin
2904+
- Gerard
28962905
- Sören Bernstein
28972906
- michael.kubovic
28982907
- devel
@@ -2944,6 +2953,7 @@ The Symfony Connect username in parenthesis allows to get more information
29442953
- Maxime Corteel (mcorteel)
29452954
- Dan Patrick (mdpatrick)
29462955
- Mathieu MARCHOIS (mmar)
2956+
- Nei Rauni Santos (nrauni)
29472957
- Geoffrey Monte (numerogeek)
29482958
- Martijn Boers (plebian)
29492959
- Plamen Mishev (pmishev)
@@ -3425,6 +3435,7 @@ The Symfony Connect username in parenthesis allows to get more information
34253435
- Bastien THOMAS
34263436
- Shaun Simmons
34273437
- Pierre-Louis LAUNAY
3438+
- Arseny Razin
34283439
- A. Pauly
34293440
- djama
34303441
- Benjamin Rosenberger
@@ -3526,6 +3537,7 @@ The Symfony Connect username in parenthesis allows to get more information
35263537
- Matthias Larisch
35273538
- Maxime P
35283539
- Sean Templeton
3540+
- Willem Mouwen
35293541
- db306
35303542
- Michaël VEROUX
35313543
- Julia
@@ -3621,6 +3633,7 @@ The Symfony Connect username in parenthesis allows to get more information
36213633
- Jérémy (libertjeremy)
36223634
- Mehdi Achour (machour)
36233635
- Mamikon Arakelyan (mamikon)
3636+
- Mark Schmale (masch)
36243637
- Matt Ketmo (mattketmo)
36253638
- Moritz Borgmann (mborgmann)
36263639
- Matt Drollette (mdrollette)

‎src/Symfony/Bridge/Doctrine/ArgumentResolver/EntityValueResolver.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,9 @@ private function find(ObjectManager $manager, Request $request, MapEntity $optio
104104
if (false === $id || null === $id) {
105105
return $id;
106106
}
107+
if (\is_array($id) && \in_array(null, $id, true)) {
108+
return null;
109+
}
107110

108111
if ($options->evictCache && $manager instanceof EntityManagerInterface) {
109112
$cacheProvider = $manager->getCache();

‎src/Symfony/Bridge/Doctrine/Tests/ArgumentResolver/EntityValueResolverTest.php‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,20 @@ public function testResolveWithNullId()
139139
$this->assertSame([null], $resolver->resolve($request, $argument));
140140
}
141141

142+
public function testResolveWithArrayIdNullValue()
143+
{
144+
$manager = $this->createMock(ObjectManager::class);
145+
$registry = $this->createRegistry($manager);
146+
$resolver = new EntityValueResolver($registry);
147+
148+
$request = new Request();
149+
$request->attributes->set('nullValue', null);
150+
151+
$argument = $this->createArgument(entity: new MapEntity(id: ['nullValue']), isNullable: true,);
152+
153+
$this->assertSame([null], $resolver->resolve($request, $argument));
154+
}
155+
142156
public function testResolveWithConversionFailedException()
143157
{
144158
$manager = $this->createMock(ObjectManager::class);

0 commit comments

Comments
 (0)
0