Merge branch '3.x'

Author: stof

.github/workflows/static-analysis.yaml

@@ -3,7 +3,7 @@ name: Code style and composer validate
 on:
     pull_request:
     push:
-        branches: [ master, 2.x ]
+        branches: [ master, 2.x, 3.x ]
 
 jobs:
     composer-validate:

Changelog.md

@@ -1,6 +1,10 @@
 Changelog
 =========
 
+### 3.4.0 (2024-06-25)
+
+* Deprecated the TwigSwiftMailer implementation
+
 ### 3.3.0 (2024-06-24)
 
 * Added a mailer implementation based on symfony/mailer and Twig

docs/emails.rst

@@ -211,10 +211,3 @@ An example is listed below.
         # ...
         service:
             mailer: app.custom_fos_user_mailer
-
-To see an example of a working implementation of the ``MailerInterface``
-see the `ZetaMailer`_ class of the `ZetaWebmailBundle`_. This implementation
-uses the Zeta Components Mail to send emails instead of the mailer component.
-
-.. _ZetaMailer: https://github.com/simplethings/ZetaWebmailBundle/blob/master/UserBundle/ZetaMailer.php
-.. _ZetaWebmailBundle: https://github.com/simplethings/ZetaWebmailBundle

tests/Doctrine/UserManagerTest.php

@@ -80,7 +80,7 @@ public function testGetClass()
     public function testFindUserBy()
     {
         $crit = ['foo' => 'bar'];
-        $this->repository->expects($this->once())->method('findOneBy')->with($this->equalTo($crit))->will($this->returnValue([]));
+        $this->repository->expects($this->once())->method('findOneBy')->with($this->equalTo($crit))->will($this->returnValue(null));
 
         $this->userManager->findUserBy($crit);
     }