From eee5065434ac326fb9aa356c7c94b09869fb60f1 Mon Sep 17 00:00:00 2001 From: Victor Berchet Date: Fri, 9 Mar 2012 21:02:20 +0100 Subject: [PATCH 01/13] [TwigBundle] Workaround a flaw in the design of the configuration (normalization) --- .../DependencyInjection/TwigExtension.php | 13 +++++++++++++ .../Tests/DependencyInjection/Fixtures/php/full.php | 1 + .../Tests/DependencyInjection/Fixtures/yml/full.yml | 3 ++- .../Tests/DependencyInjection/TwigExtensionTest.php | 6 ++++++ 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php index f7a65debd4..11e97e8fd8 100644 --- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php +++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php @@ -36,6 +36,19 @@ class TwigExtension extends Extension $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); $loader->load('twig.xml'); + foreach ($configs as &$config) { + if (isset($config['globals'])) { + foreach ($config['globals'] as $name => $value) { + if (is_array($value) && isset($value['key'])) { + $config['globals'][$name] = array( + 'key' => $name, + 'value' => $config['globals'][$name] + ); + } + } + } + } + $configuration = new Configuration(); $config = $this->processConfiguration($configuration, $configs); diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/full.php b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/full.php index 5ebfc0141e..7733f17b9f 100644 --- a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/full.php +++ b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/full.php @@ -9,6 +9,7 @@ $container->loadFromExtension('twig', array( 'globals' => array( 'foo' => '@bar', 'pi' => 3.14, + 'bad' => array('key' => 'foo'), ), 'auto_reload' => true, 'autoescape' => true, diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/yml/full.yml b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/yml/full.yml index ecad2a9f44..baf7661997 100644 --- a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/yml/full.yml +++ b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/yml/full.yml @@ -3,8 +3,9 @@ twig: resources: - MyBundle::form.html.twig globals: - foo: @bar + foo: "@bar" pi: 3.14 + bad: {key: foo} auto_reload: true autoescape: true base_template_class: stdClass diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php index 1456cbb463..88e2399b3f 100644 --- a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php +++ b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php @@ -64,6 +64,12 @@ class TwigExtensionTest extends TestCase $this->assertEquals('pi', $calls[1][1][0], '->load() registers variables as Twig globals'); $this->assertEquals(3.14, $calls[1][1][1], '->load() registers variables as Twig globals'); + // Yaml and Php specific configs + if (in_array($format, array('yml', 'php'))) { + $this->assertEquals('bad', $calls[2][1][0], '->load() registers variables as Twig globals'); + $this->assertEquals(array('key' => 'foo'), $calls[2][1][1], '->load() registers variables as Twig globals'); + } + // Twig options $options = $container->getParameter('twig.options'); $this->assertTrue($options['auto_reload'], '->load() sets the auto_reload option'); From fbed9ff8debf67def7c5e496f85b50fca5edbc4f Mon Sep 17 00:00:00 2001 From: Arnaud Buathier Date: Thu, 15 Mar 2012 20:27:40 +0100 Subject: [PATCH 02/13] Update src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php --- src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php index a0e5c12be0..f9614a7d72 100644 --- a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php +++ b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php @@ -503,7 +503,8 @@ class HttpCache implements HttpKernelInterface // wait for the lock to be released $wait = 0; while (file_exists($lock) && $wait < 5000000) { - usleep($wait += 50000); + usleep(50000); + $wait += 50000; } if ($wait < 2000000) { From 8642473185b7f63e4e73a5c3e32b2968e8c62515 Mon Sep 17 00:00:00 2001 From: Drew Butler Date: Fri, 16 Mar 2012 17:19:53 -0400 Subject: [PATCH 03/13] Changed instances of \DateTimeZone::UTC to 'UTC' as the constant is not valid a produces this error when DateTimeZone is instantiated: DateTimeZone::__construct() [datetimezone.--construct]: Unknown or bad timezone (1024) --- .../Form/Extension/Core/ChoiceList/MonthChoiceList.php | 2 +- src/Symfony/Component/Form/Extension/Core/Type/DateType.php | 2 +- .../Form/Extension/Core/ChoiceList/MonthChoiceListTest.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Component/Form/Extension/Core/ChoiceList/MonthChoiceList.php b/src/Symfony/Component/Form/Extension/Core/ChoiceList/MonthChoiceList.php index fc2f73a588..0d2e10e840 100644 --- a/src/Symfony/Component/Form/Extension/Core/ChoiceList/MonthChoiceList.php +++ b/src/Symfony/Component/Form/Extension/Core/ChoiceList/MonthChoiceList.php @@ -39,7 +39,7 @@ class MonthChoiceList extends PaddedChoiceList $pattern = $this->formatter->getPattern(); $timezone = $this->formatter->getTimezoneId(); - $this->formatter->setTimezoneId(\DateTimeZone::UTC); + $this->formatter->setTimezoneId('UTC'); if (preg_match('/M+/', $pattern, $matches)) { $this->formatter->setPattern($matches[0]); diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php index 441c2cfdb0..df659ccdad 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php @@ -57,7 +57,7 @@ class DateType extends AbstractType \Locale::getDefault(), $format, \IntlDateFormatter::NONE, - \DateTimeZone::UTC, + 'UTC', \IntlDateFormatter::GREGORIAN, $pattern ); diff --git a/tests/Symfony/Tests/Component/Form/Extension/Core/ChoiceList/MonthChoiceListTest.php b/tests/Symfony/Tests/Component/Form/Extension/Core/ChoiceList/MonthChoiceListTest.php index 5fd37fdea4..5fa9806f5c 100644 --- a/tests/Symfony/Tests/Component/Form/Extension/Core/ChoiceList/MonthChoiceListTest.php +++ b/tests/Symfony/Tests/Component/Form/Extension/Core/ChoiceList/MonthChoiceListTest.php @@ -31,7 +31,7 @@ class MonthChoiceListTest extends \PHPUnit_Framework_TestCase \Locale::getDefault(), \IntlDateFormatter::SHORT, \IntlDateFormatter::NONE, - \DateTimeZone::UTC + 'UTC' ); } From 54b24134e84b75650b6cc149fe391884de9bea00 Mon Sep 17 00:00:00 2001 From: Andrej Hudec Date: Fri, 16 Mar 2012 22:52:43 +0100 Subject: [PATCH 04/13] Webprofiler ipv6 search fix --- .../Bundle/WebProfilerBundle/Controller/ProfilerController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php index 04b887695e..b2f0d1aee1 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php +++ b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php @@ -230,7 +230,7 @@ class ProfilerController extends ContainerAware $request = $this->container->get('request'); - $ip = preg_replace('/[^\d\.]/', '', $request->query->get('ip')); + $ip = preg_replace('/[^:\d\.]/', '', $request->query->get('ip')); $url = $request->query->get('url'); $limit = $request->query->get('limit'); $token = $request->query->get('token'); From 66267bf8d041f4508feafd8132d9846aec72a560 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 19 Mar 2012 00:51:56 +0100 Subject: [PATCH 05/13] updated vendors for 2.0.12 --- vendors.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendors.php b/vendors.php index 6ed77d9290..6291546d07 100755 --- a/vendors.php +++ b/vendors.php @@ -37,7 +37,7 @@ $deps = array( array('doctrine-common', 'http://github.com/doctrine/common.git', '2.1.4'), array('monolog', 'http://github.com/Seldaek/monolog.git', '1.0.2'), array('swiftmailer', 'http://github.com/swiftmailer/swiftmailer.git', 'v4.1.5'), - array('twig', 'http://github.com/fabpot/Twig.git', 'v1.6.0'), + array('twig', 'http://github.com/fabpot/Twig.git', 'v1.6.2'), ); foreach ($deps as $dep) { From a3d9ed136d1e399360d55e30ce76b9590896d962 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 19 Mar 2012 00:56:33 +0100 Subject: [PATCH 06/13] updated CHANGELOG for 2.0.12 --- CHANGELOG-2.0.md | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/CHANGELOG-2.0.md b/CHANGELOG-2.0.md index e6642d20ca..7c8c0e8a04 100644 --- a/CHANGELOG-2.0.md +++ b/CHANGELOG-2.0.md @@ -7,6 +7,32 @@ 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.12 (2012-03-19) + + * 54b2413: Webprofiler ipv6 search fix + * 8642473: Changed instances of \DateTimeZone::UTC to 'UTC' as the constant is not valid a produces this error when DateTimeZone is instantiated: DateTimeZone::__construct() [datetimezone.--construct]: Unknown or bad timezone (1024) + * fbed9ff: Update src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php + * 1b395f5: Revert "Throw exception when "date_widget" option is not equal to "time_widget"" + * ed218bb: Fixed an "Array to string conversion" warning when using PHP 5.4. Also affects Symfony2 master. + * 50cb486: Fixed proxy generation in the DoctrineBundle when using Doctrine >= 2.2.0 + * 93cc9ef: [Validator] Remove a race condition in the ClassMetaDataFactory (fix #3217) + * 878c239: Fixed autoloader leakage in tests + * 17c3482: fixed timezone bug in DateTimeToTimestampTransformer + * 705e460: provided unmerged definition for correct help generation + * 45bbb5b: added getNativeDefinition() to allow specifying an alternate InputDefinition for help generation + * aa53b88: Sets _format attribute only if it wasn't set previously by the user + * a827375: [CssSelector] fixed CssSelector::toXPath() when the CSS selector is an empty string + * ad07a95: [BrowserKit] Fixed Client->back/forward/reload() not keeping all request attributes + * eee5065: [TwigBundle] Workaround a flaw in the design of the configuration (normalization) + * 7aad478: [Locale] Prevent empty bundle + * a894431: [DependencyInjection] Allow parsing of parameters near escaped percent signs + * f758884: [FrameworkBundle] ContainerAwareEventDispatcher::removeListener() (closes #3115) + * 8fe6ee3: [Console] fixed help command when used from the shell (closes #3480) + * caa44ae: Only work with the cli sapi + * e2fc3cd: [Process] PHP_BINARY return the current process + * dc2d5a0: [HttpFoundation][Session] Fix bug in PDO Session Storage with SQLSRV making assumptions about parameters with length being OUTPUT not INPUT parameters. + * e8281cf: SqliteProfilerStorage fix + * 2.0.11 (2012-02-24) * 3e64d36: [Serializer] Fix XML decoding attack vector through external entities From b7d0a4bd41f686f70a129874ceb8555270751f29 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 19 Mar 2012 00:57:27 +0100 Subject: [PATCH 07/13] update CONTRIBUTORS for 2.0.12 --- CONTRIBUTORS.md | 126 ++++++++++++++++++++++++++++++------------------ 1 file changed, 78 insertions(+), 48 deletions(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 3690261533..8da402ac2c 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -7,70 +7,74 @@ Symfony2 is the result of the work of many people who made the code better - Fabien Potencier (fabpot) - Bernhard Schussek (bschussek) - Johannes (schmittjoh) - - Kris Wallsmith (kriswallsmith) - Victor Berchet (vicb) + - Kris Wallsmith (kriswallsmith) - Jordi Boggiano (Seldaek) - Christophe Coevoet (stof) - Ryan Weaver (weaverryan) - Pascal Borreli (pborreli) - Lukas Kahwe Smith (lsmith77) - Benjamin Eberlei (beberlei) + - Jeremy Mikola (jmikola) - Igor Wiedler (igorw) - Joseph Bielawski (stloyd) - - Jeremy Mikola (jmikola) + - Drak (drak) - Hugo Hamon (hhamon) - Jonathan H. Wage (jwage) - Thibault Duplessis (ornicar) - Alexandre Salomé (alexandresalome) - - Bulat Shakirzyanov (avalanche123) - Eriksen Costa (eriksencosta) - - Francis Besset (francisbesset) + - Bulat Shakirzyanov (avalanche123) - stealth35 (stealth35) + - Francis Besset (francisbesset) - Miha Vrhovnik (mvrhov) - Henrik Bjørnskov (henrikbjorn) - Martin Hasoň (hason) + - Henrik Westphal (snc) - Eric Clemmons (ericclemmons) - Konstantin Kudryashov (everzet) - Dariusz Górecki (canni) - Arnout Boks (aboks) + - William DURAND (willdurand) + - Deni (yethee) - Brandon Turner (blt04) - Hidenori Goto (hidenorigoto) - - Henrik Westphal (snc) - John Wards (johnwards) - - Drak (drak) - - yethee (yethee) - Lenar Lõhmus (lenar) + - Marc Weistroff (marcw) - Brikou CARRE (brikou) - Daniel Holmes (danielholmes) - Antoine Hérault (Herzult) - Fabien Pennequin (FabienPennequin) - - Marc Weistroff (marcw) + - Andrej Hudec (pulzarraider) + - Sebastian Hörl (blogsh) - Jacob Dreesen (jdreesen) - Richard Shank (IamPersistent) - - William DURAND (willdurand) + - Kevin Bond (kbond) - Jordan Alliot (jalliot) - Excel Web Zone (excelwebzone) - Katsuhiro OGAWA (fivestar) + - Jeremy Mikola - Tobias Schultze (Tobion) - blue-eyes (blue-eyes) - Robert Schönthal (digitalkaoz) - Tim Nagel (merk) - Michel Weimerskirch (mweimerskirch) - Tigran Azatyan (tigranazatyan) + - Pierre Minnieur (pminnieur) - Christian Raue (craue) + - umpirsky (umpirsky) - Helmer Aaviksoo (helmer) - Jakub Zalas (jakzal) - Javier Eguiluz (javiereguiluz) - Matthieu Vachon (maoueh) - Amal Raghav (kertz) - Artur Kotyrba (udat) - - Kevin Bond (kbond) - - umpirsky (umpirsky) + - Daniel Gomes (danielcsgomes) - Clément JOBEILI (dator) - Bart van den Burg (Burgov) - Benjamin Dulau (benjamindulau) - Noel GUILBERT (noelg) - - Andrej Hudec (pulzarraider) - Martin Schuhfuss (usefulthink) - Thomas (rande) - Dennis Benkert (denderello) @@ -80,33 +84,36 @@ Symfony2 is the result of the work of many people who made the code better - Justin Hileman (bobthecow) - Sven Paulus (subsven) - Xavier Perez (DuoSRX) - - Brouznouf (Brouznouf) + - Joel Wurtz (Brouznouf) + - Alexander (asm89) + - Jonathan Ingram (jonathaningram) - Pablo Godel (pgodel) - Francois Zaninotto - Leszek Prabucki (l3l0) - Francois Zaninotto (fzaninotto) - - Xavier Montaña (xmontana) + - Xavier Montaña Carreras (xmontana) - Arjen Brouwer (arjenjb) - Alif Rachmawadi (subosito) + - Florin Patan (dlsniper) - Boussekeyt Jules (gordonslondon) - Jan Sorgalla (jsor) + - Marcel Beerta (mazen) - Lee McDermott (lmcd) + - Toni Uebernickel (havvg) - Richard Miller (richardmiller) - Jeroen Hoek (jdhoek) + - Rafael Dohms (rdohms) - geoffrey - - Matthew Lewinski (lewinski) - Wotre (Wotre) - - Pierre Minnieur (pminnieur) - - Daniel Gomes (danielcsgomes) + - Gyula Sallai (thesalla) + - Grégoire Pineau (lyrixx) - Danny Berger (dpb587) - - dlsniper (dlsniper) - Jérémie Augustin (jaugustin) - - Sebastian Hörl (blogsh) - Joseph Rouff (rouffj) - Manuel Kiessling (ManuelKiessling) - dbu - - asm89 (asm89) - Julien Brochet (aerialls) + - Douglas Greenshields (shieldo) - Aurelijus Valeiša (aurelijus) - Gustavo Piltcher - Ray (rrehbeindoi) @@ -114,21 +121,25 @@ Symfony2 is the result of the work of many people who made the code better - Adrian Rudnik (kreischweide) - Gábor Egyed (1ed) - Andréia Bohner (andreia) + - Andreas Hucks (meandmymonkey) + - Drak + - Jérémy Romey (jeremyFreeAgent) - Yuen-Chi Lian (yclian) - Greg Thornton (xdissent) - Lars Strojny (lstrojny) + - Arnaud Le Blanc (arnaud-lb) - Costin Bereveanu (schniper) - - Douglas Greenshields (shieldo) - Konstantin Leboev (realmfoo) + - Tobias Naumann (tna) - Donald Tyler (Chekote) + - Matthew Lewinski - Kai - - Gyula Sallai (thesalla) - Sergey Linnik (Partugal) - Laszlo Korte (laszlokorte) - - Toni Uebernickel (havvg) - Hubert LECORCHE (hlecorche) - Michael Ridgway (mridgway) - Stepan Tanasiychuk (stfalcon) + - Pavel Campr (pcampr) - Bertrand Zuchuat (Garfield-fr) - brki (brki) - Michel Salib (michelsalib) @@ -152,25 +163,24 @@ Symfony2 is the result of the work of many people who made the code better - Manuel Reinhard (sprain) - Thomas Adam (tecbot) - Nils Adermann (naderman) - - Tobias Naumann (tna) - Shein Alexey (conf) - - Jonathan Ingram (jonathaningram) - Steven Surowiec (steves) - Marcin Chylek (SongoQ) - - arnaud-lb (arnaud-lb) - Ivan Rey (ivanrey) - Ryan Rogers (timewasted) - Ned Schwartz (theinterned) - Aurélien Fredouelle (AurelC2G) - flevour (flevour) + - stealth35 - Oscar Cubo Medina (ocubom) + - IP_FIX (eversonfix) - Geoffrey Tran (geoffreytran) - Christian Schaefer (caefer) - Elliot Anderson (elliot) - Olivier Dolbeau (odolbeau) - José Nahuel Cuesta Luengo (ncuesta) - Dustin Dobervich (dustin10) - - erheme318 (erheme318) + - Erkhembayar Gantulga (erheme318) - Michael Holm (hollodk) - Rostyslav Kinash - yktd26 (yktd26) @@ -178,13 +188,13 @@ Symfony2 is the result of the work of many people who made the code better - Hossein Bukhamsin (husinluck) - Fabrice Bernhard (fabriceb) - develop - - 77web (77web) + - Hiromi Hishida (77web) - Joshua Nye (zerosanity) - andrewtch (andrewtch) - markchalloner (markchalloner) - Michael Williams (mtotheikle) - - Casper Valdemar Poulsen - - franmomu (franmomu) + - Casper Valdemar Poulsen (cvaldemar) + - Fran Moreno (franmomu) - Degory Valentine - Krzysiek Łabuś (Crozin) - superjavason (superjavason) @@ -194,31 +204,41 @@ Symfony2 is the result of the work of many people who made the code better - Peter Kruithof (pkruithof) - Albert Jessurum (ajessu) - frost-nzcr4 (frost-nzcr4) - - Abhoryo (Abhoryo) + - Petit Yoann (Abhoryo) - Fabian Vogler (fabian) - - Maksim Kotlyar (makasim) + - Maksim Kotlyar - Grégoire Passault (Gregwar) - Manuel de Ruiter (ManuelAC) - Cyril Quintin (cyqui) - Gerard van Helden (drm) + - Johnny Peck (johnnypeck) - kazusuke sasezaki (sasezaki) + - Benjamin Lévêque (benji07) - Matt Robinson (inanimatt) + - root - Chris Smith (cs278) - Derek ROTH (DerekRoth) - mwsaz + - Sergey Skopin (grizlik) - Emil Einarsson (Einarsson) + - Yanick Witschi (Toflar) - Don Pinkster + - Saem Ghani (saem) - Michael Roterman (wtfzdotnet) - Arno Geurts - Marek Kalnik (marekkalnik) - Daniel Cestari (dcestari) + - Jérémy CROMBEZ (jcrombez) - Magnus Nordlander (magnusnordlander) - Adam Monsen (meonkeys) + - Michał Pipa (michal-pipa) - Robert Gruendler (pulse00) + - Sebastian Busch (sbusch) - Benoît Merlet (trompette) - Jan Behrens (deegital) - sensio - Théophile Helleboid - chtitux (chtitux) + - Matthew Lewinski (lewinski) - xaav - Anton Babenko (antonbabenko) - irmantas (irmantas) @@ -239,11 +259,14 @@ Symfony2 is the result of the work of many people who made the code better - Neil Katin - Gustavo Adrian - Nicolas Fabre (nfabre) + - Clément Herreman (clemherreman) - heccjj (heccjj) - Sebastian Utz (seut) - Cédric Lahouste (RapotOR) - George Giannoulopoulos (dotoree) - Alberto Pirovano (geezmo) + - Xavier Briand (xavierbriand) + - Markus Lanthaler (lanthaler) - Klein Florian (docteurklein) - JerikVenture (JerikVenture) - Evan Kaufman (EvanK) @@ -252,7 +275,7 @@ Symfony2 is the result of the work of many people who made the code better - Sebastian Ionescu - Dirk Pahl (dirkaholic) - Nicolas Badey (Nico-B) - - pscheit (pscheit) + - Philipp Scheit (pscheit) - Bouke Haarsma (Bouke) - Lars Strojny - Yrwein (Yrwein) @@ -260,14 +283,15 @@ Symfony2 is the result of the work of many people who made the code better - Thomas Bibb (thomasbibb) - Ivan Kurnosov - stloyd + - Martin Parsiegla - Christoph Nißle (DerStoffel) - Luis Muñoz + - Thomas Chmielowiec (chmielot) - Oleg Zinchenko (cystbear) - Grégoire Paris (greg0ire) - Guilherme Blanco (guilhermeblanco) - Stefano Sala (stewe) - Romain Dorgueil - - Benjamin Lévêque (benji07) - Benjamin Zikarsky (bzikarsky) - alefranz (alefranz) - Andy Stanberry (cranberyxl) @@ -276,7 +300,8 @@ Symfony2 is the result of the work of many people who made the code better - Philip Dahlstrøm (phidah) - Gustavo Falco - gnat42 (gnat42) - - patashnik (patashnik) + - Alexey Popkov (patashnik) + - Alexander Miehe (Engerim) - devel - HIROKI (hirocaster) - jpauli (jpauli) @@ -297,14 +322,17 @@ Symfony2 is the result of the work of many people who made the code better - Juan M Martínez - Alex - agilemedialab (agilemedialab) + - Alan Chen (alan0101c) - Masao Maeda (brtriver) - - Gustavo Adrian (comfortablynumb) + - Gustavo Falco (comfortablynumb) - Denis Klementjev (dklementjev) - Kévin Dunglas (dunglas) - Gabriel Birke (gbirke) + - Ismael Ambrosi (iambrosi) - Osman Üngür (import) - Robert Campbell (jayrulez) - - Maerlyn (maerlyn) + - John Bohn (jjbohn) + - Gábor Fási (maerlyn) - Matthew Davis (mdavis1982) - Matt Lehner (mlehner) - Matthias (mpdude) @@ -317,18 +345,20 @@ Symfony2 is the result of the work of many people who made the code better - Beau Simensen (simensen) - Tom Van Looy (tvlooy) - Juan Ases García (Ases) - - FabienD (FabienD) + - Eugene Babushkin (EugeneBabushkin) + - Fabien D. (FabienD) - Jörg Rühl (LennyLinux) - Matt Drollette (MDrollette) - - Skorney (Skorney) + - Kornienko Alexander (Skorney) - Vincent (Vincent-P) - Drew Butler - Pierre-Louis LAUNAY - Sébastien HOUZE - Sergiy Sokolenko + - Adrien Brault (adrienbrault) - Bernd Matzner (bmatzner) - Vladimir Sazhin (cannie) - - catchamonkey (catchamonkey) + - Chris Sedlmayr (catchamonkey) - Christian Stocker (chregu) - chx (chx) - Luis Cordova (cordoval) @@ -337,10 +367,10 @@ Symfony2 is the result of the work of many people who made the code better - ds (dantleech) - Djama Suemenich (djama) - Daniel Londero (dlondero) - - dorkitude (dorkitude) + - Kyle W (dorkitude) - David Soria Parra (dsp) - Kousuke Ebihara (ebihara) - - Vladislav (ideea) + - ideea (ideea) - John Carr (Jc2k) - jdewit (jdewit) - Justin Rainbow (justinrainbow) @@ -349,29 +379,29 @@ Symfony2 is the result of the work of many people who made the code better - kwiateusz (kwiateusz) - Samuel Laulhau (lalop) - Javier López (loalf) + - Matt Fitzgerald (matthewfitz) - Penny Leach (mjollnir) - Michael Schneider (mschneid) - Oncle Tom (oncletom) - ouardisoft (ouardisoft) - - Pavel Campr (pcampr) + - patrick-mcdougle (patrick-mcdougle) - Petr Jaroš (petajaros) - pzwosta (pzwosta) - - Rafael Dohms (rdohms) - Ruud Kamphuis (ruudk) - Markus Tacker (tacker) - - Matt Fitzgerald (tirnanog06) - Tyler Stroud (tystr) - Vyacheslav Slinko (vslinko) - Josiah (web-dev) + - xanido (xanido) - Xavier HAUSHERR (xkobal) + - drublic - Gustavo Adrian - max - - Hans (drublic) + - Craig Marvelley (craigmarvelley) - m0ppers (m0ppers) - - Marcel Beerta (mazen) - Muharrem Demirci (mdemirci) - meze (meze) - - Michael (mshtukin) + - Michael Shtukin (mshtukin) - Nicolas de Marqué Fromentin (nicodmf) - Florent Cailhol (ooflorent) - Pierre (ptheg) From 0ab776227a0d6586c9f1be379926acaa94f64a01 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 19 Mar 2012 00:57:46 +0100 Subject: [PATCH 08/13] updated VERSION for 2.0.12 --- 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 f7745906eb..287d86484d 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.11'; + const VERSION = '2.0.12'; /** * Constructor. From f11f7fcbe0b361ba96524bea96ac489719e1f83b Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 19 Mar 2012 01:27:26 +0100 Subject: [PATCH 09/13] bumped Symfony version to 2.0.13-DEV --- 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 287d86484d..66d177445a 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.12'; + const VERSION = '2.0.13-DEV'; /** * Constructor. From c1206c33c2e627bfec236559de7b0eb4782b6a61 Mon Sep 17 00:00:00 2001 From: Alexander Date: Tue, 20 Mar 2012 23:59:34 +0100 Subject: [PATCH 10/13] [FrameworkBundle] Subrequests should always use GET method --- src/Symfony/Bundle/FrameworkBundle/HttpKernel.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Symfony/Bundle/FrameworkBundle/HttpKernel.php b/src/Symfony/Bundle/FrameworkBundle/HttpKernel.php index 6f827b9e48..e103162844 100644 --- a/src/Symfony/Bundle/FrameworkBundle/HttpKernel.php +++ b/src/Symfony/Bundle/FrameworkBundle/HttpKernel.php @@ -140,6 +140,7 @@ class HttpKernel extends BaseHttpKernel $options['attributes']['_route'] = '_internal'; $subRequest = $request->duplicate($options['query'], null, $options['attributes']); + $subRequest->setMethod('GET'); } $level = ob_get_level(); From efa807aa7b6200b92da51226292ade5598257582 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 21 Mar 2012 00:31:28 +0100 Subject: [PATCH 11/13] [HttpKernel] fixed sub-request which should be always a GET (refs #3657) --- .../Component/HttpKernel/EventListener/ExceptionListener.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php b/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php index 01418da6f4..6b3b877a5f 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php @@ -74,6 +74,7 @@ class ExceptionListener ); $request = $request->duplicate(null, null, $attributes); + $request->setMethod('GET'); try { $response = $event->getKernel()->handle($request, HttpKernelInterface::SUB_REQUEST, true); From 068e859f3db424dda131778af7bab60e3b1e4686 Mon Sep 17 00:00:00 2001 From: Joe Lencioni Date: Wed, 21 Mar 2012 15:25:48 -0500 Subject: [PATCH 12/13] [TwigBundle] Changed getAndCleanOutputBuffering() handling of systems where ob_get_level() never returns 0 Bug fix: yes Feature addition: no Backwards compatibility break: no Symfony2 tests pass: [![Build Status](https://secure.travis-ci.org/lencioni/symfony.png)](http://travis-ci.org/lencioni/symfony) Fixes the following tickets: - Todo: - Relying on decrementing a counter has two problems. First, and most importantly, if the output buffering nesting level is greater than the counter, the function does not perform the expected task. Secondly, on systems where the counter is needed, a lot of unnecessary extra loops would potentially occur. This approach checks to see if the level has stayed the same from the previous iteration and if it has it stops looping. --- .../TwigBundle/Controller/ExceptionController.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php b/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php index e4ca988f51..d676f82086 100644 --- a/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php +++ b/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php @@ -61,13 +61,15 @@ class ExceptionController extends ContainerAware protected function getAndCleanOutputBuffering() { - // the count variable avoids an infinite loop on - // some Windows configurations where ob_get_level() - // never reaches 0 - $count = 100; + // ob_get_level() never returns 0 on some Windows configurations, so if + // the level is the same two times in a row, the loop should be stopped. + $previousObLevel = null; $startObLevel = $this->container->get('request')->headers->get('X-Php-Ob-Level', -1); + $currentContent = ''; - while (ob_get_level() > $startObLevel && --$count) { + + while (($obLevel = ob_get_level()) > $startObLevel && $obLevel !== $previousObLevel) { + $previousObLevel = $obLevel; $currentContent .= ob_get_clean(); } From d42ae470ec98867847c174983124390142bab38d Mon Sep 17 00:00:00 2001 From: aubx Date: Thu, 22 Mar 2012 19:57:58 +0100 Subject: [PATCH 13/13] Added Croatian validator translation for 2.0 --- .../translations/validators.hr.xliff | 171 ++++++++++++++++++ 1 file changed, 171 insertions(+) create mode 100644 src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.hr.xliff diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.hr.xliff b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.hr.xliff new file mode 100644 index 0000000000..83d188fa40 --- /dev/null +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.hr.xliff @@ -0,0 +1,171 @@ + + + + + + This value should be false + Ova vrijednost treba biti netočna + + + This value should be true + Ova vrijednost treba biti točna + + + This value should be of type {{ type }} + Ova vrijednost treba biti tipa {{ type }} + + + This value should be blank + Ova vrijednost treba biti prazna + + + The value you selected is not a valid choice + Ova vrijednost treba biti jedna od ponuđenih + + + You must select at least {{ limit }} choices + Izaberite barem {{ limit }} mogućnosti + + + You must select at most {{ limit }} choices + Izaberite najviše {{ limit }} mogućnosti + + + One or more of the given values is invalid + Jedna ili više danih vrijednosti nije ispravna + + + The fields {{ fields }} were not expected + Polja {{ fields }} nisu bila očekivana + + + The fields {{ fields }} are missing + Polja {{ fields }} nedostaju + + + This value is not a valid date + Ova vrijednost nije ispravan datum + + + This value is not a valid datetime + Ova vrijednost nije ispravan datum-vrijeme + + + This value is not a valid email address + Ova vrijednost nije ispravna e-mail adresa + + + The file could not be found + Datoteka ne može biti pronađena + + + The file is not readable + Datoteka nije čitljiva + + + The file is too large ({{ size }}). Allowed maximum size is {{ limit }} + Datoteka je prevelika ({{ size }}). Najveća dozvoljena veličina je {{ limit }} + + + The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }} + Mime tip datoteke nije ispravan ({{ type }}). Dozvoljeni mime tipovi su {{ types }} + + + This value should be {{ limit }} or less + Ova vrijednost treba biti {{ limit }} ili manje + + + This value is too long. It should have {{ limit }} characters or less + Ova vrijednost je predugačka. Treba imati {{ limit }} znakova ili manje + + + This value should be {{ limit }} or more + Ova vrijednost treba biti {{ limit }} ili više + + + This value is too short. It should have {{ limit }} characters or more + Ova vrijednost je prekratka. Treba imati {{ limit }} znakova ili više + + + This value should not be blank + Ova vrijednost ne smije biti prazna + + + This value should not be null + Ova vrijednost ne smije biti null + + + This value should be null + Ova vrijednost treba biti null + + + This value is not valid + Ova vrijednost nije ispravna + + + This value is not a valid time + Ova vrijednost nije ispravno vrijeme + + + This value is not a valid URL + Ova vrijednost nije ispravan URL + + + This form should not contain extra fields + Ovaj obrazac ne smije sadržavati dodatna polja + + + The uploaded file was too large. Please try to upload a smaller file + Prenesena datoteka je prevelika. Molim pokušajte prenijeti manju datoteku + + + The CSRF token is invalid + CSRF vrijednost nije ispravna + + + The two values should be equal + Obje vrijednosti trebaju biti jednake + + + The file is too large. Allowed maximum size is {{ limit }} + Ova datoteka je prevelika. Najveća dozvoljena veličina je {{ limit }} + + + The file is too large + Ova datoteka je prevelika + + + The file could not be uploaded + Ova datoteka ne može biti prenesena + + + This value should be a valid number + Ova vrijednost treba biti ispravan broj + + + This file is not a valid image + Ova datoteka nije ispravna slika + + + This is not a valid IP address + Ovo nije ispravna IP adresa + + + This value is not a valid language + Ova vrijednost nije ispravan jezik + + + This value is not a valid locale + Ova vrijednost nije ispravana regionalna oznaka + + + This value is not a valid country + Ova vrijednost nije ispravna zemlja + + + This value is already used + Ova vrijednost je već iskorištena + + + + \ No newline at end of file