Skip to content

Commit

Permalink
Merge branch '2.8' into 3.1
Browse files Browse the repository at this point in the history 
* 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
  • Loading branch information
@nicolas-grekas
nicolas-grekas committed Aug 5, 2016
2 parents be4255e + 2f9921f commit 6f390d4
Show file tree
Hide file tree
Showing 26 changed files with 138 additions and 81 deletions.
31 changes: 31 additions & 0 deletions CHANGELOG-3.0.md
View file
Expand Up @@ -7,6 +7,37 @@ in 3.0 minor versions.
To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v3.0.0...v3.0.1

* 3.0.9 (2016-07-30)

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

* 3.0.8 (2016-06-30)

* bug #19217 [HttpKernel] Inline ValidateRequestListener logic into HttpKernel (nicolas-grekas)
Expand Down
50 changes: 31 additions & 19 deletions CONTRIBUTORS.md
View file
Expand Up @@ -53,16 +53,16 @@ Symfony is the result of the work of many people who made the code better
- Bilal Amarni (bamarni)
- Florin Patan (florinpatan)
- Peter Rehm (rpet)
- Ener-Getick (energetick)
- Iltar van der Berg (kjarli)
- Kevin Bond (kbond)
- Gábor Egyed (1ed)
- Ener-Getick (energetick)
- Michel Weimerskirch (mweimerskirch)
- Eric Clemmons (ericclemmons)
- Iltar van der Berg (kjarli)
- Matthias Pigulla (mpdude)
- Andrej Hudec (pulzarraider)
- Christian Raue
- Charles Sarrazin (csarrazi)
- Matthias Pigulla (mpdude)
- Deni
- Henrik Westphal (snc)
- Dariusz Górecki (canni)
Expand All @@ -75,25 +75,25 @@ Symfony is the result of the work of many people who made the code better
- Pierre du Plessis (pierredup)
- Bart van den Burg (burgov)
- Jordan Alliot (jalliot)
- Graham Campbell (graham)
- John Wards (johnwards)
- Toni Uebernickel (havvg)
- Fran Moreno (franmomu)
- Graham Campbell (graham)
- Antoine Hérault (herzult)
- Robin Chalas (chalas_r)
- Arnaud Le Blanc (arnaud-lb)
- Jérôme Tamarelle (gromnan)
- Paráda József (paradajozsef)
- Michal Piotrowski (eventhorizon)
- Tim Nagel (merk)
- Brice BERNARD (brikou)
- Robin Chalas (chalas_r)
- Konstantin Myakshin (koc)
- Alexander M. Turek (derrabus)
- Dariusz Ruminski
- marc.weistroff
- Issei Murasawa (issei_m)
- lenar
- Włodzimierz Gajda (gajdaw)
- Konstantin Myakshin (koc)
- Baptiste Clavié (talus)
- Alexander Schwenn (xelaris)
- Florian Voutzinos (florianv)
Expand All @@ -111,11 +111,12 @@ Symfony is the result of the work of many people who made the code better
- Gordon Franke (gimler)
- Eric GELOEN (gelo)
- David Buchmann (dbu)
- Théo FIDRY (theofidry)
- Robert Schönthal (digitalkaoz)
- Florian Lonqueu-Brochard (florianlb)
- Titouan Galopin (tgalopin)
- Stefano Sala (stefano.sala)
- Juti Noppornpitak (shiroyuki)
- Titouan Galopin (tgalopin)
- Tigran Azatyan (tigranazatyan)
- Sebastian Hörl (blogsh)
- Daniel Gomes (danielcsgomes)
Expand Down Expand Up @@ -162,6 +163,7 @@ Symfony is the result of the work of many people who made the code better
- bronze1man
- sun (sun)
- Larry Garfield (crell)
- Vyacheslav Pavlov
- Martin Schuhfuß (usefulthink)
- Matthieu Bontemps (mbontemps)
- Pierre Minnieur (pminnieur)
Expand Down Expand Up @@ -220,8 +222,10 @@ Symfony is the result of the work of many people who made the code better
- Joseph Rouff (rouffj)
- Félix Labrecque (woodspire)
- GordonsLondon
- jeremyFreeAgent (jeremyfreeagent)
- Jan Sorgalla (jsor)
- Ray
- Grégoire Paris (greg0ire)
- Chekote
- Thomas Adam
- Albert Casademont (acasademont)
Expand Down Expand Up @@ -253,12 +257,11 @@ Symfony is the result of the work of many people who made the code better
- Andrew Moore (finewolf)
- Bertrand Zuchuat (garfield-fr)
- Gabor Toth (tgabi333)
- Grégoire Paris (greg0ire)
- Alex Pott
- realmfoo
- jeremyFreeAgent (jeremyfreeagent)
- Thomas Tourlourat (armetiz)
- Andrey Esaulov (andremaha)
- Tobias Nyholm (tobias)
- Grégoire Passault (gregwar)
- Ismael Ambrosi (iambrosi)
- Uwe Jäger (uwej711)
Expand All @@ -275,6 +278,7 @@ Symfony is the result of the work of many people who made the code better
- Francesc Rosàs (frosas)
- Massimiliano Arione (garak)
- Julien Galenski (ruian)
- Andreas Schempp (aschempp)
- Bongiraud Dominique
- janschoenherr
- Thomas Schulz (king2500)
Expand All @@ -288,6 +292,7 @@ Symfony is the result of the work of many people who made the code better
- Erin Millard
- Artur Melo (restless)
- Matthew Lewinski (lewinski)
- Magnus Nordlander (magnusnordlander)
- alquerci
- Francesco Levorato
- Vitaliy Zakharov (zakharovvi)
Expand All @@ -301,6 +306,7 @@ Symfony is the result of the work of many people who made the code better
- Felix Labrecque
- Yaroslav Kiliba
- Terje Bråten
- Roland Franssen (ro0)
- Robbert Klarenbeek (robbertkl)
- Alessandro Chitolina
- JhonnyL
Expand All @@ -315,7 +321,6 @@ Symfony is the result of the work of many people who made the code better
- Costin Bereveanu (schniper)
- Loïc Chardonnet (gnusat)
- Marek Kalnik (marekkalnik)
- Tobias Nyholm (tobias)
- Vyacheslav Salakhutdinov (megazoll)
- Hassan Amouhzi
- Tamas Szijarto
Expand Down Expand Up @@ -345,7 +350,6 @@ Symfony is the result of the work of many people who made the code better
- Marc Morales Valldepérez (kuert)
- Jean-Baptiste GOMOND (mjbgo)
- Vadim Kharitonov (virtuozzz)
- Andreas Schempp (aschempp)
- Oscar Cubo Medina (ocubom)
- Karel Souffriau
- Christophe L. (christophelau)
Expand All @@ -366,7 +370,6 @@ Symfony is the result of the work of many people who made the code better
- Mihai Stancu
- Olivier Dolbeau (odolbeau)
- Jan Rosier (rosier)
- Magnus Nordlander (magnusnordlander)
- vagrant
- EdgarPE
- Florian Pfitzer (marmelatze)
Expand All @@ -382,7 +385,6 @@ Symfony is the result of the work of many people who made the code better
- Christian Schmidt
- Marek Štípek (maryo)
- Marcin Sikoń (marphi)
- Roland Franssen (ro0)
- Dominik Zogg (dominik.zogg)
- Marek Pietrzak
- Chad Sikorra (chadsikorra)
Expand All @@ -391,6 +393,7 @@ Symfony is the result of the work of many people who made the code better
- Christian Wahler
- Mathieu Lemoine
- Gintautas Miselis
- David Badura (davidbadura)
- Zander Baldwin
- Adam Harvey
- Alex Bakhturin
Expand All @@ -406,6 +409,7 @@ Symfony is the result of the work of many people who made the code better
- Benoît Burnichon (bburnichon)
- Sebastian Bergmann
- Pablo Díez (pablodip)
- SpacePossum
- Kevin McBride
- Philipp Rieber (bicpi)
- Manuel de Ruiter (manuel)
Expand All @@ -417,7 +421,6 @@ Symfony is the result of the work of many people who made the code better
- ondrowan
- Barry vd. Heuvel (barryvdh)
- Jerzy Zawadzki (jzawadzki)
- Théo FIDRY (theofidry)
- Evan S Kaufman (evanskaufman)
- mcben
- Jérôme Vieilledent (lolautruche)
Expand Down Expand Up @@ -507,6 +510,7 @@ Symfony is the result of the work of many people who made the code better
- Wang Jingyu
- Åsmund Garfors
- Maxime Douailin
- Jean Pasdeloup (pasdeloup)
- Javier López (loalf)
- Reinier Kip
- Geoffrey Brier (geoffrey-brier)
Expand Down Expand Up @@ -542,7 +546,6 @@ Symfony is the result of the work of many people who made the code better
- Arturs Vonda
- Sascha Grossenbacher
- Szijarto Tamas
- David Badura (davidbadura)
- Catalin Dan
- Stephan Vock
- Benjamin Zikarsky (bzikarsky)
Expand Down Expand Up @@ -576,7 +579,6 @@ Symfony is the result of the work of many people who made the code better
- Peter Ward
- Dominik Ritter (dritter)
- Sebastian Grodzicki (sgrodzicki)
- SpacePossum
- Martin Hujer (martinhujer)
- Pascal Helfenstein
- Baldur Rensch (brensch)
Expand All @@ -594,6 +596,7 @@ Symfony is the result of the work of many people who made the code better
- Lars Vierbergen
- Dennis Hotson
- Andrew Tchircoff (andrewtch)
- Remi Collet
- michaelwilliams
- 1emming
- Leevi Graham (leevigraham)
Expand Down Expand Up @@ -655,6 +658,7 @@ Symfony is the result of the work of many people who made the code better
- Cyril Quintin (cyqui)
- Gerard van Helden (drm)
- Johnny Peck (johnnypeck)
- Ivan Menshykov
- David Romaní
- Patrick Allaert
- Gustavo Falco (gfalco)
Expand Down Expand Up @@ -714,6 +718,7 @@ Symfony is the result of the work of many people who made the code better
- Benoît Merlet (trompette)
- Koen Kuipers
- datibbaw
- Rootie
- Raul Fraile (raulfraile)
- sensio
- Patrick Kaufmann
Expand Down Expand Up @@ -747,6 +752,7 @@ Symfony is the result of the work of many people who made the code better
- fabios
- Sander Coolen (scoolen)
- Nicolas Le Goff (nlegoff)
- Ben Oman
- Manuele Menozzi
- Anton Babenko (antonbabenko)
- Irmantas Šiupšinskas (irmantas)
Expand Down Expand Up @@ -795,6 +801,7 @@ Symfony is the result of the work of many people who made the code better
- Ken Marfilla (marfillaster)
- benatespina (benatespina)
- Denis Kop
- Maxime STEINHAUSSER
- jfcixmedia
- Martijn Evers
- Benjamin Paap (benjaminpaap)
Expand Down Expand Up @@ -823,6 +830,7 @@ Symfony is the result of the work of many people who made the code better
- Marcin Chwedziak
- hjkl
- Tony Cosentino (tony-co)
- Alexander Cheprasov
- Rodrigo Díez Villamuera (rodrigodiez)
- e-ivanov
- Jochen Bayer (jocl)
Expand Down Expand Up @@ -853,6 +861,7 @@ Symfony is the result of the work of many people who made the code better
- David de Boer (ddeboer)
- Gilles Doge (gido)
- abulford
- antograssiot
- Brooks Boyd
- Roger Webb
- Dmitriy Simushev
Expand Down Expand Up @@ -893,7 +902,6 @@ Symfony is the result of the work of many people who made the code better
- Aharon Perkel
- Abdul.Mohsen B. A. A
- Benoît Burnichon
- Remi Collet
- pthompson
- Malaney J. Hill
- Alexandre Pavy
Expand Down Expand Up @@ -944,6 +952,7 @@ Symfony is the result of the work of many people who made the code better
- ChrisC
- Ilya Biryukov
- Kim Laï Trinh
- Jonatan Männchen
- Jason Desrosiers
- m.chwedziak
- Philip Frank
Expand Down Expand Up @@ -1042,6 +1051,8 @@ Symfony is the result of the work of many people who made the code better
- Nicolas Badey (nico-b)
- Shane Preece (shane)
- Geoff
- georaldc
- Malte Wunsch
- wusuopu
- povilas
- Alessandro Tagliapietra (alex88)
Expand Down Expand Up @@ -1091,6 +1102,7 @@ Symfony is the result of the work of many people who made the code better
- David Stone
- Jovan Perovic (jperovic)
- Pablo Maria Martelletti (pmartelletti)
- Zhuravlev Alexander (scif)
- Yassine Guedidi (yguedidi)
- Luis Muñoz
- Andreas
Expand All @@ -1100,6 +1112,7 @@ Symfony is the result of the work of many people who made the code better
- Manatsawin Hanmongkolchai
- Gunther Konig
- Maciej Schmidt
- Dennis Væversted
- nuncanada
- flack
- František Bereň
Expand Down Expand Up @@ -1193,6 +1206,7 @@ Symfony is the result of the work of many people who made the code better
- Dan Patrick (mdpatrick)
- Rares Vlaseanu (raresvla)
- tante kinast (tante)
- Jérémy M (th3mouk)
- Vincent LEFORT (vlefort)
- Sadicov Vladimir (xtech)
- Alexander Zogheb
Expand Down Expand Up @@ -1280,7 +1294,6 @@ Symfony is the result of the work of many people who made the code better
- Muriel (metalmumu)
- Michael Pohlers (mick_the_big)
- Cayetano Soriano Gallego (neoshadybeat)
- Jean Pasdeloup (pasdeloup)
- Patrick McDougle (patrick-mcdougle)
- Pablo Monterde Perez (plebs)
- Jimmy Leger (redpanda)
Expand Down Expand Up @@ -1379,7 +1392,6 @@ Symfony is the result of the work of many people who made the code better
- Jon Cave
- Sébastien HOUZE
- Abdulkadir N. A.
- Ivan Menshykov
- Yevgen Kovalienia
- Lebnik
- Sema
Expand Down
2 changes: 1 addition & 1 deletion ...undle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/SessionController.php
View file
Expand Up @@ -45,7 +45,7 @@ public function welcomeAction(Request $request, $name = null)

public function logoutAction(Request $request)
{
$request->getSession('session')->invalidate();
$request->getSession()->invalidate();

return new Response('Session cleared.');
}
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/SecurityBundle/Command/UserPasswordEncoderCommand.php
View file
Expand Up @@ -105,7 +105,7 @@ protected function execute(InputInterface $input, OutputInterface $output)

return 1;
}
$passwordQuestion = $this->createPasswordQuestion($input, $output);
$passwordQuestion = $this->createPasswordQuestion();
$password = $io->askQuestion($passwordQuestion);
}

Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
View file
Expand Up @@ -78,7 +78,7 @@ public static function createSystemCache($namespace, $defaultLifetime, $version,
return $fs;
}

$apcu = new ApcuAdapter($namespace, $defaultLifetime / 5, $version);
$apcu = new ApcuAdapter($namespace, (int) $defaultLifetime / 5, $version);
if (null !== $logger) {
$apcu->setLogger($logger);
}
Expand Down

0 comments on commit 6f390d4

Please sign in to comment.