minor #16662 [Yaml] more fixes to changelog and upgrade files (Christian Flothmann)

fabpot · fabpot · commit 06279791c563 · 2015-11-28T11:18:42.000+01:00
This PR was merged into the 2.8 branch. Discussion ---------- [Yaml] more fixes to changelog and upgrade files | Q | A | ------------- | --- | Fixed tickets | #16433, #16654 | License | MIT Commits ------- 273ed25 [Yaml] more fixes to changelog and upgrade files
diff --git a/UPGRADE-2.8.md b/UPGRADE-2.8.md
@@ -491,5 +491,17 @@ Yaml
 
  * Deprecated usage of a colon in an unquoted mapping value
  * Deprecated usage of `@`, `` ` ``, `|`, and `>` at the beginning of an unquoted string
- * Deprecated non-escaped \ in double-quoted strings when parsing Yaml
-   ("Foo\Var" is not valid whereas "Foo\\Var" is)
+ * When surrounding strings with double-quotes, you must now escape `\` characters. Not
+   escaping those characters (when surrounded by double-quotes) is deprecated.
+
+   Before:
+
+   ```yml
+   class: "Foo\Var"
+   ```
+
+   After:
+
+   ```yml
+   class: "Foo\\Var"
+   ```
diff --git a/UPGRADE-3.0.md b/UPGRADE-3.0.md
@@ -1236,8 +1236,21 @@ UPGRADE FROM 2.x to 3.0
 
  * Using a colon in an unquoted mapping value leads to a `ParseException`.
  * Starting an unquoted string with `@`, `` ` ``, `|`, or `>` leads to a `ParseException`.
- * Deprecated non-escaped \ in double-quoted strings when parsing Yaml
-   ("Foo\Var" is not valid whereas "Foo\\Var" is)
+ * When surrounding strings with double-quotes, you must now escape `\` characters. Not
+   escaping those characters (when surrounded by double-quotes) leads to a `ParseException`.
+
+   Before:
+
+   ```yml
+   class: "Foo\Var"
+   ```
+
+   After:
+
+   ```yml
+   class: "Foo\\Var"
+   ```
+
 
  * The ability to pass file names to `Yaml::parse()` has been removed.
 
diff --git a/src/Symfony/Component/Yaml/CHANGELOG.md b/src/Symfony/Component/Yaml/CHANGELOG.md
@@ -6,8 +6,20 @@ CHANGELOG
 
  * Deprecated usage of a colon in an unquoted mapping value
  * Deprecated usage of @, \`, | and > at the beginning of an unquoted string
- * Deprecated non-escaped \ in double-quoted strings when parsing Yaml
-   ("Foo\Var" is not valid whereas "Foo\\Var" is)
+ * When surrounding strings with double-quotes, you must now escape `\` characters. Not
+   escaping those characters (when surrounded by double-quotes) is deprecated.
+
+   Before:
+
+   ```yml
+   class: "Foo\Var"
+   ```
+
+   After:
+
+   ```yml
+   class: "Foo\\Var"
+   ```
 
 2.1.0
 -----
