Merge branch '3.4' into 4.4

javiereguiluz · javiereguiluz · commit 59d403a5ece6 · 2020-04-10T15:10:27.000+02:00
* 3.4:
  [Contributing] Fix `trigger_error()` position in deprecated class
diff --git a/contributing/code/conventions.rst b/contributing/code/conventions.rst
@@ -126,7 +126,7 @@ ready to cope with them (by adding a custom error handler like the one used by
 the Web Debug Toolbar or by the PHPUnit bridge).
 
 When deprecating a whole class the ``trigger_error()`` call should be placed
-between the namespace and the use declarations, like in this example from
+after the use declarations, like in this example from
 `ServiceRouterLoader`_::
 
     namespace Symfony\Component\Routing\Loader\DependencyInjection;
