Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 05d9411

Browse filesBrowse files
Merge branch '2.3' into 2.7
* 2.3: [Intl] Fix test [Translator][fallback catalogues] fixed circular reference. bumped Symfony version to 2.3.33 updated VERSION for 2.3.32 update CONTRIBUTORS for 2.3.32 updated CHANGELOG for 2.3.32 [FrameworkBundle] Fix templating.helper.code.file_link_format when defined by ini setting [console] Use the description when no help is available Conflicts: src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt src/Symfony/Component/Console/Tests/Fixtures/application_asxml2.txt src/Symfony/Component/HttpKernel/Kernel.php
2 parents 2c48608 + 6f18c75 commit 05d9411
Copy full SHA for 05d9411

File tree

Expand file treeCollapse file tree

13 files changed

+118
-38
lines changed
Filter options
Expand file treeCollapse file tree

13 files changed

+118
-38
lines changed

‎CHANGELOG-2.3.md

Copy file name to clipboardExpand all lines: CHANGELOG-2.3.md
+32Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,38 @@ in 2.3 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/v2.3.0...v2.3.1
99

10+
* 2.3.32 (2015-09-01)
11+
12+
* bug #15601 [console] Use the description when no help is available (Nicofuma)
13+
* bug #15603 [HttpKernel] Do not normalize the kernel root directory path #15567 (leofeyer)
14+
* bug #15428 Fix the validation of form resources to register the default theme (stof)
15+
* bug #15619 [Translation] Fix the string casting in the XliffFileLoader (stof)
16+
* bug #15575 Add appveyor.yml for C.I. on Windows (nicolas-grekas)
17+
* bug #15611 [Translation][Xliff Loader] Support omitting the <target> node in an .xlf file. (leofeyer)
18+
* bug #15549 [FrameworkBundle] Fix precedence of xdebug.file_link_format (nicolas-grekas)
19+
* bug #15589 made Symfony compatible with both Twig 1.x and 2.x (fabpot)
20+
* bug #15535 made Symfony compatible with both Twig 1.x and 2.x (fabpot)
21+
* bug #14372 [DoctrineBridge][Form] fix EntityChoiceList when indexing by primary foreign key (giosh94mhz)
22+
* bug #15489 Implement the support of timezone objects in the stub IntlDateFormatter (stof)
23+
* bug #15426 [Serializer] Add support for variadic arguments in the GetSetNormalizer (stof)
24+
* bug #15480 [Yaml] Nested merge keys (mathroc)
25+
* bug #15445 do not remove space between attributes (greg0ire)
26+
* bug #15263 [HttpFoundation] fixed the check of 'proxy-revalidate' in Response::mustRevalidate() (axiac)
27+
* bug #15425 [Routing] Fix the retrieval of the default value for variadic arguments in the annotation loader (wdalmut, stof)
28+
* bug #15074 Fixing DbalSessionHandler to work with a Oracle "limitation" or bug? (nuncanada)
29+
* bug #15380 do not dump leading backslashes in class names (xabbuh)
30+
* bug #15376 [ClassMapGenerator] Skip ::class constant (WouterJ)
31+
* bug #15170 [Config] type specific check for emptiness (xabbuh)
32+
* bug #15411 Fix the handling of null as locale in the stub intl classes (stof)
33+
* bug #15413 Fix the return value on error for intl methods returning arrays (stof)
34+
* bug #15392 Fix missing _route parameter notice in RouterListener logging case (Haehnchen)
35+
* bug #15386 [php7] Fix for substr() always returning a string (nicolas-grekas)
36+
* bug #15355 [Security] Do not save the target path in the session for a stateless firewall (lyrixx)
37+
* bug #15330 [Console] Fix console output with closed stdout (jakzal)
38+
* bug #15326 [Security] fix check for empty usernames (xabbuh)
39+
* bug #15249 [HttpFoundation] [PSR-7] Allow to use resources as content body and to return resources from string content (dunglas)
40+
* bug #15282 [HttpFoundation] Behaviour change in PHP7 for substr (Nicofuma)
41+
1042
* 2.3.31 (2015-07-13)
1143

1244
* bug #15248 Added 'default' color (jaytaph)

‎CONTRIBUTORS.md

Copy file name to clipboardExpand all lines: CONTRIBUTORS.md
+39-22Lines changed: 39 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ Symfony is the result of the work of many people who made the code better
1414
- Kris Wallsmith (kriswallsmith)
1515
- Christophe Coevoet (stof)
1616
- Jakub Zalas (jakubzalas)
17-
- Pascal Borreli (pborreli)
1817
- Christian Flothmann (xabbuh)
18+
- Pascal Borreli (pborreli)
1919
- Hugo Hamon (hhamon)
2020
- Joseph Bielawski (stloyd)
2121
- Karma Dordrak (drak)
@@ -26,15 +26,16 @@ Symfony is the result of the work of many people who made the code better
2626
- Jean-François Simon (jfsimon)
2727
- Benjamin Eberlei (beberlei)
2828
- Igor Wiedler (igorw)
29-
- Martin Hasoň (hason)
3029
- Abdellatif Ait boudad (aitboudad)
30+
- Martin Hasoň (hason)
3131
- Eriksen Costa (eriksencosta)
3232
- Grégoire Pineau (lyrixx)
3333
- Wouter De Jong (wouterj)
3434
- Jonathan Wage (jwage)
35+
- Javier Eguiluz (javier.eguiluz)
36+
- Kévin Dunglas (dunglas)
3537
- Alexandre Salomé (alexandresalome)
3638
- William Durand (couac)
37-
- Kévin Dunglas (dunglas)
3839
- ornicar
3940
- stealth35 ‏ (stealth35)
4041
- Alexander Mols (asm89)
@@ -84,43 +85,42 @@ Symfony is the result of the work of many people who made the code better
8485
- excelwebzone
8586
- Jacob Dreesen (jdreesen)
8687
- Matthias Pigulla (mpdude)
87-
- Javier Eguiluz (javier.eguiluz)
8888
- Fabien Pennequin (fabienpennequin)
8989
- Peter Rehm (rpet)
9090
- Peter Kokot (maastermedia)
9191
- Gordon Franke (gimler)
9292
- Robert Schönthal (digitalkaoz)
93+
- Jérémy DERUSSÉ (jderusse)
9394
- Dariusz Ruminski
9495
- Michal Piotrowski (eventhorizon)
9596
- Stefano Sala (stefano.sala)
97+
- David Buchmann (dbu)
9698
- Juti Noppornpitak (shiroyuki)
9799
- Sebastian Hörl (blogsh)
98100
- Daniel Gomes (danielcsgomes)
99101
- Hidenori Goto (hidenorigoto)
100-
- David Buchmann (dbu)
102+
- Alexander Schwenn (xelaris)
101103
- Guilherme Blanco (guilhermeblanco)
102-
- Jérémy DERUSSÉ (jderusse)
103104
- Pablo Godel (pgodel)
104105
- Eric GELOEN (gelo)
106+
- Vladimir Reznichenko (kalessil)
105107
- Jérémie Augustin (jaugustin)
106-
- Alexander Schwenn (xelaris)
108+
- Issei Murasawa (issei_m)
107109
- Rafael Dohms (rdohms)
108110
- Arnaud Kleinpeter (nanocom)
111+
- Iltar van der Berg (kjarli)
109112
- Joshua Thijssen
110-
- Vladimir Reznichenko (kalessil)
111113
- Tigran Azatyan (tigranazatyan)
112-
- Issei Murasawa (issei_m)
114+
- Sebastiaan Stok (sstok)
113115
- Richard Shank (iampersistent)
114116
- Clemens Tolboom
115117
- Helmer Aaviksoo
116-
- Sebastiaan Stok (sstok)
117118
- Hiromi Hishida (77web)
118119
- Matthieu Ouellette-Vachon (maoueh)
119120
- Michał Pipa (michal.pipa)
120121
- Amal Raghav (kertz)
121122
- Jonathan Ingram (jonathaningram)
122123
- Artur Kotyrba
123-
- Iltar van der Berg
124124
- Rouven Weßling (realityking)
125125
- Andréia Bohner (andreia)
126126
- Dmitrii Chekaliuk (lazyhammer)
@@ -146,6 +146,7 @@ Symfony is the result of the work of many people who made the code better
146146
- fivestar
147147
- Dominique Bongiraud
148148
- Leszek Prabucki (l3l0)
149+
- Alexander M. Turek (derrabus)
149150
- François Zaninotto (fzaninotto)
150151
- Dustin Whittle (dustinwhittle)
151152
- jeff
@@ -164,7 +165,6 @@ Symfony is the result of the work of many people who made the code better
164165
- Francois Zaninotto
165166
- Alexander Kotynia (olden)
166167
- Daniel Tschinder
167-
- Alexander M. Turek (derrabus)
168168
- Elnur Abdurrakhimov (elnur)
169169
- John Kary (johnkary)
170170
- Manuel Reinhard (sprain)
@@ -197,6 +197,7 @@ Symfony is the result of the work of many people who made the code better
197197
- Robert Kiss (kepten)
198198
- Ruben Gonzalez (rubenrua)
199199
- Kim Hemsø Rasmussen (kimhemsoe)
200+
- Diego Saint Esteben (dosten)
200201
- Florian Lonqueu-Brochard (florianlb)
201202
- Tom Van Looy (tvlooy)
202203
- Wouter Van Hecke
@@ -212,6 +213,7 @@ Symfony is the result of the work of many people who made the code better
212213
- Andrew Moore (finewolf)
213214
- Bertrand Zuchuat (garfield-fr)
214215
- Gabor Toth (tgabi333)
216+
- Grégoire Paris (greg0ire)
215217
- Alex Pott
216218
- realmfoo
217219
- Thomas Tourlourat (armetiz)
@@ -232,8 +234,11 @@ Symfony is the result of the work of many people who made the code better
232234
- Thomas Schulz (king2500)
233235
- Marco Pivetta (ocramius)
234236
- Ricard Clau (ricardclau)
237+
- Lorenz Schori
238+
- Giorgio Premi
235239
- Erin Millard
236240
- Matthew Lewinski (lewinski)
241+
- Marcos Sánchez
237242
- alquerci
238243
- Francesco Levorato
239244
- Vitaliy Zakharov (zakharovvi)
@@ -260,13 +265,13 @@ Symfony is the result of the work of many people who made the code better
260265
- Kirill chEbba Chebunin (chebba)
261266
- Greg Thornton (xdissent)
262267
- Baptiste Clavié (talus)
263-
- Grégoire Paris (greg0ire)
264268
- Costin Bereveanu (schniper)
265269
- Loïc Chardonnet (gnusat)
266270
- Marek Kalnik (marekkalnik)
267271
- Vyacheslav Salakhutdinov (megazoll)
268272
- Hassan Amouhzi
269273
- Tamas Szijarto
274+
- Michaël Perrin (michael.perrin)
270275
- Pavel Volokitin (pvolok)
271276
- Endre Fejes
272277
- Tobias Naumann (tna)
@@ -297,8 +302,8 @@ Symfony is the result of the work of many people who made the code better
297302
- Brian King
298303
- Michel Salib (michelsalib)
299304
- geoffrey
300-
- Lorenz Schori
301305
- Jeanmonod David (jeanmonod)
306+
- Thomas Lallement (raziel057)
302307
- Jan Schumann
303308
- Niklas Fiekas
304309
- lancergr
@@ -370,6 +375,7 @@ Symfony is the result of the work of many people who made the code better
370375
- Florian Rey (nervo)
371376
- Rodrigo Borrego Bernabé (rodrigobb)
372377
- Denis Gorbachev (starfall)
378+
- Titouan Galopin (tgalopin)
373379
- Steven Surowiec
374380
- Kevin Saliou (kbsali)
375381
- Daniel Tschinder
@@ -393,7 +399,6 @@ Symfony is the result of the work of many people who made the code better
393399
- Mantas Var (mvar)
394400
- Sebastian Krebs
395401
- Christopher Davis (chrisguitarguy)
396-
- Thomas Lallement (raziel057)
397402
- alcaeus
398403
- vitaliytv
399404
- Markus Bachmann (baachi)
@@ -449,6 +454,7 @@ Symfony is the result of the work of many people who made the code better
449454
- Simon Schick (simonsimcity)
450455
- redstar504
451456
- Hossein Bukhamsin
457+
- origaminal
452458
- Paweł Wacławczyk (pwc)
453459
- Oleg Zinchenko (cystbear)
454460
- Johannes Klauss (cloppy)
@@ -538,13 +544,15 @@ Symfony is the result of the work of many people who made the code better
538544
- Tony Malzhacker
539545
- Cyril Quintin (cyqui)
540546
- Gerard van Helden (drm)
547+
- Johnny Peck (johnnypeck)
541548
- David Romaní
542549
- Patrick Allaert
543550
- Gustavo Falco (gfalco)
544551
- Matt Robinson (inanimatt)
545552
- Aleksey Podskrebyshev
546553
- David Marín Carreño (davefx)
547554
- Jörn Lang (j.lang)
555+
- Leo Feyer
548556
- mwsaz
549557
- Benoît Bourgeois
550558
- corphi
@@ -562,7 +570,6 @@ Symfony is the result of the work of many people who made the code better
562570
- Christian Morgan
563571
- Alexander Miehe (engerim)
564572
- Morgan Auchede (mauchede)
565-
- Titouan Galopin (tgalopin)
566573
- Don Pinkster
567574
- Maksim Muruev
568575
- Emil Einarsson
@@ -595,6 +602,7 @@ Symfony is the result of the work of many people who made the code better
595602
- Reece Fowell (reecefowell)
596603
- stefan.r
597604
- Matthieu Napoli (mnapoli)
605+
- Alexandru Furculita (afurculita)
598606
- Ben Ramsey (ramsey)
599607
- Christian Jul Jensen
600608
- The Whole Life to Learn
@@ -610,7 +618,6 @@ Symfony is the result of the work of many people who made the code better
610618
- Sander Marechal
611619
- Radosław Benkel
612620
- Gennady Telegin (gtelegin)
613-
- Marcos Sánchez
614621
- ttomor
615622
- Mei Gwilym (meigwilym)
616623
- Michael H. Arieli (excelwebzone)
@@ -647,6 +654,7 @@ Symfony is the result of the work of many people who made the code better
647654
- Per Sandström (per)
648655
- Goran Juric
649656
- Laurent Ghirardotti (laurentg)
657+
- Nicolas Macherey
650658
- Jan Rosier (rosier)
651659
- Lin Clark
652660
- Jeremy David (jeremy.david)
@@ -695,7 +703,6 @@ Symfony is the result of the work of many people who made the code better
695703
- Jochen Bayer (jocl)
696704
- Jeremy Bush
697705
- wizhippo
698-
- Diego Saint Esteben (dosten)
699706
- rpg600
700707
- Péter Buri (burci)
701708
- Davide Borsatto (davide.borsatto)
@@ -750,7 +757,6 @@ Symfony is the result of the work of many people who made the code better
750757
- Jakub Kulhan
751758
- Mo Di (modi)
752759
- Jeroen van den Enden (stoefke)
753-
- origaminal
754760
- Quique Porta (quiqueporta)
755761
- Tomasz Szymczyk (karion)
756762
- ConneXNL
@@ -782,8 +788,10 @@ Symfony is the result of the work of many people who made the code better
782788
- Adrien Gallou (agallou)
783789
- Karol Sójko (karolsojko)
784790
- sl_toto (sl_toto)
791+
- Walter Dal Mut (wdalmut)
785792
- Sébastien HOUZÉ
786793
- Jingyu Wang
794+
- Daniel Espendiller
787795
- steveYeah
788796
- Samy Dindane (dinduks)
789797
- Keri Henare (kerihenare)
@@ -823,10 +831,12 @@ Symfony is the result of the work of many people who made the code better
823831
- Tadcka
824832
- Beth Binkovitz
825833
- Romain Geissler
834+
- Tomaz Ahlin
826835
- Benjamin Cremer (bcremer)
827836
- Marcus Stöhr (dafish)
828837
- Emmanuel Vella (emmanuel.vella)
829838
- Carsten Nielsen (phreaknerd)
839+
- Mathieu Rochette
830840
- Jay Severson
831841
- René Kerner
832842
- Nathaniel Catchpole
@@ -861,6 +871,7 @@ Symfony is the result of the work of many people who made the code better
861871
- Sebastian Ionescu
862872
- Thomas Ploch
863873
- Simon Neidhold
874+
- Valentin VALCIU
864875
- Kevin Dew
865876
- James Cowgill
866877
- Nicolas Schwartz (nicoschwartz)
@@ -911,6 +922,7 @@ Symfony is the result of the work of many people who made the code better
911922
- 2manypeople
912923
- Wing
913924
- Thomas Bibb
925+
- Matt Farmer
914926
- catch
915927
- Alexandre Segura
916928
- Josef Cech
@@ -936,11 +948,11 @@ Symfony is the result of the work of many people who made the code better
936948
- Manatsawin Hanmongkolchai
937949
- Gunther Konig
938950
- Maciej Schmidt
951+
- nuncanada
939952
- flack
940953
- František Bereň
941954
- Christoph Nissle (derstoffel)
942955
- Ionel Scutelnicu (ionelscutelnicu)
943-
- Johnny Peck (johnnypeck)
944956
- Nicolas Tallefourtané (nicolab)
945957
- Botond Dani (picur)
946958
- Thierry Marianne (thierrymarianne)
@@ -1035,6 +1047,7 @@ Symfony is the result of the work of many people who made the code better
10351047
- Florian Pfitzer (marmelatze)
10361048
- Martin Mayer (martin)
10371049
- Grzegorz Łukaszewicz (newicz)
1050+
- Veres Lajos
10381051
- grifx
10391052
- Robert Campbell
10401053
- Matt Lehner
@@ -1095,11 +1108,11 @@ Symfony is the result of the work of many people who made the code better
10951108
- Kevin Herrera (kherge)
10961109
- Luis Ramón López López (lrlopez)
10971110
- Muriel (metalmumu)
1098-
- Michaël Perrin (michael.perrin)
10991111
- Michael Pohlers (mick_the_big)
11001112
- Cayetano Soriano Gallego (neoshadybeat)
11011113
- Pablo Monterde Perez (plebs)
11021114
- Jimmy Leger (redpanda)
1115+
- Pavel Batanov (scaytrase)
11031116
- Cyrille Jouineau (tuxosaurus)
11041117
- Yorkie Chadwick (yorkie76)
11051118
- Yanick Witschi
@@ -1123,6 +1136,7 @@ Symfony is the result of the work of many people who made the code better
11231136
- Ismail Asci (ismailasci)
11241137
- Simon CONSTANS (kosssi)
11251138
- Kristof Van Cauwenbergh (kristofvc)
1139+
- Tristan Darricau (nicofuma)
11261140
- Ramon Henrique Ornelas (ramonornela)
11271141
- Markus S. (staabm)
11281142
- Till Klampaeckel (till)
@@ -1180,6 +1194,7 @@ Symfony is the result of the work of many people who made the code better
11801194
- Skorney
11811195
- mieszko4
11821196
- Neophy7e
1197+
- bokonet
11831198
- Arrilot
11841199
- Markus Staab
11851200
- Pierre-Louis LAUNAY
@@ -1190,6 +1205,7 @@ Symfony is the result of the work of many people who made the code better
11901205
- Abdulkadir N. A.
11911206
- Yevgen Kovalienia
11921207
- Sema
1208+
- Elan Ruusamäe
11931209
- Thorsten Hallwas
11941210
- Michael Squires
11951211
- Norman Soetbeer
@@ -1203,7 +1219,6 @@ Symfony is the result of the work of many people who made the code better
12031219
- Penny Leach
12041220
- Richard Trebichavský
12051221
- g123456789l
1206-
- Giorgio Premi
12071222
- oscartv
12081223
- DanSync
12091224
- Peter Zwosta
@@ -1261,6 +1276,7 @@ Symfony is the result of the work of many people who made the code better
12611276
- samuel laulhau (lalop)
12621277
- Laurent Bachelier (laurentb)
12631278
- Jérôme Parmentier (lctrs)
1279+
- Florent Viel (luxifer)
12641280
- Matthieu Moquet (mattketmo)
12651281
- Moritz Borgmann (mborgmann)
12661282
- Matt Drollette (mdrollette)
@@ -1279,6 +1295,7 @@ Symfony is the result of the work of many people who made the code better
12791295
- Rich Sage (richsage)
12801296
- Ruud Kamphuis (ruudk)
12811297
- Bart Ruysseveldt (ruyss)
1298+
- Sascha Dens (saschadens)
12821299
- scourgen hung (scourgen)
12831300
- Sebastian Busch (sebu)
12841301
- André Filipe Gonçalves Neves (seven)

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.