From f172547d846f15ff13aea8cfeed885e3d6e8e502 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 4 Oct 2011 13:43:49 +0200 Subject: [PATCH 1/4] updated vendors for 2.0.4 --- vendors.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vendors.php b/vendors.php index 8f44e491d4..21593704e6 100755 --- a/vendors.php +++ b/vendors.php @@ -26,9 +26,9 @@ if (!is_dir($vendorDir = dirname(__FILE__).'/vendor')) { } $deps = array( - array('doctrine', 'http://github.com/doctrine/doctrine2.git', '2.1.1'), - array('doctrine-dbal', 'http://github.com/doctrine/dbal.git', '2.1.2'), - array('doctrine-common', 'http://github.com/doctrine/common.git', '2.1.1'), + array('doctrine', 'http://github.com/doctrine/doctrine2.git', '2.1.2'), + array('doctrine-dbal', 'http://github.com/doctrine/dbal.git', '2.1.3'), + array('doctrine-common', 'http://github.com/doctrine/common.git', '2.1.2'), array('monolog', 'http://github.com/Seldaek/monolog.git', '1.0.1'), array('swiftmailer', 'http://github.com/swiftmailer/swiftmailer.git', 'v4.1.2'), array('twig', 'http://github.com/fabpot/Twig.git', 'v1.1.2'), From b6ef87f68e4c1e5b9565b7a540a95da60d94cf87 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 4 Oct 2011 13:46:16 +0200 Subject: [PATCH 2/4] updated CHANGELOG for 2.0.4 --- CHANGELOG-2.0.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/CHANGELOG-2.0.md b/CHANGELOG-2.0.md index df76528cb8..10755d6115 100644 --- a/CHANGELOG-2.0.md +++ b/CHANGELOG-2.0.md @@ -7,6 +7,29 @@ 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.4 (2011-10-04) + + * cf4a91e: [ClassLoader] fixed usage of trait_exists() + * 8d6add6: [DoctrineBridge] fixed directory reference when the directory cannot be created + * 5419638: [HttpKernel] Show the actual directory needing to be created. + * 5c8a2fb: [Routing] fixed route overriden mechanism when using embedded collections (closes #2139) + * e70c884: [Bridge/Monolog] Fix WebProcessor to accept a Request object. + * 600b8ef: [Validator] added support for grapheme_strlen when mbstring is not installed but intl is installed + * d429594: removed separator of choice widget when the separator is null + * 17af138: fixed usage of LIBXML_COMPACT as it is not always available + * b12ce94: [HttpFoundation] fix #2142 PathInfo parsing/checking + * b402835: [HttpFoundation] standardized cookie paths (an empty path is equivalent to /) + * 1284681: [BrowserKit] standardized cookie paths (an empty path is equivalent to /) + * 1e7e6ba: [HttpFoundation] removed the possibility for a cookie path to set it to null (as this is equivalent to /) + * 2db24c2: removed time limit for the vendors script (closes #2282) + * c13b4e2: fixed fallback catalogue mechanism in Framework bundle + * 369f181: [FrameworkBundle] Add request scope to assets helper only if needed + * d6b915a: [FrameworkBundle] Assets templating helper does not need request scope + * ed02aa9: Fix console: list 'namespace' command display all available commands + * 85ed5c6: [ClassLoader] Fixed state when trait_exists doesn't exists + * e866a67: [DoctrineBundle] Tries to auto-generate the missing proxy files on the autoloader + * 908a7a3: [HttpFoundation] Fix bug in clearCookie/removeCookie not clearing cookies set with a default '/' path, unless it was explicitly specified + * 2.0.3 (2011-09-25) * 49c585e: Revert "merged branch stealth35/ini_bool (PR #2235)" From 408c9139917a05e19805c44885ffbd48a132b1c4 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 4 Oct 2011 13:46:51 +0200 Subject: [PATCH 3/4] update CONTRIBUTORS for 2.0.4 --- CONTRIBUTORS.md | 74 ++++++++++++++++++++++++++----------------------- 1 file changed, 40 insertions(+), 34 deletions(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index b14720ae2e..dbe0136699 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -11,85 +11,89 @@ Symfony2 is the result of the work of many people who made the code better - Victor Berchet (vicb) - Jordi Boggiano (Seldaek) - Ryan Weaver (weaverryan) + - Alexandre Salomé (alexandresalome) - Christophe Coevoet (stof) - Pascal Borreli (pborreli) - Joseph Bielawski (stloyd) - Benjamin Eberlei (beberlei) - - Alexandre Salomé (alexandresalome) - Lukas Kahwe Smith (lsmith77) - Igor Wiedler (igorw) - - Jonathan H. Wage (jwage) - Jeremy Mikola (jmikola) + - Jonathan H. Wage (jwage) + - stealth35 (stealth35) - Hugo Hamon (hhamon) - Thibault Duplessis (ornicar) - Bulat Shakirzyanov (avalanche123) - Eriksen Costa (eriksencosta) - - stealth35 (stealth35) - Francis Besset (francisbesset) - - yethee (yethee) - - Miha Vrhovnik (mvrhov) + - Henrik Westphal (snc) - Arnout Boks (aboks) + - yethee (yethee) - Martin Hasoň (hason) + - Miha Vrhovnik (mvrhov) + - Jacob Dreesen (jdreesen) - Henrik Bjørnskov (henrikbjorn) + - Benjamin Dulau (benjamindulau) - Konstantin Kudryashov (everzet) - Brikou CARRE (brikou) - - Jacob Dreesen (jdreesen) - - Hidenori Goto (hidenorigoto) + - Jordan Alliot (jalliot) - Lenar Lõhmus (lenar) - - Henrik Westphal (snc) + - Hidenori Goto (hidenorigoto) + - Wotre (Wotre) - Brandon Turner (blt04) - Marc Weistroff (marcw) - John Wards (johnwards) - - Antoine Hérault (Herzult) - Daniel Holmes (danielholmes) - - Benjamin Dulau (benjamindulau) + - Antoine Hérault (Herzult) - Fabien Pennequin (FabienPennequin) - - Matthieu Vachon (maoueh) - - Katsuhiro OGAWA (fivestar) - - Konstantin Leboev (realmfoo) - - Christian Raue (craue) - - Matthieu Bontemps (mbontemps) - - Wotre (Wotre) - Michel Salib (michelsalib) + - Matthieu Vachon (maoueh) + - Excel Web Zone (excelwebzone) + - Christian Raue (craue) + - Katsuhiro OGAWA (fivestar) + - Helmer Aaviksoo (helmer) + - Konstantin Leboev (realmfoo) + - Matthieu Bontemps (mbontemps) + - brki (brki) - Robert Schönthal (digitalkaoz) - - Jordan Alliot (jalliot) - Michel Weimerskirch (mweimerskirch) + - Thomas (rande) - blue-eyes (blue-eyes) - Tim Nagel (merk) - Francois Zaninotto (fzaninotto) - - Excel Web Zone (excelwebzone) - Richard Shank (IamPersistent) - Amal Raghav (kertz) - Jeroen Hoek (jdhoek) - Arjen Brouwer (arjenjb) - - Thomas (rande) + - Eric Clemmons (ericclemmons) - Jakub Zalas (jakzal) - Artur Kotyrba (udat) - - brki (brki) + - Michele Orselli (micheleorselli) + - Alif Rachmawadi (alifity) - Clément JOBEILI (dator) - - Eric Clemmons (ericclemmons) - Xavier Montaña (xmontana) - Noel GUILBERT (noelg) - Martin Schuhfuss (usefulthink) - Dennis Benkert (denderello) - Dustin Whittle (dustinwhittle) - - Michele Orselli (micheleorselli) - Jean-François PHILIPPE (jfphilippe) - Justin Hileman (bobthecow) - - Alif Rachmawadi (alifity) - dlsniper (dlsniper) - Sven Paulus (subsven) - umpirsky (umpirsky) - Xavier Perez (DuoSRX) - Brouznouf (Brouznouf) + - Drak (drak) - Boussekeyt Jules (gordonslondon) - - Helmer Aaviksoo (helmer) + - Tom Klingenberg (ktomk) - Pablo Godel (pgodel) - Leszek Prabucki (l3l0) - Jan Sorgalla (jsor) + - superjavason (superjavason) - Lee McDermott (lmcd) - HIROKI (hirocaster) - Pierre-Yves LEBECQ (pylebecq) + - Kirill chEbba Chebunin (chEbba) - Michael Ridgway (mridgway) - Gordon Franke (gimler) - geoffrey @@ -97,13 +101,15 @@ Symfony2 is the result of the work of many people who made the code better - yktd26 (yktd26) - heccjj (heccjj) - Jeremie Augustin - - Tom Klingenberg (ktomk) + - Julien Brochet (aerialls) - Aurelijus Valeiša (aurelijus) - Ray (rrehbeindoi) - Kevin McBride (krmcbride) - Adrian Rudnik (kreischweide) - asm89 (asm89) - Geoffrey Tran (geoffreytran) + - Teo (teo-sk) + - Neil Katin - Andréia Bohner (andreia) - Daniel Gomes (danielcsgomes) - Shigenobu Nishikawa (shishi) @@ -119,12 +125,14 @@ Symfony2 is the result of the work of many people who made the code better - Richard Miller (richardmiller) - Sergey Linnik (Partugal) - Laszlo Korte (laszlokorte) - - Kirill chEbba Chebunin (chEbba) - Derek ROTH (DerekRoth) - Baptiste Clavié (Taluu) + - Marek Kalnik (marekkalnik) - arnaud-lb (arnaud-lb) - Stepan Tanasiychuk (stfalcon) - Bertrand Zuchuat (Garfield-fr) + - John Carr (Jc2k) + - jdewit (jdewit) - Oncle Tom (oncletom) - Jan Behrens (deegital) - Jan Schumann (janschumann) @@ -133,6 +141,7 @@ Symfony2 is the result of the work of many people who made the code better - Gábor Egyed - Javier Eguiluz (javiereguiluz) - Marcin Sikoń (marphi) + - Laurent Bachelier (laurentb) - Fabian Lange (CodingFabian) - Yoshio HANAWA - Pablo Díez (pablodip) @@ -141,6 +150,7 @@ Symfony2 is the result of the work of many people who made the code better - Douglas Greenshields (shieldo) - Nicolas Badey (Nico-B) - Benoit Tirmarche (mcbennn) + - stloyd - De Cock Xavier (xdecock) - Cristian González Sánchez (cristiangsp) - Grégoire Passault (Gregwar) @@ -156,7 +166,6 @@ Symfony2 is the result of the work of many people who made the code better - Grégoire Passault - Michael Roterman (wtfzdotnet) - Christian Schaefer (caefer) - - Teo (teo-sk) - Elliot Anderson (elliot) - Sortex - Tobias Sjösten (tobiassjosten) @@ -166,10 +175,8 @@ Symfony2 is the result of the work of many people who made the code better - Rostyslav Kinash - umpirski (umpirski) - Davide Borsatto (davideborsatto) - - Neil Katin - Sebastian Bergmann (sebastianbergmann) - Hossein Bukhamsin (husinluck) - - Laurent Bachelier (laurentb) - Fabrice Bernhard (fabriceb) - develop - Joshua Nye (zerosanity) @@ -194,15 +201,12 @@ Symfony2 is the result of the work of many people who made the code better - Gabriel Birke (gbirke) - Osman Üngür (import) - Robert Campbell (jayrulez) - - Marek Kalnik (marekkalnik) - Don Pinkster - hlecorche - Vyacheslav Slinko - Luis Cordova (cordoval) - Daniel Cestari (dcestari) - Vladislav (ideea) - - John Carr (Jc2k) - - jdewit (jdewit) - Magnus Nordlander (magnusnordlander) - ouardisoft (ouardisoft) - Pierre Minnieur (pminnieur) @@ -220,7 +224,6 @@ Symfony2 is the result of the work of many people who made the code better - kaiwa - Gustavo Adrian - Nicolas Fabre (nfabre) - - Julien Brochet (aerialls) - Sebastian Utz (seut) - George Giannoulopoulos (dotoree) - Bart00 (Bart00) @@ -232,7 +235,7 @@ Symfony2 is the result of the work of many people who made the code better - Sebastian Ionescu - Dirk Pahl (dirkaholic) - Bouke Haarsma (Bouke) - - stloyd + - Yrwein (Yrwein) - Luis Muñoz - Oleg Zinchenko (cystbear) - Benjamin Lévêque (benji07) @@ -246,6 +249,7 @@ Symfony2 is the result of the work of many people who made the code better - gnat42 (gnat42) - Kevin McBride - devel + - Dan Patrick (mdpatrick) - Jan Eichhorn (Exeu) - Alexander Zogheb - Dan Ordille (dordille) @@ -269,6 +273,7 @@ Symfony2 is the result of the work of many people who made the code better - FabienD (FabienD) - Matt Drollette (MDrollette) - Skorney (Skorney) + - Marcin Chylek (SongoQ) - Vincent (Vincent-P) - Sébastien HOUZE - Sergiy Sokolenko @@ -291,6 +296,7 @@ Symfony2 is the result of the work of many people who made the code better - Michael Schneider (mschneid) - Drew Butler (nodrew) - Petr Jaroš (petajaros) + - Andrej Hudec (pulzarraider) - pzwosta (pzwosta) - Ruud Kamphuis (ruudk) - Matt Fitzgerald (tirnanog06) From 1f2e72d84aa9a4829185d6b2a0b814f6b933b30a Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 4 Oct 2011 13:47:14 +0200 Subject: [PATCH 4/4] updated VERSION for 2.0.4 --- src/Symfony/Component/HttpKernel/Kernel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index ecd9207182..508f79e853 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -57,7 +57,7 @@ abstract class Kernel implements KernelInterface protected $startTime; protected $classes; - const VERSION = '2.0.4-DEV'; + const VERSION = '2.0.4'; /** * Constructor.