diff --git a/UPGRADE-3.0.md b/UPGRADE-3.0.md
index 931eae5264..8897913349 100644
--- a/UPGRADE-3.0.md
+++ b/UPGRADE-3.0.md
@@ -1333,6 +1333,11 @@ UPGRADE FROM 2.x to 3.0
### Yaml
+ * Using a colon in an unquoted mapping value leads to a `ParseException`.
+ * Starting an unquoted string with `@`, `` ` ``, `|`, or `>` leads to a `ParseException`.
+ * Deprecated non-escaped \ in double-quoted strings when parsing Yaml
+ ("Foo\Var" is not valid whereas "Foo\\Var" is)
+
* The ability to pass file names to `Yaml::parse()` has been removed.
Before:
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index b22aede91d..0538884cc4 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -47,4 +47,14 @@
+
+
+
+
+
+ Symfony\Component\HttpFoundation
+
+
+
+
diff --git a/src/Symfony/Bridge/PhpUnit/ClockMock.php b/src/Symfony/Bridge/PhpUnit/ClockMock.php
index 4b745e38e8..b81fee9658 100644
--- a/src/Symfony/Bridge/PhpUnit/ClockMock.php
+++ b/src/Symfony/Bridge/PhpUnit/ClockMock.php
@@ -66,7 +66,7 @@ class ClockMock
return self::$now;
}
- return sprintf("%0.6f %d\n", $now - (int) $now, (int) self::$now);
+ return sprintf("%0.6f %d\n", self::$now - (int) self::$now, (int) self::$now);
}
public static function register($class)
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
index c3fda4acd3..20c6e02c7e 100644
--- a/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
+++ b/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
@@ -57,7 +57,7 @@
{%- endif -%}