Merge branch '2.7' into 2.8

fabpot · fabpot · commit 498b849ea31a · 2017-12-31T05:16:51.000+01:00
* 2.7:
  [2.7][DX] Use constant message contextualisation for deprecations
diff --git a/Translator.php b/Translator.php
@@ -154,7 +154,7 @@ public function getLocale()
      */
     public function setFallbackLocale($locales)
     {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Use the setFallbackLocales() method instead.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.3 and will be removed in 3.0. Use the setFallbackLocales() method instead.', E_USER_DEPRECATED);
 
         $this->setFallbackLocales(is_array($locales) ? $locales : array($locales));
     }

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ public function getLocale()`
`154`	`154`	`*/`
`155`	`155`	`public function setFallbackLocale($locales)`
`156`	`156`	`{`
`157`		`- @trigger_error('The '.__METHOD__.' method is deprecated since version 2.3 and will be removed in 3.0. Use the setFallbackLocales() method instead.', E_USER_DEPRECATED);`
	`157`	`+ @trigger_error('The '.__METHOD__.' method is deprecated since Symfony 2.3 and will be removed in 3.0. Use the setFallbackLocales() method instead.', E_USER_DEPRECATED);`
`158`	`158`
`159`	`159`	`$this->setFallbackLocales(is_array($locales) ? $locales : array($locales));`
`160`	`160`	`}`