Merge branch '2.7' into 2.8
* 2.7: [Yaml] Fix the tests [github] Add a reminder about CHANGELOG.md files
This commit is contained in:
commit
6568a76411
4
.github/PULL_REQUEST_TEMPLATE.md
vendored
4
.github/PULL_REQUEST_TEMPLATE.md
vendored
@ -2,9 +2,9 @@
|
|||||||
| ------------- | ---
|
| ------------- | ---
|
||||||
| Branch? | master / 2.7, 2.8 or 3.2 <!-- see comment below -->
|
| Branch? | master / 2.7, 2.8 or 3.2 <!-- see comment below -->
|
||||||
| Bug fix? | yes/no
|
| Bug fix? | yes/no
|
||||||
| New feature? | yes/no
|
| New feature? | yes/no <!-- don't forget updating src/**/CHANGELOG.md files -->
|
||||||
| BC breaks? | yes/no
|
| BC breaks? | yes/no
|
||||||
| Deprecations? | yes/no
|
| Deprecations? | yes/no <!-- don't forget updating UPGRADE-*.md files -->
|
||||||
| Tests pass? | yes/no
|
| Tests pass? | yes/no
|
||||||
| Fixed tickets | #... <!-- #-prefixed issue number(s), if any -->
|
| Fixed tickets | #... <!-- #-prefixed issue number(s), if any -->
|
||||||
| License | MIT
|
| License | MIT
|
||||||
|
@ -210,23 +210,25 @@ EOF;
|
|||||||
public function getEscapeSequences()
|
public function getEscapeSequences()
|
||||||
{
|
{
|
||||||
return array(
|
return array(
|
||||||
'null' => array("\t\\0", '"\t\\\\0"'),
|
'empty string' => array('', "''"),
|
||||||
'bell' => array("\t\\a", '"\t\\\\a"'),
|
'null' => array("\x0", '"\\0"'),
|
||||||
'backspace' => array("\t\\b", '"\t\\\\b"'),
|
'bell' => array("\x7", '"\\a"'),
|
||||||
'horizontal-tab' => array("\t\\t", '"\t\\\\t"'),
|
'backspace' => array("\x8", '"\\b"'),
|
||||||
'line-feed' => array("\t\\n", '"\t\\\\n"'),
|
'horizontal-tab' => array("\t", '"\\t"'),
|
||||||
'vertical-tab' => array("\t\\v", '"\t\\\\v"'),
|
'line-feed' => array("\n", '"\\n"'),
|
||||||
'form-feed' => array("\t\\f", '"\t\\\\f"'),
|
'vertical-tab' => array("\v", '"\\v"'),
|
||||||
'carriage-return' => array("\t\\r", '"\t\\\\r"'),
|
'form-feed' => array("\xC", '"\\f"'),
|
||||||
'escape' => array("\t\\e", '"\t\\\\e"'),
|
'carriage-return' => array("\r", '"\\r"'),
|
||||||
'space' => array("\t\\ ", '"\t\\\\ "'),
|
'escape' => array("\x1B", '"\\e"'),
|
||||||
'double-quote' => array("\t\\\"", '"\t\\\\\\""'),
|
'space' => array(' ', "' '"),
|
||||||
'slash' => array("\t\\/", '"\t\\\\/"'),
|
'double-quote' => array('"', "'\"'"),
|
||||||
'backslash' => array("\t\\\\", '"\t\\\\\\\\"'),
|
'slash' => array('/', '/'),
|
||||||
'next-line' => array("\t\\N", '"\t\\\\N"'),
|
'backslash' => array('\\', '\\'),
|
||||||
'non-breaking-space' => array("\t\\<EFBFBD>", '"\t\\\\<5C>"'),
|
'next-line' => array("\xC2\x85", '"\\N"'),
|
||||||
'line-separator' => array("\t\\L", '"\t\\\\L"'),
|
'non-breaking-space' => array("\xc2\xa0", '"\\_"'),
|
||||||
'paragraph-separator' => array("\t\\P", '"\t\\\\P"'),
|
'line-separator' => array("\xE2\x80\xA8", '"\\L"'),
|
||||||
|
'paragraph-separator' => array("\xE2\x80\xA9", '"\\P"'),
|
||||||
|
'colon' => array(':', "':'"),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user