Skip to content

Commit 3f0167f

Browse files
Merge pull request #1 from symfony/3.4
Merge upstream to ansi_no-ansi
2 parents 9063c5a + b30f4c1 commit 3f0167f

File tree

14 files changed

+491
-352
lines changed

14 files changed

+491
-352
lines changed

CHANGELOG-3.4.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,16 @@ in 3.4 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/v3.4.0...v3.4.1
99

10+
* 3.4.42 (2020-06-12)
11+
12+
* bug #37103 [Form] switch the context when validating nested forms (xabbuh)
13+
* bug #37182 [HttpKernel] Fix regression where Store does not return response body correctly (mpdude)
14+
* bug #36913 [FrameworkBundle] fix type annotation on ControllerTrait::addFlash() (ThomasLandauer)
15+
* bug #37169 [Cache] fix forward compatibility with Doctrine DBAL 3 (xabbuh)
16+
* bug #37085 [Form] properly cascade validation to child forms (xabbuh)
17+
* bug #37095 [PhpUnitBridge] Fix undefined index when output of "composer show" cannot be parsed (nicolas-grekas)
18+
* bug #37092 [PhpUnitBridge] fix undefined var on version 3.4 (nicolas-grekas)
19+
1020
* 3.4.41 (2020-05-31)
1121

1222
* bug #36894 [Validator] never directly validate Existence (Required/Optional) constraints (xabbuh)

CONTRIBUTORS.md

Lines changed: 35 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,18 @@ Symfony is the result of the work of many people who made the code better
6565
- Kevin Bond (kbond)
6666
- Saša Stamenković (umpirsky)
6767
- Peter Rehm (rpet)
68+
- Gábor Egyed (1ed)
6869
- Gabriel Ostrolucký (gadelat)
6970
- Henrik Bjørnskov (henrikbjorn)
70-
- Gábor Egyed (1ed)
7171
- Miha Vrhovnik
7272
- David Maicher (dmaicher)
73+
- Titouan Galopin (tgalopin)
7374
- Diego Saint Esteben (dii3g0)
7475
- Jan Schädlich (jschaedl)
75-
- Titouan Galopin (tgalopin)
7676
- Konstantin Kudryashov (everzet)
77+
- Vladimir Reznichenko (kalessil)
7778
- Bilal Amarni (bamarni)
7879
- Mathieu Piot (mpiot)
79-
- Vladimir Reznichenko (kalessil)
8080
- Florin Patan (florinpatan)
8181
- Jáchym Toušek (enumag)
8282
- Andrej Hudec (pulzarraider)
@@ -91,12 +91,12 @@ Symfony is the result of the work of many people who made the code better
9191
- Henrik Westphal (snc)
9292
- Dariusz Górecki (canni)
9393
- David Buchmann (dbu)
94+
- Jérôme Tamarelle (gromnan)
9495
- Graham Campbell (graham)
9596
- Dariusz Ruminski
9697
- Lee McDermott
9798
- Brandon Turner
9899
- Luis Cordova (cordoval)
99-
- Jérôme Tamarelle (gromnan)
100100
- Daniel Holmes (dholmes)
101101
- Toni Uebernickel (havvg)
102102
- Fran Moreno (franmomu)
@@ -106,11 +106,11 @@ Symfony is the result of the work of many people who made the code better
106106
- Antoine Hérault (herzult)
107107
- Paráda József (paradajozsef)
108108
- Arnaud Le Blanc (arnaud-lb)
109+
- Sebastiaan Stok (sstok)
109110
- Maxime STEINHAUSSER
110111
- Baptiste Clavié (talus)
111112
- Michal Piotrowski (eventhorizon)
112113
- Tim Nagel (merk)
113-
- Sebastiaan Stok (sstok)
114114
- Chris Wilkinson (thewilkybarkid)
115115
- Brice BERNARD (brikou)
116116
- marc.weistroff
@@ -170,14 +170,14 @@ Symfony is the result of the work of many people who made the code better
170170
- Philipp Wahala (hifi)
171171
- Rafael Dohms (rdohms)
172172
- jwdeitch
173+
- Ahmed TAILOULOUTE (ahmedtai)
173174
- Mikael Pajunen
174175
- Arman Hosseini (arman)
175176
- Niels Keurentjes (curry684)
176177
- Vyacheslav Pavlov
177178
- Richard van Laak (rvanlaak)
178179
- Richard Shank (iampersistent)
179180
- Thomas Rabaix (rande)
180-
- Ahmed TAILOULOUTE (ahmedtai)
181181
- Vincent Touzet (vincenttouzet)
182182
- jeremyFreeAgent (jeremyfreeagent)
183183
- Rouven Weßling (realityking)
@@ -198,6 +198,7 @@ Symfony is the result of the work of many people who made the code better
198198
- GDIBass
199199
- Samuel NELA (snela)
200200
- Saif (╯°□°)╯ (azjezz)
201+
- Gary PEGEOT (gary-p)
201202
- James Halsall (jaitsu)
202203
- Matthieu Napoli (mnapoli)
203204
- Florent Mata (fmata)
@@ -220,7 +221,6 @@ Symfony is the result of the work of many people who made the code better
220221
- DQNEO
221222
- Andre Rømcke (andrerom)
222223
- mcfedr (mcfedr)
223-
- Gary PEGEOT (gary-p)
224224
- Ruben Gonzalez (rubenrua)
225225
- Benjamin Dulau (dbenjamin)
226226
- Jan Rosier (rosier)
@@ -244,6 +244,7 @@ Symfony is the result of the work of many people who made the code better
244244
- Matthieu Bontemps (mbontemps)
245245
- apetitpa
246246
- Pierre Minnieur (pminnieur)
247+
- David Prévot
247248
- fivestar
248249
- Dominique Bongiraud
249250
- Jeremy Livingston (jeremylivingston)
@@ -277,7 +278,6 @@ Symfony is the result of the work of many people who made the code better
277278
- Ruud Kamphuis (ruudk)
278279
- Pavel Batanov (scaytrase)
279280
- Mantis Development
280-
- David Prévot
281281
- Loïc Faugeron
282282
- Hidde Wieringa (hiddewie)
283283
- dFayet
@@ -371,6 +371,7 @@ Symfony is the result of the work of many people who made the code better
371371
- Chris Smith (cs278)
372372
- Thomas Bisignani (toma)
373373
- Florian Klein (docteurklein)
374+
- Benjamin Leveque (benji07)
374375
- Manuel Kiessling (manuelkiessling)
375376
- Atsuhiro KUBO (iteman)
376377
- rudy onfroy (ronfroy)
@@ -407,6 +408,7 @@ Symfony is the result of the work of many people who made the code better
407408
- Dariusz Rumiński
408409
- Berny Cantos (xphere81)
409410
- Thierry Thuon (lepiaf)
411+
- Guilhem N (guilhemn)
410412
- Ricard Clau (ricardclau)
411413
- Mark Challoner (markchalloner)
412414
- Philippe Segatori
@@ -432,6 +434,7 @@ Symfony is the result of the work of many people who made the code better
432434
- Tomasz Kowalczyk (thunderer)
433435
- Artur Eshenbrener
434436
- Timo Bakx (timobakx)
437+
- Harm van Tilborg (hvt)
435438
- Thomas Perez (scullwm)
436439
- Felix Labrecque
437440
- Yaroslav Kiliba
@@ -471,7 +474,6 @@ Symfony is the result of the work of many people who made the code better
471474
- Michele Locati
472475
- Pavel Volokitin (pvolok)
473476
- Valentine Boineau (valentineboineau)
474-
- Benjamin Leveque (benji07)
475477
- Arthur de Moulins (4rthem)
476478
- Matthias Althaus (althaus)
477479
- Nicolas Dewez (nicolas_dewez)
@@ -516,10 +518,11 @@ Symfony is the result of the work of many people who made the code better
516518
- Steffen Roßkamp
517519
- Alexandru Furculita (afurculita)
518520
- Valentin Jonovs (valentins-jonovs)
519-
- Guilhem N (guilhemn)
521+
- Sebastien Morel (plopix)
520522
- Jeanmonod David (jeanmonod)
521523
- Christopher Davis (chrisguitarguy)
522524
- Webnet team (webnet)
525+
- Joe Bennett (kralos)
523526
- Farhad Safarov
524527
- Jan Schumann
525528
- Niklas Fiekas
@@ -556,6 +559,7 @@ Symfony is the result of the work of many people who made the code better
556559
- Ariel Ferrandini (aferrandini)
557560
- Dirk Pahl (dirkaholic)
558561
- cedric lombardot (cedriclombardot)
562+
- Arkadius Stefanski (arkadius)
559563
- Tim Goudriaan (codedmonkey)
560564
- Jonas Flodén (flojon)
561565
- Tobias Weichart
@@ -621,6 +625,7 @@ Symfony is the result of the work of many people who made the code better
621625
- Maks Slesarenko
622626
- Filip Procházka (fprochazka)
623627
- mmoreram
628+
- Jeroen Thora (bolle)
624629
- Markus Lanthaler (lanthaler)
625630
- Remi Collet
626631
- Vicent Soria Durá (vicentgodella)
@@ -688,6 +693,7 @@ Symfony is the result of the work of many people who made the code better
688693
- Pavel Campr (pcampr)
689694
- Andrii Dembitskyi
690695
- Johnny Robeson (johnny)
696+
- Thomas Landauer (thomas-landauer)
691697
- Guilliam Xavier
692698
- Disquedur
693699
- Michiel Boeckaert (milio)
@@ -701,13 +707,11 @@ Symfony is the result of the work of many people who made the code better
701707
- Piotr Stankowski
702708
- Baptiste Leduc (bleduc)
703709
- Julien Maulny
704-
- Sebastien Morel (plopix)
705710
- Jean-Christophe Cuvelier [Artack]
706711
- Julien Montel (julienmgel)
707712
- Simon DELICATA
708713
- Artem Henvald (artemgenvald)
709714
- Dmitry Simushev
710-
- Joe Bennett (kralos)
711715
- alcaeus
712716
- Thomas Talbot (ioni)
713717
- Fred Cox
@@ -722,10 +726,12 @@ Symfony is the result of the work of many people who made the code better
722726
- Marvin Butkereit
723727
- Renan
724728
- Ricky Su (ricky)
729+
- Marcin Szepczynski (czepol)
725730
- Kyle Evans (kevans91)
726731
- Charles-Henri Bruyand
727732
- Max Rath (drak3)
728733
- Stéphane Escandell (sescandell)
734+
- Baptiste Leduc (korbeil)
729735
- Konstantin S. M. Möllers (ksmmoellers)
730736
- James Johnston
731737
- Noémi Salaün (noemi-salaun)
@@ -776,7 +782,6 @@ Symfony is the result of the work of many people who made the code better
776782
- maxime.steinhausser
777783
- adev
778784
- Stefan Warman
779-
- Arkadius Stefanski (arkadius)
780785
- Tristan Maindron (tmaindron)
781786
- Behnoush Norouzali (behnoush)
782787
- Wesley Lancel
@@ -949,12 +954,10 @@ Symfony is the result of the work of many people who made the code better
949954
- Jayson Xu (superjavason)
950955
- Hubert Lenoir (hubert_lenoir)
951956
- fago
952-
- Harm van Tilborg
953957
- Jan Prieser
954958
- GDIBass
955959
- Antoine Lamirault
956960
- Adrien Lucas (adrienlucas)
957-
- Jeroen Thora (bolle)
958961
- Zhuravlev Alexander (scif)
959962
- Stefano Degenkamp (steef)
960963
- James Michael DuPont
@@ -1038,7 +1041,6 @@ Symfony is the result of the work of many people who made the code better
10381041
- Don Pinkster
10391042
- Maksim Muruev
10401043
- Emil Einarsson
1041-
- Thomas Landauer
10421044
- 243083df
10431045
- Thibault Duplessis
10441046
- Rimas Kudelis
@@ -1060,6 +1062,7 @@ Symfony is the result of the work of many people who made the code better
10601062
- Hugo Alliaume (kocal)
10611063
- Marcos Gómez Vilches (markitosgv)
10621064
- Matthew Davis (mdavis1982)
1065+
- Paulo Ribeiro (paulo)
10631066
- Markus S. (staabm)
10641067
- Benjamin Morel
10651068
- Maks
@@ -1118,7 +1121,6 @@ Symfony is the result of the work of many people who made the code better
11181121
- xaav
11191122
- Mahmoud Mostafa (mahmoud)
11201123
- Antonio Jose Cerezo (ajcerezo)
1121-
- Baptiste Leduc (korbeil)
11221124
- Ahmed Abdou
11231125
- Daniel Iwaniec
11241126
- Thomas Ferney
@@ -1157,6 +1159,8 @@ Symfony is the result of the work of many people who made the code better
11571159
- zairig imad (zairigimad)
11581160
- Anton Babenko (antonbabenko)
11591161
- Irmantas Šiupšinskas (irmantas)
1162+
- Benoit Mallo
1163+
- Lescot Edouard (idetox)
11601164
- Danilo Silva
11611165
- Giuseppe Campanelli
11621166
- Arnaud PETITPAS (apetitpa)
@@ -1226,11 +1230,13 @@ Symfony is the result of the work of many people who made the code better
12261230
- gr1ev0us
12271231
- mlazovla
12281232
- Alejandro Diaz Torres
1233+
- quentin neyrat (qneyrat)
12291234
- Max Beutel
12301235
- Jan Vernieuwe (vernija)
12311236
- Antanas Arvasevicius
12321237
- Pierre Dudoret
12331238
- Thomas
1239+
- j.schmitt
12341240
- Maximilian Berghoff (electricmaxxx)
12351241
- nacho
12361242
- Piotr Antosik (antek88)
@@ -1326,7 +1332,9 @@ Symfony is the result of the work of many people who made the code better
13261332
- Carlos Ortega Huetos
13271333
- rpg600
13281334
- Péter Buri (burci)
1335+
- John VanDeWeghe
13291336
- kaiwa
1337+
- Claude Khedhiri (ck-developer)
13301338
- Charles Sanquer (csanquer)
13311339
- Albert Ganiev (helios-ag)
13321340
- Neil Katin
@@ -1363,6 +1371,7 @@ Symfony is the result of the work of many people who made the code better
13631371
- arnaud (arnooo999)
13641372
- Gilles Doge (gido)
13651373
- Oscar Esteve (oesteve)
1374+
- Sobhan Sharifi (50bhan)
13661375
- abulford
13671376
- Philipp Kretzschmar
13681377
- antograssiot
@@ -1412,6 +1421,7 @@ Symfony is the result of the work of many people who made the code better
14121421
- Marc Torres
14131422
- Mark Spink
14141423
- Alberto Aldegheri
1424+
- Sagrario Meneses
14151425
- Dmitri Petmanson
14161426
- heccjj
14171427
- Alexandre Melard
@@ -1731,7 +1741,9 @@ Symfony is the result of the work of many people who made the code better
17311741
- Przemysław Piechota (kibao)
17321742
- Leonid Terentyev (li0n)
17331743
- Martynas Sudintas (martiis)
1744+
- Douglas Hammond (wizhippo)
17341745
- ryunosuke
1746+
- Bruno BOUTAREL
17351747
- victoria
17361748
- Francisco Facioni (fran6co)
17371749
- Stanislav Gamayunov (happyproff)
@@ -1864,6 +1876,7 @@ Symfony is the result of the work of many people who made the code better
18641876
- Pavel.Batanov
18651877
- avi123
18661878
- Pavel Prischepa
1879+
- Sami Mussbach
18671880
- alsar
18681881
- downace
18691882
- Aarón Nieves Fernández
@@ -1891,6 +1904,7 @@ Symfony is the result of the work of many people who made the code better
18911904
- Brian Graham (incognito)
18921905
- Kevin Vergauwen (innocenzo)
18931906
- Alessio Baglio (ioalessio)
1907+
- Jeroen Noten (jeroennoten)
18941908
- Johannes Müller (johmue)
18951909
- Jordi Llonch (jordillonch)
18961910
- Nicholas Ruunu (nicholasruunu)
@@ -1911,6 +1925,7 @@ Symfony is the result of the work of many people who made the code better
19111925
- Alexey Popkov
19121926
- Gijs Kunze
19131927
- Artyom Protaskin
1928+
- Steven Dubois
19141929
- Nathanael d. Noblet
19151930
- helmer
19161931
- ged15
@@ -1983,6 +1998,7 @@ Symfony is the result of the work of many people who made the code better
19831998
- Andrew Marcinkevičius (ifdattic)
19841999
- Ioana Hazsda (ioana-hazsda)
19852000
- Jan Marek (janmarek)
2001+
- Dmitriy Mamontov (mamontovdmitriy)
19862002
- Mark de Haan (markdehaan)
19872003
- Dan Patrick (mdpatrick)
19882004
- naitsirch (naitsirch)
@@ -2343,6 +2359,7 @@ Symfony is the result of the work of many people who made the code better
23432359
- Ben Miller
23442360
- Peter Gribanov
23452361
- Matteo Galli
2362+
- Loenix
23462363
- kwiateusz
23472364
- jspee
23482365
- Ilya Bulakh
@@ -2466,7 +2483,6 @@ Symfony is the result of the work of many people who made the code better
24662483
- Marco Petersen (ocrampete16)
24672484
- ollie harridge (ollietb)
24682485
- Paul Andrieux (paulandrieux)
2469-
- Paulo Ribeiro (paulo)
24702486
- Paweł Szczepanek (pauluz)
24712487
- Philippe Degeeter (pdegeeter)
24722488
- Christian López Espínola (penyaskito)
@@ -2521,6 +2537,7 @@ Symfony is the result of the work of many people who made the code better
25212537
- MaPePeR
25222538
- Andreas Streichardt
25232539
- Alexandre Segura
2540+
- Marco Pfeiffer
25242541
- Vivien
25252542
- Pascal Hofmann
25262543
- david-binda

src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace Symfony\Bridge\Doctrine\Security\RememberMe;
1313

1414
use Doctrine\DBAL\Connection;
15+
use Doctrine\DBAL\Driver\Result;
1516
use Doctrine\DBAL\Types\Type;
1617
use Doctrine\DBAL\Types\Types;
1718
use Symfony\Component\Security\Core\Authentication\RememberMe\PersistentToken;
@@ -63,7 +64,7 @@ public function loadTokenBySeries($series)
6364
$paramValues = ['series' => $series];
6465
$paramTypes = ['series' => \PDO::PARAM_STR];
6566
$stmt = $this->conn->executeQuery($sql, $paramValues, $paramTypes);
66-
$row = method_exists($stmt, 'fetchAssociative') ? $stmt->fetchAssociative() : $stmt->fetch(\PDO::FETCH_ASSOC);
67+
$row = $stmt instanceof Result ? $stmt->fetchAssociative() : $stmt->fetch(\PDO::FETCH_ASSOC);
6768

6869
if ($row) {
6970
return new PersistentToken($row['class'], $row['username'], $series, $row['value'], new \DateTime($row['last_used']));

src/Symfony/Bundle/FrameworkBundle/Controller/ControllerTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ protected function file($file, $fileName = null, $disposition = ResponseHeaderBa
187187
* Adds a flash message to the current session for type.
188188
*
189189
* @param string $type The type
190-
* @param string $message The message
190+
* @param mixed $message The message
191191
*
192192
* @throws \LogicException
193193
*

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy