Skip to content

Commit cff5f29

Browse files
committed
Merge branch '2.8' into 3.1
* 2.8: [Form] Fix typo in doc comment [Config] Handle open_basedir restrictions in FileLocator [bugfix] [Console] Set `Input::$interactive` to `false` when command is executed with `--quiet` as verbosity level Use JSON_UNESCAPED_SLASHES for lint commands output Fixed collapsed ChoiceType options attributes Fixed the nullable support for php 7.1 and below
2 parents 134781b + 6cac204 commit cff5f29

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

Command/YamlLintCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ private function displayJson(OutputInterface $output, $filesInfo)
157157
}
158158
});
159159

160-
$output->writeln(json_encode($filesInfo, JSON_PRETTY_PRINT));
160+
$output->writeln(json_encode($filesInfo, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
161161

162162
return min($errors, 1);
163163
}

Resources/views/Form/choice_attributes.html.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
id="<?php echo $view->escape($id) ?>" name="<?php echo $view->escape($full_name) ?>"
21
<?php if ($disabled): ?>disabled="disabled" <?php endif ?>
32
<?php foreach ($choice_attr as $k => $v): ?>
43
<?php if ($v === true): ?>

0 commit comments

Comments
 (0)