Merge branch '5.2' into 5.x

* 5.2: [Testing] Fix typo in assertEmailAttachmentCount Remove Jakub from the core team Use correct domain Fix DSNs Fix DSN Use UserBadge in all passports

Author: javiereguiluz

contributing/code/core_team.rst

@@ -60,7 +60,6 @@ Active Core Members
  * **Christian Flothmann** (`xabbuh`_);
  * **Tobias Schultze** (`Tobion`_);
  * **Kévin Dunglas** (`dunglas`_);
- * **Jakub Zalas** (`jakzal`_);
  * **Javier Eguiluz** (`javiereguiluz`_);
  * **Grégoire Pineau** (`lyrixx`_);
  * **Ryan Weaver** (`weaverryan`_);
@@ -106,7 +105,8 @@ Symfony contributions:
 * **Romain Neutron** (`romainneutron`_);
 * **Jordi Boggiano** (`Seldaek`_);
 * **Lukas Kahwe Smith** (`lsmith77`_);
-* **Jules Pietri** (`HeahDude`_).
+* **Jules Pietri** (`HeahDude`_);
+* **Jakub Zalas** (`jakzal`_).
 
 Core Membership Application
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~

mailer.rst

@@ -163,9 +163,9 @@ party provider:
  Mailchimp Mandrill mandrill+smtp://USERNAME:PASSWORD@default mandrill+https://KEY@default mandrill+api://KEY@default
  Mailgun mailgun+smtp://USERNAME:PASSWORD@default mailgun+https://KEY:DOMAIN@default mailgun+api://KEY:DOMAIN@default
  Mailjet mailjet+smtp://ACCESS_KEY:SECRET_KEY@default n/a mailjet+api://ACCESS_KEY:SECRET_KEY@default
- Postmark postmark+smtp://ID:ID@default n/a postmark+api://KEY@default
- Sendgrid sendgrid+smtp://apikey:KEY@default n/a sendgrid+api://KEY@default
- Sendinblue sendinblue+smtp://apikey:USERNAME:PASSWORD@default n/a sendinblue+api://KEY@default
+ Postmark postmark+smtp://ID@default  n/a postmark+api://KEY@default
+ Sendgrid sendgrid+smtp://KEY@default  n/a sendgrid+api://KEY@default
+ Sendinblue sendinblue+smtp://USERNAME:PASSWORD@default  n/a sendinblue+api://KEY@default
 ==================== ==================================================== =========================================== ========================================
 
 .. caution::
@@ -192,8 +192,8 @@ party provider:
  .. code-block:: env
 
  # .env
- MAILER_DSN=mailgun+https://KEY:DOMAIN@example.com
- MAILER_DSN=mailgun+https://KEY:DOMAIN@example.com:99
+ MAILER_DSN=mailgun+https://KEY:DOMAIN@requestbin.com
+ MAILER_DSN=mailgun+https://KEY:DOMAIN@requestbin.com:99
 
  Note that the protocol is *always* HTTPs and cannot be changed.
 

security/experimental_authenticators.rst

@@ -494,15 +494,15 @@ The following credential classes are supported by default:
  use Symfony\Component\Security\Http\Authenticator\Passport\Credentials\PasswordCredentials;
 
  // ...
- return new Passport($user, new PasswordCredentials($plaintextPassword));
+ return new Passport(new UserBadge($email), new PasswordCredentials($plaintextPassword));
 
 :class:`Symfony\\Component\\Security\\Http\\Authenticator\\Passport\\Credentials\\CustomCredentials`
  Allows a custom closure to check credentials::
 
  use Symfony\Component\Security\Http\Authenticator\Passport\Credentials\CustomCredentials;
 
  // ...
- return new Passport($user, new CustomCredentials(
+ return new Passport(new UserBadge($email), new CustomCredentials(
  // If this function returns anything else than `true`, the credentials
  // are marked as invalid.
  // The $credentials parameter is equal to the next argument of this class
@@ -581,7 +581,7 @@ would initialize the passport like this::
  // ... validate no parameter is empty
 
  return new Passport(
- new UserBadge($user),
+ new UserBadge($email),
  new PasswordCredentials($password),
  [new CsrfTokenBadge('login', $csrfToken)]
  );

testing/functional_tests_assertions.rst

@@ -110,7 +110,7 @@ Mailer
 - ``assertQueuedEmailCount()``
 - ``assertEmailIsQueued()``
 - ``assertEmailIsNotQueued()``
-- ``assertEmailAttachementCount()``
+- ``assertEmailAttachmentCount()``
 - ``assertEmailTextBodyContains()``
 - ``assertEmailTextBodyNotContains()``
 - ``assertEmailHtmlBodyContains()``