Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

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

Sign up
Appearance settings

Commitcbedceb

Browse files
committed
don't dump a scalar tag value on its own line
1 parent6f332ce commitcbedceb

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

‎src/Symfony/Component/Yaml/Dumper.php‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,15 +115,11 @@ public function dump($input, $inline = 0, $indent = 0, $flags = 0)
115115
if ($valueinstanceof TaggedValue) {
116116
$output .=sprintf('%s%s !%s',$prefix,$dumpAsMap ? Inline::dump($key,$flags).':' :'-',$value->getTag());
117117

118-
if ($inline -1 <=0) {
118+
if ($inline -1 <=0 ||is_scalar($value->getValue())) {
119119
$output .=''.$this->dump($value->getValue(),$inline -1,0,$flags)."\n";
120120
}else {
121121
$output .="\n";
122122
$output .=$this->dump($value->getValue(),$inline -1,$dumpAsMap ?$indent +$this->indentation :$indent +2,$flags);
123-
124-
if (is_scalar($value->getValue())) {
125-
$output .="\n";
126-
}
127123
}
128124

129125
continue;

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -532,10 +532,8 @@ public function testDumpingNotInlinedScalarTaggedValue()
532532
'user2' =>newTaggedValue('user','john'),
533533
];
534534
$expected =<<<YAML
535-
user1: !user
536-
jane
537-
user2: !user
538-
john
535+
user1: !user jane
536+
user2: !user john
539537
540538
YAML;
541539

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp