8000 Merge branch '2.7' into 2.8 · symfony/symfony@af81bb5 · GitHub
[go: up one dir, main page]

Skip to content

Commit af81bb5

Browse files
Merge branch '2.7' into 2.8
* 2.7: Remove some unused variables, properties and methods [ExpressionLanguage] Fix parse error on 5.3 [HttpKernel] remove noisy frame in controller stack traces [ExpressionLanguage] throw an SyntaxError instead of letting a undefined index notice Fix php doc in Table class bumped Symfony version to 2.7.40 updated VERSION for 2.7.39 update CONTRIBUTORS for 2.7.39 updated CHANGELOG for 2.7.39
2 parents e8b5aa1 + 40ced3a commit af81bb5

File tree

18 files changed

+72
-55
lines changed

18 files changed

+72
-55
lines changed

CHANGELOG-2.7.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,20 @@ in 2.7 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.7.0...v2.7.1
99

10+
* 2.7.39 (2017-12-04)
11+
12+
* bug #25278 Fix for missing whitespace control modifier in form layout (kubawerlos)
13+
* bug #25236 [Form][TwigBridge] Fix collision between view properties and form fields (yceruto)
14+
* bug #25258 [link] Prevent warnings when running link with 2.7 (dunglas)
15+
* bug #24750 [Validator] ExpressionValidator should use OBJECT_TO_STRING (Simperfit)
16+
* bug #25182 [HttpFoundation] AutExpireFlashBag should not clear new flashes (Simperfit, sroze)
17+
* bug #25152 [Form] Don't rely on `Symfony\Component\HttpFoundation\File\File` if http-foundation isn't in FileType (issei-m)
18+
* bug #24987 [Console] Fix global console flag when used in chain (Simperfit)
19+
* bug #25043 [Yaml] added ability for substitute aliases when mapping is on single line (Michał Strzelecki, xabbuh)
20+
* bug #25102 [Form] Fixed ContextErrorException in FileType (chihiro-adachi)
21+
* bug #25130 [DI] Fix handling of inlined definitions by ContainerBuilder (nicolas-grekas)
22+
* bug #24956 Fix ambiguous pattern (weltling)
23+
1024
* 2.7.38 (2017-11-16)
1125

1226
* security #24995 Validate redirect targets using the session cookie domain (nicolas-grekas)

CONTRIBUTORS.md

Lines changed: 32 additions & 19 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
- Victor Berchet (victor)
1515
- Johannes S (johannes)
1616
- Jakub Zalas (jakubzalas)
17-
- Kris Wallsmith (kriswallsmith)
1817
- Kévin Dunglas (dunglas)
18+
- Kris Wallsmith (kriswallsmith)
1919
- Ryan Weaver (weaverryan)
2020
- Javier Eguiluz (javier.eguiluz)
2121
- Maxime Steinhausser (ogizanagi)
@@ -29,8 +29,8 @@ Symfony is the result of the work of many people who made the code better
2929
- Joseph Bielawski (stloyd)
3030
- Karma Dordrak (drak)
3131
- Lukas Kahwe Smith (lsmith)
32-
- Martin Hasoň (hason)
3332
- Roland Franssen (ro0)
33+
- Martin Hasoň (hason)
3434
- Jeremy Mikola (jmikola)
3535
- Jean-François Simon (jfsimon)
3636
- Benjamin Eberlei (beberlei)
@@ -52,24 +52,24 @@ Symfony is the result of the work of many people who made the code better
5252
- Peter Rehm (rpet)
5353
- Saša Stamenković (umpirsky)
5454
- Henrik Bjørnskov (henrikbjorn)
55+
- Yonel Ceruto (yonelceruto)
5556
- Miha Vrhovnik
5657
- Matthias Pigulla (mpdude)
5758
- Diego Saint Esteben (dii3g0)
5859
- Konstantin Kudryashov (everzet)
5960
- Bilal Amarni (bamarni)
60-
- Yonel Ceruto (yonelceruto)
61-
- Dany Maillard (maidmaid)
6261
- Kevin Bond (kbond)
62+
- Dany Maillard (maidmaid)
63+
- Pierre du Plessis (pierredup)
6364
- Florin Patan (florinpatan)
6465
- Jérémy DERUSSÉ (jderusse)
65-
- Pierre du Plessis (pierredup)
6666
- Gábor Egyed (1ed)
6767
- Michel Weimerskirch (mweimerskirch)
6868
- Andrej Hudec (pulzarraider)
69+
- Alexander M. Turek (derrabus)
6970
- Eric Clemmons (ericclemmons)
7071
- Jáchym Toušek (enumag)
7172
- Charles Sarrazin (csarrazi)
72-
- Alexander M. Turek (derrabus)
7373
- Konstantin Myakshin (koc)
7474
- Christian Raue
7575
- Arnout Boks (aboks)
@@ -79,6 +79,7 @@ Symfony is the result of the work of many people who made the code better
7979
- Titouan Galopin (tgalopin)
8080
- Douglas Greenshields (shieldo)
8181
- Tobias Nyholm (tobias)
82+
- Issei Murasawa (issei_m)
8283
- Lee McDermott
8384
- Brandon Turner
8485
- Luis Cordova (cordoval)
@@ -91,13 +92,14 @@ Symfony is the result of the work of many people who made the code better
9192
- John Wards (johnwards)
9293
- Dariusz Ruminski
9394
- Fran Moreno (franmomu)
94-
- Issei Murasawa (issei_m)
9595
- Antoine Hérault (herzult)
9696
- Paráda József (paradajozsef)
9797
- Arnaud Le Blanc (arnaud-lb)
9898
- Maxime STEINHAUSSER
9999
- Michal Piotrowski (eventhorizon)
100+
- Samuel ROZE (sroze)
100101
- Tim Nagel (merk)
102+
- Amrouche Hamza (simperfit)
101103
- Brice BERNARD (brikou)
102104
- Baptiste Clavié (talus)
103105
- Vladimir Reznichenko (kalessil)
@@ -126,6 +128,7 @@ Symfony is the result of the work of many people who made the code better
126128
- Sebastiaan Stok (sstok)
127129
- Stefano Sala (stefano.sala)
128130
- Evgeniy (ewgraf)
131+
- Grégoire Paris (greg0ire)
129132
- Vincent AUBERT (vincent)
130133
- Juti Noppornpitak (shiroyuki)
131134
- Tigran Azatyan (tigranazatyan)
@@ -135,7 +138,6 @@ Symfony is the result of the work of many people who made the code better
135138
- Guilherme Blanco (guilhermeblanco)
136139
- Pablo Godel (pgodel)
137140
- Jérémie Augustin (jaugustin)
138-
- Grégoire Paris (greg0ire)
139141
- Andréia Bohner (andreia)
140142
- Rafael Dohms (rdohms)
141143
- Arnaud Kleinpeter (nanocom)
@@ -149,6 +151,7 @@ Symfony is the result of the work of many people who made the code better
149151
- Vyacheslav Pavlov
150152
- Richard van Laak (rvanlaak)
151153
- Javier Spagnoletti (phansys)
154+
- Julien Falque (julienfalque)
152155
- Richard Shank (iampersistent)
153156
- Thomas Rabaix (rande)
154157
- Rouven Weßling (realityking)
@@ -160,7 +163,6 @@ Symfony is the result of the work of many people who made the code better
160163
- Matthieu Ouellette-Vachon (maoueh)
161164
- Michał Pipa (michal.pipa)
162165
- Dawid Nowak
163-
- Julien Falque (julienfalque)
164166
- Amal Raghav (kertz)
165167
- Jonathan Ingram (jonathaningram)
166168
- Artur Kotyrba
@@ -171,8 +173,6 @@ Symfony is the result of the work of many people who made the code better
171173
- Warnar Boekkooi (boekkooi)
172174
- Dmitrii Chekaliuk (lazyhammer)
173175
- Clément JOBEILI (dator)
174-
- Amrouche Hamza
175-
- Samuel ROZE (sroze)
176176
- Daniel Espendiller
177177
- Possum
178178
- Dorian Villet (gnutix)
@@ -190,6 +190,7 @@ Symfony is the result of the work of many people who made the code better
190190
- Stepan Anchugov (kix)
191191
- bronze1man
192192
- sun (sun)
193+
- Valentin Udaltsov (vudaltsov)
193194
- Larry Garfield (crell)
194195
- Martin Schuhfuß (usefulthink)
195196
- apetitpa
@@ -248,7 +249,6 @@ Symfony is the result of the work of many people who made the code better
248249
- Pierre-Yves LEBECQ (pylebecq)
249250
- Jordan Samouh (jordansamouh)
250251
- Jakub Kucharovic (jkucharovic)
251-< F42D /span>
- Valentin Udaltsov (vudaltsov)
252252
- Uwe Jäger (uwej711)
253253
- Eugene Leonovich (rybakit)
254254
- Filippo Tessarotto
@@ -261,6 +261,7 @@ Symfony is the result of the work of many people who made the code better
261261
- Nikolay Labinskiy (e-moe)
262262
- Leo Feyer
263263
- Chekote
264+
- gadelat (gadelat)
264265
- Thomas Adam
265266
- Albert Casademont (acasademont)
266267
- Jhonny Lidfors (jhonne)
@@ -299,8 +300,8 @@ Symfony is the result of the work of many people who made the code better
299300
- Thomas Tourlourat (armetiz)
300301
- Andrey Esaulov (andremaha)
301302
- Grégoire Passault (gregwar)
303+
- Jerzy Zawadzki (jzawadzki)
302304
- Ismael Ambrosi (iambrosi)
303-
- gadelat (gadelat)
304305
- Baptiste Lafontaine
305306
- Aurelijus Valeiša (aurelijus)
306307
- Victor Bocharsky (bocharsky_bw)
@@ -345,6 +346,7 @@ Symfony is the result of the work of many people who made the code better
345346
- Yaroslav Kiliba
346347
- Terje Bråten
347348
- Robbert Klarenbeek (robbertkl)
349+
- Edi Modrić (emodric)
348350
- Thomas Calvet (fancyweb)
349351
- Niels Keurentjes (curry684)
350352
- JhonnyL
@@ -364,7 +366,6 @@ Symfony is the result of the work of many people who made the code better
364366
- Loïc Chardonnet (gnusat)
365367
- Marek Kalnik (marekkalnik)
366368
- Vyacheslav Salakhutdinov (megazoll)
367-
- Jerzy Zawadzki (jzawadzki)
368369
- Hassan Amouhzi
369370
- Tamas Szijarto
370371
- Pavel Volokitin (pvolok)
@@ -375,6 +376,7 @@ Symfony is the result of the work of many people who made the code better
375376
- Tobias Naumann (tna)
376377
- Daniel Beyer
377378
- Shein Alexey
379+
- Alex Rock Ancelet (pierstoval)
378380
- Romain Gautier (mykiwi)
379381
- Joe Lencioni
380382
- Daniel Tschinder
@@ -434,7 +436,6 @@ Symfony is the result of the work of many people who made the code better
434436
- cedric lombardot (cedriclombardot)
435437
- Jonas Flodén (flojon)
436438
- Thomas Perez (scullwm)
437-
- Edi Modrić (emodric)
438439
- Marcin Sikoń (marphi)
439440
- Dominik Zogg (dominik.zogg)
440441
- Marek Pietrzak
@@ -446,6 +447,7 @@ Symfony is the result of the work of many people who made the code better
446447
- Rob Bast
447448
- Zander Baldwin
448449
- Adam Harvey
450+
- Anton Bakai
449451
- Maxime Veber (nek-)
450452
- Alex Bakhturin
451453
- Yanick Witschi (toflar)
@@ -495,7 +497,6 @@ Symfony is the result of the work of many people who made the code better
495497
- Arjen van der Meijden
496498
- Michele Locati
497499
- Dariusz Ruminski
498-
- Alex Rock Ancelet (pierstoval)
499500
- Erik Trapman (eriktrapman)
500501
- De Cock Xavier (xdecock)
501502
- Almog Baku (almogbaku)
@@ -619,7 +620,6 @@ Symfony is the result of the work of many people who made the code better
619620
- Catalin Dan
620621
- Stephan Vock
621622
- Benjamin Zikarsky (bzikarsky)
622-
- Anton Bakai
623623
- Simon Schick (simonsimcity)
624624
- redstar504
625625
- Tristan Roussel
@@ -711,8 +711,10 @@ Symfony is the result of the work of many people who made the code better
711711
- Nikita Nefedov (nikita2206)
712712
- cgonzalez
713713
- Ben
714+
- Mathieu Lechat
714715
- Vincent Composieux (eko)
715716
- Jayson Xu (superjavason)
717+
- Christopher Hertel (chertel)
716718
- Hubert Lenoir (hubert_lenoir)
717719
- Jaik Dean (jaikdean)
718720
- fago
@@ -733,6 +735,7 @@ Symfony is the result of the work of many people who made the code better
733735
- Pierre Vanliefland (pvanliefland)
734736
- Sofiane HADDAG (sofhad)
735737
- frost-nzcr4
738+
- Bozhidar Hristov
736739
- Abhoryo
737740
- Fabian Vogler (fabian)
738741
- Korvin Szanto
@@ -763,6 +766,7 @@ Symfony is the result of the work of many people who made the code better
763766
- Fabien LUCAS (flucas2)
764767
- Jörn Lang (j.lang)
765768
- Omar Yepez (oyepez003)
769+
- Gawain Lynch (gawain)
766770
- mwsaz
767771
- Jelle Kapitein
768772
- Benoît Bourgeois
@@ -925,6 +929,7 @@ Symfony is the result of the work of many people who made the code better
925929
- Christian
926930
- Denis Golubovskiy (bukashk0zzz)
927931
- Sergii Smertin (nfx)
932+
- Michał Strzelecki
928933
- hugofonseca (fonsecas72)
929934
- Martynas Narbutas
930935
- Bailey Parker
@@ -1002,6 +1007,7 @@ Symfony is the result of the work of many people who made the code better
10021007
- Brooks Boyd
10031008
- Roger Webb
10041009
- Dmitriy Simushev
1010+
- pkowalczyk
10051011
- Max Voloshin (maxvoloshin)
10061012
- Nicolas Fabre (nfabre)
10071013
- Raul Rodriguez (raul782)
@@ -1127,6 +1133,7 @@ Symfony is the result of the work of many people who made the code better
11271133
- Max Summe
11281134
- WedgeSama
11291135
- Felds Liscia
1136+
- Chihiro Adachi (chihiro-adachi)
11301137
- Sullivan SENECHAL
11311138
- Tadcka
11321139
- Beth Binkovitz
@@ -1283,6 +1290,7 @@ Symfony is the result of the work of many people who made the code better
12831290
- nuncanada
12841291
- flack
12851292
- František Bereň
1293+
- Jeremiah VALERIE
12861294
- Mike Francis
12871295
- Christoph Nissle (derstoffel)
12881296
- Ionel Scutelnicu (ionelscutelnicu)
@@ -1305,6 +1313,7 @@ Symfony is the result of the work of many people who made the code better
13051313
- Andrew Zhilin (zhil)
13061314
- Oleksii Zhurbytskyi
13071315
- Andy Stanberry
1316+
- Felix Marezki
13081317
- Luiz “Felds” Liscia
13091318
- Thomas Rothe
13101319
- nietonfir
@@ -1352,7 +1361,6 @@ Symfony is the result of the work of many people who made the code better
13521361
- Nicole Cordes
13531362
- Martin Kirilov
13541363
- Bram Van der Sype (brammm)
1355-
- Christopher Hertel (chertel)
13561364
- Guile (guile)
13571365
- Julien Moulin (lizjulien)
13581366
- Mauro Foti (skler)
@@ -1386,7 +1394,6 @@ Symfony is the result of the work of many people who made the code better
13861394
- Bertalan Attila
13871395
- Yannick Bensacq (cibou)
13881396
- Freek Van der Herten (freekmurze)
1389-
- Gawain Lynch (gawain)
13901397
- Luca Genuzio (genuzio)
13911398
- Hans Nilsson (hansnilsson)
13921399
- Andrew Marcinkevičius (ifdattic)
@@ -1444,6 +1451,7 @@ Symfony is the result of the work of many people who made the code better
14441451
- David Windell
14451452
- Gabriel Birke
14461453
- skafandri
1454+
- Derek Bonner
14471455
- Alan Chen
14481456
- Maerlyn
14491457
- Even André Fiskvik
@@ -1487,6 +1495,7 @@ Symfony is the result of the work of many people who made the code better
14871495
- Ian Jenkins (jenkoian)
14881496
- Jorge Martin (jorgemartind)
14891497
- Joeri Verdeyen (jverdeyen)
1498+
- Dmitrii Poddubnyi (karser)
14901499
- Kevin Verschaeve (keversc)
14911500
- Kevin Herrera (kherge)
14921501
- Luis Ramón López López (lrlopez)
@@ -1500,6 +1509,7 @@ Symfony is the result of the work of many people who made the code better
15001509
- Jimmy Leger (redpanda)
15011510
- Marcin Szepczynski (szepczynski)
15021511
- Cyrille Jouineau (tuxosaurus)
1512+
- Vladimir Chernyshev (volch)
15031513
- Yorkie Chadwick (yorkie76)
15041514
- GuillaumeVerdon
15051515
- Ondrej Mirtes
@@ -1582,9 +1592,11 @@ Symfony is the result of the work of many people who made the code better
15821592
- Michael Schneider
15831593
- Cédric Bertolini
15841594
- n-aleha
1595+
- Anatol Belski
15851596
- Şəhriyar İmanov
15861597
- Kaipi Yann
15871598
- Sam Williams
1599+
- Guillaume Aveline
15881600
- Adrian Philipp
15891601
- James Michael DuPont
15901602
- Kasperki
@@ -1744,6 +1756,7 @@ Symfony is the result of the work of many people who made the code better
17441756
- Schuyler Jager (sjager)
17451757
- Pascal Luna (skalpa)
17461758
- Volker (skydiablo)
1759+
- Serkan Yildiz (srknyldz)
17471760
- Julien Sanchez (sumbobyboys)
17481761
- Guillermo Gisinger (t3chn0r)
17491762
- Markus Tacker (tacker)

src/Symfony/Bundle/FrameworkBundle/Templating/Helper/AssetsHelper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public function __construct(Packages $packages)
4343
public function getUrl($path, $packageName = null, $version = null)
4444
{
4545
// BC layer to be removed in 3.0
46-
if (3 === $count = func_num_args()) {
46+
if (3 === func_num_args()) {
4747
@trigger_error('Forcing a version for an asset was deprecated in 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);
4848

4949
$args = func_get_args();

src/Symfony/Component/Console/Helper/Table.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,13 +224,15 @@ public function setRow($column, array $row)
224224
* Renders table to output.
225225
*
226226
* Example:
227+
* <code>
227228
* +---------------+-----------------------+------------------+
228229
* | ISBN | Title | Author |
229230
* +---------------+-----------------------+------------------+
230231
* | 99921-58-10-7 | Divine Comedy | Dante Alighieri |
231232
* | 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens |
232233
* | 960-425-059-0 | The Lord of the Rings | J. R. R. Tolkien |
233234
* +---------------+-----------------------+------------------+
235+
* </code>
234236
*/
235237
public function render()
236238
{
@@ -264,7 +266,7 @@ public function render()
264266
/**
265267
* Renders horizontal header separator.
266268
*
267-
* Example: +-----+-----------+-------+
269+
* Example: <code>+-----+-----------+-------+</code>
268270
*/
269271
private function renderRowSeparator()
270272
{
@@ -295,7 +297,7 @@ private function renderColumnSeparator()
295297
/**
296298
* Renders table row.
297299
*
298-
* Example: | 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens |
300+
* Example: <code>| 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens |</code>
299301
*
300302
* @param array $row
301303
* @param string $cellFormat

0 commit comments

Comments
 (0)
0