Skip to content

Commit 599f413

Browse files
Merge branch '2.7' into 2.8
* 2.7: Create PULL_REQUEST_TEMPLATE.md Remove duplicate validation in RedirectResponse [Yaml] fix default timezone to be UTC [DependencyInjection] fix dumped YAML string [Config] Add suggest to composer.json for symfony/yaml Conflicts: src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
2 parents ffc360f + 2af69a2 commit 599f413

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Dumper/YamlDumper.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ private function addService($id, $definition)
8989
}
9090

9191
if ($definition->getFile()) {
92-
$code .= sprintf(" file: %s\n", $definition->getFile());
92+
$code .= sprintf(" file: %s\n", $this->dumper->dump($definition->getFile()));
9393
}
9494

9595
if ($definition->isSynthetic()) {
@@ -125,11 +125,11 @@ private function addService($id, $definition)
125125
}
126126

127127
if ($definition->getFactoryMethod(false)) {
128-
$code .= sprintf(" factory_method: %s\n", $definition->getFactoryMethod(false));
128+
$code .= sprintf(" factory_method: %s\n", $this->dumper->dump($definition->getFactoryMethod(false)));
129129
}
130130

131131
if ($definition->getFactoryService(false)) {
132-
$code .= sprintf(" factory_service: %s\n", $definition->getFactoryService(false));
132+
$code .= sprintf(" factory_service: %s\n", $this->dumper->dump($definition->getFactoryService(false)));
133133
}
134134

135135
if ($definition->getArguments()) {
@@ -149,7 +149,7 @@ private function addService($id, $definition)
149149
}
150150

151151
if (ContainerInterface::SCOPE_CONTAINER !== $scope = $definition->getScope(false)) {
152-
$code .= sprintf(" scope: %s\n", $scope);
152+
$code .= sprintf(" scope: %s\n", $this->dumper->dump($scope));
153153
}
154154

155155
if (null !== $decorated = $definition->getDecoratedService()) {

0 commit comments

Comments
 (0)