symfony
diff --git a/`‎CHANGELOG-2.1.md` b/`‎CHANGELOG-2.1.md`
diff --git a/‎CONTRIBUTORS.md
Lines changed: 37 additions & 18 deletions b/‎CONTRIBUTORS.md
Lines changed: 37 additions & 18 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/FormPass.php
Lines changed: 5 additions & 3 deletions b/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/FormPass.php
Lines changed: 5 additions & 3 deletions
@@ -7,6 +7,41 @@ in 2.1 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.1.0...v2.1.1
 
+* 2.1.9 (2013-03-26)
+
+ * 9875c4b: Added '@@' escaping strategy for YamlFileLoader and YamlDumper
+ * bbcdfe2: [Yaml] fixed bugs with folded scalar parsing
+ * 5afea04: [Form] made DefaultCsrfProvider using session_status() when available
+ * c928ddc: [HttpFoudantion] fixed Request::getPreferredLanguage()
+ * e6b7515: [DomCrawler] added support for query string with slash
+ * 17dc2ff: [HttpRequest] fixes Request::getLanguages() bug
+ * e51432a: sub-requests are now created with the same class as their parent
+ * ef53456: [DoctrineBridge] Avoids blob values to be logged by doctrine
+ * 6575df6: [Security] use current request attributes to generate redirect url?
+ * 7216cb0: [Validator] fix showing wrong max file size for upload errors
+ * c423f16: [2.1][TwigBridge] Fixes Issue #7342 in TwigBridge
+ * 7d87ecd: [FrameworkBundle] fixed cahe:clear command's warmup
+ * fe4cc24: [TwigBridge] fixed fixed scope & trans_default_domain node visitor
+ * fc47589: [BrowserKit] added ability to ignored malformed set-cookie header
+ * 5bc30bb: [Translation] added xliff loader/dumper with resname support
+ * 7241be9: [Finder] fixed a potential issue on Solaris where INF value is wrong (refs #7269)
+ * 1d3da29: [FrameworkBundle] avoids cache:clear to break if new/old folders already exist
+ * b9cdb9a: [HttpKernel] Fixed possible profiler token collision (closes #7272, closes #7171)
+ * d1f5d25: [FrameworkBundle] Fixes invalid serialized objects in cache
+ * c82c754: RedisProfilerStorage wrong db-number/index-number selected
+ * e86fefa: Unset loading[$id] in ContainerBuilder on exception
+ * 73bead7: [ClassLoader] made DebugClassLoader idempotent
+ * a4ec677: [DomCrawler] Fix relative path handling in links
+ * 6681df0: [Console] fixed StringInput binding
+ * 5b19c89: [Console] fixed unparsed StringInput tokens
+ * bae83c7: [TwigBridge] fixed trans twig extractor
+ * 8f8ba38: [DomCrawler] fix handling of schemes by Link::getUri()
+ * 83382bc: [TwigBridge] fixed the translator extractor that were not trimming the text in trans tags (closes #7056)
+ * b1ea8e5: Fixed handling absent href attribute in base tag
+ * 8d9cd42: Routing issue with installation in a sub-directory ref: https://github.com/symfony/symfony/issues/7129
+ * 0690709: added a DebuClassLoader::findFile() method to make the wrapping less invasive
+ * 635b1fc: StringInput resets the given options.
+
 * 2.1.8 (2013-02-23)
 
  * b2080c4: [HttpFoundation] Remove Cache-Control when using https download via IE<9 (fixes #6750)
 
@@ -20,10 +20,10 @@ Symfony2 is the result of the work of many people who made the code better
  - Joseph Bielawski (stloyd)
  - Igor Wiedler (igorw)
  - Benjamin Eberlei (beberlei)
+ - Jean-François Simon (jfsimon)
  - Hugo Hamon (hhamon)
  - Eriksen Costa (eriksencosta)
  - Martin Hasoň (hason)
- - Jean-François Simon (jfsimon)
  - Jonathan Wage (jwage)
  - William Durand (couac)
  - Alexandre Salomé (alexandresalome)
@@ -40,11 +40,11 @@ Symfony2 is the result of the work of many people who made the code better
  - Arnaud Le Blanc (arnaud-lb)
  - Florin Patan (florinpatan)
  - Eric Clemmons (ericclemmons)
+ - Bilal Amarni (bamarni)
  - Henrik Westphal (snc)
  - Romain Neutron (romain)
  - Deni
  - Dariusz Górecki (canni)
- - Bilal Amarni (bamarni)
  - Marc Weistroff (futurecat)
  - Jordan Alliot (jalliot)
  - Arnout Boks (aboks)
@@ -54,25 +54,25 @@ Symfony2 is the result of the work of many people who made the code better
  - Andrej Hudec (pulzarraider)
  - Brikou Carré (brikou)
  - John Wards (johnwards)
- - Antoine Hérault (herzult)
  - Fran Moreno (franmomu)
+ - Antoine Hérault (herzult)
  - Daniel Holmes (dholmes)
- - Bart van den Burg (burgov)
- - Christian Raue
  - Tim Nagel (merk)
  - Włodzimierz Gajda (gajdaw)
+ - Bart van den Burg (burgov)
+ - Christian Raue
  - Michal Piotrowski (eventhorizon)
+ - Toni Uebernickel (havvg)
  - Colin Frei
  - lenar
- - Toni Uebernickel (havvg)
  - Fabien Pennequin (fabienpennequin)
  - excelwebzone
  - woodspire
+ - Michel Weimerskirch (mweimerskirch)
  - Grégoire Pineau (lyrixx)
  - Mario A. Alvarez Garcia (nomack84)
  - Douglas Greenshields (shieldo)
  - Kevin Bond (kbond)
- - Michel Weimerskirch (mweimerskirch)
  - Richard Miller (mr_r_miller)
  - Jacob Dreesen (jdreesen)
  - Richard Shank (iampersistent)
@@ -81,6 +81,7 @@ Symfony2 is the result of the work of many people who made the code better
  - Robert Schönthal (digitalkaoz)
  - Felix Labrecque
  - Michał Pipa (michal.pipa)
+ - Gordon Franke (gimler)
  - Daniel Gomes (danielcsgomes)
  - Gábor Egyed (1ed)
  - Tigran Azatyan (tigranazatyan)
@@ -89,7 +90,6 @@ Symfony2 is the result of the work of many people who made the code better
  - Arnaud Kleinpeter (nanocom)
  - David Buchmann (dbu)
  - Jonathan Ingram (jonathaningram)
- - Gordon Franke (gimler)
  - Sebastiaan Stok (sstok)
  - Javier Eguiluz (javier.eguiluz)
  - Matthieu Ouellette-Vachon (maoueh)
@@ -132,6 +132,7 @@ Symfony2 is the result of the work of many people who made the code better
  - Alif Rachmawadi
  - boombatower
  - Florian Klein (docteurklein)
+ - Adrien Brault (adrienbrault)
  - jules boussekeyt (gordonslondon)
  - Jan Sorgalla (jsor)
  - jdhoek
@@ -148,7 +149,6 @@ Symfony2 is the result of the work of many people who made the code better
  - Eric GELOEN (gelo)
  - Sebastian Bergmann
  - arjen
- - Adrien Brault (adrienbrault)
  - sun (sun)
  - Manuel Kiessling (manuelkiessling)
  - Sergey Linnik
@@ -171,8 +171,10 @@ Symfony2 is the result of the work of many people who made the code better
  - Jeanmonod David (jeanmonod)
  - Thomas Lallement (raziel057)
  - Niklas Fiekas
+ - Francesco Levorato
  - Tom Van Looy (tvlooy)
  - Brouznouf
+ - Peter Kruithof (pkruithof)
  - Greg Thornton (xdissent)
  - Lars Strojny
  - Terje Bråten
@@ -194,13 +196,17 @@ Symfony2 is the result of the work of many people who made the code better
  - Christophe L. (christophelau)
  - Michael Ridgway
  - Pavel Campr (pcampr)
+ - Emanuele Gaspari (inmarelibero)
  - Brian King
  - Ricard Clau (ricardclau)
  - Jan Schumann
+ - Erin Millard
  - Olivier Dolbeau (odolbeau)
  - Konstantin Myakshin (koc)
+ - Elnur Abdurrakhimov (elnur)
  - Michele Orselli (orso)
  - Asier Illarramendi (doup)
+ - Javier López (loalf)
  - Chris Heng (gigablah)
  - Christoph Mewes (xrstf)
  - Jonas Flodén (flojon)
@@ -226,7 +232,6 @@ Symfony2 is the result of the work of many people who made the code better
  - mcben
  - Maks Slesarenko
  - Vicent Soria Durá (vicentgodella)
- - Peter Kruithof (pkruithof)
  - Erik Trapman (eriktrapman)
  - De Cock Xavier (xdecock)
  - Manuel Reinhard (sprain)
@@ -253,15 +258,14 @@ Symfony2 is the result of the work of many people who made the code better
  - Lenar Lõhmus
  - Zach Badgett (zachbadgett)
  - Aurélien Fredouelle
- - Francesco Levorato
  - Karoly Negyesi (chx)
+ - janschoenherr
  - Thomas Tourlourat (armetiz)
  - jamogon
  - Geoffrey Tran (geoff)
  - Florian Rey (nervo)
  - Maks
  - Christian Schaefer (caefer)
- - Emanuele Gaspari (inmarelibero)
  - Elliot Anderson (elliot)
  - Patrick Kaufmann
  - Ben Ramsey (ramsey)
@@ -272,15 +276,13 @@ Symfony2 is the result of the work of many people who made the code better
  - aubx
  - Max Rath (drak3)
  - Ruben Gonzalez (rubenrua)
- - Elnur Abdurrakhimov (elnur)
  - Sinan Eldem
  - DerManoMann
  - Nahuel Cuesta (ncuesta)
  - Chris Boden (cboden)
  - Roumen Damianoff (roumen)
  - Pierre du Plessis (pierredup)
  - Åsmund Garfors
- - Erin Millard
  - Jeremy David (jeremy.david)
  - Tobias Sjösten (tobiassjosten)
  - Dustin Dobervich (dustin10)
@@ -293,12 +295,15 @@ Symfony2 is the result of the work of many people who made the code better
  - yktd26
  - Jakub Kucharovic
  - umpirski
+ - Dmitrii Chekaliuk
  - cedric lombardot (cedriclombardot)
  - John Kary (johnkary)
  - Hossein Bukhamsin
  - Pierre-Yves LEBECQ (pylebecq)
  - Fabrice Bernhard (fabriceb)
+ - Oleg Zinchenko (cystbear)
  - Johannes Klauss (cloppy)
+ - fzerorubigd
  - Mark Sonnabaum
  - develop
  - Atsuhiro KUBO (iteman)
@@ -382,7 +387,6 @@ Symfony2 is the result of the work of many people who made the code better
  - Miha Vrhovnik
  - Moritz Borgmann
  - Daniel Cestari
- - Javier López (loalf)
  - Magnus Nordlander (magnusnordlander)
  - Adam Monsen (meonkeys)
  - LOUARDI Abdeltif (ouardisoft)
@@ -405,6 +409,7 @@ Symfony2 is the result of the work of many people who made the code better
  - Irmantas Šiupšinskas (irmantas)
  - dantleech
  - Tero Alén (tero)
+ - Artem (digi)
  - Vadim Tyukov (vatson)
  - Sortex
  - arjenjb
@@ -415,15 +420,16 @@ Symfony2 is the result of the work of many people who made the code better
  - Sébastien Lavoie
  - Per Sandström (per)
  - Ville Mattila
+ - Marcos Quesada (marcos_quesada)
  - Robert Kiss (kepten)
  - Vitaliy Tverdokhlib (vitaliytv)
  - Martijn Evers
  - Sergii Smertin (nfx)
+ - Eddie Jaoude
  - Nerijus Arlauskas
  - Haritz Iturbe (hizai)
  - SPolischook
  - Diego Sapriza
- - fzerorubigd
  - Joan Cruz
  - Antoine Corcy
  - inspiran
@@ -433,11 +439,11 @@ Symfony2 is the result of the work of many people who made the code better
  - Alex Demchenko (pilot)
  - Tomasz Kowalczyk (thunderer)
  - Vincent AUBERT (vincent)
+ - Benoit Garret
  - DerManoMann
  - Jochen Bayer (jocl)
  - Jeremy Bush
  - Evan Villemez
- - Dmitrii Chekaliuk
  - Davide Borsatto (davide.borsatto)
  - kaiwa
  - Albert Ganiev (helios-ag)
@@ -468,6 +474,7 @@ Symfony2 is the result of the work of many people who made the code better
  - Janusz Jablonski
  - George Giannoulopoulos
  - Ilya Biryukov
+ - Lance McNearney
  - Alberto Pirovano (geezmo)
  - Xavier Briand (xavierbriand)
  - Evan Kaufman
@@ -490,10 +497,14 @@ Symfony2 is the result of the work of many people who made the code better
  - Simon Neidhold
  - Kevin Dew
  - James Cowgill
+ - Thomas Ploch (tploch)
+ - Benjamin Bender
  - Konrad Mohrfeldt
+ - Benoit Lévêque (benoit_leveque)
  - Mephistofeles
  - pscheit
  - Nicolas Badey (nico-b)
+ - Gunnar Lium
  - povilas
  - Lars Strojny
  - Bouke Haarsma
@@ -504,8 +515,10 @@ Symfony2 is the result of the work of many people who made the code better
  - Francisco Facioni (fran6co)
  - Paweł Wacławczyk (pwc)
  - Eric Caron
+ - 2manypeople
  - Thomas Bibb
  - Josef Cech
+ - Ait Boudad Abdellatif (aitboudad)
  - Andrey Esaulov (andremaha)
  - hicham ELGUAROUANI (hiiimoo)
  - Stefan Koopmanschap (skoop)
@@ -514,7 +527,6 @@ Symfony2 is the result of the work of many people who made the code better
  - Chris Tickner (tickner)
  - Luis Muñoz
  - Thomas Chmielowiec
- - Oleg Zinchenko
  - Christoph Nissle (derstoffel)
  - Xavier HAUSHERR
  - Benjamin Zikarsky
@@ -538,6 +550,7 @@ Symfony2 is the result of the work of many people who made the code better
  - Artyom Protaskin
  - Nathanael d. Noblet
  - helmer
+ - Julien Moulin (lizjulien)
  - devel
  - gedrox
  - hirocaster
@@ -569,6 +582,7 @@ Symfony2 is the result of the work of many people who made the code better
  - Haritz
  - Grummfy
  - Rowan Manning
+ - Kevin Herrera
  - David Windell
  - Gabriel Birke
  - Alan Chen
@@ -595,6 +609,7 @@ Symfony2 is the result of the work of many people who made the code better
  - Jorge Martin (jorgemartind)
  - giulio de donato (liuggio)
  - Matthew Davis (mdavis1982)
+ - Muriel Lusseau (metalmumu)
  - Matthias Pigulla (mpdude)
  - Pablo Monterde Perez (plebs)
  - Jimmy Leger (redpanda)
@@ -650,6 +665,7 @@ Symfony2 is the result of the work of many people who made the code better
  - kwiateusz
  - David Soria Parra
  - Sergiy Sokolenko
+ - dinitrol
  - Penny Leach
  - Gábor Fási
  - oscartv
@@ -663,6 +679,8 @@ Symfony2 is the result of the work of many people who made the code better
  - dorkitude
  - tirnanog06
  - Besnik Br
+ - sualko
+ - Nicolas Roudaire
  - Alex Olmos (alexolmos)
  - Juan Ases García (ases)
  - Bernd Matzner (bmatzner)
@@ -693,6 +711,7 @@ Symfony2 is the result of the work of many people who made the code better
  - Alex Carol (picard89)
  - Daniel Perez Pinazo (pitiflautico)
  - Ruud Kamphuis (ruudk)
+ - Sarah Khalil (saro0h)
  - Sebastian Busch (sebu)
  - Simon Terrien (sterrien)
  - Markus Tacker (tacker)
 
@@ -28,6 +28,8 @@ public function process(ContainerBuilder $container)
             return;
         }
 
+        $definition = $container->getDefinition('form.extension');
+
         // Builds an array with service IDs as keys and tag aliases as values
         $types = array();
 
@@ -40,7 +42,7 @@ public function process(ContainerBuilder $container)
             $types[$alias] = $serviceId;
         }
 
-        $container->getDefinition('form.extension')->replaceArgument(1, $types);
+        $definition->replaceArgument(1, $types);
 
         $typeExtensions = array();
 
@@ -52,11 +54,11 @@ public function process(ContainerBuilder $container)
             $typeExtensions[$alias][] = $serviceId;
         }
 
-        $container->getDefinition('form.extension')->replaceArgument(2, $typeExtensions);
+        $definition->replaceArgument(2, $typeExtensions);
 
         // Find all services annotated with "form.type_guesser"
         $guessers = array_keys($container->findTaggedServiceIds('form.type_guesser'));
 
-        $container->getDefinition('form.extension')->replaceArgument(3, $guessers);
+        $definition->replaceArgument(3, $guessers);
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,8 @@ public function process(ContainerBuilder $container)`
`28`	`28`	`return;`
`29`	`29`	`}`
`30`	`30`
	`31`	`+ $definition = $container->getDefinition('form.extension');`
	`32`	`+`
`31`	`33`	`// Builds an array with service IDs as keys and tag aliases as values`
`32`	`34`	`$types = array();`
`33`	`35`
`@@ -40,7 +42,7 @@ public function process(ContainerBuilder $container)`
`40`	`42`	`$types[$alias] = $serviceId;`
`41`	`43`	`}`
`42`	`44`
`43`		`- $container->getDefinition('form.extension')->replaceArgument(1, $types);`
	`45`	`+ $definition->replaceArgument(1, $types);`
`44`	`46`
`45`	`47`	`$typeExtensions = array();`
`46`	`48`
`@@ -52,11 +54,11 @@ public function process(ContainerBuilder $container)`
`52`	`54`	`$typeExtensions[$alias][] = $serviceId;`
`53`	`55`	`}`
`54`	`56`
`55`		`- $container->getDefinition('form.extension')->replaceArgument(2, $typeExtensions);`
	`57`	`+ $definition->replaceArgument(2, $typeExtensions);`
`56`	`58`
`57`	`59`	`// Find all services annotated with "form.type_guesser"`
`58`	`60`	`$guessers = array_keys($container->findTaggedServiceIds('form.type_guesser'));`
`59`	`61`
`60`		`- $container->getDefinition('form.extension')->replaceArgument(3, $guessers);`
	`62`	`+ $definition->replaceArgument(3, $guessers);`
`61`	`63`	`}`
`62`	`64`	`}`