Skip to content

Commit d0a97b4

Browse files
Merge branch '3.4' into 4.1
* 3.4: [DoctrineBridge] allow dev versions of Doctrine again bumped Symfony version to 3.4.15 updated VERSION for 3.4.14 updated CHANGELOG for 3.4.14 bumped Symfony version to 2.8.45 updated VERSION for 2.8.44 update CONTRIBUTORS for 2.8.44 updated CHANGELOG for 2.8.44
2 parents 75ece97 + 6c1aa4f commit d0a97b4

File tree

4 files changed

+24
-12
lines changed

4 files changed

+24
-12
lines changed

CHANGELOG-4.0.md

+10
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,16 @@ in 4.0 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/v4.0.0...v4.0.1
99

10+
* 4.0.14 (2018-08-01)
11+
12+
* security #cve-2018-14774 [HttpKernel] fix trusted headers management in HttpCache and InlineFragmentRenderer (nicolas-grekas)
13+
* security #cve-2018-14773 [HttpFoundation] Remove support for legacy and risky HTTP headers (nicolas-grekas)
14+
* bug #28003 [HttpKernel] Fixes invalid REMOTE_ADDR in inline subrequest when configuring trusted proxy with subnet (netiul)
15+
* bug #28007 [FrameworkBundle] fixed guard event names for transitions (destillat)
16+
* bug #28045 [HttpFoundation] Fix Cookie::isCleared (ro0NL)
17+
* bug #28080 [HttpFoundation] fixed using _method parameter with invalid type (Phobetor)
18+
* bug #28052 [HttpKernel] Fix merging bindings for controllers' locators (nicolas-grekas)
19+
1020
* 4.0.13 (2018-07-23)
1121

1222
* bug #28005 [HttpKernel] Fixed templateExists on parse error of the template name (yceruto)

CONTRIBUTORS.md

+11-9
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ Symfony is the result of the work of many people who made the code better
3232
- Lukas Kahwe Smith (lsmith)
3333
- Martin Hasoň (hason)
3434
- Jeremy Mikola (jmikola)
35+
- Samuel ROZE (sroze)
3536
- Jean-François Simon (jfsimon)
3637
- Benjamin Eberlei (beberlei)
3738
- Igor Wiedler (igorw)
38-
- Samuel ROZE (sroze)
3939
- Jules Pietri (heah)
4040
- Eriksen Costa (eriksencosta)
4141
- Guilhem Niot (energetick)
@@ -67,8 +67,8 @@ Symfony is the result of the work of many people who made the code better
6767
- Bilal Amarni (bamarni)
6868
- Jérémy DERUSSÉ (jderusse)
6969
- Florin Patan (florinpatan)
70-
- Mathieu Piot (mpiot)
7170
- Gábor Egyed (1ed)
71+
- Mathieu Piot (mpiot)
7272
- Michel Weimerskirch (mweimerskirch)
7373
- Titouan Galopin (tgalopin)
7474
- Andrej Hudec (pulzarraider)
@@ -101,9 +101,9 @@ Symfony is the result of the work of many people who made the code better
101101
- Paráda József (paradajozsef)
102102
- Arnaud Le Blanc (arnaud-lb)
103103
- Maxime STEINHAUSSER
104+
- Grégoire Paris (greg0ire)
104105
- Michal Piotrowski (eventhorizon)
105106
- Tim Nagel (merk)
106-
- Grégoire Paris (greg0ire)
107107
- Brice BERNARD (brikou)
108108
- Valentin Udaltsov (vudaltsov)
109109
- gadelat (gadelat)
@@ -159,6 +159,7 @@ Symfony is the result of the work of many people who made the code better
159159
- Vyacheslav Pavlov
160160
- Richard van Laak (rvanlaak)
161161
- Richard Shank (iampersistent)
162+
- Jannik Zschiesche (apfelbox)
162163
- Thomas Rabaix (rande)
163164
- Rouven Weßling (realityking)
164165
- Clemens Tolboom
@@ -170,7 +171,6 @@ Symfony is the result of the work of many people who made the code better
170171
- Amal Raghav (kertz)
171172
- Jonathan Ingram (jonathaningram)
172173
- Artur Kotyrba
173-
- Jannik Zschiesche (apfelbox)
174174
- GDIBass
175175
- jeremyFreeAgent (Jérémy Romey) (jeremyfreeagent)
176176
- James Halsall (jaitsu)
@@ -284,6 +284,7 @@ Symfony is the result of the work of many people who made the code better
284284
- Andreas Schempp (aschempp)
285285
- jdhoek
286286
- Pavel Batanov (scaytrase)
287+
- Massimiliano Arione (garak)
287288
- Bob den Otter (bopp)
288289
- Nikita Konstantinov
289290
- Wodor Wodorski
@@ -332,7 +333,6 @@ Symfony is the result of the work of many people who made the code better
332333
- Adrian Rudnik (kreischweide)
333334
- Francesc Rosàs (frosas)
334335
- Romain Pierre (romain-pierre)
335-
- Massimiliano Arione (garak)
336336
- Julien Galenski (ruian)
337337
- Bongiraud Dominique
338338
- janschoenherr
@@ -407,6 +407,7 @@ Symfony is the result of the work of many people who made the code better
407407
- Karoly Negyesi (chx)
408408
- Ivan Kurnosov
409409
- Xavier HAUSHERR
410+
- David Prévot
410411
- Albert Jessurum (ajessu)
411412
- Laszlo Korte
412413
- Miha Vrhovnik
@@ -438,6 +439,7 @@ Symfony is the result of the work of many people who made the code better
438439
- Mihai Stancu
439440
- Olivier Dolbeau (odolbeau)
440441
- Jan Rosier (rosier)
442+
- Alessandro Lai (jean85)
441443
- Arturs Vonda
442444
- Josip Kruslin
443445
- Asmir Mustafic (goetas)
@@ -565,7 +567,6 @@ Symfony is the result of the work of many people who made the code better
565567
- Disquedur
566568
- Michiel Boeckaert (milio)
567569
- Geoffrey Tran (geoff)
568-
- David Prévot
569570
- Jan Behrens
570571
- Mantas Var (mvar)
571572
- Sebastian Krebs
@@ -584,7 +585,6 @@ Symfony is the result of the work of many people who made the code better
584585
- Max Rath (drak3)
585586
- Stéphane Escandell (sescandell)
586587
- Konstantin S. M. Möllers (ksmmoellers)
587-
- Alessandro Lai (jean85)
588588
- James Johnston
589589
- Sinan Eldem
590590
- Alexandre Dupuy (satchette)
@@ -713,6 +713,7 @@ Symfony is the result of the work of many people who made the code better
713713
- Yuen-Chi Lian
714714
- Besnik Br
715715
- Jose Gonzalez
716+
- Oleksii Zhurbytskyi
716717
- Dariusz Ruminski
717718
- Joshua Nye
718719
- Claudio Zizza
@@ -882,6 +883,7 @@ Symfony is the result of the work of many people who made the code better
882883
- datibbaw
883884
- Erik Saunier (snickers)
884885
- Rootie
886+
- Kyle
885887
- Raul Fraile (raulfraile)
886888
- sensio
887889
- Sebastien Morel (plopix)
@@ -1382,6 +1384,7 @@ Symfony is the result of the work of many people who made the code better
13821384
- Matt Wells
13831385
- Nicolas Appriou
13841386
- stloyd
1387+
- Andreas
13851388
- Chris Tickner
13861389
- Andrew Coulton
13871390
- Jeremy Benoist
@@ -1432,7 +1435,6 @@ Symfony is the result of the work of many people who made the code better
14321435
- Nicolas Bastien (nicolas_bastien)
14331436
- Denis (yethee)
14341437
- Andrew Zhilin (zhil)
1435-
- Oleksii Zhurbytskyi
14361438
- Andy Stanberry
14371439
- Felix Marezki
14381440
- Normunds
@@ -1973,7 +1975,6 @@ Symfony is the result of the work of many people who made the code better
19731975
19741976
- AbdElKader Bouadjadja
19751977
- DSeemiller
1976-
- Kyle
19771978
- Jan Emrich
19781979
- Mark Topper
19791980
- Xavier REN
@@ -2001,3 +2002,4 @@ Symfony is the result of the work of many people who made the code better
20012002
- Matej Žilák (teo_sk)
20022003
- Vladislav Vlastovskiy (vlastv)
20032004
- RENAUDIN Xavier (xorrox)
2005+
- Yannick Vanhaeren (yvh)

composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"require": {
1919
"php": "^7.1.3",
2020
"ext-xml": "*",
21-
"doctrine/common": "~2.4@stable",
21+
"doctrine/common": "~2.4",
2222
"fig/link-util": "^1.0",
2323
"twig/twig": "^1.35|^2.4.4",
2424
"psr/cache": "~1.0",
@@ -90,7 +90,7 @@
9090
"doctrine/cache": "~1.6",
9191
"doctrine/data-fixtures": "1.0.*",
9292
"doctrine/dbal": "~2.4",
93-
"doctrine/orm": "~2.4,>=2.4.5,<=2.7.0",
93+
"doctrine/orm": "~2.4,>=2.4.5",
9494
"doctrine/doctrine-bundle": "~1.4",
9595
"monolog/monolog": "~1.11",
9696
"ocramius/proxy-manager": "~0.4|~1.0|~2.0",

src/Symfony/Bridge/Doctrine/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
],
1818
"require": {
1919
"php": "^7.1.3",
20-
"doctrine/common": "~2.4@stable",
20+
"doctrine/common": "~2.4",
2121
"symfony/polyfill-ctype": "~1.8",
2222
"symfony/polyfill-mbstring": "~1.0"
2323
},

0 commit comments

Comments
 (0)