Skip to content

Commit 0627979

Browse files
committed
minor symfony#16662 [Yaml] more fixes to changelog and upgrade files (Christian Flothmann)
This PR was merged into the 2.8 branch. Discussion ---------- [Yaml] more fixes to changelog and upgrade files | Q | A | ------------- | --- | Fixed tickets | symfony#16433, symfony#16654 | License | MIT Commits ------- 273ed25 [Yaml] more fixes to changelog and upgrade files
2 parents 953ed3c + 273ed25 commit 0627979

File tree

3 files changed

+43
-6
lines changed

3 files changed

+43
-6
lines changed

UPGRADE-2.8.md

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -491,5 +491,17 @@ Yaml
491491

492492
* Deprecated usage of a colon in an unquoted mapping value
493493
* Deprecated usage of `@`, `` ` ``, `|`, and `>` at the beginning of an unquoted string
494-
* Deprecated non-escaped \ in double-quoted strings when parsing Yaml
495-
("Foo\Var" is not valid whereas "Foo\\Var" is)
494+
* When surrounding strings with double-quotes, you must now escape `\` characters. Not
495+
escaping those characters (when surrounded by double-quotes) is deprecated.
496+
497+
Before:
498+
499+
```yml
500+
class: "Foo\Var"
501+
```
502+
503+
After:
504+
505+
```yml
506+
class: "Foo\\Var"
507+
```

UPGRADE-3.0.md

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1236,8 +1236,21 @@ UPGRADE FROM 2.x to 3.0
12361236

12371237
* Using a colon in an unquoted mapping value leads to a `ParseException`.
12381238
* Starting an unquoted string with `@`, `` ` ``, `|`, or `>` leads to a `ParseException`.
1239-
* Deprecated non-escaped \ in double-quoted strings when parsing Yaml
1240-
("Foo\Var" is not valid whereas "Foo\\Var" is)
1239+
* When surrounding strings with double-quotes, you must now escape `\` characters. Not
1240+
escaping those characters (when surrounded by double-quotes) leads to a `ParseException`.
1241+
1242+
Before:
1243+
1244+
```yml
1245+
class: "Foo\Var"
1246+
```
1247+
1248+
After:
1249+
1250+
```yml
1251+
class: "Foo\\Var"
1252+
```
1253+
12411254

12421255
* The ability to pass file names to `Yaml::parse()` has been removed.
12431256

src/Symfony/Component/Yaml/CHANGELOG.md

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,20 @@ CHANGELOG
66

77
* Deprecated usage of a colon in an unquoted mapping value
88
* Deprecated usage of @, \`, | and > at the beginning of an unquoted string
9-
* Deprecated non-escaped \ in double-quoted strings when parsing Yaml
10-
("Foo\Var" is not valid whereas "Foo\\Var" is)
9+
* When surrounding strings with double-quotes, you must now escape `\` characters. Not
10+
escaping those characters (when surrounded by double-quotes) is deprecated.
11+
12+
Before:
13+
14+
```yml
15+
class: "Foo\Var"
16+
```
17+
18+
After:
19+
20+
```yml
21+
class: "Foo\\Var"
22+
```
1123
1224
2.1.0
1325
-----

0 commit comments

Comments
 (0)