Merge branch '2.1' into 2.2

* 2.1: updated VERSION for 2.0.23 update CONTRIBUTORS for 2.0.23 updated CHANGELOG for 2.0.23 [Form] fixed failing test [DomCrawler] added support for query string with slash
2013-03-20 14:55:39 +01:00 · 2013-03-20 14:55:39 +01:00 · e24ce2f22f
parent 8ff21064b2 0631f9edcd
commit e24ce2f22f
4 changed files with 70 additions and 28 deletions
--- a/CHANGELOG-2.0.md
+++ b/CHANGELOG-2.0.md
@ -7,6 +7,22 @@ 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.23 (2013-03-20)
+
+ * f8812b2: [Form] Fixed "label" option to accept the value "0"
+ * cb03074: [DomCrawler] lowered parsed protocol string (fixes #6986)
+ * 179cd58: [Process] Fix regression introduced in #6620 / 880da01c49a9255f5022ab7e18bca38c18f56370, fixes #7082
+ * 87f3db7: [EventDispathcer] Fix removeListener
+ * bd0ad92: [DependencyInjection] Allow frozen containers to be dumped to graphviz
+ * a12744e: Add dot character `.` to legal mime subtype regular expression
+ * ddf4678: [HttpFoundation] fixed the creation of sub-requests under some circumstancies (closes #6923, closes #6936)
+ * 74f2fcf: fixed a circular call (closes #6864)
+ * 4119caf: [DependencyInjection] fixed the creation of synthetic services in ContainerBuilder
+ * ce38069: [FrameworkBundle] fixed Client::doRequest that must call its parent method (closes #6737)
+ * 53ccc2c: [Yaml] fixed ignored text when parsing an inlined mapping or sequence (closes #6786)
+ * ab0385c: [Yaml] fixed #6773
+ * fea20b7: [Yaml] fixed #6770
+
 * 2.0.22 (2013-01-17)

 * 3c87e2e: Added Yaml\Dumper::setIndentation() method to allow a custom indentation level of nested nodes.
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@ -23,83 +23,83 @@ Symfony2 is the result of the work of many people who made the code better
 - Hugo Hamon (hhamon)
 - Eriksen Costa (eriksencosta)
 - Martin Hasoň (hason)
+ - Jean-François Simon (jfsimon)
 - Jonathan Wage (jwage)
 - William Durand (couac)
 - Alexandre Salomé (alexandresalome)
 - ornicar
 - stealth35 ‏ (stealth35)
- - Jean-François Simon (jfsimon)
 - Alexander Mols (asm89)
+ - Jakub Zalas (jakubzalas)
 - Bulat Shakirzyanov (avalanche123)
 - Francis Besset (francisbesset)
- - Jakub Zalas (jakubzalas)
- - Miha Vrhovnik
 - Henrik Bjørnskov (henrikbjorn)
+ - Miha Vrhovnik
 - Konstantin Kudryashov (everzet)
 - Саша Стаменковић (umpirsky)
 - Arnaud Le Blanc (arnaud-lb)
+ - Florin Patan (florinpatan)
 - Eric Clemmons (ericclemmons)
 - Henrik Westphal (snc)
 - Romain Neutron (romain)
 - Deni
- - Florin Patan (florinpatan)
 - Dariusz Górecki (canni)
+ - Bilal Amarni (bamarni)
 - Marc Weistroff (futurecat)
 - Jordan Alliot (jalliot)
 - Arnout Boks (aboks)
 - Hidenori Goto (hidenorigoto)
- - Bilal Amarni (bamarni)
+ - Lee McDermott
 - Brandon Turner
 - Andrej Hudec (pulzarraider)
 - Brikou Carré (brikou)
 - John Wards (johnwards)
 - Antoine Hérault (herzult)
+ - Fran Moreno (franmomu)
 - Daniel Holmes (dholmes)
+ - Bart van den Burg (burgov)
 - Christian Raue
 - Tim Nagel (merk)
- - Michal Piotrowski (eventhorizon)
- - Bart van den Burg (burgov)
 - Włodzimierz Gajda (gajdaw)
+ - Michal Piotrowski (eventhorizon)
 - Colin Frei
 - lenar
- - Lee McDermott
+ - Toni Uebernickel (havvg)
 - Fabien Pennequin (fabienpennequin)
 - excelwebzone
- - Toni Uebernickel (havvg)
 - woodspire
 - 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)
- - Michel Weimerskirch (mweimerskirch)
 - Richard Shank (iampersistent)
 - Sebastian Hörl (blogsh)
- - Fran Moreno (franmomu)
 - Juti Noppornpitak
 - Robert Schönthal (digitalkaoz)
 - Felix Labrecque
 - Michał Pipa (michal.pipa)
 - Daniel Gomes (danielcsgomes)
+ - Gábor Egyed (1ed)
 - Tigran Azatyan (tigranazatyan)
 - Pierre Minnieur (pminnieur)
 - Larry Garfield (crell)
 - Arnaud Kleinpeter (nanocom)
 - David Buchmann (dbu)
 - Jonathan Ingram (jonathaningram)
+ - Gordon Franke (gimler)
+ - Sebastiaan Stok (sstok)
 - Javier Eguiluz (javier.eguiluz)
 - Matthieu Ouellette-Vachon (maoueh)
 - Amal Raghav (kertz)
 - Artur Kotyrba
 - Pablo Godel (pgodel)
- - Sebastiaan Stok (sstok)
 - Helmer Aaviksoo
- - Gábor Egyed (1ed)
 - Clément JOBEILI (dator)
 - Julien Brochet (mewt)
 - Rafael Dohms (rdohms)
- - Gordon Franke (gimler)
 - Benjamin Dulau (dbenjamin)
 - Andreas Hucks (meandmymonkey)
 - Noel Guilbert (noel)
@ -123,6 +123,7 @@ Symfony2 is the result of the work of many people who made the code better
 - Ray
 - Joseph Rouff (rouffj)
 - Albert Casademont (acasademont)
+ - Guilherme Blanco (guilhermeblanco)
 - Francois Zaninotto
 - François Zaninotto (fzaninotto)
 - Xavier Montaña Carreras (xmontana)
@ -133,7 +134,6 @@ Symfony2 is the result of the work of many people who made the code better
 - Florian Klein (docteurklein)
 - jules boussekeyt (gordonslondon)
 - Jan Sorgalla (jsor)
- - Guilherme Blanco (guilhermeblanco)
 - jdhoek
 - geoffrey
 - Wodor Wodorski
@ -146,8 +146,10 @@ Symfony2 is the result of the work of many people who made the code better
 - Yaroslav Kiliba
 - Andréia Bohner (andreia)
 - Eric GELOEN (gelo)
+ - Sebastian Bergmann
 - arjen
 - Adrien Brault (adrienbrault)
+ - sun (sun)
 - Manuel Kiessling (manuelkiessling)
 - Sergey Linnik
 - Bertrand Zuchuat (garfield-fr)
@ -171,9 +173,7 @@ Symfony2 is the result of the work of many people who made the code better
 - Niklas Fiekas
 - Tom Van Looy (tvlooy)
 - Brouznouf
- - Sebastian Bergmann
 - Greg Thornton (xdissent)
- - sun (sun)
 - Lars Strojny
 - Terje Bråten
 - Costin Bereveanu (schniper)
@ -186,6 +186,7 @@ Symfony2 is the result of the work of many people who made the code better
 - Joe Lencioni
 - Chekote
 - Kai
+ - Denis Gorbachev (starfall)
 - Laszlo Korte
 - Alessandro Desantis (alessandro1997)
 - hubert lecorche (hlecorche)
@ -207,10 +208,12 @@ Symfony2 is the result of the work of many people who made the code better
 - Marcin Sikoń (marphi)
 - Miquel Rodríguez Telep (mrtorrent)
 - Filippo Tessarotto
+ - Adam Harvey
 - Laurent Bachelier (laurentb)
 - Fabian Lange (codingfabian)
 - Yoshio HANAWA
 - Tiago Brito (blackmx)
+ - Hiromi Hishida (77web)
 - hossein zolfi (ocean)
 - Kevin McBride
 - Pablo Díez (pablodip)
@ -219,20 +222,24 @@ Symfony2 is the result of the work of many people who made the code better
 - Manuel de Ruiter (manuel)
 - ondrowan
 - Roman Marintsenko (inori)
+ - Stéphane PY (steph_py)
 - mcben
+ - Maks Slesarenko
 - Vicent Soria Durá (vicentgodella)
 - Peter Kruithof (pkruithof)
 - Erik Trapman (eriktrapman)
 - De Cock Xavier (xdecock)
 - Manuel Reinhard (sprain)
+ - Matthijs van den Bos
 - Joel Wurtz
 - Uwe Jäger (uwej711)
 - Nils Adermann (naderman)
 - Leevi Graham
+ - Michaël Perrin (michael.perrin)
 - sasezaki
+ - Loïc Chardonnet (gnusat)
 - Steven Surowiec
 - Marek Kalnik (marekkalnik)
- - Denis Gorbachev (starfall)
 - Chris Smith
 - Anthon Pang
 - Eugene Leonovich
@ -247,11 +254,14 @@ Symfony2 is the result of the work of many people who made the code better
 - Zach Badgett (zachbadgett)
 - Aurélien Fredouelle
 - Francesco Levorato
+ - Karoly Negyesi (chx)
 - 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)
@ -262,6 +272,7 @@ 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)
@ -269,6 +280,7 @@ Symfony2 is the result of the work of many people who made the code better
 - Roumen Damianoff (roumen)
 - Pierre du Plessis (pierredup)
 - Åsmund Garfors
+ - Erin Millard
 - Jeremy David (jeremy.david)
 - Tobias Sjösten (tobiassjosten)
 - Dustin Dobervich (dustin10)
@ -286,21 +298,21 @@ Symfony2 is the result of the work of many people who made the code better
 - Hossein Bukhamsin
 - Pierre-Yves LEBECQ (pylebecq)
 - Fabrice Bernhard (fabriceb)
+ - Johannes Klauss (cloppy)
 - Mark Sonnabaum
 - develop
 - Atsuhiro KUBO (iteman)
 - Samy Dindane (dinduks)
 - yclian
+ - Jérôme Tamarelle (gromnan)
 - Jérémy Romey (jeremyfreeagent)
 - Pascal Helfenstein
 - Matt Daum (daum)
 - Baldur Rensch
- - Hiromi Hishida (77web)
 - Alex Xandra Albert Sim
 - Yuen-Chi Lian
 - Joshua Nye
 - avorobiev
- - Stéphane PY (steph_py)
 - Mark Challoner
 - Andrew Tchircoff (andrewtch)
 - BilgeXA
@ -332,8 +344,6 @@ Symfony2 is the result of the work of many people who made the code better
 - Philipp Kräutli (pkraeutli)
 - Stefano Sala (stefano.sala)
 - frost-nzcr4
- - Loïc Chardonnet (gnusat)
- - Michaël Perrin (michael.perrin)
 - Abhoryo
 - Fabian Vogler (fabian)
 - Maksim Kotlyar (makasim)
@ -361,6 +371,7 @@ Symfony2 is the result of the work of many people who made the code better
 - Emil Einarsson
 - Thibault Duplessis
 - Marc Abramowitz
+ - Martijn Evers
 - Mathias Rohnstock (drmonty)
 - Harry Walter (haswalt)
 - Michael Roterman (wtfzdotnet)
@ -371,7 +382,6 @@ Symfony2 is the result of the work of many people who made the code better
 - Miha Vrhovnik
 - Moritz Borgmann
 - Daniel Cestari
- - Karoly Negyesi (chx)
 - Javier López (loalf)
 - Magnus Nordlander (magnusnordlander)
 - Adam Monsen (meonkeys)
@ -379,12 +389,12 @@ Symfony2 is the result of the work of many people who made the code better
 - Robert Gruendler (pulse00)
 - ragtek (ragtek)
 - Benoît Merlet (trompette)
- - Maks
 - Jan Behrens
 - Raul Fraile (raulfraile)
 - sensio
 - Théophile Helleboid - chtitux
 - xaav
+ - Mahmoud Mostafa (mahmoud)
 - Juti Noppornpitak
 - Mei Gwilym
 - ttomor
@ -413,6 +423,7 @@ Symfony2 is the result of the work of many people who made the code better
 - Haritz Iturbe (hizai)
 - SPolischook
 - Diego Sapriza
+ - fzerorubigd
 - Joan Cruz
 - Antoine Corcy
 - inspiran
@ -436,7 +447,6 @@ Symfony2 is the result of the work of many people who made the code better
 - Nicolas Fabre (nfabre)
 - Paul Matthews
 - Clement Herreman (clemherreman)
- - Jérôme Tamarelle (gromnan)
 - Marco
 - Alberto Aldegheri
 - heccjj
@ -449,6 +459,7 @@ Symfony2 is the result of the work of many people who made the code better
 - Andy Cox (ringo)
 - Sebastian Göttschkes (sgoettschkes)
 - Pierre Tachoire
+ - Ludek Stepan
 - Balázs Benyó (duplabe)
 - Sebastian Utz
 - Keri Henare (kerihenare)
@ -464,12 +475,16 @@ Symfony2 is the result of the work of many people who made the code better
 - Marcus Stöhr (dafish)
 - Carsten Nielsen (phreaknerd)
 - Jay Severson
+ - René Kerner
+ - Adrien Samson (adriensamson)
 - Martin Eckhardt
 - Michael Dowling (mtdowling)
 - Robert Queck
 - mlively
 - Fabian Steiner (fabstei)
 - Thomas Chmielowiec (chmielot)
+ - Jānis Lukss
+ - fdgdfg (psampaz)
 - kaywalker
 - Sebastian Ionescu
 - Simon Neidhold
@ -479,13 +494,16 @@ Symfony2 is the result of the work of many people who made the code better
 - Mephistofeles
 - pscheit
 - Nicolas Badey (nico-b)
+ - povilas
 - Lars Strojny
 - Bouke Haarsma
 - Harm van Tilborg
+ - Martin Eckhardt
 - Leonid Terentyev
 - Tom Adam (tomadam)
 - Francisco Facioni (fran6co)
 - Paweł Wacławczyk (pwc)
+ - Eric Caron
 - Thomas Bibb
 - Josef Cech
 - Andrey Esaulov (andremaha)
@ -543,6 +561,7 @@ Symfony2 is the result of the work of many people who made the code better
 - Jan Eichhorn (exeu)
 - Julien DIDIER (juliendidier)
 - Martin Mayer (martin)
+ - Grzegorz Łukaszewicz (newicz)
 - partugal
 - Robert Campbell
 - Matt Lehner
@ -555,6 +574,7 @@ Symfony2 is the result of the work of many people who made the code better
 - Alan Chen
 - Maerlyn
 - Even André Fiskvik
+ - Franz Liedke
 - Rafał Wrzeszcz
 - Frédéric Hardy
 - Lenar Lõhmus
@ -567,6 +587,7 @@ Symfony2 is the result of the work of many people who made the code better
 - Alexander Kotynia
 - Rafał
 - Masao Maeda (brtriver)
+ - Dave Marshall (davedevelopment)
 - Denis Klementjev (dklementjev)
 - Kévin Dunglas (dunglas)
 - Vincent Composieux (eko)
@ -582,10 +603,10 @@ Symfony2 is the result of the work of many people who made the code better
 - Till Klampaeckel
 - srsbiz
 - Nicolas A. Bérard-Nault
+ - Gladhon
 - Saem Ghani
 - Alexey Popkov
 - Piotr Błasiak
- - Elnur Abdurrakhimov
 - Arnaud Buathier (arnapou)
 - chesteroni (chesteroni)
 - Simon CONSTANS (kosssi)
@ -593,12 +614,15 @@ Symfony2 is the result of the work of many people who made the code better
 - Wotre
 - goohib
 - Xavier HAUSHERR
+ - Brian Debuire
 - Lars Vierbergen
 - Sylvain Lorinet
 - jc
 - BenjaminBeck
+ - Christian Eikermann
 - Vladimir Sazhin
 - Vyacheslav Slinko
+ - Maksim Muruev
 - Johannes
 - Jörg Rühl
 - patrick-mcdougle
@ -634,6 +658,7 @@ Symfony2 is the result of the work of many people who made the code better
 - Peter Zwosta
 - parhs
 - Oncle Tom
+ - Xavier Amado
 - Christian Stocker
 - dorkitude
 - tirnanog06
@ -653,7 +678,6 @@ Symfony2 is the result of the work of many people who made the code better
 - Yohan Giarelli (frequence-web)
 - Massimiliano Arione (garak)
 - Vladislav Krupenkin (ideea)
- - Emanuele Gaspari (inmarelibero)
 - joris de wit (jdewit)
 - Jérémy CROMBEZ (jeremy)
 - Jorge Maiden (jorgemaiden)
--- a/src/Symfony/Component/DomCrawler/Tests/LinkTest.php
+++ b/src/Symfony/Component/DomCrawler/Tests/LinkTest.php
@ -102,6 +102,8 @@ class LinkTest extends \PHPUnit_Framework_TestCase
            array('?foo=2', 'http://localhost/bar/?foo=1', 'http://localhost/bar/?foo=2'),
            array('?bar=2', 'http://localhost?foo=1', 'http://localhost?bar=2'),

+            array('foo', 'http://login.foo.com/bar/baz?/query/string', 'http://login.foo.com/bar/foo'),
+
            array('.', 'http://localhost/foo/bar/baz', 'http://localhost/foo/bar/'),
            array('./', 'http://localhost/foo/bar/baz', 'http://localhost/foo/bar/'),
            array('./foo', 'http://localhost/foo/bar/baz', 'http://localhost/foo/bar/foo'),
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php
@ -257,7 +257,7 @@ class TimeTypeTest extends LocalizedTestCase
            'with_seconds' => true,
        ));

-        $dateTime = new \DateTime('12:04:05');
+        $dateTime = new \DateTime('2013-01-01 12:04:05');
        $dateTime->setTimezone(new \DateTimeZone('America/New_York'));

        $form->setData($dateTime->format('H:i:s'));