Merge branch '2.8' into 3.0

nicolas-grekas · nicolas-grekas · commit 12c64badfa2b · 2016-02-18T10:00:02.000+01:00
* 2.8:
  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
diff --git a/Dumper/YamlDumper.php b/Dumper/YamlDumper.php
@@ -89,7 +89,7 @@ private function addService($id, $definition)
         }
 
         if ($definition->getFile()) {
-            $code .= sprintf("        file: %s\n", $definition->getFile());
+            $code .= sprintf("        file: %s\n", $this->dumper->dump($definition->getFile()));
         }
 
         if ($definition->isSynthetic()) {

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ private function addService($id, $definition)`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`if ($definition->getFile()) {`
`92`		`- $code .= sprintf(" file: %s\n", $definition->getFile());`
	`92`	`+ $code .= sprintf(" file: %s\n", $this->dumper->dump($definition->getFile()));`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`if ($definition->isSynthetic()) {`