Merge branch '5.1'

* 5.1:
  fix: clarify parameter name to comply with deprecations from #34074
  [Sendgrid-Mailer] Fixed envelope recipients on sendgridApiTransport
  mark the AssertingContextualValidator class as internal
  Fix the parameter names in the SecurityFactoryInterface::create() method
  [Serializer][ClassDiscriminatorMapping] Fix getMappedObjectType() when a discriminator child extends another one
  make return type correct

Author: fabpot

DependencyInjection/Security/Factory/SecurityFactoryInterface.php

@@ -29,7 +29,7 @@ interface SecurityFactoryInterface
      *               - the listener id
      *               - the entry point id
      */
-    public function create(ContainerBuilder $container, string $id, array $config, string $userProvider, ?string $defaultEntryPoint);
+    public function create(ContainerBuilder $container, string $id, array $config, string $userProviderId, ?string $defaultEntryPointId);
 
     /**
      * Defines the position at which the provider is called.