Skip to content

Commit 2af69a2

Browse files
Merge branch '2.3' into 2.7
* 2.3: Create PULL_REQUEST_TEMPLATE.md Remove duplicate validation in RedirectResponse [Yaml] fix default timezone to be UTC [DependencyInjection] fix dumped YAML string Conflicts: src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php src/Symfony/Component/Yaml/Tests/InlineTest.php
2 parents c9fe42f + 9c1dced commit 2af69a2

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()) {
@@ -109,11 +109,11 @@ private function addService($id, $definition)
109109
}
110110

111111
if ($definition->getFactoryMethod(false)) {
112-
$code .= sprintf(" factory_method: %s\n", $definition->getFactoryMethod(false));
112+
$code .= sprintf(" factory_method: %s\n", $this->dumper->dump($definition->getFactoryMethod(false)));
113113
}
114114

115115
if ($definition->getFactoryService(false)) {
116-
$code .= sprintf(" factory_service: %s\n", $definition->getFactoryService(false));
116+
$code .= sprintf(" factory_service: %s\n", $this->dumper->dump($definition->getFactoryService(false)));
117117
}
118118

119119
if ($definition->getArguments()) {
@@ -129,7 +129,7 @@ private function addService($id, $definition)
129129
}
130130

131131
if (ContainerInterface::SCOPE_CONTAINER !== $scope = $definition->getScope()) {
132-
$code .= sprintf(" scope: %s\n", $scope);
132+
$code .= sprintf(" scope: %s\n", $this->dumper->dump($scope));
133133
}
134134

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

0 commit comments

Comments
 (0)