Skip to content

Commit 6f390d4

Browse files
Merge branch '2.8' into 3.1
* 2.8: Relax 1 test failing with latest PHP versions bumped Symfony version to 2.8.10 Remove usage of __CLASS__ outside of a class [HttpKernel] Fix variable conflicting name [Process] Fix double-fread() when reading unix pipes [Process] Fix AbstractPipes::write() for a situation seen on HHVM (at least) [Validator] Fix dockblock typehint in XmlFileLoader bumped Symfony version to 2.8.10 updated VERSION for 2.8.9 updated CHANGELOG for 2.8.9 bumped Symfony version to 2.7.17 updated VERSION for 2.7.16 update CONTRIBUTORS for 2.7.16 updated CHANGELOG for 2.7.16 Minor fixes [Console] Overcomplete argument exception message tweak. fixed bad auto merge Console table cleanup undefined offset fix (symfony#19406) [EventDispatcher] Removed unused variable Conflicts: CHANGELOG-2.7.md CHANGELOG-3.0.md src/Symfony/Bridge/Swiftmailer/DataCollector/MessageDataCollector.php src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php src/Symfony/Component/Console/Tests/Helper/LegacyDialogHelperTest.php src/Symfony/Component/Console/Tests/Helper/TableTest.php src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/legacy-container9.php src/Symfony/Component/EventDispatcher/Tests/AbstractEventDispatcherTest.php src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/LegacyPdoSessionHandlerTest.php src/Symfony/Component/HttpKernel/Kernel.php
2 parents be4255e + 2f9921f commit 6f390d4

File tree

26 files changed

+138
-81
lines changed

26 files changed

+138
-81
lines changed

CHANGELOG-3.0.md

+31
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,37 @@ in 3.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/v3.0.0...v3.0.1
99

10+
* 3.0.9 (2016-07-30)
11+
12+
* bug #19470 undefined offset fix (#19406) (ReenExe)
13+
* bug #19300 [HttpKernel] Use flock() for HttpCache's lock files (mpdude)
14+
* bug #19428 [Process] Fix write access check for pipes on Windows (nicolas-grekas)
15+
* bug #19439 [DependencyInjection] Fixed deprecated default message template with XML (jeremyFreeAgent)
16+
* bug #19397 [HttpFoundation] HttpCache refresh stale responses containing an ETag (maennchen)
17+
* bug #19426 [Form] Fix the money form type render with Bootstrap3 (Th3Mouk)
18+
* bug #19422 [DomCrawler] Inherit the namespace cache in subcrawlers (stof)
19+
* bug #19425 [BrowserKit] Uppercase the "GET" method in redirects (jakzal)
20+
* bug #19384 Fix PHP 7.1 related failures (nicolas-grekas)
21+
* bug #19379 [VarDumper] Fix for PHP 7.1 (nicolas-grekas)
22+
* bug #19342 Added class existence check if is_subclass_of() fails in compiler passes (SCIF)
23+
* bug #19369 Fix the DBAL session handler version check for Postgresql (stof)
24+
* bug #19368 [VarDumper] Fix dumping jsons casted as arrays (nicolas-grekas)
25+
* bug #19334 [Security] Fix the retrieval of the last username when using forwarding (stof)
26+
* bug #19321 [HttpFoundation] Add OPTIONS and TRACE to the list of safe methods (dunglas)
27+
* bug #19317 [BrowserKit] Update Client::getAbsoluteUri() for query string only URIs (georaldc)
28+
* bug #19298 [ClassLoader] Fix declared classes being computed when not needed (nicolas-grekas)
29+
* bug #19316 [Validator] Added additional MasterCard range to the CardSchemeValidator (Dennis Væversted)
30+
* bug #19290 [HttpKernel] fixed internal subrequests having an if-modified-since-header (MalteWunsch)
31+
* bug #19307 [Security] Fix deprecated usage of DigestAuthenticationEntryPoint::getKey() in DigestAuthenticationListener (Maxime STEINHAUSSER)
32+
* bug #19309 [DoctrineBridge] added missing error code for constraint. (Koc)
33+
* bug #19306 [Form] fixed bug - name in ButtonBuilder (cheprasov)
34+
* bug #19292 [varDumper] Fix missing usage of ExceptionCaster::$traceArgs (nicolas-grekas)
35+
* bug #19288 [VarDumper] Fix indentation trimming in ExceptionCaster (nicolas-grekas)
36+
* bug #19267 [Validator] UuidValidator must accept a Uuid constraint. (hhamon)
37+
* bug #19186 Fix for #19183 to add support for new PHP MongoDB extension in sessions. (omanizer)
38+
* bug #19253 [Console] Fix block() padding formatting after #19189 (chalasr)
39+
* bug #19218 [Security][Guard] check if session exist before using it (pasdeloup)
40+
1041
* 3.0.8 (2016-06-30)
1142

1243
* bug #19217 [HttpKernel] Inline ValidateRequestListener logic into HttpKernel (nicolas-grekas)

CONTRIBUTORS.md

+31-19
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,16 @@ Symfony is the result of the work of many people who made the code better
5353
- Bilal Amarni (bamarni)
5454
- Florin Patan (florinpatan)
5555
- Peter Rehm (rpet)
56+
- Ener-Getick (energetick)
57+
- Iltar van der Berg (kjarli)
5658
- Kevin Bond (kbond)
5759
- Gábor Egyed (1ed)
58-
- Ener-Getick (energetick)
5960
- Michel Weimerskirch (mweimerskirch)
6061
- Eric Clemmons (ericclemmons)
61-
- Iltar van der Berg (kjarli)
62+
- Matthias Pigulla (mpdude)
6263
- Andrej Hudec (pulzarraider)
6364
- Christian Raue
6465
- Charles Sarrazin (csarrazi)
65-
- Matthias Pigulla (mpdude)
6666
- Deni
6767
- Henrik Westphal (snc)
6868
- Dariusz Górecki (canni)
@@ -75,25 +75,25 @@ Symfony is the result of the work of many people who made the code better
7575
- Pierre du Plessis (pierredup)
7676
- Bart van den Burg (burgov)
7777
- Jordan Alliot (jalliot)
78+
- Graham Campbell (graham)
7879
- John Wards (johnwards)
7980
- Toni Uebernickel (havvg)
8081
- Fran Moreno (franmomu)
81-
- Graham Campbell (graham)
8282
- Antoine Hérault (herzult)
83+
- Robin Chalas (chalas_r)
8384
- Arnaud Le Blanc (arnaud-lb)
8485
- Jérôme Tamarelle (gromnan)
8586
- Paráda József (paradajozsef)
8687
- Michal Piotrowski (eventhorizon)
8788
- Tim Nagel (merk)
8889
- Brice BERNARD (brikou)
89-
- Robin Chalas (chalas_r)
90+
- Konstantin Myakshin (koc)
9091
- Alexander M. Turek (derrabus)
9192
- Dariusz Ruminski
9293
- marc.weistroff
9394
- Issei Murasawa (issei_m)
9495
- lenar
9596
- Włodzimierz Gajda (gajdaw)
96-
- Konstantin Myakshin (koc)
9797
- Baptiste Clavié (talus)
9898
- Alexander Schwenn (xelaris)
9999
- Florian Voutzinos (florianv)
@@ -111,11 +111,12 @@ Symfony is the result of the work of many people who made the code better
111111
- Gordon Franke (gimler)
112112
- Eric GELOEN (gelo)
113113
- David Buchmann (dbu)
114+
- Théo FIDRY (theofidry)
114115
- Robert Schönthal (digitalkaoz)
115116
- Florian Lonqueu-Brochard (florianlb)
117+
- Titouan Galopin (tgalopin)
116118
- Stefano Sala (stefano.sala)
117119
- Juti Noppornpitak (shiroyuki)
118-
- Titouan Galopin (tgalopin)
119120
- Tigran Azatyan (tigranazatyan)
120121
- Sebastian Hörl (blogsh)
121122
- Daniel Gomes (danielcsgomes)
@@ -162,6 +163,7 @@ Symfony is the result of the work of many people who made the code better
162163
- bronze1man
163164
- sun (sun)
164165
- Larry Garfield (crell)
166+
- Vyacheslav Pavlov
165167
- Martin Schuhfuß (usefulthink)
166168
- Matthieu Bontemps (mbontemps)
167169
- Pierre Minnieur (pminnieur)
@@ -220,8 +222,10 @@ Symfony is the result of the work of many people who made the code better
220222
- Joseph Rouff (rouffj)
221223
- Félix Labrecque (woodspire)
222224
- GordonsLondon
225+
- jeremyFreeAgent (jeremyfreeagent)
223226
- Jan Sorgalla (jsor)
224227
- Ray
228+
- Grégoire Paris (greg0ire)
225229
- Chekote
226230
- Thomas Adam
227231
- Albert Casademont (acasademont)
@@ -253,12 +257,11 @@ Symfony is the result of the work of many people who made the code better
253257
- Andrew Moore (finewolf)
254258
- Bertrand Zuchuat (garfield-fr)
255259
- Gabor Toth (tgabi333)
256-
- Grégoire Paris (greg0ire)
257260
- Alex Pott
258261
- realmfoo
259-
- jeremyFreeAgent (jeremyfreeagent)
260262
- Thomas Tourlourat (armetiz)
261263
- Andrey Esaulov (andremaha)
264+
- Tobias Nyholm (tobias)
262265
- Grégoire Passault (gregwar)
263266
- Ismael Ambrosi (iambrosi)
264267
- Uwe Jäger (uwej711)
@@ -275,6 +278,7 @@ Symfony is the result of the work of many people who made the code better
275278
- Francesc Rosàs (frosas)
276279
- Massimiliano Arione (garak)
277280
- Julien Galenski (ruian)
281+
- Andreas Schempp (aschempp)
278282
- Bongiraud Dominique
279283
- janschoenherr
280284
- Thomas Schulz (king2500)
@@ -288,6 +292,7 @@ Symfony is the result of the work of many people who made the code better
288292
- Erin Millard
289293
- Artur Melo (restless)
290294
- Matthew Lewinski (lewinski)
295+
- Magnus Nordlander (magnusnordlander)
291296
- alquerci
292297
- Francesco Levorato
293298
- Vitaliy Zakharov (zakharovvi)
@@ -301,6 +306,7 @@ Symfony is the result of the work of many people who made the code better
301306
- Felix Labrecque
302307
- Yaroslav Kiliba
303308
- Terje Bråten
309+
- Roland Franssen (ro0)
304310
- Robbert Klarenbeek (robbertkl)
305311
- Alessandro Chitolina
306312
- JhonnyL
@@ -315,7 +321,6 @@ Symfony is the result of the work of many people who made the code better
315321
- Costin Bereveanu (schniper)
316322
- Loïc Chardonnet (gnusat)
317323
- Marek Kalnik (marekkalnik)
318-
- Tobias Nyholm (tobias)
319324
- Vyacheslav Salakhutdinov (megazoll)
320325
- Hassan Amouhzi
321326
- Tamas Szijarto
@@ -345,7 +350,6 @@ Symfony is the result of the work of many people who made the code better
345350
- Marc Morales Valldepérez (kuert)
346351
- Jean-Baptiste GOMOND (mjbgo)
347352
- Vadim Kharitonov (virtuozzz)
348-
- Andreas Schempp (aschempp)
349353
- Oscar Cubo Medina (ocubom)
350354
- Karel Souffriau
351355
- Christophe L. (christophelau)
@@ -366,7 +370,6 @@ Symfony is the result of the work of many people who made the code better
366370
- Mihai Stancu
367371
- Olivier Dolbeau (odolbeau)
368372
- Jan Rosier (rosier)
369-
- Magnus Nordlander (magnusnordlander)
370373
- vagrant
371374
- EdgarPE
372375
- Florian Pfitzer (marmelatze)
@@ -382,7 +385,6 @@ Symfony is the result of the work of many people who made the code better
382385
- Christian Schmidt
383386
- Marek Štípek (maryo)
384387
- Marcin Sikoń (marphi)
385-
- Roland Franssen (ro0)
386388
- Dominik Zogg (dominik.zogg)
387389
- Marek Pietrzak
388390
- Chad Sikorra (chadsikorra)
@@ -391,6 +393,7 @@ Symfony is the result of the work of many people who made the code better
391393
- Christian Wahler
392394
- Mathieu Lemoine
393395
- Gintautas Miselis
396+
- David Badura (davidbadura)
394397
- Zander Baldwin
395398
- Adam Harvey
396399
- Alex Bakhturin
@@ -406,6 +409,7 @@ Symfony is the result of the work of many people who made the code better
406409
- Benoît Burnichon (bburnichon)
407410
- Sebastian Bergmann
408411
- Pablo Díez (pablodip)
412+
- SpacePossum
409413
- Kevin McBride
410414
- Philipp Rieber (bicpi)
411415
- Manuel de Ruiter (manuel)
@@ -417,7 +421,6 @@ Symfony is the result of the work of many people who made the code better
417421
- ondrowan
418422
- Barry vd. Heuvel (barryvdh)
419423
- Jerzy Zawadzki (jzawadzki)
420-
- Théo FIDRY (theofidry)
421424
- Evan S Kaufman (evanskaufman)
422425
- mcben
423426
- Jérôme Vieilledent (lolautruche)
@@ -507,6 +510,7 @@ Symfony is the result of the work of many people who made the code better
507510
- Wang Jingyu
508511
- Åsmund Garfors
509512
- Maxime Douailin
513+
- Jean Pasdeloup (pasdeloup)
510514
- Javier López (loalf)
511515
- Reinier Kip
512516
- Geoffrey Brier (geoffrey-brier)
@@ -542,7 +546,6 @@ Symfony is the result of the work of many people who made the code better
542546
- Arturs Vonda
543547
- Sascha Grossenbacher
544548
- Szijarto Tamas
545-
- David Badura (davidbadura)
546549
- Catalin Dan
547550
- Stephan Vock
548551
- Benjamin Zikarsky (bzikarsky)
@@ -576,7 +579,6 @@ Symfony is the result of the work of many people who made the code better
576579
- Peter Ward
577580
- Dominik Ritter (dritter)
578581
- Sebastian Grodzicki (sgrodzicki)
579-
- SpacePossum
580582
- Martin Hujer (martinhujer)
581583
- Pascal Helfenstein
582584
- Baldur Rensch (brensch)
@@ -594,6 +596,7 @@ Symfony is the result of the work of many people who made the code better
594596
- Lars Vierbergen
595597
- Dennis Hotson
596598
- Andrew Tchircoff (andrewtch)
599+
- Remi Collet
597600
- michaelwilliams
598601
- 1emming
599602
- Leevi Graham (leevigraham)
@@ -655,6 +658,7 @@ Symfony is the result of the work of many people who made the code better
655658
- Cyril Quintin (cyqui)
656659
- Gerard van Helden (drm)
657660
- Johnny Peck (johnnypeck)
661+
- Ivan Menshykov
658662
- David Romaní
659663
- Patrick Allaert
660664
- Gustavo Falco (gfalco)
@@ -714,6 +718,7 @@ Symfony is the result of the work of many people who made the code better
714718
- Benoît Merlet (trompette)
715719
- Koen Kuipers
716720
- datibbaw
721+
- Rootie
717722
- Raul Fraile (raulfraile)
718723
- sensio
719724
- Patrick Kaufmann
@@ -747,6 +752,7 @@ Symfony is the result of the work of many people who made the code better
747752
- fabios
748753
- Sander Coolen (scoolen)
749754
- Nicolas Le Goff (nlegoff)
755+
- Ben Oman
750756
- Manuele Menozzi
751757
- Anton Babenko (antonbabenko)
752758
- Irmantas Šiupšinskas (irmantas)
@@ -795,6 +801,7 @@ Symfony is the result of the work of many people who made the code better
795801
- Ken Marfilla (marfillaster)
796802
- benatespina (benatespina)
797803
- Denis Kop
804+
- Maxime STEINHAUSSER
798805
- jfcixmedia
799806
- Martijn Evers
800807
- Benjamin Paap (benjaminpaap)
@@ -823,6 +830,7 @@ Symfony is the result of the work of many people who made the code better
823830
- Marcin Chwedziak
824831
- hjkl
825832
- Tony Cosentino (tony-co)
833+
- Alexander Cheprasov
826834
- Rodrigo Díez Villamuera (rodrigodiez)
827835
- e-ivanov
828836
- Jochen Bayer (jocl)
@@ -853,6 +861,7 @@ Symfony is the result of the work of many people who made the code better
853861
- David de Boer (ddeboer)
854862
- Gilles Doge (gido)
855863
- abulford
864+
- antograssiot
856865
- Brooks Boyd
857866
- Roger Webb
858867
- Dmitriy Simushev
@@ -893,7 +902,6 @@ Symfony is the result of the work of many people who made the code better
893902
- Aharon Perkel
894903
- Abdul.Mohsen B. A. A
895904
- Benoît Burnichon
896-
- Remi Collet
897905
- pthompson
898906
- Malaney J. Hill
899907
- Alexandre Pavy
@@ -944,6 +952,7 @@ Symfony is the result of the work of many people who made the code better
944952
- ChrisC
945953
- Ilya Biryukov
946954
- Kim Laï Trinh
955+
- Jonatan Männchen
947956
- Jason Desrosiers
948957
- m.chwedziak
949958
- Philip Frank
@@ -1042,6 +1051,8 @@ Symfony is the result of the work of many people who made the code better
10421051
- Nicolas Badey (nico-b)
10431052
- Shane Preece (shane)
10441053
- Geoff
1054+
- georaldc
1055+
- Malte Wunsch
10451056
- wusuopu
10461057
- povilas
10471058
- Alessandro Tagliapietra (alex88)
@@ -1091,6 +1102,7 @@ Symfony is the result of the work of many people who made the code better
10911102
- David Stone
10921103
- Jovan Perovic (jperovic)
10931104
- Pablo Maria Martelletti (pmartelletti)
1105+
- Zhuravlev Alexander (scif)
10941106
- Yassine Guedidi (yguedidi)
10951107
- Luis Muñoz
10961108
- Andreas
@@ -1100,6 +1112,7 @@ Symfony is the result of the work of many people who made the code better
11001112
- Manatsawin Hanmongkolchai
11011113
- Gunther Konig
11021114
- Maciej Schmidt
1115+
- Dennis Væversted
11031116
- nuncanada
11041117
- flack
11051118
- František Bereň
@@ -1193,6 +1206,7 @@ Symfony is the result of the work of many people who made the code better
11931206
- Dan Patrick (mdpatrick)
11941207
- Rares Vlaseanu (raresvla)
11951208
- tante kinast (tante)
1209+
- Jérémy M (th3mouk)
11961210
- Vincent LEFORT (vlefort)
11971211
- Sadicov Vladimir (xtech)
11981212
- Alexander Zogheb
@@ -1280,7 +1294,6 @@ Symfony is the result of the work of many people who made the code better
12801294
- Muriel (metalmumu)
12811295
- Michael Pohlers (mick_the_big)
12821296
- Cayetano Soriano Gallego (neoshadybeat)
1283-
- Jean Pasdeloup (pasdeloup)
12841297
- Patrick McDougle (patrick-mcdougle)
12851298
- Pablo Monterde Perez (plebs)
12861299
- Jimmy Leger (redpanda)
@@ -1379,7 +1392,6 @@ Symfony is the result of the work of many people who made the code better
13791392
- Jon Cave
13801393
- Sébastien HOUZE
13811394
- Abdulkadir N. A.
1382-
- Ivan Menshykov
13831395
- Yevgen Kovalienia
13841396
- Lebnik
13851397
- Sema

src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/SessionController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function welcomeAction(Request $request, $name = null)
4545

4646
public function logoutAction(Request $request)
4747
{
48-
$request->getSession('session')->invalidate();
48+
$request->getSession()->invalidate();
4949

5050
return new Response('Session cleared.');
5151
}

src/Symfony/Bundle/SecurityBundle/Command/UserPasswordEncoderCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
105105

106106
return 1;
107107
}
108-
$passwordQuestion = $this->createPasswordQuestion($input, $output);
108+
$passwordQuestion = $this->createPasswordQuestion();
109109
$password = $io->askQuestion($passwordQuestion);
110110
}
111111

src/Symfony/Component/Cache/Adapter/AbstractAdapter.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public static function createSystemCache($namespace, $defaultLifetime, $version,
7878
return $fs;
7979
}
8080

81-
$apcu = new ApcuAdapter($namespace, $defaultLifetime / 5, $version);
81+
$apcu = new ApcuAdapter($namespace, (int) $defaultLifetime / 5, $version);
8282
if (null !== $logger) {
8383
$apcu->setLogger($logger);
8484
}

0 commit comments

Comments
 (0)