diff --git a/CHANGELOG-3.0.md b/CHANGELOG-3.0.md
index c5bf52b188..c8d8e25296 100644
--- a/CHANGELOG-3.0.md
+++ b/CHANGELOG-3.0.md
@@ -7,6 +7,45 @@ 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.5 (2016-05-03)
+
+ * bug #18180 [Form] fixed BC break with pre selection of choices with `ChoiceType` and its children (HeahDude)
+ * bug #18645 [Console] Fix wrong exceptions being thrown (JhonnyL)
+ * bug #18562 [WebProfilerBunde] Give an absolute url in case the request occured from another domain (romainneutron)
+ * bug #18600 [DI] Fix AutowirePass fatal error with classes that have non-existing parents (hason, nicolas-grekas)
+ * bug #18556 [FrameworkBundle] Better output for user in ContainerDebugCommand (JhonnyL)
+ * 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 #18596 [DI] Fix internal caching in AutowirePass (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 #18540 Replace iconv_*() uses by mb_*(), add mbstring polyfill when required (nicolas-grekas)
+ * bug #18496 [Console] use ANSI escape sequences in ProgressBar overwrite method (alekitto)
+ * bug #18490 [LDAP] Free the search result after a search to free memory (hiddewie)
+ * bug #18491 [DependencyInjection] anonymous services are always private (xabbuh)
+ * bug #18515 [Filesystem] Better error handling in remove() (nicolas-grekas)
+ * bug #18081 [Form] FormValidator removed code related to removed `cascade_validation` option (peterrehm)
+ * bug #18360 [PropertyInfo] Extract nullable and collection key type for Doctrine associations (teohhanhui)
+ * bug #18449 [PropertyAccess] Fix regression (nicolas-grekas)
+ * bug #18429 [Console] Correct time formatting. (camporter)
+ * bug #18457 [WebProfilerBundle] Fixed error from unset twig variable (simonsargeant)
+ * bug #18467 [DependencyInjection] Resolve aliases before removing abstract services + add tests (nicolas-grekas)
+ * bug #18469 Force profiler toolbar svg display (pyrech)
+ * 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 #18407 Fixed the "hover" state of the profiler sidebar menu (javiereguiluz)
+ * bug #18399 [Intl] Fix int32 min boundary check (nicolas-grekas)
+ * bug #18394 [FrameworkBundle] Return the invokable service if its name is the class name (dunglas)
+ * bug #18347 Fixed the styles of the Symfony icon in the web debug toolbar (javiereguiluz)
+ * 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)
+
* 3.0.4 (2016-03-30)
* bug #18352 [Debug] Fix case sensitivity checks (nicolas-grekas)
@@ -218,7 +257,7 @@ To get the diff between two versions, go to https://github.com/symfony/symfony/c
* bug #17094 [Process] More robustness and deterministic tests (nicolas-grekas)
* bug #17112 [PropertyAccess] Reorder elements array after PropertyPathBuilder::replace (alekitto)
* bug #17109 Improved the design of the web debug toolbar (javiereguiluz)
- * bug #16797 [Filesystem] Recursivly widen non-executable directories (Slamdunk)
+ * bug #16797 [Filesystem] Recursively widen non-executable directories (Slamdunk)
* bug #16926 [DependencyInjection] fixed definition loosing property shared when decorated by a parent definition (wahler)
* bug #17040 [Console] Avoid extra blank lines when rendering exceptions (ogizanagi)
* bug #17044 [Form] fix BC break introduced with prototype_data option (memphys)
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 79ca50e61c..456aeba37a 100644
--- 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
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
index 9d8128fbe6..3a9cc3276a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
@@ -231,7 +231,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());
}
}
diff --git 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
index 9eafbc6e16..182e09e857 100644
--- 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 @@
]]>
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
'|',
);
- /**
- * @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.
*
@@ -187,21 +182,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 = '';
@@ -272,7 +265,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;