Merge branch '4.4' into 5.0

* 4.4:
  Update definitions.rst
  [EventDispatcher] Fix position of `AddEventAliasesPass`
  [Contributing] Fix `trigger_error()` position in deprecated class

Author: javiereguiluz

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);
 

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;

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::