merged 2.0

This commit is contained in:
Fabien Potencier 2011-12-26 21:57:48 +01:00
commit cc9eff0bc6
4 changed files with 114 additions and 69 deletions

View File

@ -7,6 +7,36 @@ in 2.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/v2.0.0...v2.0.1
* 2.0.8 (2011-12-26)
* adea589: [Twig] made code compatible with Twig 1.5
* 6e98730: added forwards compatibility for the Filesystem component
* 1b4aaa2: [HttpFoundation] fixed ApacheRequest
* 8235848: [HttpFoundation][File] Add flv file default extension
* 5a6c989: FrameworkBundle: Adding test-attribute in xsd-schema to write functional-tests if using xml-configurations
* 649fa52: [DoctrineBridge] Fixed the entity provider to support proxies
* e417153: [BugFix][Console] Fix type hint for output formatter
* d1fa8cc: [WebProfiler] Fix some design glitches (closes #2867)
* 662fdc3: [DoctrineBundle] Fixed incorrectly shown params
* 9e38d6a: [SwiftmailerBundle] fixed the send email command when the queue does not extends Swift_ConfigurableSpool
* 5c41ec9: [HttpKernel][Client] Only simple (name=value without any other params) cookies can be stored in same line, so lets add every as standalone to be compliant with rfc6265
* 8069ea6: [Form] Added missing use statements (closes #2880)
* d5a1343: [Console] Improve input definition output for Boolean defaults
* 62f3dc4: [SecurityBundle] Changed environment to something unique.
* 0900ecc: #2688: Entities are generated in wrong folder (doctrine:generate:entities Namespace)
* f3e92c4: [TwigBundle] Fix the exception message escaping
* 4d64d90: Allow empty result; change default *choices* value to **null** instead of **array()**. - added *testEmptyChoicesAreManaged* test - `null` as default value for choices. - is_array() used to test if choices are user-defined. - `null` as default value in __construct too. - `null` as default value for choices in EntityType.
* ec7eec5: [DependencyInjection] fixed espacing issue (close #2819)
* 6548354: fixed data-url
* d97d7e9: Added a check to see if the type is a string if it's not a FormTypeInterface
* 7827f72: Fixes #2817: ensure that the base loader is correctly initialised
* 9c1fbb8: [DoctrineBridge] fixed the refreshing of the user for invalid users
* 45bba7b: Added a hint about a possible cause for why no mime type guesser is be available
* 3759ff0: [Locale] StubNumberFormatter allow to parse 64bit number in 64bit mode
* db2d773: [FrameworkBundle] Improve the TemplateLocator exception message
* 2c3e9ad: [DependencyInjection] Made the reference case insensitive
* 4535abe: [DoctrineBridge] Fixed attempt to serialize non-serializable values
* 2.0.7 (2011-12-08)
* b7fd519: [Security] fixed cast

View File

@ -9,82 +9,97 @@ Symfony2 is the result of the work of many people who made the code better
- Johannes (schmittjoh)
- Jordi Boggiano (Seldaek)
- Kris Wallsmith (kriswallsmith)
- Victor Berchet (vicb)
- Christophe Coevoet (stof)
- Alexandre Salomé (alexandresalome)
- Lukas Kahwe Smith (lsmith77)
- Victor Berchet (vicb)
- Alexandre Salomé (alexandresalome)
- Benjamin Eberlei (beberlei)
- Ryan Weaver (weaverryan)
- Pascal Borreli (pborreli)
- Joseph Bielawski (stloyd)
- stealth35 (stealth35)
- Ryan Weaver (weaverryan)
- Pascal Borreli (pborreli)
- Eric Clemmons (ericclemmons)
- Jeremy Mikola (jmikola)
- Henrik Westphal (snc)
- Igor Wiedler (igorw)
- Hugo Hamon (hhamon)
- Jonathan H. Wage (jwage)
- Miha Vrhovnik (mvrhov)
- Drak (drak)
- Tigran Azatyan (tigranazatyan)
- Jordan Alliot (jalliot)
- Thibault Duplessis (ornicar)
- Martin Hasoň (hason)
- Bulat Shakirzyanov (avalanche123)
- Hugo Hamon (hhamon)
- Miha Vrhovnik (mvrhov)
- Arnout Boks (aboks)
- Eriksen Costa (eriksencosta)
- Jonathan H. Wage (jwage)
- Benjamin Dulau (benjamindulau)
- Francis Besset (francisbesset)
- Jacob Dreesen (jdreesen)
- Martin Hasoň (hason)
- Thibault Duplessis (ornicar)
- Helmer Aaviksoo (helmer)
- Richard Shank (IamPersistent)
- Henrik Bjørnskov (henrikbjorn)
- Excel Web Zone (excelwebzone)
- yethee (yethee)
- dbu
- Lenar Lõhmus (lenar)
- Jacob Dreesen (jdreesen)
- Bulat Shakirzyanov (avalanche123)
- Eriksen Costa (eriksencosta)
- Francis Besset (francisbesset)
- Richard Shank (IamPersistent)
- Wotre (Wotre)
- Konstantin Kudryashov (everzet)
- dbu
- Henrik Bjørnskov (henrikbjorn)
- yethee (yethee)
- Lenar Lõhmus (lenar)
- Richard Miller (richardmiller)
- Dariusz Górecki (canni)
- Konstantin Kudryashov (everzet)
- Brikou CARRE (brikou)
- Daniel Holmes (danielholmes)
- William DURAND (willdurand)
- Brandon Turner (blt04)
- brki (brki)
- Hidenori Goto (hidenorigoto)
- John Wards (johnwards)
- Antoine Hérault (Herzult)
- Dariusz Górecki (canni)
- Fabien Pennequin (FabienPennequin)
- brki (brki)
- Marc Weistroff (marcw)
- Danny Berger (dpb587)
- Alif Rachmawadi (alifity)
- Christian Raue (craue)
- Fabien Pennequin (FabienPennequin)
- Tobias Schultze (Tobion)
- Katsuhiro OGAWA (fivestar)
- Michel Salib (michelsalib)
- Marc Weistroff (marcw)
- Julien Brochet (aerialls)
- Thomas (rande)
- Michel Salib (michelsalib)
- Marcin Chylek (SongoQ)
- blue-eyes (blue-eyes)
- Christian Raue (craue)
- superjavason (superjavason)
- Thomas (rande)
- Joseph Rouff (rouffj)
- Katsuhiro OGAWA (fivestar)
- blue-eyes (blue-eyes)
- Daniel Gomes (danielcsgomes)
- Miquel Rodríguez Telep (mrtorrent)
- flevour (flevour)
- Tim Nagel (merk)
- Robert Schönthal (digitalkaoz)
- Michel Weimerskirch (mweimerskirch)
- William DURAND (willdurand)
- Daniel Gomes (danielcsgomes)
- Michele Orselli (micheleorselli)
- Jakub Zalas (jakzal)
- Miquel Rodríguez Telep (mrtorrent)
- Matthieu Vachon (maoueh)
- Joseph Rouff (rouffj)
- Amal Raghav (kertz)
- Artur Kotyrba (udat)
- Clément JOBEILI (dator)
- Michele Orselli (micheleorselli)
- Noel GUILBERT (noelg)
- Martin Schuhfuss (usefulthink)
- Dennis Benkert (denderello)
- Matthieu Bontemps (mbontemps)
- Bernd Matzner (bmatzner)
- Clément JOBEILI (dator)
- Tom Klingenberg (ktomk)
- Thomas Bibb (thomasbibb)
- Marek Kalnik (marekkalnik)
- Oscar Cubo Medina (ocubom)
- xaav
- Pierre Minnieur (pminnieur)
- Neil Katin
- Noel GUILBERT (noelg)
- Klein Florian (docteurklein)
- Martin Schuhfuss (usefulthink)
- stloyd
- Dennis Benkert (denderello)
- Bart van den Burg (Burgov)
- Matthieu Bontemps (mbontemps)
- Kirill chEbba Chebunin (chEbba)
- John Carr (Jc2k)
- jdewit (jdewit)
- Teo (teo-sk)
- Dustin Whittle (dustinwhittle)
- Jean-François PHILIPPE (jfphilippe)
- Justin Hileman (bobthecow)
@ -92,56 +107,51 @@ Symfony2 is the result of the work of many people who made the code better
- umpirsky (umpirsky)
- Xavier Perez (DuoSRX)
- Brouznouf (Brouznouf)
- Tom Klingenberg (ktomk)
- Thomas Bibb (thomasbibb)
- xaav
- Pablo Godel (pgodel)
- Francois Zaninotto
- Leszek Prabucki (l3l0)
- Francois Zaninotto (fzaninotto)
- Xavier Montaña (xmontana)
- Neil Katin
- Arjen Brouwer (arjenjb)
- Klein Florian (docteurklein)
- Boussekeyt Jules (gordonslondon)
- Thomas Adam (tecbot)
- Jan Sorgalla (jsor)
- stloyd
- Douglas Greenshields (shieldo)
- Lee McDermott (lmcd)
- Shein Alexey (conf)
- Manuel de Ruiter (ManuelAC)
- Kirill chEbba Chebunin (chEbba)
- Jeroen Hoek (jdhoek)
- Marek Kalnik (marekkalnik)
- flevour (flevour)
- John Carr (Jc2k)
- jdewit (jdewit)
- Teo (teo-sk)
- Robert Gruendler (pulse00)
- geoffrey
- Matthew Lewinski (lewinski)
- dlsniper (dlsniper)
- Jérémie Augustin (jaugustin)
- ondrowan (ondrowan)
- Costin Bereveanu (schniper)
- asm89 (asm89)
- Andrej Hudec (pulzarraider)
- Aurelijus Valeiša (aurelijus)
- Ray (rrehbeindoi)
- Adrian Rudnik (kreischweide)
- Dustin Dobervich (dustin10)
- Andréia Bohner (andreia)
- Yuen-Chi Lian (yclian)
- Greg Thornton (xdissent)
- asm89 (asm89)
- andrewtch (andrewtch)
- Konstantin Leboev (realmfoo)
- Thomas Adam (tecbot)
- Grégoire Paris (greg0ire)
- Donald Tyler (Chekote)
- Kai
- Gyula Sallai (thesalla)
- Sergey Linnik (Partugal)
- Laszlo Korte (laszlokorte)
- Jonathan Ingram (jonathaningram)
- Hubert LECORCHE (hlecorche)
- Michael Ridgway (mridgway)
- Stepan Tanasiychuk (stfalcon)
- Bertrand Zuchuat (Garfield-fr)
- Adam Monsen (meonkeys)
- Xavier HAUSHERR (xkobal)
- Jan Schumann (janschumann)
- Vadim Tyukov (vatson)
- Asier Illarramendi (doup)
@ -158,18 +168,17 @@ Symfony2 is the result of the work of many people who made the code better
- Cristian González Sánchez (cristiangsp)
- Nils Adermann (naderman)
- Tobias Naumann (tna)
- Jonathan Ingram (jonathaningram)
- Steven Surowiec (steves)
- arnaud-lb (arnaud-lb)
- Ivan Rey (ivanrey)
- Ned Schwartz (theinterned)
- Gordon Franke (gimler)
- Aurélien Fredouelle (AurelC2G)
- Andrej Hudec (pulzarraider)
- David Soria Parra (dsp)
- Geoffrey Tran (geoffreytran)
- Christian Schaefer (caefer)
- Elliot Anderson (elliot)
- Kevin Bond (kbond)
- José Nahuel Cuesta Luengo (ncuesta)
- Sebastian Marek (proofek)
- erheme318 (erheme318)
@ -191,7 +200,6 @@ Symfony2 is the result of the work of many people who made the code better
- Degory Valentine
- Krzysiek Łabuś (Crozin)
- Jan Prieser (jaypea)
- Grégoire Paris (greg0ire)
- paulkamer (paulkamer)
- Peter Kruithof (pkruithof)
- Albert Jessurum (ajessu)
@ -202,6 +210,7 @@ Symfony2 is the result of the work of many people who made the code better
- Cyril Quintin (cyqui)
- kazusuke sasezaki (sasezaki)
- cim-dch (cim-dch)
- Julien DIDIER (juliendidier)
- Chris Smith (cs278)
- Derek ROTH (DerekRoth)
- mwsaz
@ -210,15 +219,14 @@ Symfony2 is the result of the work of many people who made the code better
- Emil Einarsson (Einarsson)
- Don Pinkster
- Michael Roterman (wtfzdotnet)
- Arno Geurts
- ds (dantleech)
- Daniel Cestari (dcestari)
- Magnus Nordlander (magnusnordlander)
- Pavel Campr (pcampr)
- Pierre Minnieur (pminnieur)
- Markus Tacker (tacker)
- Benoît Merlet (trompette)
- Xavier HAUSHERR (xkobal)
- Jan Behrens (deegital)
- Robert Gruendler (pulse00)
- sensio
- Théophile Helleboid - chtitux (chtitux)
- irmantas (irmantas)
@ -237,8 +245,8 @@ Symfony2 is the result of the work of many people who made the code better
- Nicolas Fabre (nfabre)
- heccjj (heccjj)
- Sebastian Utz (seut)
- Cédric Lahouste (RapotOR)
- George Giannoulopoulos (dotoree)
- Bart van den Burg (Burgov)
- Alberto Pirovano (geezmo)
- JerikVenture (JerikVenture)
- Evan Kaufman (EvanK)
@ -269,6 +277,7 @@ Symfony2 is the result of the work of many people who made the code better
- patashnik (patashnik)
- devel
- HIROKI (hirocaster)
- jpauli (jpauli)
- Kevin McBride (krmcbride)
- Dan Patrick (mdpatrick)
- Pierre-Yves LEBECQ (pylebecq)
@ -336,6 +345,8 @@ Symfony2 is the result of the work of many people who made the code better
- Gustavo Adrian
- max
- Marcel Beerta (mazen)
- Muharrem Demirci (mdemirci)
- meze (meze)
- Nicolas de Marqué Fromentin (nicodmf)
- Florent Cailhol (ooflorent)
- Pierre (ptheg)

View File

@ -162,6 +162,10 @@
<source>This value is not a valid country</source>
<target>Este valor no es un país válido</target>
</trans-unit>
<trans-unit id="41">
<source>This value is already used</source>
<target>Este valor ya se ha utilizado</target>
</trans-unit>
</body>
</file>
</xliff>

View File

@ -91,8 +91,8 @@ class ParameterBag
* Returns a parameter by name.
*
* @param string $path The key
* @param mixed $default The default value
* @param boolean $deep
* @param mixed $default The default value if the parameter key does not exist
* @param boolean $deep If true, a path like foo[bar] will find deeper items
*
* @api
*/
@ -188,8 +188,8 @@ class ParameterBag
* Returns the alphabetic characters of the parameter value.
*
* @param string $key The parameter key
* @param mixed $default The default value
* @param boolean $deep
* @param mixed $default The default value if the parameter key does not exist
* @param boolean $deep If true, a path like foo[bar] will find deeper items
*
* @return string The filtered value
*
@ -204,8 +204,8 @@ class ParameterBag
* Returns the alphabetic characters and digits of the parameter value.
*
* @param string $key The parameter key
* @param mixed $default The default value
* @param boolean $deep
* @param mixed $default The default value if the parameter key does not exist
* @param boolean $deep If true, a path like foo[bar] will find deeper items
*
* @return string The filtered value
*
@ -220,8 +220,8 @@ class ParameterBag
* Returns the digits of the parameter value.
*
* @param string $key The parameter key
* @param mixed $default The default value
* @param boolean $deep
* @param mixed $default The default value if the parameter key does not exist
* @param boolean $deep If true, a path like foo[bar] will find deeper items
*
* @return string The filtered value
*
@ -236,8 +236,8 @@ class ParameterBag
* Returns the parameter value converted to integer.
*
* @param string $key The parameter key
* @param mixed $default The default value
* @param boolean $deep
* @param mixed $default The default value if the parameter key does not exist
* @param boolean $deep If true, a path like foo[bar] will find deeper items
*
* @return string The filtered value
*