Merge branch '2.7' into 2.8

* 2.7: add @Event annotation for AuthenticationEvents add @Event annotation for KernelEvents bumped Symfony version to 2.7.13 updated VERSION for 2.7.12 update CONTRIBUTORS for 2.7.12 updated CHANGELOG for 2.7.12 bumped Symfony version to 2.3.41 updated VERSION for 2.3.40 update CONTRIBUTORS for 2.3.40 updated CHANGELOG for 2.3.40 Revert "minor #18257 [Routing] Don't needlessly execute strtr's as they are fairly expensive (arjenm)" Revert "fixed CS" [FrameworkBundle] Remove misleading comment bug #17460 [DI] fix ambiguous services schema
2016-05-03 14:21:46 +02:00 · 2016-05-03 14:21:46 +02:00 · a5e6172e12
commit a5e6172e12
parent 6bc7c87147 591fc3a491
8 changed files with 153 additions and 49 deletions
--- a/CHANGELOG-2.3.md
+++ b/CHANGELOG-2.3.md
@ -7,6 +7,35 @@ in 2.3 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/v2.3.0...v2.3.1

+* 2.3.40 (2016-04-29)
+
+ * bug #18246 [DependencyInjection] fix ambiguous services schema (backbone87)
+ * bug #18603 [PropertyAccess] ->getValue() should be read-only (nicolas-grekas)
+ * bug #18280 [Routing] add query param if value is different from default (Tobion)
+ * bug #18515 [Filesystem] Better error handling in remove() (nicolas-grekas)
+ * bug #18449 [PropertyAccess] Fix regression (nicolas-grekas)
+ * bug #18467 [DependencyInjection] Resolve aliases before removing abstract services + add tests (nicolas-grekas)
+ * bug #18460 [DomCrawler] Fix select option with empty value (Matt Wells)
+ * bug #18425 [Security] Fixed SwitchUserListener when exiting an impersonation with AnonymousToken (lyrixx)
+ * bug #18317 [Form] fix "prototype" not required when parent form is not required (HeahDude)
+ * bug #18439 [Logging] Add support for Firefox (43+) in ChromePhpHandler (arjenm)
+ * bug #18385 Detect CLI color support for Windows 10 build 10586 (mlocati)
+ * bug #18426 [EventDispatcher] Try first if the event is Stopped (lyrixx)
+ * bug #18265 Optimize ReplaceAliasByActualDefinitionPass (ajb-in)
+ * bug #18358 [Form] NumberToLocalizedStringTransformer should return floats when possible (nicolas-grekas)
+ * bug #17926 [DependencyInjection] Enable alias for service_container (hason)
+ * bug #18336 [Debug] Fix handling of php7 throwables (nicolas-grekas)
+ * bug #18312 [ClassLoader] Fix storing not-found classes in APC cache (nicolas-grekas)
+ * bug #18255 [HttpFoundation] Fix support of custom mime types with parameters (Ener-Getick)
+ * bug #18259 [PropertyAccess] Backport fixes from 2.7 (nicolas-grekas)
+ * bug #18224 [PropertyAccess] Remove most ref mismatches to improve perf (nicolas-grekas)
+ * bug #18210 [PropertyAccess] Throw an UnexpectedTypeException when the type do not match (dunglas, nicolas-grekas)
+ * bug #18216 [Intl] Fix invalid numeric literal on PHP 7 (nicolas-grekas)
+ * bug #18147 [Validator] EmailValidator cannot extract hostname if email contains multiple @ symbols (natechicago)
+ * bug #18175 [Translation] Add support for fuzzy tags in PoFileLoader (nud)
+ * bug #18179 [Form] Fix NumberToLocalizedStringTransformer::reverseTransform with big integers (ovrflo, nicolas-grekas)
+ * bug #18164 [HttpKernel] set s-maxage only if all responses are cacheable (xabbuh)
+
 * 2.3.39 (2016-03-13)

 * bug #18080 [HttpFoundation] Set the Content-Range header if the requested Range is unsatisfied (jakzal)
--- a/CHANGELOG-2.7.md
+++ b/CHANGELOG-2.7.md
@ -7,6 +7,37 @@ in 2.7 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/v2.7.0...v2.7.1

+* 2.7.12 (2016-04-29)
+
+ * bug #18180 [Form] fixed BC break with pre selection of choices with `ChoiceType` and its children (HeahDude)
+ * bug #18562 [WebProfilerBunde] Give an absolute url in case the request occured from another domain (romainneutron)
+ * bug #18603 [PropertyAccess] ->getValue() should be read-only (nicolas-grekas)
+ * bug #18593 [VarDumper] Fix dumping type hints for non-existing parent classes (nicolas-grekas)
+ * bug #18581 [Console] [TableHelper] make it work with SymfonyStyle. (aitboudad)
+ * bug #18280 [Routing] add query param if value is different from default (Tobion)
+ * bug #18496 [Console] use ANSI escape sequences in ProgressBar overwrite method (alekitto)
+ * bug #18491 [DependencyInjection] anonymous services are always private (xabbuh)
+ * bug #18515 [Filesystem] Better error handling in remove() (nicolas-grekas)
+ * bug #18449 [PropertyAccess] Fix regression (nicolas-grekas)
+ * bug #18429 [Console] Correct time formatting. (camporter)
+ * bug #18467 [DependencyInjection] Resolve aliases before removing abstract services + add tests (nicolas-grekas)
+ * bug #18460 [DomCrawler] Fix select option with empty value (Matt Wells)
+ * bug #18425 [Security] Fixed SwitchUserListener when exiting an impersonation with AnonymousToken (lyrixx)
+ * bug #18317 [Form] fix "prototype" not required when parent form is not required (HeahDude)
+ * bug #18439 [Logging] Add support for Firefox (43+) in ChromePhpHandler (arjenm)
+ * bug #18385 Detect CLI color support for Windows 10 build 10586 (mlocati)
+ * bug #18426 [EventDispatcher] Try first if the event is Stopped (lyrixx)
+ * bug #18394 [FrameworkBundle] Return the invokable service if its name is the class name (dunglas)
+ * bug #18265 Optimize ReplaceAliasByActualDefinitionPass (ajb-in)
+ * bug #18349 [Process] Fix stream_select priority when writing to stdin (nicolas-grekas)
+ * bug #18358 [Form] NumberToLocalizedStringTransformer should return floats when possible (nicolas-grekas)
+ * bug #17926 [DependencyInjection] Enable alias for service_container (hason)
+ * bug #18352 [Debug] Fix case sensitivity checks (nicolas-grekas)
+ * bug #18336 [Debug] Fix handling of php7 throwables (nicolas-grekas)
+ * bug #18354 [FrameworkBundle][TwigBridge] fix high deps tests (xabbuh)
+ * bug #18312 [ClassLoader] Fix storing not-found classes in APC cache (nicolas-grekas)
+ * bug #18298 [Validator] do not treat payload as callback (xabbuh)
+
 * 2.7.11 (2016-03-25)

 * bug #18255 [HttpFoundation] Fix support of custom mime types with parameters (Ener-Getick)
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@ -9,25 +9,25 @@ Symfony is the result of the work of many people who made the code better
 - Bernhard Schussek (bschussek)
 - Tobias Schultze (tobion)
 - Christophe Coevoet (stof)
+ - Christian Flothmann (xabbuh)
 - Jordi Boggiano (seldaek)
 - Victor Berchet (victor)
- - Christian Flothmann (xabbuh)
 - Johannes S (johannes)
 - Kris Wallsmith (kriswallsmith)
 - Jakub Zalas (jakubzalas)
 - Ryan Weaver (weaverryan)
 - Javier Eguiluz (javier.eguiluz)
 - Hugo Hamon (hhamon)
+ - Kévin Dunglas (dunglas)
 - Abdellatif Ait boudad (aitboudad)
 - Pascal Borreli (pborreli)
- - Kévin Dunglas (dunglas)
 - Joseph Bielawski (stloyd)
 - Wouter De Jong (wouterj)
 - Karma Dordrak (drak)
 - Romain Neutron (romain)
 - Lukas Kahwe Smith (lsmith)
- - Jeremy Mikola (jmikola)
 - Martin Hasoň (hason)
+ - Jeremy Mikola (jmikola)
 - Jean-François Simon (jfsimon)
 - Benjamin Eberlei (beberlei)
 - Igor Wiedler (igorw)
@ -42,6 +42,7 @@ Symfony is the result of the work of many people who made the code better
 - ornicar
 - stealth35 ‏ (stealth35)
 - Alexander Mols (asm89)
+ - Jules Pietri (heah)
 - Francis Besset (francisbesset)
 - Bulat Shakirzyanov (avalanche123)
 - Saša Stamenković (umpirsky)
@ -56,13 +57,15 @@ Symfony is the result of the work of many people who made the code better
 - Michel Weimerskirch (mweimerskirch)
 - Eric Clemmons (ericclemmons)
 - Andrej Hudec (pulzarraider)
+ - Peter Rehm (rpet)
 - Christian Raue
 - Matthias Pigulla (mpdude)
- - Peter Rehm (rpet)
 - Deni
 - Henrik Westphal (snc)
 - Dariusz Górecki (canni)
 - Arnout Boks (aboks)
+ - Iltar van der Berg (kjarli)
+ - Ener-Getick (energetick)
 - Douglas Greenshields (shieldo)
 - Lee McDermott
 - Brandon Turner
@ -71,21 +74,18 @@ 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)
+ - Charles Sarrazin (csarrazi)
 - John Wards (johnwards)
 - Toni Uebernickel (havvg)
 - Fran Moreno (franmomu)
 - Graham Campbell (graham)
 - Antoine Hérault (herzult)
- - Iltar van der Berg (kjarli)
 - Arnaud Le Blanc (arnaud-lb)
 - Jérôme Tamarelle (gromnan)
- - Jules Pietri (heah)
 - Michal Piotrowski (eventhorizon)
 - Tim Nagel (merk)
 - Paráda József (paradajozsef)
 - Brice BERNARD (brikou)
- - Ener-Getick (energetick)
- - Charles Sarrazin (csarrazi)
 - Alexander M. Turek (derrabus)
 - Dariusz Ruminski
 - marc.weistroff
@ -93,6 +93,7 @@ Symfony is the result of the work of many people who made the code better
 - Włodzimierz Gajda (gajdaw)
 - Alexander Schwenn (xelaris)
 - Florian Voutzinos (florianv)
+ - Konstantin Myakshin (koc)
 - Colin Frei
 - Adrien Brault (adrienbrault)
 - Joshua Thijssen
@ -100,19 +101,18 @@ Symfony is the result of the work of many people who made the code better
 - Peter Kokot (maastermedia)
 - excelwebzone
 - Jacob Dreesen (jdreesen)
- - Konstantin Myakshin (koc)
 - Jérémy DERUSSÉ (jderusse)
 - Vladimir Reznichenko (kalessil)
 - Baptiste Clavié (talus)
 - Fabien Pennequin (fabienpennequin)
 - Gordon Franke (gimler)
+ - David Buchmann (dbu)
 - Tomáš Votruba (tomas_votruba)
 - Jáchym Toušek
 - Robert Schönthal (digitalkaoz)
 - Florian Lonqueu-Brochard (florianlb)
 - Eric GELOEN (gelo)
 - Stefano Sala (stefano.sala)
- - David Buchmann (dbu)
 - Juti Noppornpitak (shiroyuki)
 - Tigran Azatyan (tigranazatyan)
 - Sebastian Hörl (blogsh)
@ -127,26 +127,27 @@ Symfony is the result of the work of many people who made the code better
 - Andréia Bohner (andreia)
 - Rafael Dohms (rdohms)
 - Arnaud Kleinpeter (nanocom)
+ - Joel Wurtz (brouznouf)
 - Philipp Wahala (hifi)
 - Richard Shank (iampersistent)
 - Thomas Rabaix (rande)
 - Vincent AUBERT (vincent)
- - Joel Wurtz (brouznouf)
 - Mikael Pajunen
 - Clemens Tolboom
 - Helmer Aaviksoo
 - Hiromi Hishida (77web)
+ - Richard van Laak (rvanlaak)
 - Matthieu Ouellette-Vachon (maoueh)
 - Michał Pipa (michal.pipa)
 - Amal Raghav (kertz)
 - Jonathan Ingram (jonathaningram)
+ - Titouan Galopin (tgalopin)
 - Artur Kotyrba
 - Rouven Weßling (realityking)
 - Warnar Boekkooi (boekkooi)
 - Dmitrii Chekaliuk (lazyhammer)
 - Clément JOBEILI (dator)
 - Daniel Wehner
- - Richard van Laak (rvanlaak)
 - Possum
 - Dorian Villet (gnutix)
 - Javier Spagnoletti (phansys)
@ -183,7 +184,6 @@ Symfony is the result of the work of many people who made the code better
 - Sergey Linnik (linniksa)
 - Michaël Perrin (michael.perrin)
 - Marcel Beerta (mazen)
- - Titouan Galopin (tgalopin)
 - Loïc Faugeron
 - Jannik Zschiesche (apfelbox)
 - Marco Pivetta (ocramius)
@ -209,6 +209,7 @@ Symfony is the result of the work of many people who made the code better
 - Katsuhiro OGAWA
 - Alif Rachmawadi
 - Kristen Gilden (kgilden)
+ - Dawid Nowak
 - Pierre-Yves LEBECQ (pylebecq)
 - Jakub Kucharovic (jkucharovic)
 - Eugene Leonovich (rybakit)
@ -226,6 +227,7 @@ Symfony is the result of the work of many people who made the code better
 - Nikita Konstantinov
 - Wodor Wodorski
 - Thomas Lallement (raziel057)
+ - Matthieu Napoli (mnapoli)
 - Beau Simensen (simensen)
 - Michael Hirschler (mvhirsch)
 - Robert Kiss (kepten)
@ -237,7 +239,7 @@ Symfony is the result of the work of many people who made the code better
 - Peter Kruithof (pkruithof)
 - Michael Holm (hollo)
 - Marc Weistroff (futurecat)
- - Dawid Nowak
+ - Hidde Wieringa (hiddewie)
 - Chris Smith (cs278)
 - Florian Klein (docteurklein)
 - Manuel Kiessling (manuelkiessling)
@ -272,12 +274,12 @@ Symfony is the result of the work of many people who made the code better
 - janschoenherr
 - Thomas Schulz (king2500)
 - Berny Cantos (xphere81)
+ - Teoh Han Hui (teohhanhui)
 - Ricard Clau (ricardclau)
 - Mark Challoner (markchalloner)
 - Gregor Harlan (gharlan)
 - Gennady Telegin (gtelegin)
 - Giorgio Premi
- - Matthieu Napoli (mnapoli)
 - Ben Davies (bendavies)
 - Erin Millard
 - Artur Melo (restless)
@ -296,6 +298,8 @@ Symfony is the result of the work of many people who made the code better
 - Yaroslav Kiliba
 - Terje Bråten
 - Robbert Klarenbeek (robbertkl)
+ - Alessandro Chitolina
+ - JhonnyL
 - hossein zolfi (ocean)
 - Clément Gautier (clementgautier)
 - Eduardo Gulias (egulias)
@ -321,6 +325,7 @@ Symfony is the result of the work of many people who made the code better
 - Kai
 - Lee Rowlands
 - Maximilian Reichel (phramz)
+ - Loick Piera (pyrech)
 - Karoly Negyesi (chx)
 - Ivan Kurnosov
 - Xavier HAUSHERR
@ -351,6 +356,7 @@ Symfony is the result of the work of many people who made the code better
 - Niklas Fiekas
 - Markus Bachmann (baachi)
 - lancergr
+ - Mihai Stancu
 - Olivier Dolbeau (odolbeau)
 - Jan Rosier (rosier)
 - vagrant
@ -367,7 +373,6 @@ Symfony is the result of the work of many people who made the code better
 - cedric lombardot (cedriclombardot)
 - Jonas Flodén (flojon)
 - Christian Schmidt
- - Hidde Wieringa (hiddewie)
 - Marek Štípek (maryo)
 - Marcin Sikoń (marphi)
 - Dominik Zogg (dominik.zogg)
@ -380,7 +385,6 @@ Symfony is the result of the work of many people who made the code better
 - Zander Baldwin
 - Adam Harvey
 - Alex Bakhturin
- - Alessandro Chitolina
 - boombatower
 - Fabrice Bernhard (fabriceb)
 - Jérôme Macias (jeromemacias)
@ -425,12 +429,13 @@ Symfony is the result of the work of many people who made the code better
 - Norbert Orzechowicz (norzechowicz)
 - Denis Charrier (brucewouaigne)
 - Matthijs van den Bos (matthijs)
- - Loick Piera (pyrech)
 - Lenard Palko
 - Nils Adermann (naderman)
 - Gábor Fási
 - DUPUCH (bdupuch)
 - Benjamin Leveque (benji07)
+ - Nate (frickenate)
+ - jhonnyL
 - sasezaki
 - Dawid Pakuła (zulusx)
 - Florian Rey (nervo)
@ -453,7 +458,9 @@ Symfony is the result of the work of many people who made the code better
 - Marcin Chyłek (songoq)
 - Ned Schwartz
 - Ziumin
+ - Jeremy Benoist
 - Lenar Lõhmus
+ - Krzysztof Piasecki (krzysztek)
 - Benjamin Laugueux (yzalis)
 - Zach Badgett (zachbadgett)
 - Aurélien Fredouelle
@ -492,12 +499,13 @@ Symfony is the result of the work of many people who made the code better
 - Javier López (loalf)
 - Reinier Kip
 - Dustin Dobervich (dustin10)
+ - Anne-Sophie Bachelard (annesophie)
 - Sebastian Marek (proofek)
 - Erkhembayar Gantulga (erheme318)
 - Michal Trojanowski
- - Mihai Stancu
 - David Fuhr
 - Kamil Kokot (pamil)
+ - Aurimas Niekis (gcds)
 - Max Grigorian (maxakawizard)
 - Rostyslav Kinash
 - Maciej Malarz (malarzm)
@ -521,11 +529,13 @@ Symfony is the result of the work of many people who made the code better
 - Arturs Vonda
 - Sascha Grossenbacher
 - Szijarto Tamas
+ - Catalin Dan
 - Stephan Vock
 - Benjamin Zikarsky (bzikarsky)
 - Simon Schick (simonsimcity)
 - redstar504
 - Tristan Roussel
+ - Cameron Porter
 - Hossein Bukhamsin
 - Disparity
 - origaminal
@ -579,6 +589,7 @@ Symfony is the result of the work of many people who made the code better
 - Romain Gautier (mykiwi)
 - Yosmany Garcia (yosmanyga)
 - Wouter de Wild
+ - Miroslav Sustek
 - Degory Valentine
 - Benoit Lévêque (benoit_leveque)
 - Jeroen Fiege (fieg)
@ -587,6 +598,8 @@ Symfony is the result of the work of many people who made the code better
 - possum
 - Denis Zunke (donalberto)
 - Olivier Maisonneuve (olineuve)
+ - Michele Locati
+ - Masterklavi
 - Francis Turmel (fturmel)
 - cgonzalez
 - Ben
@ -598,6 +611,7 @@ Symfony is the result of the work of many people who made the code better
 - Adrien Lucas (adrienlucas)
 - James Michael DuPont
 - Tom Klingenberg
+ - Jhonny Lidfors (jhonne)
 - Christopher Hall (mythmakr)
 - Paul Kamer (pkamer)
 - Rafał Wrzeszcz (rafalwrzeszcz)
@ -607,6 +621,7 @@ Symfony is the result of the work of many people who made the code better
 - Pierre Vanliefland (pvanliefland)
 - Sofiane HADDAG (sofhad)
 - frost-nzcr4
+ - Arjen van der Meijden
 - Abhoryo
 - Fabian Vogler (fabian)
 - Korvin Szanto
@ -614,6 +629,7 @@ Symfony is the result of the work of many people who made the code better
 - Maksim Kotlyar (makasim)
 - Neil Ferreira
 - Dmitry Parnas (parnas)
+ - Théo FIDRY (theofidry)
 - Paul LE CORRE
 - DQNEO
 - Emanuele Iannone
@ -670,10 +686,8 @@ Symfony is the result of the work of many people who made the code better
 - omerida
 - Gábor Tóth
 - Daniel Cestari
- - Jeremy Benoist
 - David Lima
 - Jérôme Vasseur
- - Krzysztof Piasecki (krzysztek)
 - Brunet Laurent (lbrunet)
 - Magnus Nordlander (magnusnordlander)
 - Mikhail Yurasov (mym)
@ -715,7 +729,6 @@ Symfony is the result of the work of many people who made the code better
 - fabios
 - Sander Coolen (scoolen)
 - Nicolas Le Goff (nlegoff)
- - Anne-Sophie Bachelard (annesophie)
 - Manuele Menozzi
 - Anton Babenko (antonbabenko)
 - Irmantas Šiupšinskas (irmantas)
@ -723,6 +736,7 @@ Symfony is the result of the work of many people who made the code better
 - Zachary Tong (polyfractal)
 - Hryhorii Hrebiniuk
 - mcfedr (mcfedr)
+ - hamza
 - dantleech
 - Xavier Leune
 - Tero Alén (tero)
@ -735,6 +749,7 @@ Symfony is the result of the work of many people who made the code better
 - Sortex
 - chispita
 - Wojciech Sznapka
+ - Ariel J. Birnbaum
 - Arjan Keeman
 - Máximo Cuadros (mcuadros)
 - tamirvs
@ -750,7 +765,6 @@ Symfony is the result of the work of many people who made the code better
 - Ville Mattila
 - Boris Vujicic (boris.vujicic)
 - Max Beutel
- - Catalin Dan
 - nacho
 - Piotr Antosik (antek88)
 - Artem Lopata
@ -783,6 +797,7 @@ Symfony is the result of the work of many people who made the code better
 - Benoit Garret
 - Thomas Royer (cydonia7)
 - DerManoMann
+ - Jhonny Lidfors (jhonny)
 - Julien Bianchi (jubianchi)
 - Marcin Chwedziak
 - Roland Franssen (ro0)
@ -796,7 +811,6 @@ Symfony is the result of the work of many people who made the code better
 - rpg600
 - Péter Buri (burci)
 - Davide Borsatto (davide.borsatto)
- - Teoh Han Hui (teohhanhui)
 - kaiwa
 - Charles Sanquer (csanquer)
 - Albert Ganiev (helios-ag)
@ -899,6 +913,7 @@ Symfony is the result of the work of many people who made the code better
 - Berat Doğan
 - Anthony Ferrara
 - Klaas Cuvelier (kcuvelier)
+ - Steve Frécinaux
 - ShiraNai7
 - Vašek Purchart (vasek-purchart)
 - Janusz Jabłoński (yanoosh)
@ -919,7 +934,6 @@ Symfony is the result of the work of many people who made the code better
 - Pete Mitchell (peterjmit)
 - Tom Corrigan (tomcorrigan)
 - Martin Pärtel
- - Miroslav Sustek
 - Patrick Daley (padrig)
 - Xavier Briand (xavierbriand)
 - Max Summe
@ -943,7 +957,6 @@ Symfony is the result of the work of many people who made the code better
 - Nathaniel Catchpole
 - Jose Gonzalez
 - Adrien Samson (adriensamson)
- - Aurimas Niekis (gcds)
 - Samuel Gordalina (gordalina)
 - Max Romanovsky (maxromanovsky)
 - Mathieu Morlon
@ -960,6 +973,7 @@ Symfony is the result of the work of many people who made the code better
 - r1pp3rj4ck
 - Robert Queck
 - mlively
+ - Amine Matmati
 - Fabian Steiner (fabstei)
 - Klaus Silveira (klaussilveira)
 - Thomas Chmielowiec (chmielot)
@ -984,6 +998,7 @@ Symfony is the result of the work of many people who made the code better
 - Benjamin Bender
 - Konrad Mohrfeldt
 - Lance Chen
+ - Andrey Astakhov (aast)
 - kor3k kor3k (kor3k)
 - Stelian Mocanita (stelian)
 - Flavian (2much)
@ -1010,6 +1025,7 @@ Symfony is the result of the work of many people who made the code better
 - Jakub Simon
 - Bouke Haarsma
 - Martin Eckhardt
+ - natechicago
 - Jonathan Poston
 - Adrian Olek (adrianolek)
 - Przemysław Piechota (kibao)
@ -1032,12 +1048,13 @@ Symfony is the result of the work of many people who made the code better
 - Josef Cech
 - Arnau González (arnaugm)
 - Simon Bouland (bouland)
- - Nate (frickenate)
 - Matthew Foster (mfoster)
 - Paul Seiffert (seiffert)
 - Vasily Khayrulin (sirian)
 - Stefan Koopmanschap (skoop)
 - Stefan Hüsges (tronsha)
+ - Dan Blows
+ - Matt Wells
 - stloyd
 - Chris Tickner
 - Andrew Coulton
@ -1051,6 +1068,7 @@ Symfony is the result of the work of many people who made the code better
 - Andreas
 - Thomas Chmielowiec
 - Andrey Ryaguzov
+ - Peter Bex
 - Manatsawin Hanmongkolchai
 - Gunther Konig
 - Maciej Schmidt
@ -1081,10 +1099,12 @@ Symfony is the result of the work of many people who made the code better
 - Aarón Nieves Fernández
 - Mike Meier
 - Kirill Saksin
+ - Koalabaerchen
 - michalmarcinkowski
 - Warwick
 - Chris
 - JakeFr
+ - Simon Sargeant
 - efeen
 - Michał Dąbrowski (defrag)
 - Nathanael Noblet (gnat)
@ -1118,10 +1138,12 @@ Symfony is the result of the work of many people who made the code better
 - Jason Woods
 - dened
 - Dmitry Korotovsky
+ - Michael van Tricht
 - Sam Ward
 - Walther Lalk
 - Adam
 - devel
+ - taiiiraaa
 - Trevor Suarez
 - gedrox
 - dropfen
@ -1229,6 +1251,7 @@ 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)
+ - Patrick McDougle (patrick-mcdougle)
 - Pablo Monterde Perez (plebs)
 - Jimmy Leger (redpanda)
 - Cyrille Jouineau (tuxosaurus)
@ -1269,6 +1292,7 @@ Symfony is the result of the work of many people who made the code better
 - Myke79
 - Brian Debuire
 - Piers Warmers
+ - Guilliam Xavier
 - Sylvain Lorinet
 - klyk50
 - Andreas Lutro
@ -1332,6 +1356,7 @@ Symfony is the result of the work of many people who made the code better
 - Norman Soetbeer
 - zorn
 - Benjamin Long
+ - Robin Chalas
 - Matt Janssen
 - Peter Gribanov
 - kwiateusz
@ -1382,6 +1407,7 @@ Symfony is the result of the work of many people who made the code better
 - Adel ELHAIBA (eadel)
 - Damián Nohales (eagleoneraptor)
 - Elliot Anderson (elliot)
+ - Sergey Zolotov (enleur)
 - Fabien D. (fabd)
 - Sorin Gitlan (forapathy)
 - Yohan Giarelli (frequence-web)
@ -1395,6 +1421,7 @@ Symfony is the result of the work of many people who made the code better
 - Jose Manuel Gonzalez (jgonzalez)
 - Jorge Maiden (jorgemaiden)
 - Justin Rainbow (jrainbow)
+ - Juan Luis (juanlugb)
 - JuntaTom (juntatom)
 - Ismail Faizi (kanafghan)
 - Sébastien Armand (khepin)
@ -1439,6 +1466,7 @@ Symfony is the result of the work of many people who made the code better
 - Víctor Mateo (victormateo)
 - Vincent (vincent1870)
 - Eugene Babushkin (warl)
+ - Wouter Sioen (wouter_sioen)
 - Xavier Amado (xamado)
 - Jesper Søndergaard Pedersen (zerrvox)
 - Florent Cailhol
@ -1451,6 +1479,8 @@ Symfony is the result of the work of many people who made the code better
 - Andreas Streichardt
 - smokeybear87
 - Gustavo Adrian
+ - Kevin Weber
+ - Sergey Fedotov
 - Michael
 - fh-github@fholzhauer.de
 - Mark Topper
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
@ -234,7 +234,6 @@ class TextDescriptor extends Descriptor
                $alias = $definition;
                $tableRows[] = array_merge(array($serviceId, sprintf('alias for "%s"', $alias)), $tagsCount ? array_fill(0, $tagsCount, '') : array());
            } else {
-                // we have no information (happens with "service_container")
                $tableRows[] = array_merge(array($serviceId, get_class($definition)), $tagsCount ? array_fill(0, $tagsCount, '') : array());
            }
        }
--- a/src/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd
+++ b/src/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd
@ -24,14 +24,28 @@
      ]]></xsd:documentation>
    </xsd:annotation>
    <xsd:sequence>
-      <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="imports" type="imports" minOccurs="0" maxOccurs="1" />
-      <xsd:element name="parameters" type="parameters" minOccurs="0" maxOccurs="1" />
-      <xsd:element name="services" type="services" minOccurs="0" maxOccurs="1" />
-      <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
+      <xsd:group ref="foreign" />
+      <xsd:sequence minOccurs="0">
+        <xsd:element name="imports" type="imports" />
+        <xsd:group ref="foreign" />
+      </xsd:sequence>
+      <xsd:sequence minOccurs="0">
+        <xsd:element name="parameters" type="parameters" />
+        <xsd:group ref="foreign" />
+      </xsd:sequence>
+      <xsd:sequence minOccurs="0">
+        <xsd:element name="services" type="services" />
+        <xsd:group ref="foreign" />
+      </xsd:sequence>
    </xsd:sequence>
  </xsd:complexType>

+  <xsd:group name="foreign">
+    <xsd:sequence>
+      <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
+    </xsd:sequence>
+  </xsd:group>
+
  <xsd:complexType name="services">
    <xsd:annotation>
      <xsd:documentation><![CDATA[
--- a/src/Symfony/Component/HttpKernel/KernelEvents.php
+++ b/src/Symfony/Component/HttpKernel/KernelEvents.php
@ -108,6 +108,10 @@ final class KernelEvents
     *
     * This event allows you to reset the global and environmental state of
     * the application, when it was changed during the request.
+     * The event listener method receives a
+     * Symfony\Component\HttpKernel\Event\FinishRequestEvent instance.
+     *
+     * @Event
     *
     * @var string
     */
--- a/src/Symfony/Component/Routing/Generator/UrlGenerator.php
+++ b/src/Symfony/Component/Routing/Generator/UrlGenerator.php
@ -75,11 +75,6 @@ class UrlGenerator implements UrlGeneratorInterface, ConfigurableRequirementsInt
        '%7C' => '|',
    );

-    /**
-     * @var string This regexp matches all characters that are not or should not be encoded by rawurlencode (see list in array above).
-     */
-    private $urlEncodingSkipRegexp = '#[^-.~a-zA-Z0-9_/@:;,=+!*|]#';
-
    /**
     * Constructor.
     *
@ -201,21 +196,19 @@ class UrlGenerator implements UrlGeneratorInterface, ConfigurableRequirementsInt

        if ('' === $url) {
            $url = '/';
-        } elseif (preg_match($this->urlEncodingSkipRegexp, $url)) {
-            // the context base URL is already encoded (see Symfony\Component\HttpFoundation\Request)
-            $url = strtr(rawurlencode($url), $this->decodedChars);
        }

+        // the contexts base URL is already encoded (see Symfony\Component\HttpFoundation\Request)
+        $url = strtr(rawurlencode($url), $this->decodedChars);
+
        // the path segments "." and ".." are interpreted as relative reference when resolving a URI; see http://tools.ietf.org/html/rfc3986#section-3.3
        // so we need to encode them as they are not used for this purpose here
        // otherwise we would generate a URI that, when followed by a user agent (e.g. browser), does not match this route
-        if (false !== strpos($url, '/.')) {
-            $url = strtr($url, array('/../' => '/%2E%2E/', '/./' => '/%2E/'));
-            if ('/..' === substr($url, -3)) {
-                $url = substr($url, 0, -2).'%2E%2E';
-            } elseif ('/.' === substr($url, -2)) {
-                $url = substr($url, 0, -1).'%2E';
-            }
+        $url = strtr($url, array('/../' => '/%2E%2E/', '/./' => '/%2E/'));
+        if ('/..' === substr($url, -3)) {
+            $url = substr($url, 0, -2).'%2E%2E';
+        } elseif ('/.' === substr($url, -2)) {
+            $url = substr($url, 0, -1).'%2E';
        }

        $schemeAuthority = '';
@ -292,7 +285,7 @@ class UrlGenerator implements UrlGeneratorInterface, ConfigurableRequirementsInt
        if ($extra && $query = http_build_query($extra, '', '&')) {
            // "/" and "?" can be left decoded for better user experience, see
            // http://tools.ietf.org/html/rfc3986#section-3.4
-            $url .= '?'.(false === strpos($query, '%2F') ? $query : strtr($query, array('%2F' => '/')));
+            $url .= '?'.strtr($query, array('%2F' => '/'));
        }

        return $url;
--- a/src/Symfony/Component/Security/Core/AuthenticationEvents.php
+++ b/src/Symfony/Component/Security/Core/AuthenticationEvents.php
@ -20,6 +20,8 @@ final class AuthenticationEvents
     * The event listener method receives a
     * Symfony\Component\Security\Core\Event\AuthenticationEvent instance.
     *
+     * @Event
+     *
     * @var string
     */
    const AUTHENTICATION_SUCCESS = 'security.authentication.success';
@ -32,6 +34,8 @@ final class AuthenticationEvents
     * Symfony\Component\Security\Core\Event\AuthenticationFailureEvent
     * instance.
     *
+     * @Event
+     *
     * @var string
     */
    const AUTHENTICATION_FAILURE = 'security.authentication.failure';