From 6645d303cc1a1933e8730a0dbacbb8041072e7e3 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 17 Jan 2013 16:39:41 +0100 Subject: [PATCH 1/8] updated CHANGELOG for 2.0.22 --- CHANGELOG-2.0.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/CHANGELOG-2.0.md b/CHANGELOG-2.0.md index 1e641c3fad..76b938d258 100644 --- a/CHANGELOG-2.0.md +++ b/CHANGELOG-2.0.md @@ -7,6 +7,23 @@ 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.22 (2013-01-17) + + * 3c87e2e: Added Yaml\Dumper::setIndentation() method to allow a custom indentation level of nested nodes. + * ba6e315: added a way to enable/disable object support when parsing/dumping + * ac756bf: added a way to enable/disable PHP support when parsing a YAML input via Yaml::parse() + * dc2cc6b: [Console] fixed input bug when the value of an option is empty (closes #6649, closes #6689) + * 880da01: [Process] In edge cases `getcwd()` can return `false`, then `proc_open()` should get `null` to use default value (the working dir of the current PHP process) + * 1d362b8: [DependencyInjection] fixed a bug where the strict flag on references were lost (closes #6607) + * 3195122: [HttpFoundation] Check if required shell functions for `FileBinaryMimeTypeGuesser` are not disabled + * dbafc2c: [CssSelector] added css selector with empty string + * ba2d035: Restrict Monolog version to be in version <1.3 + * e0923ae: [DependencyInjection] fixed PhpDumper optimizations when an inlined service depends on the current one indirectly + * cd15390: [DependencyInjection] fixed PhpDumper when an inlined service definition has some properties + * 73d9cef: [Locale] Adjust `StubIntlDateFormatter` to have new methods added in PHP 5.5 + * 913b564: [Locale] Fix failing `StubIntlDateFormatter` in PHP 5.5 + * 8ae773b: [Form] Fix failing `MonthChoiceList` in PHP 5.5 + * 2.0.21 (2012-12-21) * b8e5689: [FrameworkBundle] fixed ESI calls From e1d415ae0f01b2e15c929a57cc56e28138b9ac86 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 17 Jan 2013 16:40:10 +0100 Subject: [PATCH 2/8] update CONTRIBUTORS for 2.0.22 --- CONTRIBUTORS.md | 182 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 127 insertions(+), 55 deletions(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 92fb61f188..ba82f2ae4e 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -10,18 +10,18 @@ Symfony2 is the result of the work of many people who made the code better - Jordi Boggiano (seldaek) - Johannes S (johannes) - Kris Wallsmith (kriswallsmith) - - Christophe Coevoet (stof) - Tobias Schultze (tobion) + - Christophe Coevoet (stof) - Pascal Borreli (pborreli) - Karma Dordrak (drak) - Ryan Weaver - Lukas Kahwe Smith (lsmith) - Jeremy Mikola (jmikola) - - Benjamin Eberlei (beberlei) - - Igor Wiedler (igorw) - Joseph Bielawski (stloyd) - - Eriksen Costa (eriksencosta) + - Igor Wiedler (igorw) + - Benjamin Eberlei (beberlei) - Hugo Hamon (hhamon) + - Eriksen Costa (eriksencosta) - Martin Hasoň (hason) - Jonathan Wage (jwage) - William Durand (couac) @@ -29,72 +29,78 @@ Symfony2 is the result of the work of many people who made the code better - ornicar - stealth35 ‏ (stealth35) - Jean-François Simon (jfsimon) + - Alexander Mols (asm89) - Bulat Shakirzyanov (avalanche123) - Francis Besset (francisbesset) + - Jakub Zalas (jakubzalas) - Miha Vrhovnik - Henrik Bjørnskov (henrikbjorn) - Konstantin Kudryashov (everzet) - - Jakub Zalas (jakubzalas) + - Саша Стаменковић (umpirsky) - Arnaud Le Blanc (arnaud-lb) - Eric Clemmons (ericclemmons) - Henrik Westphal (snc) - - Alexander Mols (asm89) - - Deni - Romain Neutron (romain) + - Deni + - Florin Patan (florinpatan) - Dariusz Górecki (canni) - Marc Weistroff (futurecat) - Jordan Alliot (jalliot) - Arnout Boks (aboks) - - Саша Стаменковић (umpirsky) - Hidenori Goto (hidenorigoto) + - Bilal Amarni (bamarni) - Brandon Turner - Andrej Hudec (pulzarraider) - Brikou Carré (brikou) - John Wards (johnwards) - Antoine Hérault (herzult) - Daniel Holmes (dholmes) - - Bilal Amarni (bamarni) - Christian Raue - Tim Nagel (merk) - Michal Piotrowski (eventhorizon) - - Włodzimierz Gajda (gajdaw) - - Florin Patan (florinpatan) - - lenar - - Fabien Pennequin (fabienpennequin) - Bart van den Burg (burgov) + - Włodzimierz Gajda (gajdaw) + - Colin Frei + - lenar + - Lee McDermott + - Fabien Pennequin (fabienpennequin) - excelwebzone + - Toni Uebernickel (havvg) + - woodspire + - Grégoire Pineau (lyrixx) + - Mario A. Alvarez Garcia (nomack84) + - Douglas Greenshields (shieldo) - Kevin Bond (kbond) - Richard Miller (mr_r_miller) - - Grégoire Pineau (lyrixx) - - Toni Uebernickel (havvg) - Jacob Dreesen (jdreesen) - - Douglas Greenshields (shieldo) + - Michel Weimerskirch (mweimerskirch) - Richard Shank (iampersistent) - Sebastian Hörl (blogsh) - - Mario A. Alvarez Garcia (nomack84) + - Fran Moreno (franmomu) - Juti Noppornpitak - Robert Schönthal (digitalkaoz) + - Felix Labrecque - Michał Pipa (michal.pipa) - - woodspire - Daniel Gomes (danielcsgomes) - - Michel Weimerskirch (mweimerskirch) - Tigran Azatyan (tigranazatyan) - Pierre Minnieur (pminnieur) + - Larry Garfield (crell) - Arnaud Kleinpeter (nanocom) + - David Buchmann (dbu) - Jonathan Ingram (jonathaningram) - Javier Eguiluz (javier.eguiluz) - Matthieu Ouellette-Vachon (maoueh) - - Larry Garfield (crell) - Amal Raghav (kertz) - Artur Kotyrba - Pablo Godel (pgodel) + - Sebastiaan Stok (sstok) - Helmer Aaviksoo + - Gábor Egyed (1ed) - Clément JOBEILI (dator) - Julien Brochet (mewt) - - David Buchmann (dbu) - - Sebastiaan Stok (sstok) + - Rafael Dohms (rdohms) + - Gordon Franke (gimler) - Benjamin Dulau (dbenjamin) - - Felix Labrecque - Andreas Hucks (meandmymonkey) - Noel Guilbert (noel) - Jérémie Augustin (jaugustin) @@ -102,15 +108,14 @@ Symfony2 is the result of the work of many people who made the code better - Thomas Rabaix (rande) - Dennis Benkert (denderello) - Marcel Beerta (mazen) - - Rafael Dohms (rdohms) - Matthieu Bontemps (mbontemps) - fivestar - Dominique Bongiraud - Leszek Prabucki (l3l0) - Danny Berger (dpb587) - Dustin Whittle (dustinwhittle) - - Fran Moreno (franmomu) - jeff + - Clemens Tolboom - Justin Hileman (bobthecow) - Sven Paulus (subsven) - Xavier Perez @@ -118,19 +123,16 @@ Symfony2 is the result of the work of many people who made the code better - Ray - Joseph Rouff (rouffj) - Albert Casademont (acasademont) - - Gordon Franke (gimler) - Francois Zaninotto - François Zaninotto (fzaninotto) - Xavier Montaña Carreras (xmontana) - - Gábor Egyed (1ed) - Katsuhiro OGAWA - - Clemens Tolboom + - Peter Kokot (maastermedia) - Alif Rachmawadi - boombatower - Florian Klein (docteurklein) - jules boussekeyt (gordonslondon) - Jan Sorgalla (jsor) - - Lee McDermott - Guilherme Blanco (guilhermeblanco) - jdhoek - geoffrey @@ -141,7 +143,9 @@ Symfony2 is the result of the work of many people who made the code better - Wouter Van Hecke - Gyula Sallai (salla) - Michael Holm (hollo) - - Peter Kokot (maastermedia) + - Yaroslav Kiliba + - Andréia Bohner (andreia) + - Eric GELOEN (gelo) - arjen - Adrien Brault (adrienbrault) - Manuel Kiessling (manuelkiessling) @@ -150,6 +154,7 @@ Symfony2 is the result of the work of many people who made the code better - Beau Simensen (simensen) - Grégoire Paris (greg0ire) - Tamas Szijarto + - Thomas Adam - Grégoire Passault (gregwar) - Aurelijus Valeiša (aurelijus) - Gustavo Piltcher @@ -164,18 +169,19 @@ Symfony2 is the result of the work of many people who made the code better - Jeanmonod David (jeanmonod) - Thomas Lallement (raziel057) - Niklas Fiekas + - Tom Van Looy (tvlooy) - Brouznouf - - Andréia Bohner (andreia) - Sebastian Bergmann - Greg Thornton (xdissent) - sun (sun) - - Yaroslav Kiliba - Lars Strojny - Terje Bråten - Costin Bereveanu (schniper) - Markus Lanthaler (lanthaler) + - Jérôme Vieilledent (lolautruche) - realmfoo - Tobias Naumann + - Ismael Ambrosi (iambrosi) - Shein Alexey - Joe Lencioni - Chekote @@ -188,10 +194,13 @@ Symfony2 is the result of the work of many people who made the code better - Michael Ridgway - Pavel Campr (pcampr) - Brian King + - Ricard Clau (ricardclau) - Jan Schumann - Olivier Dolbeau (odolbeau) + - Konstantin Myakshin (koc) - Michele Orselli (orso) - Asier Illarramendi (doup) + - Chris Heng (gigablah) - Christoph Mewes (xrstf) - Jonas Flodén (flojon) - Shigenibu Nishikawa @@ -201,31 +210,36 @@ Symfony2 is the result of the work of many people who made the code better - Laurent Bachelier (laurentb) - Fabian Lange (codingfabian) - Yoshio HANAWA + - Tiago Brito (blackmx) + - hossein zolfi (ocean) - Kevin McBride - Pablo Díez (pablodip) - Michael Piecko (michael.piecko) + - Sebastian Krebs - Manuel de Ruiter (manuel) - ondrowan - Roman Marintsenko (inori) - mcben - - Jérôme Vieilledent (lolautruche) + - Vicent Soria Durá (vicentgodella) - Peter Kruithof (pkruithof) - - Eric GELOEN (gelo) - Erik Trapman (eriktrapman) - De Cock Xavier (xdecock) - Manuel Reinhard (sprain) - - Thomas Adam - Joel Wurtz - Uwe Jäger (uwej711) - Nils Adermann (naderman) + - Leevi Graham - sasezaki - Steven Surowiec - Marek Kalnik (marekkalnik) + - Denis Gorbachev (starfall) - Chris Smith - Anthon Pang + - Eugene Leonovich - Ryan - Alexander Deruwe (aderuwe) - Ivan Rey (ivanrey) + - Jan Kramer (jankramer) - Marcin Chyłek (songoq) - Ned Schwartz - Ziumin @@ -234,6 +248,7 @@ Symfony2 is the result of the work of many people who made the code better - Aurélien Fredouelle - Francesco Levorato - Thomas Tourlourat (armetiz) + - jamogon - Geoffrey Tran (geoff) - Florian Rey (nervo) - Christian Schaefer (caefer) @@ -242,16 +257,20 @@ Symfony2 is the result of the work of many people who made the code better - Ben Ramsey (ramsey) - Christian Jul Jensen - Chris Jones (leek) + - vitaliytv - Markus Bachmann (baachi) - - Colin Frei - aubx - Max Rath (drak3) + - Ruben Gonzalez (rubenrua) + - Sinan Eldem - DerManoMann - Nahuel Cuesta (ncuesta) - Chris Boden (cboden) - Roumen Damianoff (roumen) + - Pierre du Plessis (pierredup) + - Åsmund Garfors - Jeremy David (jeremy.david) - - Konstantin Myakshin (koc) + - Tobias Sjösten (tobiassjosten) - Dustin Dobervich (dustin10) - Sebastian Marek (proofek) - Erkhembayar Gantulga (erheme318) @@ -259,43 +278,48 @@ Symfony2 is the result of the work of many people who made the code better - Rostyslav Kinash - jfcixmedia - Vincent Simonin - - Chris Heng - yktd26 - - Tom Van Looy (tvlooy) + - Jakub Kucharovic - umpirski - cedric lombardot (cedriclombardot) - John Kary (johnkary) - Hossein Bukhamsin + - Pierre-Yves LEBECQ (pylebecq) - Fabrice Bernhard (fabriceb) - Mark Sonnabaum - develop - - hossein zolfi (ocean) - Atsuhiro KUBO (iteman) - Samy Dindane (dinduks) - yclian - Jérémy Romey (jeremyfreeagent) + - Pascal Helfenstein - Matt Daum (daum) + - Baldur Rensch - Hiromi Hishida (77web) + - Alex Xandra Albert Sim - Yuen-Chi Lian - Joshua Nye - - Sebastian Krebs - avorobiev + - Stéphane PY (steph_py) - Mark Challoner - Andrew Tchircoff (andrewtch) - BilgeXA - michaelwilliams - Casper Valdemar Poulsen + - Eduardo Gulias (egulias) - Josiah (josiah) - John Bohn (jbohn) - Nicolas Schwartz (nicoschwartz) + - Christian Soronellas Vallespí (theunic) + - Benjamin Grandfond (benjamin) - Degory Valentine - Krzysiek Łabuś - Xavier Lacot (xavier) - Olivier Maisonneuve + - Iwan van Staveren (istaveren) - cgonzalez - matt foster - Evan S Kaufman (evanskaufman) - - Ismael Ambrosi (iambrosi) - Jayson Xu (superjavason) - Jan Prieser - James Michael DuPont @@ -304,20 +328,20 @@ Symfony2 is the result of the work of many people who made the code better - Christopher Hall (mythmakr) - Paul Kamer (pkamer) - Pierre Vanliefland (pvanliefland) + - Martin Parsiegla (spea) - Philipp Kräutli (pkraeutli) + - Stefano Sala (stefano.sala) - frost-nzcr4 - Loïc Chardonnet (gnusat) - Michaël Perrin (michael.perrin) - Abhoryo - Fabian Vogler (fabian) - - Leevi Graham - Maksim Kotlyar (makasim) - Neil Ferreira - Tony Malzhacker - Cyril Quintin (cyqui) - Gerard van Helden (drm) - Johnny Peck (johnnypeck) - - Denis Gorbachev (starfall) - Kirill chEbba Chebunin - Benjamin Leveque (benji07) - Gustavo Falco (gfalco) @@ -330,23 +354,23 @@ Symfony2 is the result of the work of many people who made the code better - grizlik - Derek ROTH - Shin Ohno (ganchiku) - - Jan Kramer (jankramer) - Drew Butler (nodrew) + - Alexander Miehe (engerim) + - Titouan Galopin (tgalopin) - Don Pinkster - Emil Einarsson - Thibault Duplessis - Marc Abramowitz - Mathias Rohnstock (drmonty) + - Harry Walter (haswalt) - Michael Roterman (wtfzdotnet) - Arno Geurts - Adán Lobato (adanlobato) - Mikhail Yurasov - - jamogon - Sam Williams - Miha Vrhovnik - Moritz Borgmann - Daniel Cestari - - Eugene Leonovich - Karoly Negyesi (chx) - Javier López (loalf) - Magnus Nordlander (magnusnordlander) @@ -362,29 +386,47 @@ Symfony2 is the result of the work of many people who made the code better - Théophile Helleboid - chtitux - xaav - Juti Noppornpitak + - Mei Gwilym + - ttomor - Sander Coolen - Josip Kruslin + - Manuele Menozzi - Anton Babenko (antonbabenko) - Irmantas Šiupšinskas (irmantas) + - dantleech - Tero Alén (tero) - Vadim Tyukov (vatson) - Sortex - arjenjb - chispita - Wojciech Sznapka - - Tobias Sjösten (tobiassjosten) - Alex Bogomazov - julien.galenski - Sébastien Lavoie - Per Sandström (per) + - Ville Mattila - Robert Kiss (kepten) - Vitaliy Tverdokhlib (vitaliytv) - Martijn Evers + - Sergii Smertin (nfx) - Nerijus Arlauskas + - Haritz Iturbe (hizai) + - SPolischook + - Diego Sapriza + - Joan Cruz + - Antoine Corcy + - inspiran + - Cristobal Dabed + - matteo giachino + - Daniel Mecke (daniel_mecke) + - Alex Demchenko (pilot) + - Tomasz Kowalczyk (thunderer) + - Vincent AUBERT (vincent) - DerManoMann - Jochen Bayer (jocl) - Jeremy Bush - Evan Villemez + - Dmitrii Chekaliuk - Davide Borsatto (davide.borsatto) - kaiwa - Albert Ganiev (helios-ag) @@ -398,18 +440,23 @@ Symfony2 is the result of the work of many people who made the code better - Marco - Alberto Aldegheri - heccjj + - Alexandre Melard - modi - Sergey Yuferev - Richard van den Brand (ricbra) - Aharon Perkel - Malaney J. Hill - Andy Cox (ringo) + - Sebastian Göttschkes (sgoettschkes) + - Pierre Tachoire - Balázs Benyó (duplabe) - Sebastian Utz - Keri Henare (kerihenare) - Cédric Lahouste (rapotor) + - Anthony Ferrara - Janusz Jablonski - George Giannoulopoulos + - Ilya Biryukov - Alberto Pirovano (geezmo) - Xavier Briand (xavierbriand) - Evan Kaufman @@ -417,11 +464,13 @@ Symfony2 is the result of the work of many people who made the code better - Marcus Stöhr (dafish) - Carsten Nielsen (phreaknerd) - Jay Severson - - Stéphane PY (steph_py) - Martin Eckhardt - Michael Dowling (mtdowling) + - Robert Queck - mlively + - Fabian Steiner (fabstei) - Thomas Chmielowiec (chmielot) + - kaywalker - Sebastian Ionescu - Simon Neidhold - Kevin Dew @@ -441,26 +490,31 @@ Symfony2 is the result of the work of many people who made the code better - Josef Cech - Andrey Esaulov (andremaha) - hicham ELGUAROUANI (hiiimoo) + - Stefan Koopmanschap (skoop) - Ivan Kurnosov - stloyd - - Martin Parsiegla (spea) - Chris Tickner (tickner) - Luis Muñoz - Thomas Chmielowiec - Oleg Zinchenko - - Benjamin Grandfond (benjamin) - Christoph Nissle (derstoffel) - - Stefano Sala (stefano.sala) - Xavier HAUSHERR - Benjamin Zikarsky - Romain Dorgueil + - Patrick Allaert - Grayson Koonce (breerly) - Andy Stanberry - alefranz + - alsar + - efeen + - Bob den Otter (bopp) + - Simone Fumagalli (hpatoio) - Alessio Baglio (ioalessio) - Jérôme Macias (jeromemacias) + - Jordi Llonch (jordillonch) - Cédric Dugat (ph3nol) - Philip Dahlstrøm (phidah) + - Robin Duval (robin-duval) - Artem Lopata (bumz) - Alexey Popkov - Artyom Protaskin @@ -470,12 +524,12 @@ Symfony2 is the result of the work of many people who made the code better - gedrox - hirocaster - Andrey Chernykh - - Alexander Miehe (engerim) + - François Pluchino - Jörn Lang (j.lang) - Jan Marek (janmarek) - Dan Patrick (mdpatrick) - - Pierre-Yves LEBECQ (pylebecq) - Rares Vlaseanu (raresvla) + - tante kinast (tante) - Tugdual Saunier (tucksaun) - Alexander Zogheb - Florian Pfitzer @@ -493,14 +547,15 @@ Symfony2 is the result of the work of many people who made the code better - Robert Campbell - Matt Lehner - cyrillej + - Haritz - Grummfy - - Eduardo Gulias - Rowan Manning - David Windell - Gabriel Birke - Alan Chen - Maerlyn - Even André Fiskvik + - Rafał Wrzeszcz - Frédéric Hardy - Lenar Lõhmus - Cristian Gonzalez @@ -516,13 +571,16 @@ Symfony2 is the result of the work of many people who made the code better - Kévin Dunglas (dunglas) - Vincent Composieux (eko) - Osman Üngür (import) + - Jorge Martin (jorgemartind) - giulio de donato (liuggio) - Matthew Davis (mdavis1982) - Matthias Pigulla (mpdude) + - Pablo Monterde Perez (plebs) - Jimmy Leger (redpanda) - Baptiste Clavié (talus) - Yanick Witschi - Till Klampaeckel + - srsbiz - Nicolas A. Bérard-Nault - Saem Ghani - Alexey Popkov @@ -530,6 +588,7 @@ Symfony2 is the result of the work of many people who made the code better - Elnur Abdurrakhimov - Arnaud Buathier (arnapou) - chesteroni (chesteroni) + - Simon CONSTANS (kosssi) - Mauricio Lopez (sanctuary29) - Wotre - goohib @@ -537,11 +596,13 @@ Symfony2 is the result of the work of many people who made the code better - Lars Vierbergen - Sylvain Lorinet - jc + - BenjaminBeck - Vladimir Sazhin - Vyacheslav Slinko - Johannes - Jörg Rühl - patrick-mcdougle + - andreabreu98 - Michael Schneider - Jerome Tamarelle - xanido @@ -549,6 +610,7 @@ Symfony2 is the result of the work of many people who made the code better - Samuel Laulhau - Oleg Stepura - James Michael DuPont + - Tammy D - Ondrej Slinták - vlechemin - Skorney @@ -557,6 +619,7 @@ Symfony2 is the result of the work of many people who made the code better - djama - Sébastien HOUZE - Abdulkadir N. A. + - Sema - Thorsten Hallwas - Vincent - Chris Smith @@ -564,6 +627,8 @@ Symfony2 is the result of the work of many people who made the code better - David Soria Parra - Sergiy Sokolenko - Penny Leach + - Gábor Fási + - oscartv - Philipp Rieber - DanSync - Peter Zwosta @@ -573,6 +638,7 @@ Symfony2 is the result of the work of many people who made the code better - dorkitude - tirnanog06 - Besnik Br + - Alex Olmos (alexolmos) - Juan Ases García (ases) - Bernd Matzner (bmatzner) - Chris Sedlmayr (catchamonkey) @@ -587,21 +653,27 @@ 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) - Justin Rainbow (jrainbow) - Sébastien Armand (khepin) - Krzysztof Menżyk (krymen) + - Martin Ledgard (le6o) - Matthieu Moquet (mattketmo) - Matt Drollette (mdrollette) - Florent CAILHOL (ooflorent) - Petr Jaroš (petajaros) + - Philipp Hoffmann (philipphoffmann) + - Alex Carol (picard89) - Daniel Perez Pinazo (pitiflautico) - Ruud Kamphuis (ruudk) - Sebastian Busch (sebu) - Simon Terrien (sterrien) - Markus Tacker (tacker) - Tyler Stroud (tystr) + - Víctor Mateo (victormateo) - Eugene Babushkin (warl) - Florent Cailhol - craigmarvelley From 08ccc62aa59a40b5461ca6c2e72c53c2950cbcdc Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 17 Jan 2013 16:40:40 +0100 Subject: [PATCH 3/8] updated VERSION for 2.0.22 --- src/Symfony/Component/HttpKernel/Kernel.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index 8f4405fbb4..643d1823fd 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -56,12 +56,12 @@ abstract class Kernel implements KernelInterface protected $startTime; protected $classes; - const VERSION = '2.0.22-DEV'; + const VERSION = '2.0.22'; const VERSION_ID = '20022'; const MAJOR_VERSION = '2'; const MINOR_VERSION = '0'; const RELEASE_VERSION = '22'; - const EXTRA_VERSION = 'DEV'; + const EXTRA_VERSION = ''; /** * Constructor. From 28add1210ef14da08b421755b176bcc080ff83a0 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 17 Jan 2013 17:21:31 +0100 Subject: [PATCH 4/8] updated CHANGELOG for 2.1.7 --- CHANGELOG-2.1.md | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/CHANGELOG-2.1.md b/CHANGELOG-2.1.md index 15f69b5f90..df49b91d18 100644 --- a/CHANGELOG-2.1.md +++ b/CHANGELOG-2.1.md @@ -7,6 +7,53 @@ 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.7 (2013-01-17) + + * e17e232: [Yaml] fixed default value + * 3c87e2e: Added Yaml\Dumper::setIndentation() method to allow a custom indentation level of nested nodes. + * ba6e315: added a way to enable/disable object support when parsing/dumping + * ac756bf: added a way to enable/disable PHP support when parsing a YAML input via Yaml::parse() + * 785d365: fixes a bug when output/error output contains a % character + * dc2cc6b: [Console] fixed input bug when the value of an option is empty (closes #6649, closes #6689) + * 9257b03: [Profiler] [Redis] Fix sort of profiler rows. + * c7bfce9: Fix version_compare() calls for PHP 5.5. + * 880da01: [Process] In edge cases `getcwd()` can return `false`, then `proc_open()` should get `null` to use default value (the working dir of the current PHP process) + * 34def9f: Handle the deprecation of IntlDateFormatter::setTimeZoneId() in PHP 5.5. + * b33d5bc: removed the .gitattributes files (closes #6605, reverts #5674) + * eb93e66: [Console] Fix style escaping parsing + * 8ca1b80: [Console] Make style formatter matching less greedy to avoid having to escape when not needed + * 55aa012: [Form] Fixed EntityChoiceList when loading objects with negative integer IDs + * 1d362b8: [DependencyInjection] fixed a bug where the strict flag on references were lost (closes #6607) + * 3195122: [HttpFoundation] Check if required shell functions for `FileBinaryMimeTypeGuesser` are not disabled + * dbafc2c: [CssSelector] added css selector with empty string + * 1e2fb64: [DependencyInjection] refactored code to avoid logic duplication + * d786e09: [Console] made Application::getTerminalDimensions() public + * 8f21f89: [2.1] [Console] Added getTerminalDimensions() with fix for osx/freebsd + * 33e9d00: [Form] Deleted references in FormBuilder::getFormConfig() to improve performance + * ba2d035: Restrict Monolog version to be in version <1.3 + * 4abd5bf: Restrict Monolog version to be in version `<1.3`. Because of conflict between `HttpKernel/Log/LoggerInterface` and `Psr\Log\LoggerInterface` (PSR-3) + * e0923ae: [DependencyInjection] fixed PhpDumper optimizations when an inlined service depends on the current one indirectly + * cd15390: [DependencyInjection] fixed PhpDumper when an inlined service definition has some properties + * fa6fb6f: [Process] Do not reset stdout/stderr pipes on Interrupted system call + * 73d9cef: [Locale] Adjust `StubIntlDateFormatter` to have new methods added in PHP 5.5 + * d601b13: use the right RequestMatcherInterface + * 913b564: [Locale] Fix failing `StubIntlDateFormatter` in PHP 5.5 + * 8ae773b: [Form] Fix failing `MonthChoiceList` in PHP 5.5 + * c526ad9: [Form] Fixed inheritance of "error_bubbling" in RepeatedType + * 6c5e615: [Form] Fixed DateType when used with the intl extension disabled. + * 10b01c9: [HttpFoundation] fix return types and handling of zero in Response + * 75952af: [HttpFoundation] better fix for non-parseable Expires header date + * 87b6cc2: Fix Expires when the header is -1 + * c282a2b: [DoctrineBridge] Allowing memcache port to be 0 to support memcache unix domain sockets. + * 2fc41a1: [Console] fixed unitialized properties (closes #5935) + * a5aeb21: [Process] Prevented test from failing when pcntl extension is not enabled. + * 1d395ad: Revert "[DoctrineBridge] Improved performance of the EntityType when used with the "query_builder" option" + * ef6f241: [Locale] Fixed the StubLocaleTest for ICU versions lower than 4.8. + * bfccd28: HttpUtils must handle RequestMatcher too + * 05fca6d: use preferred_choices in favor of preferred_query + * 6855cff: add preferred_query option to ModelType + * 8beee64: [Form] Fix for `DateTimeToStringTransformer` + * 2.1.6 (2012-12-21) * b8e5689: [FrameworkBundle] fixed ESI calls From 3444290cd65bad3e09217f3b6070d9ebc91b6743 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 17 Jan 2013 17:21:47 +0100 Subject: [PATCH 5/8] updated VERSION for 2.1.7 --- src/Symfony/Component/HttpKernel/Kernel.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index 3a95946fe5..87bac61e24 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -58,12 +58,12 @@ abstract class Kernel implements KernelInterface, TerminableInterface protected $classes; protected $errorReportingLevel; - const VERSION = '2.1.7-DEV'; + const VERSION = '2.1.7'; const VERSION_ID = '20107'; const MAJOR_VERSION = '2'; const MINOR_VERSION = '1'; const RELEASE_VERSION = '7'; - const EXTRA_VERSION = 'DEV'; + const EXTRA_VERSION = ''; /** * Constructor. From 51d1948327227f4064f81cf61f5659e97cb929da Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 17 Jan 2013 17:53:40 +0100 Subject: [PATCH 6/8] [Yaml] fixed typo --- src/Symfony/Component/Yaml/Yaml.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Yaml/Yaml.php b/src/Symfony/Component/Yaml/Yaml.php index ca24cffb9c..48a0191d20 100644 --- a/src/Symfony/Component/Yaml/Yaml.php +++ b/src/Symfony/Component/Yaml/Yaml.php @@ -145,7 +145,7 @@ class Yaml * * @api */ - public static function dump($array, $inline = 2, $indent = 4, $exceptionOnInvalidType = false, $objectSupport = false) + public static function dump($array, $inline = 2, $indent = 2, $exceptionOnInvalidType = false, $objectSupport = false) { $yaml = new Dumper(); $yaml->setIndentation($indent); From 972e1b7a168454f12e52f9ba0dfe8b538f9b6ec1 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 17 Jan 2013 22:13:26 +0100 Subject: [PATCH 7/8] [DependencyInjection] fixed a bug in the YAML dumper where references where not converted to the @ notation --- .../DependencyInjection/Dumper/YamlDumper.php | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php index 04fc117eee..8846d83e48 100644 --- a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php +++ b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php @@ -166,11 +166,7 @@ class YamlDumper extends Dumper return ''; } - if ($this->container->isFrozen()) { - $parameters = $this->prepareParameters($this->container->getParameterBag()->all()); - } else { - $parameters = $this->container->getParameterBag()->all(); - } + $parameters = $this->prepareParameters($this->container->getParameterBag()->all(), $this->container->isFrozen()); return Yaml::dump(array('parameters' => $parameters), 2); } @@ -240,12 +236,12 @@ class YamlDumper extends Dumper * * @return array */ - private function prepareParameters($parameters) + private function prepareParameters($parameters, $escape = true) { $filtered = array(); foreach ($parameters as $key => $value) { if (is_array($value)) { - $value = $this->prepareParameters($value); + $value = $this->prepareParameters($value, $escape); } elseif ($value instanceof Reference) { $value = '@'.$value; } @@ -253,7 +249,7 @@ class YamlDumper extends Dumper $filtered[$key] = $value; } - return $this->escape($filtered); + return $escape ? $this->escape($filtered) : $filtered; } /** From 0138c2d0b360a92d53e990ee3695a826cbad5469 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 17 Jan 2013 22:16:19 +0100 Subject: [PATCH 8/8] [Yaml] fixed unneeded BC break --- src/Symfony/Component/Yaml/Dumper.php | 6 +++--- src/Symfony/Component/Yaml/Yaml.php | 2 +- tests/Symfony/Tests/Component/Yaml/DumperTest.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Symfony/Component/Yaml/Dumper.php b/src/Symfony/Component/Yaml/Dumper.php index 5b0baa5271..f8d50d7d78 100644 --- a/src/Symfony/Component/Yaml/Dumper.php +++ b/src/Symfony/Component/Yaml/Dumper.php @@ -40,13 +40,13 @@ class Dumper * * @param mixed $input The PHP value * @param integer $inline The level where you switch to inline YAML + * @param integer $indent The level of indentation (used internally) * @param Boolean $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise * @param Boolean $objectSupport true if object support is enabled, false otherwise - * @param integer $indent The level of indentation (used internally) * * @return string The YAML representation of the PHP value */ - public function dump($input, $inline = 0, $exceptionOnInvalidType = false, $objectSupport = false, $indent = 0) + public function dump($input, $inline = 0, $indent = 0, $exceptionOnInvalidType = false, $objectSupport = false) { $output = ''; $prefix = $indent ? str_repeat(' ', $indent) : ''; @@ -63,7 +63,7 @@ class Dumper $prefix, $isAHash ? Inline::dump($key, $exceptionOnInvalidType, $objectSupport).':' : '-', $willBeInlined ? ' ' : "\n", - $this->dump($value, $inline - 1, $exceptionOnInvalidType, $objectSupport, $willBeInlined ? 0 : $indent + $this->indentation) + $this->dump($value, $inline - 1, $willBeInlined ? 0 : $indent + $this->indentation, $exceptionOnInvalidType, $objectSupport) ).($willBeInlined ? "\n" : ''); } } diff --git a/src/Symfony/Component/Yaml/Yaml.php b/src/Symfony/Component/Yaml/Yaml.php index 48a0191d20..768451d8e8 100644 --- a/src/Symfony/Component/Yaml/Yaml.php +++ b/src/Symfony/Component/Yaml/Yaml.php @@ -150,6 +150,6 @@ class Yaml $yaml = new Dumper(); $yaml->setIndentation($indent); - return $yaml->dump($array, $inline, $exceptionOnInvalidType, $objectSupport); + return $yaml->dump($array, $inline, 0, $exceptionOnInvalidType, $objectSupport); } } diff --git a/tests/Symfony/Tests/Component/Yaml/DumperTest.php b/tests/Symfony/Tests/Component/Yaml/DumperTest.php index 83e08ca8cb..9be4aebc14 100644 --- a/tests/Symfony/Tests/Component/Yaml/DumperTest.php +++ b/tests/Symfony/Tests/Component/Yaml/DumperTest.php @@ -154,7 +154,7 @@ EOF; public function testObjectSupportEnabled() { - $dump = $this->dumper->dump(array('foo' => new A(), 'bar' => 1), 0, false, true); + $dump = $this->dumper->dump(array('foo' => new A(), 'bar' => 1), 0, 0, false, true); $this->assertEquals('{ foo: !!php/object:O:30:"Symfony\Tests\Component\Yaml\A":1:{s:1:"a";s:3:"foo";}, bar: 1 }', $dump, '->dump() is able to dump objects'); } @@ -171,7 +171,7 @@ EOF; */ public function testObjectSupportDisabledWithExceptions() { - $this->dumper->dump(array('foo' => new A(), 'bar' => 1), 0, true, false); + $this->dumper->dump(array('foo' => new A(), 'bar' => 1), 0, 0, true, false); } }