8000 Merge branch '3.4' into 4.2 · symfony/symfony@32e1400 · GitHub
[go: up one dir, main page]

Skip to content

Commit 32e1400

Browse files
Merge branch '3.4' into 4.2
* 3.4: [FrameworkBundle] Update the xsd to match the actual session configuration [Form] CsrfValidationListener marks the token as invalid if it is not a string [VarDumper] Fixed phpDoc [PhpUnitBridge] fix PHP 5.3 compat [Filesystem] Fixed some docblocks and typos bumped Symfony version to 3.4.23 updated VERSION for 3.4.22 update CONTRIBUTORS for 3.4.22 updated CHANGELOG for 3.4.22 fix some minor typos do not overwrite the constraint being evaluated
2 parents fd720ed + 8f29f56 commit 32e1400

File tree

10 files changed

+97
-45
lines changed

10 files changed

+97
-45
lines changed

CONTRIBUTORS.md

Lines changed: 36 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ Symfony is the result of the work of many people who made the code better
1010
- Christian Flothmann (xabbuh)
1111
- Tobias Schultze (tobion)
1212
- Christophe Coevoet (stof)
13+
- Robin Chalas (chalas_r)
1314
- Jordi Boggiano (seldaek)
1415
- Victor Berchet (victor)
15-
- Robin Chalas (chalas_r)
1616
- Kévin Dunglas (dunglas)
1717
- Maxime Steinhausser (ogizanagi)
1818
- Jakub Zalas (jakubzalas)
1919
- Johannes S (johannes)
20-
- Kris Wallsmith (kriswallsmith)
2120
- Ryan Weaver (weaverryan)
21+
- Kris Wallsmith (kriswallsmith)
2222
- Javier Eguiluz (javier.eguiluz)
2323
- Roland Franssen (ro0)
2424
- Grégoire Pineau (lyrixx)
@@ -61,14 +61,14 @@ Symfony is the result of the work of many people who made the code better
6161
- Kevin Bond (kbond)
6262
- Pierre du Plessis (pierredup)
6363
- Henrik Bjørnskov (henrikbjorn)
64+
- Alexander M. Turek (derrabus)
6465
- Miha Vrhovnik
6566
- Diego Saint Esteben (dii3g0)
66-
- Alexander M. Turek (derrabus)
6767
- Konstantin Kudryashov (everzet)
6868
- Bilal Amarni (bamarni)
69+
- Mathieu Piot (mpiot)
6970
- Florin Patan (florinpatan)
7071
- Gábor Egyed (1ed)
71-
- Mathieu Piot (mpiot)
7272
- Titouan Galopin (tgalopin)
7373
- Vladimir Reznichenko (kalessil)
7474
- Michel Weimerskirch (mweimerskirch)
@@ -82,11 +82,11 @@ Symfony is the result of the work of many people who made the code better
8282
- Issei Murasawa (issei_m)
8383
- Arnout Boks (aboks)
8484
- Deni
85+
- Grégoire Paris (greg0ire)
8586
- Henrik Westphal (snc)
8687
- Dariusz Górecki (canni)
87-
- Douglas Greenshields (shieldo)
88-
- Grégoire Paris (greg0ire)
8988
- Valentin Udaltsov (vudaltsov)
89+
- Douglas Greenshields (shieldo)
9090
- Dariusz Ruminski
9191
- Lee McDermott
9292
- Brandon Turner
@@ -109,12 +109,13 @@ Symfony is the result of the work of many people who made the code better
109109
- Brice BERNARD (brikou)
110110
- Baptiste Clavié (talus)
111111
- marc.weistroff
112+
- Tomáš Votruba (tomas_votruba)
112113
- David Buchmann (dbu)
113114
- lenar
114115
- Alexander Schwenn (xelaris)
115116
- Włodzimierz Gajda (gajdaw)
116117
- Chris Wilkinson (thewilkybarkid)
117-
- Tomáš Votruba (tomas_votruba)
118+
- Jérôme Vasseur (jvasseur)
118119
- Peter Kokot (maastermedia)
119120
- Jacob Dreesen (jdreesen)
120121
- Florian Voutzinos (florianv)
@@ -124,7 +125,6 @@ Symfony is the result of the work of many people who made the code better
124125
- Daniel Wehner (dawehner)
125126
- excelwebzone
126127
- Gordon Franke (gimler)
127-
- Jérôme Vasseur (jvasseur)
128128
- Javier Spagnoletti (phansys)
129129
- Fabien Pennequin (fabienpennequin)
130130
- Eric GELOEN (gelo)
@@ -144,6 +144,7 @@ Symfony is the result of the work of many people who made the code better
144144
- Daniel Gomes (danielcsgomes)
145145
- Gabriel Caruso
146146
- Hidenori Goto (hidenorigoto)
147+
- Thomas Calvet (fancyweb)
147148
- Arnaud Kleinpeter (nanocom)
148149
- Jannik Zschiesche (apfelbox)
149150
- Guilherme Blanco (guilhermeblanco)
@@ -175,14 +176,14 @@ Symfony is the result of the work of many people who made the code better
175176
- Amal Raghav (kertz)
176177
- Jonathan Ingram (jonathaningram)
177178
- Artur Kotyrba
179+
- Tyson Andre
178180
- GDIBass
179181
- SpacePossum
180182
- jeremyFreeAgent (Jérémy Romey) (jeremyfreeagent)
181183
- James Halsall (jaitsu)
182184
- Matthieu Napoli (mnapoli)
183185
- Florent Mata (fmata)
184186
- Warnar Boekkooi (boekkooi)
185-
- Thomas Calvet (fancyweb)
186187
- Dmitrii Chekaliuk (lazyhammer)
187188
- Clément JOBEILI (dator)
188189
- Daniel Espendiller
@@ -198,13 +199,15 @@ Symfony is the result of the work of many people who made the code better
198199
- Mathieu Lemoine (lemoinem)
199200
- Christian Schmidt
200201
- Andreas Hucks (meandmymonkey)
202+
- Tom Van Looy (tvlooy)
201203
- Noel Guilbert (noel)
202204
- Yanick Witschi (toflar)
203205
- Marek Štípek (maryo)
204206
- Stepan Anchugov (kix)
205207
- bronze1man
206208
- sun (sun)
207209
- Larry Garfield (crell)
210+
- George Mponos (gmponos)
208211
- Michaël Perrin (michael.perrin)
209212
- Nikolay Labinskiy (e-moe)
210213
- Martin Schuhfuß (usefulthink)
@@ -227,17 +230,16 @@ Symfony is the result of the work of many people who made the code better
227230
- Justin Hileman (bobthecow)
228231
- Blanchon Vincent (blanchonvincent)
229232
- Michele Orselli (orso)
230-
- Tom Van Looy (tvlooy)
231233
- Sven Paulus (subsven)
232234
- Rui Marinho (ruimarinho)
233235
- Eugene Wissner
234236
- Pascal Montoya
235-
- George Mponos (gmponos)
236237
- Julien Brochet (mewt)
237238
- Leo Feyer
238239
- Tristan Darricau (nicofuma)
239240
- Marcel Beerta (mazen)
240241
- Pavel Batanov (scaytrase)
242+
- Samuel NELA (snela)
241243
- Loïc Faugeron
242244
- Hidde Wieringa (hiddewie)
243245
- Marco Pivetta (ocramius)
@@ -282,15 +284,13 @@ Symfony is the result of the work of many people who made the code better
282284
- GordonsLondon
283285
- Jan Sorgalla (jsor)
284286
- Ray
285-
- Tyson Andre
286287
- Chekote
287288
- Thomas Adam
288289
- Viktor Bocharskyi (bocharsky_bw)
289290
- Jhonny Lidfors (jhonne)
290291
- Diego Agulló (aeoris)
291292
- Andreas Schempp (aschempp)
292293
- jdhoek
293-
- Samuel NELA (snela)
294294
- Massimiliano Arione (garak)
295295
- Bob den Otter (bopp)
296296
- Frank de Jonge (frenkynet)
@@ -301,6 +301,7 @@ Symfony is the result of the work of many people who made the code better
301301
- Colin O'Dell (colinodell)
302302
- Giorgio Premi
303303
- Jan Schädlich (jschaedl)
304+
- Ben Davies (bendavies)
304305
- Beau Simensen (simensen)
305306
- Michael Hirschler (mvhirsch)
306307
- Robert Kiss (kepten)
@@ -313,6 +314,7 @@ Symfony is the result of the work of many people who made the code better
313314
- Peter Kruithof (pkruithof)
314315
- Michael Holm (hollo)
315316
- Remon van de Kamp (rpkamp)
317+
- Mathieu Lechat
316318
- Marc Weistroff (futurecat)
317319
- Christian Schmidt
318320
- MatTheCat
@@ -356,7 +358,6 @@ Symfony is the result of the work of many people who made the code better
356358
- Ricard Clau (ricardclau)
357359
- Mark Challoner (markchalloner)
358360
- Gennady Telegin (gtelegin)
359-
- Ben Davies (bendavies)
360361
- Erin Millard
361362
- Artur Melo (restless)
362363
- Matthew Lewinski (lewinski)
@@ -379,11 +380,11 @@ Symfony is the result of the work of many people who made the code better
379380
- Felix Labrecque
380381
- Yaroslav Kiliba
381382
- Terje Bråten
382-
- Mathieu Lechat
383383
- Robbert Klarenbeek (robbertkl)
384384
- JhonnyL
385385
- David Badura (davidbadura)
386386
- hossein zolfi (ocean)
387+
- Alexander Schranz (alexander-schranz)
387388
- Clément Gautier (clementgautier)
388389
- Sanpi
389390
- Eduardo Gulias (egulias)
@@ -483,7 +484,6 @@ Symfony is the result of the work of many people who made the code better
483484
- Marek Pietrzak
484485
- Luc Vieillescazes (iamluc)
485486
- franek (franek)
486-
- Alexander Schranz (alexander-schranz)
487487
- Christian Wahler
488488
- Gintautas Miselis
489489
- Rob Bast
@@ -606,6 +606,7 @@ Symfony is the result of the work of many people who made the code better
606606
- Sebastian Blum
607607
- aubx
608608
- Marvin Butkereit
609+
- Renan
609610
- Ricky Su (ricky)
610611
- Gildas Quéméner (gquemener)
611612
- Charles-Henri Bruyand
@@ -675,6 +676,7 @@ Symfony is the result of the work of many people who made the code better
675676
- Michael Devery (mickadoo)
676677
- Antoine Corcy
677678
- Sascha Grossenbacher
679+
- Emanuele Panzeri (thepanz)
678680
- Szijarto Tamas
679681
- Robin Lehrmann (robinlehrmann)
680682
- Catalin Dan
@@ -713,6 +715,7 @@ Symfony is the result of the work of many people who made the code better
713715
- Mark Sonnabaum
714716
- Massimiliano Braglia (massimilianobraglia)
715717
- Richard Quadling
718+
- Raphaëll Roussel
716719
- jochenvdv
717720
- Arturas Smorgun (asarturas)
718721
- Alexander Volochnev (exelenz)
@@ -731,13 +734,15 @@ Symfony is the result of the work of many people who made the code better
731734
- Pascal Helfenstein
732735
- Anthony GRASSIOT (antograssiot)
733736
- Baldur Rensch (brensch)
737+
- Anthony MARTIN (xurudragon)
734738
- Pierre Rineau
735739
- Vladyslav Petrovych
736740
- Alex Xandra Albert Sim
737741
- Carson Full
738742
- Sergey Yastrebov
739743
- Trent Steel (trsteel88)
740744
- Yuen-Chi Lian
745+
- Tarjei Huse (tarjei)
741746
- Besnik Br
742747
- Jose Gonzalez
743748
- Oleksii Zhurbytskyi
@@ -764,6 +769,7 @@ Symfony is the result of the work of many people who made the code better
764769
- John Bohn (jbohn)
765770
- Marc Morera (mmoreram)
766771
- Saif Eddin Gmati (azjezz)
772+
- Stadly
767773
- Andrew Hilobok (hilobok)
768774
- Noah Heck (myesain)
769775
- Christian Soronellas (theunic)
@@ -853,6 +859,7 @@ Symfony is the result of the work of many people who made the code better
853859
- Jelle Kapitein
854860
- Benoît Bourgeois
855861
- mantulo
862+
- Stefan Kruppa
856863
- corphi
857864
- grizlik
858865
- Derek ROTH
@@ -885,6 +892,7 @@ Symfony is the result of the work of many people who made the code better
885892
- Forfarle (forfarle)
886893
- Harry Walter (haswalt)
887894
- Johnson Page (jwpage)
895+
- Michael Käfer (michael_kaefer)
888896
- Ruben Gonzalez (rubenruateltek)
889897
- Michael Roterman (wtfzdotnet)
890898
- Arno Geurts
@@ -950,6 +958,7 @@ Symfony is the result of the work of many people who made the code better
950958
- Franz Wilding (killerpoke)
951959
- ProgMiner
952960
- Oleg Golovakhin (doc_tr)
961+
- Joost van Driel
953962
- Icode4Food (icode4food)
954963
- Radosław Benkel
955964
- kevin.nadin
@@ -996,6 +1005,7 @@ Symfony is the result of the work of many people who made the code better
9961005
- Wojciech Sznapka
9971006
- Gavin Staniforth
9981007
- Ariel J. Birnbaum
1008+
- Pablo Borowicz
9991009
- Mathieu Santostefano
10001010
- Arjan Keeman
10011011
- Máximo Cuadros (mcuadros)
@@ -1031,6 +1041,7 @@ Symfony is the result of the work of many people who made the code better
10311041
- Sergey Novikov (s12v)
10321042
- Marcos Quesada (marcos_quesada)
10331043
- Matthew Vickery (mattvick)
1044+
- MARYNICH Mikhail (mmarynich-ext)
10341045
- Viktor Novikov (panzer_commander)
10351046
- Paul Mitchum (paul-m)
10361047
- Angel Koilov (po_taka)
@@ -1085,6 +1096,7 @@ Symfony is the result of the work of many people who made the code better
10851096
- Andrew Tch
10861097
- Alexander Cheprasov
10871098
- Rodrigo Díez Villamuera (rodrigodiez)
1099+
- James Hudson
10881100
- e-ivanov
10891101
- Einenlum
10901102
- Jochen Bayer (jocl)
@@ -1095,6 +1107,7 @@ Symfony is the result of the work of many people who made the code better
10951107
- wizhippo
10961108
- Mathias STRASSER (roukmoute)
10971109
- Thomason, James
1110+
- Gordienko Vladislav
10981111
- Viacheslav Sychov
10991112
- Alexandre Quercia (alquerci)
11001113
- Helmut Hummel (helhum)
@@ -1157,7 +1170,6 @@ Symfony is the result of the work of many people who made the code better
11571170
- Vacheslav Silyutin
11581171
- Juan Traverso
11591172
- Alain Flaus (halundra)
1160-
- Tarjei Huse (tarjei)
11611173
- tsufeki
11621174
- Philipp Strube
11631175
- Clement Herreman (clemherreman)
@@ -1240,6 +1252,7 @@ Symfony is the result of the work of many people who made the code better
12401252
- Berat Doğan
12411253
- Guillaume LECERF
12421254
- Juanmi Rodriguez Cerón
1255+
- renanbr
12431256
- Andy Raines
12441257
- Anthony Ferrara
12451258
- Geoffrey Pécro (gpekz)
@@ -1290,7 +1303,6 @@ Symfony is the result of the work of many people who made the code better
12901303
- WedgeSama
12911304
- Felds Liscia
12921305
- Chihiro Adachi (chihiro-adachi)
1293-
- Emanuele Panzeri (thepanz)
12941306
- Raphaëll Roussel
12951307
- Tadcka
12961308
- Beth Binkovitz
@@ -1404,6 +1416,7 @@ Symfony is the result of the work of many people who made the code better
14041416
- Gavin Staniforth
14051417
- Alessandro Tagliapietra (alex88)
14061418
- Biji (biji)
1419+
- Alex Teterin (errogaht)
14071420
- Gunnar Lium (gunnarlium)
14081421
- Tiago Garcia (tiagojsag)
14091422
- Artiom
@@ -1446,6 +1459,7 @@ Symfony is the result of the work of many people who made the code better
14461459
- Paul Seiffert (seiffert)
14471460
- Vasily Khayrulin (sirian)
14481461
- Stefan Koopmanschap (skoop)
1462+
- Stas Soroka (stasyan)
14491463
- Stefan Hüsges (tronsha)
14501464
- Jake Bishop (yakobeyak)
14511465
- Dan Blows
@@ -1546,6 +1560,7 @@ Symfony is the result of the work of many people who made the code better
15461560
- Muhammed Akbulut
15471561
- Aaron Somi
15481562
- Michał Dąbrowski (defrag)
1563+
- Konstantin Grachev (grachevko)
15491564
- Simone Fumagalli (hpatoio)
15501565
- Brian Graham (incognito)
15511566
- Kevin Vergauwen (innocenzo)
@@ -1635,6 +1650,7 @@ Symfony is the result of the work of many people who made the code better
16351650
- Darryl Hein (xmmedia)
16361651
- Sadicov Vladimir (xtech)
16371652
- Kevin EMO (zarcox)
1653+
- Andrzej
16381654
- Alexander Zogheb
16391655
- Rémi Blaise
16401656
- Nicolas Séverin
@@ -1869,6 +1885,7 @@ Symfony is the result of the work of many people who made the code better
18691885
- Şəhriyar İmanov
18701886
- Alexis BOYER
18711887
- Kaipi Yann
1888+
- adam-mospan
18721889
- Sam Williams
18731890
- Guillaume Aveline
18741891
- Adrian Philipp
@@ -1906,7 +1923,6 @@ Symfony is the result of the work of many people who made the code better
19061923
- Shude
19071924
- Ondřej Führer
19081925
- Sema
1909-
- Michael Käfer
19101926
- Elan Ruusamäe
19111927
- Thorsten Hallwas
19121928
- Michael Squires
@@ -2074,9 +2090,9 @@ Symfony is the result of the work of many people who made the code better
20742090
- drublic
20752091
- Andreas Streichardt
20762092
- Pascal Hofmann
2077-
- Stefan Kruppa
20782093
- smokeybear87
20792094
- Gustavo Adrian
2095+
- damaya
20802096
- Kevin Weber
20812097
- Ben Scott
20822098
- Dionysis Arvanitis

src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@
121121
<xsd:attribute name="gc-probability" type="xsd:string" />
122122
<xsd:attribute name="use-strict-mode" type="xsd:boolean" />
123123
<xsd:attribute name="save-path" type="xsd:string" />
124+
<xsd:attribute name="metadata-update-threshold" type="xsd:nonNegativeInteger" />
124125
</xsd:complexType>
125126

126127
<xsd:complexType name="request">

src/Symfony/Component/Filesystem/Exception/IOExceptionInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ interface IOExceptionInterface extends ExceptionInterface
2121
/**
2222
* Returns the associated path for the exception.
2323
*
24-
* @return string The path
24+
* @return string|null The path
2525
*/
2626
public function getPath();
2727
}

0 commit comments

Comments
 (0)
0