Skip to content

Commit d277c16

Browse files
committed
Merge branch '2.6' into 2.7
* 2.6: (36 commits) [Debug] fix error message on double exception [Validator] make DateTime objects represented as strings in the violation message. [RFC] [DebugBundle] [HttpKernel] Avoid using container as dependency for DumpListener Upgrade information for the Translation component regarding the new LoggingTranslator class. [WebProfilerBundle] Remove usage of app.request in search bar template Fix initialized() with aliased services fix data type in docblock Rename Symfony2 to Symfony bumped Symfony version to 2.6.0 updated VERSION for 2.6.0-BETA2 updated CHANGELOG for 2.6.0-BETA2 [Debug] fix ENT_SUBSTITUTE usage compare version using PHP_VERSION_ID backport symfony#12489 remove an unneeded check Remove block submit_widget reformat code as suggested by @fabpot Fix typo Make `\Request::get` more performant. properly set request attributes in controller test ...
2 parents 6a63cc5 + 18c4ac1 commit d277c16

File tree

68 files changed

+594
-266
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+594
-266
lines changed

CHANGELOG-2.3.md

+15
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,21 @@ 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.22 (2014-11-20)
11+
12+
* bug #12525 [Bundle][FrameworkBundle] be smarter when guessing the document root (xabbuh)
13+
* bug #12296 [SecurityBundle] Authentication entry point is only registered with firewall exception listener, not with authentication listeners (rjkip)
14+
* bug #12393 [DependencyInjection] inlined factory not referenced (boekkooi)
15+
* bug #12436 [Filesystem] Fixed case for empty folder (yosmanyga)
16+
* bug #12370 [Yaml] improve error message for multiple documents (xabbuh)
17+
* bug #12170 [Form] fix form handling with OPTIONS request method (Tobion)
18+
* bug #12235 [Validator] Fixed Regex::getHtmlPattern() to work with complex and negated patterns (webmozart)
19+
* bug #12326 [Session] remove invalid hack in session regenerate (Tobion)
20+
* bug #12341 [Kernel] ensure session is saved before sending response (Tobion)
21+
* bug #12329 [Routing] serialize the compiled route to speed things up (Tobion)
22+
* bug #12316 Break infinite loop while resolving aliases (chx)
23+
* bug #12313 [Security][listener] change priority of switchuser (aitboudad)
24+
1025
* 2.3.21 (2014-10-24)
1126

1227
* bug #11696 [Form] Fix #11694 - Enforce options value type check in some form types (kix)

CHANGELOG-2.5.md

+20
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,26 @@ in 2.5 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.5.0...v2.5.1
99

10+
* 2.5.7 (2014-11-20)
11+
12+
* bug #12525 [Bundle][FrameworkBundle] be smarter when guessing the document root (xabbuh)
13+
* bug #12296 [SecurityBundle] Authentication entry point is only registered with firewall exception listener, not with authentication listeners (rjkip)
14+
* bug #12489 [FrameworkBundle] Fix server run in case the router script does not exist (romainneutron)
15+
* bug #12443 [HttpKernel] Adding support for invokable controllers in the RequestDataCollector (jameshalsall)
16+
* bug #12393 [DependencyInjection] inlined factory not referenced (boekkooi)
17+
* bug #12436 [Filesystem] Fixed case for empty folder (yosmanyga)
18+
* bug #12397 [Routing] fix BC (nicolas-grekas)
19+
* bug #12382 [Routing] removed errors from git (HeinZawHtet)
20+
* bug #12370 [Yaml] improve error message for multiple documents (xabbuh)
21+
* bug #12170 [Form] fix form handling with OPTIONS request method (Tobion)
22+
* bug #12235 [Validator] Fixed Regex::getHtmlPattern() to work with complex and negated patterns (webmozart)
23+
* bug #12326 [Session] remove invalid hack in session regenerate (Tobion)
24+
* bug #12341 [Kernel] ensure session is saved before sending response (Tobion)
25+
* bug #12329 [Routing] serialize the compiled route to speed things up (Tobion)
26+
* bug #12291 [Form] Fixed usage of "name" variable in form_start block (webmozart)
27+
* bug #12316 Break infinite loop while resolving aliases (chx)
28+
* bug #12313 [Security][listener] change priority of switchuser (aitboudad)
29+
1030
* 2.5.6 (2014-10-24)
1131

1232
* bug #11696 [Form] Fix #11694 - Enforce options value type check in some form types (kix)

CHANGELOG-2.6.md

+19
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,25 @@ in 2.6 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.6.0...v2.6.1
99

10+
* 2.6.0-BETA2 (2014-11-23)
11+
12+
* bug #12555 [Debug] fix ENT_SUBSTITUTE usage (nicolas-grekas)
13+
* feature #12538 [FrameworkBundle] be smarter when guessing the document root (xabbuh)
14+
* bug #12539 [TwigBundle] properly set request attributes in controller test (xabbuh)
15+
* bug #12267 [Form][WebProfiler] Empty form names fix (kix)
16+
* bug #12137 [FrameworkBundle] cache:clear command fills *.php.meta files with wrong data (Strate)
17+
* bug #12525 [Bundle][FrameworkBundle] be smarter when guessing the document root (xabbuh)
18+
* bug #12296 [SecurityBundle] Authentication entry point is only registered with firewall exception listener, not with authentication listeners (rjkip)
19+
* bug #12446 [Twig/DebugBundle] move dump extension registration (nicolas-grekas)
20+
* bug #12489 [FrameworkBundle] Fix server run in case the router script does not exist (romainneutron)
21+
* feature #12404 [Form] Remove timezone options from DateType and TimeType (jakzal)
22+
* bug #12487 [DomCrawler] Added support for 'link' tags in the Link class (StephaneSeng)
23+
* bug #12490 [FrameworkBundle] Fix server start in case the PHP binary is not found (romainneutron)
24+
* bug #12443 [HttpKernel] Adding support for invokable controllers in the RequestDataCollector (jameshalsall)
25+
* bug #12393 [DependencyInjection] inlined factory not referenced (boekkooi)
26+
* bug #12411 [VarDumper] Use Unicode Control Pictures (nicolas-grekas)
27+
* bug #12436 [Filesystem] Fixed case for empty folder (yosmanyga)
28+
1029
* 2.6.0-BETA1 (2014-11-03)
1130

1231
* first beta release

CONTRIBUTORS.md

+26-12
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
CONTRIBUTORS
22
============
33

4-
Symfony2 is the result of the work of many people who made the code better
4+
Symfony is the result of the work of many people who made the code better
55
(see http://symfony.com/contributors for more information):
66

77
- Fabien Potencier (fabpot)
@@ -24,9 +24,9 @@ Symfony2 is the result of the work of many people who made the code better
2424
- Benjamin Eberlei (beberlei)
2525
- Igor Wiedler (igorw)
2626
- Hugo Hamon (hhamon)
27+
- Nicolas Grekas (nicolas-grekas)
2728
- Martin Hasoň (hason)
2829
- Eriksen Costa (eriksencosta)
29-
- Nicolas Grekas (nicolas-grekas)
3030
- Christian Flothmann (xabbuh)
3131
- Jonathan Wage (jwage)
3232
- Grégoire Pineau (lyrixx)
@@ -40,8 +40,8 @@ Symfony2 is the result of the work of many people who made the code better
4040
- Saša Stamenković (umpirsky)
4141
- Miha Vrhovnik
4242
- Henrik Bjørnskov (henrikbjorn)
43-
- Konstantin Kudryashov (everzet)
4443
- Wouter De Jong (wouterj)
44+
- Konstantin Kudryashov (everzet)
4545
- Bilal Amarni (bamarni)
4646
- Florin Patan (florinpatan)
4747
- Eric Clemmons (ericclemmons)
@@ -65,8 +65,8 @@ Symfony2 is the result of the work of many people who made the code better
6565
- Luis Cordova (cordoval)
6666
- Arnaud Le Blanc (arnaud-lb)
6767
- Kevin Bond (kbond)
68-
- Tim Nagel (merk)
6968
- Ait Boudad Abdellatif (aitboudad)
69+
- Tim Nagel (merk)
7070
- Brice BERNARD (brikou)
7171
- marc.weistroff
7272
- lenar
@@ -120,6 +120,7 @@ Symfony2 is the result of the work of many people who made the code better
120120
- Andreas Hucks (meandmymonkey)
121121
- Andréia Bohner (andreia)
122122
- Noel Guilbert (noel)
123+
- Peter Rehm (rpet)
123124
- Charles Sarrazin (csarrazi)
124125
- bronze1man
125126
- sun (sun)
@@ -138,7 +139,6 @@ Symfony2 is the result of the work of many people who made the code better
138139
- Sven Paulus (subsven)
139140
- Lars Strojny (lstrojny)
140141
- Joel Wurtz (brouznouf)
141-
- Peter Rehm (rpet)
142142
- Rui Marinho (ruimarinho)
143143
- Matthias Pigulla (mpdude)
144144
- Julien Brochet (mewt)
@@ -173,6 +173,7 @@ Symfony2 is the result of the work of many people who made the code better
173173
- jdhoek
174174
- Nikita Konstantinov
175175
- Wodor Wodorski
176+
- Iltar van der Berg
176177
- julien pauli (jpauli)
177178
- Beau Simensen (simensen)
178179
- Robert Kiss (kepten)
@@ -185,6 +186,7 @@ Symfony2 is the result of the work of many people who made the code better
185186
- Chris Smith (cs278)
186187
- Florian Klein (docteurklein)
187188
- Manuel Kiessling (manuelkiessling)
189+
- Daniel Wehner
188190
- Atsuhiro KUBO (iteman)
189191
- Andrew Moore (finewolf)
190192
- Bertrand Zuchuat (garfield-fr)
@@ -207,7 +209,6 @@ Symfony2 is the result of the work of many people who made the code better
207209
- janschoenherr
208210
- Marco Pivetta (ocramius)
209211
- Ricard Clau (ricardclau)
210-
- Iltar van der Berg
211212
- Erin Millard
212213
- John Kary (johnkary)
213214
- Matthew Lewinski (lewinski)
@@ -246,6 +247,7 @@ Symfony2 is the result of the work of many people who made the code better
246247
- Shein Alexey
247248
- Joe Lencioni
248249
- Kai
250+
- Karoly Negyesi (chx)
249251
- Xavier HAUSHERR
250252
- Albert Jessurum (ajessu)
251253
- Laszlo Korte
@@ -301,7 +303,6 @@ Symfony2 is the result of the work of many people who made the code better
301303
- Iker Ibarguren (ikerib)
302304
- Ricardo Oliveira (ricardolotr)
303305
- ondrowan
304-
- Daniel Wehner
305306
- Evan S Kaufman (evanskaufman)
306307
- mcben
307308
- Maks Slesarenko
@@ -311,6 +312,7 @@ Symfony2 is the result of the work of many people who made the code better
311312
- Ioan Negulescu
312313
- Jakub Škvára (jskvara)
313314
- Andrew Udvare (audvare)
315+
- Sarah Khalil (saro0h)
314316
- alexpods
315317
- Erik Trapman (eriktrapman)
316318
- De Cock Xavier (xdecock)
@@ -334,8 +336,8 @@ Symfony2 is the result of the work of many people who made the code better
334336
- Lenar Lõhmus
335337
- Zach Badgett (zachbadgett)
336338
- Aurélien Fredouelle
337-
- Karoly Negyesi (chx)
338339
- Pavel Campr (pcampr)
340+
- Disquedur
339341
- Geoffrey Tran (geoff)
340342
- Jan Behrens
341343
- Sebastian Krebs
@@ -363,6 +365,7 @@ Symfony2 is the result of the work of many people who made the code better
363365
- Maxime Douailin
364366
- Javier López (loalf)
365367
- Dustin Dobervich (dustin10)
368+
- Warnar Boekkooi
366369
- Alexander M. Turek (derrabus)
367370
- Sebastian Marek (proofek)
368371
- Erkhembayar Gantulga (erheme318)
@@ -421,6 +424,7 @@ Symfony2 is the result of the work of many people who made the code better
421424
- Venu
422425
- Lars Vierbergen
423426
- Mark Challoner
427+
- Dennis Hotson
424428
- Andrew Tchircoff (andrewtch)
425429
- michaelwilliams
426430
- 1emming
@@ -431,6 +435,7 @@ Symfony2 is the result of the work of many people who made the code better
431435
- John Bohn (jbohn)
432436
- Andrew Hilobok (hilobok)
433437
- Christian Soronellas (theunic)
438+
- Yosmany Garcia (yosmanyga)
434439
- Daniel Beyer
435440
- Jérôme Vieilledent (lolautruche)
436441
- Degory Valentine
@@ -480,9 +485,9 @@ Symfony2 is the result of the work of many people who made the code better
480485
- grizlik
481486
- Derek ROTH
482487
- Shin Ohno (ganchiku)
488+
- Geert De Deckere (geertdd)
483489
- Jan Kramer (jankramer)
484490
- abdul malik ikhsan (samsonasik)
485-
- Sarah Khalil (saro0h)
486491
- Timothée Barray (tyx)
487492
- Benjamin Laugueux (yzalis)
488493
- Christian Morgan
@@ -531,6 +536,7 @@ Symfony2 is the result of the work of many people who made the code better
531536
- Radosław Benkel
532537
- ttomor
533538
- Mei Gwilym (meigwilym)
539+
- Michael H. Arieli (excelwebzone)
534540
- Luciano Mammino (loige)
535541
- fabios
536542
- Sander Coolen (scoolen)
@@ -540,6 +546,7 @@ Symfony2 is the result of the work of many people who made the code better
540546
- Anton Babenko (antonbabenko)
541547
- Irmantas Šiupšinskas (irmantas)
542548
- Danilo Silva
549+
- Stepan Anchugov (kix)
543550
- Zachary Tong (polyfractal)
544551
- Hryhorii Hrebiniuk
545552
- dantleech
@@ -567,7 +574,6 @@ Symfony2 is the result of the work of many people who made the code better
567574
- Boris Vujicic (boris.vujicic)
568575
- Max Beutel
569576
- Catalin Dan
570-
- Warnar Boekkooi
571577
- Piotr Antosik (antek88)
572578
- Artem Lopata
573579
- Marcos Quesada (marcos_quesada)
@@ -592,6 +598,7 @@ Symfony2 is the result of the work of many people who made the code better
592598
- Daniel Mecke (daniel_mecke)
593599
- Matteo Giachino (matteosister)
594600
- Alex Demchenko (pilot)
601+
- Tadas Gliaubicas (tadcka)
595602
- Benoit Garret
596603
- Thomas Royer (cydonia7)
597604
- DerManoMann
@@ -708,6 +715,7 @@ Symfony2 is the result of the work of many people who made the code better
708715
- Max Summe
709716
- WedgeSama
710717
- Felds Liscia
718+
- James Halsall (jaitsu)
711719
- Maxime Veber (nek-)
712720
- Tadcka
713721
- Beth Binkovitz
@@ -734,7 +742,6 @@ Symfony2 is the result of the work of many people who made the code better
734742
- r1pp3rj4ck
735743
- Robert Queck
736744
- mlively
737-
- Dennis Hotson
738745
- Fabian Steiner (fabstei)
739746
- Klaus Silveira (klaussilveira)
740747
- Thomas Chmielowiec (chmielot)
@@ -780,6 +787,7 @@ Symfony2 is the result of the work of many people who made the code better
780787
- Martin Eckhardt
781788
- Denis Zunke
782789
- Jonathan Poston
790+
- Adrian Olek (adrianolek)
783791
- Przemysław Piechota (kibao)
784792
- Leonid Terentyev (li0n)
785793
- Adam Prager (padam87)
@@ -800,7 +808,6 @@ Symfony2 is the result of the work of many people who made the code better
800808
- Paul Seiffert (seiffert)
801809
- Vasily Khayrulin (sirian)
802810
- Stefan Koopmanschap (skoop)
803-
- Yosmany Garcia (yosmanyga)
804811
- Ivan Kurnosov
805812
- stloyd
806813
- Chris Tickner
@@ -891,6 +898,7 @@ Symfony2 is the result of the work of many people who made the code better
891898
- Joel Marcey
892899
- David Christmann
893900
- root
901+
- James Hudson
894902
- Tom Maguire
895903
- David Zuelke
896904
- Pierre Rineau
@@ -906,6 +914,7 @@ Symfony2 is the result of the work of many people who made the code better
906914
- grifx
907915
- Robert Campbell
908916
- Matt Lehner
917+
- Hein Zaw Htet™
909918
- Ruben Kruiswijk
910919
- Michael J
911920
- Alex Pods
@@ -944,7 +953,9 @@ Symfony2 is the result of the work of many people who made the code better
944953
- Vincent Composieux (eko)
945954
- Franz Liedke (franzliedke)
946955
- gondo (gondo)
956+
- Gusakov Nikita (hell0w0rd)
947957
- Osman Üngür (import)
958+
- Jelle Bekker (jbekker)
948959
- Ian Jenkins (jenkoian)
949960
- Jorge Martin (jorgemartind)
950961
- Kevin Herrera (kherge)
@@ -973,6 +984,7 @@ Symfony2 is the result of the work of many people who made the code better
973984
- Daniele Cesarini (ijanki)
974985
- Ismail Asci (ismailasci)
975986
- Simon CONSTANS (kosssi)
987+
- Kristof Van Cauwenbergh (kristofvc)
976988
- Ramon Henrique Ornelas (ramonornela)
977989
- Till Klampaeckel (till)
978990
- Tobias Weinert (tweini)
@@ -1003,6 +1015,7 @@ Symfony2 is the result of the work of many people who made the code better
10031015
- patrick-mcdougle
10041016
- Dariusz Czech
10051017
- Anonymous User
1018+
- Eric J. Duran
10061019
- cmfcmf
10071020
- Drew Butler
10081021
- Steve Müller
@@ -1118,6 +1131,7 @@ Symfony2 is the result of the work of many people who made the code better
11181131
- Vincent (vincent1870)
11191132
- Eugene Babushkin (warl)
11201133
- Xavier Amado (xamado)
1134+
- Dawid Pakuła (zulusx)
11211135
- Florent Cailhol
11221136
- szymek
11231137
- craigmarvelley

0 commit comments

Comments
 (0)