Skip to content

Commit 6c3e8e8

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '7.4' into 8.0
* 7.4: chore: PHP CS Fixer - update heredoc handling
2 parents 6615f6e + 1d401d5 commit 6c3e8e8

File tree

1 file changed

+27
-54
lines changed

1 file changed

+27
-54
lines changed

‎Tests/ParserTest.php‎

Lines changed: 27 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1338,8 +1338,7 @@ public static function getCommentLikeStringInScalarBlockData()
13381338
</body>
13391339
13401340
footer # comment3
1341-
EOT
1342-
,
1341+
EOT,
13431342
],
13441343
],
13451344
];
@@ -1366,25 +1365,22 @@ public static function getCommentLikeStringInScalarBlockData()
13661365
# bar
13671366
baz
13681367

1369-
EOT
1370-
,
1368+
EOT,
13711369
'collection' => [
13721370
[
13731371
'one' => <<<'EOT'
13741372
foo
13751373
# bar
13761374
baz
13771375

1378-
EOT
1379-
,
1376+
EOT,
13801377
],
13811378
[
13821379
'two' => <<<'EOT'
13831380
foo
13841381
# bar
13851382
baz
1386-
EOT
1387-
,
1383+
EOT,
13881384
],
13891385
],
13901386
];
@@ -1448,8 +1444,7 @@ public function testBlankLinesAreParsedAsNewLinesInFoldedBlocks()
14481444
'test' => <<<'EOT'
14491445
<h2>A heading</h2>
14501446
<ul> <li>a list</li> <li>may be a good example</li> </ul>
1451-
EOT
1452-
,
1447+
EOT,
14531448
],
14541449
$this->parser->parse($yaml)
14551450
);
@@ -1475,8 +1470,7 @@ public function testAdditionallyIndentedLinesAreParsedAsNewLinesInFoldedBlocks()
14751470
<li>a list</li>
14761471
<li>may be a good example</li>
14771472
</ul>
1478-
EOT
1479-
,
1473+
EOT,
14801474
],
14811475
$this->parser->parse($yaml)
14821476
);
@@ -1529,32 +1523,28 @@ public static function getInvalidBinaryData()
15291523
<<<'EOT'
15301524
data: !!binary |
15311525
SGVsbG8d29ybGQ=
1532-
EOT
1533-
,
1526+
EOT,
15341527
'/The normalized base64 encoded data \(data without whitespace characters\) length must be a multiple of four \(\d+ bytes given\)/',
15351528
],
15361529
'invalid characters in block scalar' => [
15371530
<<<'EOT'
15381531
data: !!binary |
15391532
SGVsbG8#d29ybGQ=
1540-
EOT
1541-
,
1533+
EOT,
15421534
'/The base64 encoded data \(.*\) contains invalid characters/',
15431535
],
15441536
'too many equals characters in block scalar' => [
15451537
<<<'EOT'
15461538
data: !!binary |
15471539
SGVsbG8gd29yb===
1548-
EOT
1549-
,
1540+
EOT,
15501541
'/The base64 encoded data \(.*\) contains invalid characters/',
15511542
],
15521543
'misplaced equals character in block scalar' => [
15531544
<<<'EOT'
15541545
data: !!binary |
15551546
SGVsbG8gd29ybG=Q
1556-
EOT
1557-
,
1547+
EOT,
15581548
'/The base64 encoded data \(.*\) contains invalid characters/',
15591549
],
15601550
];
@@ -1842,8 +1832,7 @@ public static function escapedQuotationCharactersInQuotedStrings()
18421832
- message: 'No emails received before timeout - Address: ''[email protected]''
18431833
Keyword: ''Your Order confirmation'' ttl: 50'
18441834
outcome: failed
1845-
YAML
1846-
,
1835+
YAML,
18471836
[
18481837
'entries' => [
18491838
[
@@ -1859,8 +1848,7 @@ public static function escapedQuotationCharactersInQuotedStrings()
18591848
- message: "No emails received before timeout - Address: \"[email protected]\"
18601849
Keyword: \"Your Order confirmation\" ttl: 50"
18611850
outcome: failed
1862-
YAML
1863-
,
1851+
YAML,
18641852
[
18651853
'entries' => [
18661854
[
@@ -1964,8 +1952,7 @@ public static function inlineNotationSpanningMultipleLinesProvider(): array
19641952
'foo': 'bar',
19651953
'bar': 'baz'
19661954
}
1967-
YAML
1968-
,
1955+
YAML,
19691956
],
19701957
'mapping with unquoted strings and values' => [
19711958
['foo' => 'bar', 'bar' => 'baz'],
@@ -1974,8 +1961,7 @@ public static function inlineNotationSpanningMultipleLinesProvider(): array
19741961
foo: bar,
19751962
bar: baz
19761963
}
1977-
YAML
1978-
,
1964+
YAML,
19791965
],
19801966
'sequence' => [
19811967
['foo', 'bar'],
@@ -1984,8 +1970,7 @@ public static function inlineNotationSpanningMultipleLinesProvider(): array
19841970
'foo',
19851971
'bar'
19861972
]
1987-
YAML
1988-
,
1973+
YAML,
19891974
],
19901975
'sequence with unquoted items' => [
19911976
['foo', 'bar'],
@@ -1994,8 +1979,7 @@ public static function inlineNotationSpanningMultipleLinesProvider(): array
19941979
foo,
19951980
bar
19961981
]
1997-
YAML
1998-
,
1982+
YAML,
19991983
],
20001984
'nested mapping terminating at end of line' => [
20011985
[
@@ -2006,8 +1990,7 @@ public static function inlineNotationSpanningMultipleLinesProvider(): array
20061990
<<<YAML
20071991
{ foo: { bar: foobar }
20081992
}
2009-
YAML
2010-
,
1993+
YAML,
20111994
],
20121995
'nested sequence terminating at end of line' => [
20131996
[
@@ -2041,8 +2024,7 @@ public static function inlineNotationSpanningMultipleLinesProvider(): array
20412024
'foo': ['bar', 'foobar'],
20422025
'bar': ['baz']
20432026
}
2044-
YAML
2045-
,
2027+
YAML,
20462028
],
20472029
'sequence spanning multiple lines nested in mapping' => [
20482030
[
@@ -2057,8 +2039,7 @@ public static function inlineNotationSpanningMultipleLinesProvider(): array
20572039
bar,
20582040
baz
20592041
]
2060-
YAML
2061-
,
2042+
YAML,
20622043
],
20632044
'sequence spanning multiple lines nested in mapping with a following mapping' => [
20642045
[
@@ -2091,8 +2072,7 @@ public static function inlineNotationSpanningMultipleLinesProvider(): array
20912072
bar,
20922073
baz
20932074
]]
2094-
YAML
2095-
,
2075+
YAML,
20962076
],
20972077
'nested sequence nested in mapping starting on the following line' => [
20982078
[
@@ -2110,8 +2090,7 @@ public static function inlineNotationSpanningMultipleLinesProvider(): array
21102090
bar,
21112091
baz
21122092
]]
2113-
YAML
2114-
,
2093+
YAML,
21152094
],
21162095
'mapping nested in sequence' => [
21172096
['foo', ['bar' => 'baz']],
@@ -2122,8 +2101,7 @@ public static function inlineNotationSpanningMultipleLinesProvider(): array
21222101
'bar': 'baz'
21232102
}
21242103
]
2125-
YAML
2126-
,
2104+
YAML,
21272105
],
21282106
'mapping spanning multiple lines nested in sequence' => [
21292107
[
@@ -2137,8 +2115,7 @@ public static function inlineNotationSpanningMultipleLinesProvider(): array
21372115
foo: bar,
21382116
bar: baz
21392117
}
2140-
YAML
2141-
,
2118+
YAML,
21422119
],
21432120
'nested mapping nested in sequence starting on the same line' => [
21442121
[
@@ -2155,8 +2132,7 @@ public static function inlineNotationSpanningMultipleLinesProvider(): array
21552132
},
21562133
bar: baz
21572134
}
2158-
YAML
2159-
,
2135+
YAML,
21602136
],
21612137
'nested mapping nested in sequence starting on the following line' => [
21622138
[
@@ -2174,26 +2150,23 @@ public static function inlineNotationSpanningMultipleLinesProvider(): array
21742150
},
21752151
bar: baz
21762152
}
2177-
YAML
2178-
,
2153+
YAML,
21792154
],
21802155
'single quoted multi-line string' => [
21812156
"foo\nbar",
21822157
<<<YAML
21832158
'foo
21842159
21852160
bar'
2186-
YAML
2187-
,
2161+
YAML,
21882162
],
21892163
'double quoted multi-line string' => [
21902164
"foo\nbar",
21912165
<<<YAML
21922166
'foo
21932167
21942168
bar'
2195-
YAML
2196-
,
2169+
YAML,
21972170
],
21982171
'single-quoted multi-line mapping value' => [
21992172
['foo' => "bar\nbaz"],

0 commit comments

Comments
 (0)