8000 Merge branch '2.8' into 3.2 · symfony/symfony@17f717c · GitHub
[go: up one dir, main page]
Skip to content
Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 17f717c

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '2.8' into 3.2
* 2.8: [Yaml] Fix the tests [github] Add a reminder about CHANGELOG.md files
2 parents 94d059d + 6568a76 commit 17f717c

File tree

2 files changed

+22
-20
lines changed

2 files changed

+22
-20
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
| Q | A
22
| ------------- | ---
3-
| Branch? | master / 2.7, 2.8 or 3.2 <!--see comment below-->
3+
| Branch? | master / 2.7, 2.8 or 3.2 <!-- see comment below -->
44
| Bug fix? | yes/no
5-
| New feature? | yes/no
5+
| New feature? | yes/no <!-- don't forget updating src/**/CHANGELOG.md files -->
66
| BC breaks? | yes/no
7-
| Deprecations? | yes/no
7+
| Deprecations? | yes/no <!-- don't forget updating UPGRADE-*.md files -->
88
| Tests pass? | yes/no
99
| Fixed tickets | #... <!-- #-prefixed issue number(s), if any -->
1010
| License | MIT

‎src/Symfony/Component/Yaml/Tests/DumperTest.php

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -258,23 +258,25 @@ public function testEscapedEscapeSequencesInQuotedScalar($input, $expected)
258258
public function getEscapeSequences()
259259
{
260260
return array(
261-
'null' => array("\t\\0", '"\t\\\\0"'),
262-
'bell' => array("\t\\a", '"\t\\\\a"'),
263-
'backspace' => array("\t\\b", '"\t\\\\b"'),
264-
'horizontal-tab' => array("\t\\t", '"\t\\\\t"'),
265-
'line-feed' => array("\t\\n", '"\t\\\\n"'),
266-
'vertical-tab' => array("\t\\v", '"\t\\\\v"'),
267-
'form-feed' => array("\t\\f", '"\t\\\\f"'),
268-
'carriage-return' => array("\t\\r", '"\t\\\\r"'),
269-
'escape' => array("\t\\e", '"\t\\\\e"'),
270-
'space' => array("\t\\ ", '"\t\\\\ "'),
271-
'double-quote' => array("\t\\\"", '"\t\\\\\\""'),
272-
'slash' => array("\t\\/", '"\t\\\\/"'),
273-
'backslash' => array("\t\\\\", '"\t\\\\\\\\"'),
274-
'next-line' => array("\t\\N", '"\t\\\\N"'),
275-
'non-breaking-space' => array("\t\\�", '"\t\\\\�"'),
276-
'line-separator' => array("\t\\L", '"\t\\\\L"'),
277-
'paragraph-separator' => array("\t\\P", '"\t\\\\P"'),
261+
'empty string' => array('', "''"),
262+
'null' => array("\x0", '"\\0"'),
263+
'bell' => array("\x7", '"\\a"'),
264+
'backspace' => array("\x8", '"\\b"'),
265+
'horizontal-tab' => array("\t", '"\\t"'),
266+
'line-feed' => array("\n", '"\\n"'),
267+
'vertical-tab' => array("\v", '"\\v"'),
268+
'form-feed' => array("\xC", '"\\f"'),
269+
'carriage-return' => array("\r", '"\\r"'),
270+
'escape' => array("\x1B", '"\\e"'),
271+
'space' => array(' ', "' '"),
272+
'double-quote' => array('"', "'\"'"),
273+
'slash' => array('/', '/'),
274+
'backslash' => array('\\', '\\'),
275+
'next-line' => array("\xC2\x85", '"\\N"'),
276+
'non-breaking-space' => array("\xc2\xa0", '"\\_"'),
277+
'line-separator' => array("\xE2\x80\xA8", '"\\L"'),
278+
'paragraph-separator' => array("\xE2\x80\xA9", '"\\P"'),
279+
'colon' => array(':', "':'"),
278280
);
279281
}
280282

0 commit comments

Comments
 (0)
0