Merge branch '3.2'

* 3.2: consistently parse omitted keys as the colon bumped Symfony version to 3.2.5 updated VERSION for 3.2.4 update CONTRIBUTORS for 3.2.4 updated CHANGELOG for 3.2.4
2017-02-17 12:56:33 +01:00 · 2017-02-17 12:56:33 +01:00 · 0a3cd973ae
commit 0a3cd973ae
parent 444b37d575 6ea510f7b4
4 changed files with 41 additions and 11 deletions
--- a/CHANGELOG-3.2.md
+++ b/CHANGELOG-3.2.md
@ -7,6 +7,26 @@ in 3.2 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/v3.2.0...v3.2.1

+* 3.2.4 (2017-02-16)
+
+ * bug #21634 [VarDumper] Added missing persistent stream cast (lyrixx)
+ * bug #21436 [DependencyInjection] check for circular refs caused by method calls (xabbuh)
+ * bug #21400 [Serializer] fix upper camel case conversion (see #21399) (markusu49)
+ * bug #21599 [Console][Table] fixed render when using multiple rowspans. (aitboudad)
+ * bug #21613 [Process] Permit empty suffix on Windows (Bilge)
+ * bug #21057 [DI] Auto register extension configuration classes as a resource (ro0NL)
+ * bug #21607 Improve tracking of environment variables in the case of private services (tgalopin)
+ * bug #21592 [Validator] property constraints can be added in child classes (angelk, xabbuh)
+ * bug #21458 [Config] Early return for DirectoryResource (robfrawley)
+ * bug #21562 [DoctrineBridge] make sure that null can be the invalid value (xabbuh)
+ * bug #21556 [FrameworkBundle] Wire ArrayCache for annotation reader at bootstrap (nicolas-grekas)
+ * bug #21584 [WebProfilerBundle] Readd Symfony version status in the toolbar (wouterj)
+ * bug #21557 [VarDumper] Improve dump of AMQP* Object (lyrixx)
+ * bug #21579 [Security] LdapUserProvider should not throw an exception if the UID key does not exist in an LDAP entry (csarrazi)
+ * bug #21552 [FrameworkBundle] Fix annotations cache folder path (akeeman)
+ * bug #21542 [VarDumper] Fixed dumping of terminated generator (lyrixx)
+ * bug #21292 Ignore missing 'debug.file_link_formatter' service in Debug bundle (core23)
+
 * 3.2.3 (2017-02-06)

 * bug #21528 [Cache] Fix class exists checks in PhpArrayAdapter (nicolas-grekas)
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@ -50,8 +50,8 @@ Symfony is the result of the work of many people who made the code better
 - Saša Stamenković (umpirsky)
 - Henrik Bjørnskov (henrikbjorn)
 - Miha Vrhovnik
- - Diego Saint Esteben (dii3g0)
 - Roland Franssen (ro0)
+ - Diego Saint Esteben (dii3g0)
 - Konstantin Kudryashov (everzet)
 - Iltar van der Berg (kjarli)
 - Bilal Amarni (bamarni)
@ -69,15 +69,15 @@ Symfony is the result of the work of many people who made the code better
 - Deni
 - Henrik Westphal (snc)
 - Dariusz Górecki (canni)
- - Douglas Greenshields (shieldo)
 - Titouan Galopin (tgalopin)
+ - Douglas Greenshields (shieldo)
+ - Pierre du Plessis (pierredup)
 - Konstantin Myakshin (koc)
 - Lee McDermott
 - Brandon Turner
 - Luis Cordova (cordoval)
 - Graham Campbell (graham)
 - Daniel Holmes (dholmes)
- - Pierre du Plessis (pierredup)
 - Toni Uebernickel (havvg)
 - Bart van den Burg (burgov)
 - Jordan Alliot (jalliot)
@ -165,6 +165,7 @@ Symfony is the result of the work of many people who made the code better
 - Mario A. Alvarez Garcia (nomack84)
 - Dennis Benkert (denderello)
 - Benjamin Dulau (dbenjamin)
+ - James Halsall (jaitsu)
 - Mathieu Lemoine (lemoinem)
 - Andreas Hucks (meandmymonkey)
 - Noel Guilbert (noel)
@ -186,7 +187,6 @@ Symfony is the result of the work of many people who made the code better
 - Dustin Whittle (dustinwhittle)
 - jeff
 - John Kary (johnkary)
- - James Halsall (jaitsu)
 - Justin Hileman (bobthecow)
 - Blanchon Vincent (blanchonvincent)
 - Chris Wilkinson (thewilkybarkid)
@ -200,6 +200,7 @@ Symfony is the result of the work of many people who made the code better
 - Eugene Wissner
 - Julien Brochet (mewt)
 - Tristan Darricau (nicofuma)
+ - Grégoire Paris (greg0ire)
 - Sergey Linnik (linniksa)
 - Michaël Perrin (michael.perrin)
 - Marcel Beerta (mazen)
@ -217,6 +218,7 @@ Symfony is the result of the work of many people who made the code better
 - Manuel Reinhard (sprain)
 - Danny Berger (dpb587)
 - Jérôme Vasseur
+ - Adam Prager (padam87)
 - Roman Marintšenko (inori)
 - Christian Schmidt
 - Xavier Montaña Carreras (xmontana)
@ -238,7 +240,6 @@ Symfony is the result of the work of many people who made the code better
 - GordonsLondon
 - Jan Sorgalla (jsor)
 - Ray
- - Grégoire Paris (greg0ire)
 - Leo Feyer
 - Chekote
 - Thomas Adam
@ -257,7 +258,6 @@ Symfony is the result of the work of many people who made the code better
 - Robert Kiss (kepten)
 - Ruben Gonzalez (rubenrua)
 - Roumen Damianoff (roumen)
- - Adam Prager (padam87)
 - Antonio J. García Lagar (ajgarlag)
 - Kim Hemsø Rasmussen (kimhemsoe)
 - Wouter Van Hecke
@ -310,6 +310,7 @@ Symfony is the result of the work of many people who made the code better
 - Magnus Nordlander (magnusnordlander)
 - alquerci
 - Francesco Levorato
+ - Rob Frawley 2nd (robfrawley)
 - Vitaliy Zakharov (zakharovvi)
 - Tobias Sjösten (tobiassjosten)
 - Gyula Sallai (salla)
@ -526,7 +527,6 @@ Symfony is the result of the work of many people who made the code better
 - Konstantin S. M. Möllers (ksmmoellers)
 - Sinan Eldem
 - Alexandre Dupuy (satchette)
- - Rob Frawley 2nd
 - Andre Rømcke (andrerom)
 - Nahuel Cuesta (ncuesta)
 - Chris Boden (cboden)
@ -566,6 +566,7 @@ Symfony is the result of the work of many people who made the code better
 - Miquel Rodríguez Telep (mrtorrent)
 - Sergey Kolodyazhnyy (skolodyazhnyy)
 - umpirski
+ - Denis Brumann (dbrumann)
 - Quentin de Longraye (quentinus95)
 - Chris Heng (gigablah)
 - Ulumuddin Yunus (joenoez)
@ -684,6 +685,7 @@ Symfony is the result of the work of many people who made the code better
 - Abhoryo
 - Fabian Vogler (fabian)
 - Korvin Szanto
+ - Arjan Keeman
 - Alaattin Kahramanlar (alaattin)
 - Sergey Zolotov (enleur)
 - Maksim Kotlyar (makasim)
@ -832,7 +834,7 @@ Symfony is the result of the work of many people who made the code better
 - Nicolas Macherey
 - Lin Clark
 - Jeremy David (jeremy.david)
- - Denis Brumann (dbrumann)
+ - Robin Lehrmann (robinlehrmann)
 - Troy McCabe
 - Ville Mattila
 - ilyes kooli
@ -845,6 +847,7 @@ Symfony is the result of the work of many people who made the code better
 - Sergey Novikov (s12v)
 - Marcos Quesada (marcos_quesada)
 - Matthew Vickery (mattvick)
+ - Angel Koilov (po_taka)
 - Dan Finnie
 - Ken Marfilla (marfillaster)
 - benatespina (benatespina)
@ -942,6 +945,7 @@ Symfony is the result of the work of many people who made the code better
 - Alberto Aldegheri
 - heccjj
 - Alexandre Melard
+ - Jay Klehr
 - Sergey Yuferev
 - Tobias Stöckler
 - Mario Young
@ -1131,7 +1135,6 @@ Symfony is the result of the work of many people who made the code better
 - Leonid Terentyev (li0n)
 - ryunosuke
 - victoria
- - Arjan Keeman
 - Francisco Facioni (fran6co)
 - Iwan van Staveren (istaveren)
 - Dany Maillard (maidmaid)
@ -1243,6 +1246,7 @@ Symfony is the result of the work of many people who made the code better
 - Yannick Warnier (ywarnier)
 - Kevin Decherf
 - Jason Woods
+ - klemens
 - dened
 - Dmitry Korotovsky
 - Michael van Tricht
@ -1527,6 +1531,7 @@ Symfony is the result of the work of many people who made the code better
 - Choong Wei Tjeng (choonge)
 - Kousuke Ebihara (co3k)
 - Loïc Vernet (coil)
+ - Christian Gripp (core23)
 - Christoph Schaefer (cvschaefer)
 - Damon Jones (damon__jones)
 - Łukasz Giza (destroyer)
--- a/src/Symfony/Component/Yaml/Inline.php
+++ b/src/Symfony/Component/Yaml/Inline.php
@ -477,11 +477,11 @@ class Inline
            // key
            $key = self::parseScalar($mapping, $flags, array(':', ' '), $i, false);

-            if (false === $i = strpos($mapping, ':', $i)) {
+            if (':' !== $key && false === $i = strpos($mapping, ':', $i)) {
                break;
            }

-            if (!isset($mapping[$i + 1]) || !in_array($mapping[$i + 1], array(' ', ',', '[', ']', '{', '}'), true)) {
+            if (':' !== $key && (!isset($mapping[$i + 1]) || !in_array($mapping[$i + 1], array(' ', ',', '[', ']', '{', '}'), true))) {
                @trigger_error('Using a colon that is not followed by an indication character (i.e. " ", ",", "[", "]", "{", "}" is deprecated since version 3.2 and will throw a ParseException in 4.0.', E_USER_DEPRECATED);
            }

--- a/src/Symfony/Component/Yaml/Tests/InlineTest.php
+++ b/src/Symfony/Component/Yaml/Tests/InlineTest.php
@ -686,4 +686,9 @@ class InlineTest extends \PHPUnit_Framework_TestCase

        $this->assertEquals($longStringWithQuotes, $arrayFromYaml['longStringWithQuotes']);
    }
+
+    public function testOmittedMappingKeyIsParsedAsColon()
+    {
+        $this->assertSame(array(':' => 'foo'), Inline::parse('{: foo}'));
+    }
 }