Merge branch '2.8' into 3.1

nicolas-grekas · nicolas-grekas · commit ab4fa32ffe6e · 2016-11-03T09:04:31.000+01:00
* 2.8:
  CS fixes
  Remove trailing space
  CS: apply rules
  [Yaml] Clean some messages + add test case
  [Console] simplified code
  [Form] Fix UrlType transforms valid protocols
  [SecurityBundle] Changed encoder configuration example to bcrypt
diff --git a/Tests/Definition/Dumper/XmlReferenceDumperTest.php b/Tests/Definition/Dumper/XmlReferenceDumperTest.php
@@ -34,7 +34,7 @@ public function testNamespaceDumper()
 
     private function getConfigurationAsString()
     {
-        return str_replace("\n", PHP_EOL, <<<EOL
+        return str_replace("\n", PHP_EOL, <<<'EOL'
 <!-- Namespace: http://example.org/schema/dic/acme_root -->
 <!-- scalar-required: Required -->
 <!-- enum-with-default: One of "this"; "that" -->

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function testNamespaceDumper()`
`34`	`34`
`35`	`35`	`private function getConfigurationAsString()`
`36`	`36`	`{`
`37`		`- return str_replace("\n", PHP_EOL, <<<EOL`
	`37`	`+ return str_replace("\n", PHP_EOL, <<<'EOL'`
`38`	`38`	`<!-- Namespace: http://example.org/schema/dic/acme_root -->`
`39`	`39`	`<!-- scalar-required: Required -->`
`40`	`40`	`<!-- enum-with-default: One of "this"; "that" -->`