Merge branch '5.0'

javiereguiluz · javiereguiluz · commit 745fb9222a6d · 2020-04-10T15:18:25.000+02:00
* 5.0:
  Update definitions.rst
  [EventDispatcher] Fix position of `AddEventAliasesPass`
  [Contributing] Fix `trigger_error()` position in deprecated class
diff --git a/components/event_dispatcher.rst b/components/event_dispatcher.rst
@@ -235,10 +235,10 @@ determine which instance is passed.
         use Symfony\Component\EventDispatcher\EventDispatcher;
 
         $containerBuilder = new ContainerBuilder(new ParameterBag());
-        $containerBuilder->addCompilerPass(new RegisterListenersPass(), PassConfig::TYPE_BEFORE_REMOVING);
         $containerBuilder->addCompilerPass(new AddEventAliasesPass([
             \AcmeFooActionEvent::class => 'acme.foo.action',
         ]));
+        $containerBuilder->addCompilerPass(new RegisterListenersPass(), PassConfig::TYPE_BEFORE_REMOVING)
 
         $containerBuilder->register('event_dispatcher', EventDispatcher::class);
 
diff --git a/contributing/code/conventions.rst b/contributing/code/conventions.rst
@@ -121,9 +121,8 @@ A deprecation must also be triggered to help people with the migration
 
     trigger_deprecation('symfony/package-name', '5.1', 'The "%s" class is deprecated, use "%s" instead.', Deprecated::class, Replacement::class);
 
-When deprecating a whole class the ``trigger_deprecation()`` call should be placed
-between the namespace and the use declarations, like in this example from
-`ServiceRouterLoader`_::
+When deprecating a whole class the ``trigger_error()`` call should be placed
+after the use declarations, like in this example from `ServiceRouterLoader`_::
 
     namespace Symfony\Component\Routing\Loader\DependencyInjection;
 
diff --git a/service_container/definitions.rst b/service_container/definitions.rst
@@ -89,14 +89,18 @@ fetched from the container::
 
     // gets a specific argument
     $firstArgument = $definition->getArgument(0);
+    
+    // adds a new argument with the name of the argument
+    // $argumentName = the name of the argument in the constructor
+    $argument = $definition->setArgument('$argumentName', $argumentValue);
 
     // adds a new argument
     $definition->addArgument($argument);
 
     // replaces argument on a specific index (0 = first argument)
     $definition->replaceArgument($index, $argument);
 
-    // replace all previously configured arguments with the passed array
+    // replaces all previously configured arguments with the passed array
     $definition->setArguments($arguments);
 
 .. caution::
