Merge branch '5.4' into 6.2

* 5.4:
  [Translation][Mailer] Convert `$this` calls to static ones in data providers
  [BC Break] Make data providers for abstract test cases static
  use TestCase suffix for abstract tests in Tests directories
  Fix Request locale property doc types
  Bump absolute lowest dep to 4.4

Author: nicolas-grekas

CHANGELOG.md

@@ -18,6 +18,14 @@ CHANGELOG
 
  * The `HttpTransportException` class takes a string at first argument
 
+5.4.21
+------
+
+ * [BC BREAK] The following data providers for `TransportFactoryTestCase` are now static:
+  `supportsProvider()`, `createProvider()`, `unsupportedSchemeProvider()`and `incompleteDsnProvider()`
+ * [BC BREAK] The following data providers for `TransportTestCase` are now static:
+  `toStringProvider()`, `supportedMessagesProvider()` and `unsupportedMessagesProvider()`
+
 5.4
 ---
 

Test/TransportFactoryTestCase.php

@@ -13,6 +13,8 @@
 
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
+use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\Mailer\Exception\IncompleteDsnException;
 use Symfony\Component\Mailer\Exception\UnsupportedSchemeException;
 use Symfony\Component\Mailer\Transport\Dsn;
@@ -31,22 +33,22 @@ abstract class TransportFactoryTestCase extends TestCase
     protected const USER = 'u$er';
     protected const PASSWORD = 'pa$s';
 
-    protected $dispatcher;
-    protected $client;
-    protected $logger;
+    protected static $dispatcher;
+    protected static $client;
+    protected static $logger;
 
-    abstract public function getFactory(): TransportFactoryInterface;
+    abstract public static function getFactory(): TransportFactoryInterface;
 
-    abstract public function supportsProvider(): iterable;
+    abstract public static function supportsProvider(): iterable;
 
-    abstract public function createProvider(): iterable;
+    abstract public static function createProvider(): iterable;
 
-    public function unsupportedSchemeProvider(): iterable
+    public static function unsupportedSchemeProvider(): iterable
     {
         return [];
     }
 
-    public function incompleteDsnProvider(): iterable
+    public static function incompleteDsnProvider(): iterable
     {
         return [];
     }
@@ -100,18 +102,22 @@ public function testIncompleteDsnException(Dsn $dsn)
         $factory->create($dsn);
     }
 
-    protected function getDispatcher(): EventDispatcherInterface
+    protected static function getDispatcher(): EventDispatcherInterface
     {
-        return $this->dispatcher ??= $this->createMock(EventDispatcherInterface::class);
+        return self::$dispatcher ??= new class() implements EventDispatcherInterface {
+            public function dispatch($event, string $eventName = null): object
+            {
+            }
+        };
     }
 
-    protected function getClient(): HttpClientInterface
+    protected static function getClient(): HttpClientInterface
     {
-        return $this->client ??= $this->createMock(HttpClientInterface::class);
+        return self::$client ??= new MockHttpClient();
     }
 
-    protected function getLogger(): LoggerInterface
+    protected static function getLogger(): LoggerInterface
     {
-        return $this->logger ??= $this->createMock(LoggerInterface::class);
+        return self::$logger ??= new NullLogger();
     }
 }

Tests/Transport/NullTransportFactoryTest.php

@@ -19,24 +19,24 @@
 
 class NullTransportFactoryTest extends TransportFactoryTestCase
 {
-    public function getFactory(): TransportFactoryInterface
+    public static function getFactory(): TransportFactoryInterface
     {
-        return new NullTransportFactory($this->getDispatcher(), $this->getClient(), $this->getLogger());
+        return new NullTransportFactory(self::getDispatcher(), self::getClient(), self::getLogger());
     }
 
-    public function supportsProvider(): iterable
+    public static function supportsProvider(): iterable
     {
         yield [
             new Dsn('null', ''),
             true,
         ];
     }
 
-    public function createProvider(): iterable
+    public static function createProvider(): iterable
     {
         yield [
             new Dsn('null', 'null'),
-            new NullTransport($this->getDispatcher(), $this->getLogger()),
+            new NullTransport(self::getDispatcher(), self::getLogger()),
         ];
     }
 }

Tests/Transport/SendmailTransportFactoryTest.php

@@ -19,33 +19,33 @@
 
 class SendmailTransportFactoryTest extends TransportFactoryTestCase
 {
-    public function getFactory(): TransportFactoryInterface
+    public static function getFactory(): TransportFactoryInterface
     {
-        return new SendmailTransportFactory($this->getDispatcher(), $this->getClient(), $this->getLogger());
+        return new SendmailTransportFactory(self::getDispatcher(), self::getClient(), self::getLogger());
     }
 
-    public function supportsProvider(): iterable
+    public static function supportsProvider(): iterable
     {
         yield [
             new Dsn('sendmail+smtp', 'default'),
             true,
         ];
     }
 
-    public function createProvider(): iterable
+    public static function createProvider(): iterable
     {
         yield [
             new Dsn('sendmail+smtp', 'default'),
-            new SendmailTransport(null, $this->getDispatcher(), $this->getLogger()),
+            new SendmailTransport(null, self::getDispatcher(), self::getLogger()),
         ];
 
         yield [
             new Dsn('sendmail+smtp', 'default', null, null, null, ['command' => '/usr/sbin/sendmail -oi -t']),
-            new SendmailTransport('/usr/sbin/sendmail -oi -t', $this->getDispatcher(), $this->getLogger()),
+            new SendmailTransport('/usr/sbin/sendmail -oi -t', self::getDispatcher(), self::getLogger()),
         ];
     }
 
-    public function unsupportedSchemeProvider(): iterable
+    public static function unsupportedSchemeProvider(): iterable
     {
         yield [
             new Dsn('sendmail+http', 'default'),

Tests/Transport/Smtp/EsmtpTransportFactoryTest.php

@@ -20,12 +20,12 @@
 
 class EsmtpTransportFactoryTest extends TransportFactoryTestCase
 {
-    public function getFactory(): TransportFactoryInterface
+    public static function getFactory(): TransportFactoryInterface
     {
-        return new EsmtpTransportFactory($this->getDispatcher(), $this->getClient(), $this->getLogger());
+        return new EsmtpTransportFactory(self::getDispatcher(), self::getClient(), self::getLogger());
     }
 
-    public function supportsProvider(): iterable
+    public static function supportsProvider(): iterable
     {
         yield [
             new Dsn('smtp', 'example.com'),
@@ -43,10 +43,10 @@ public function supportsProvider(): iterable
         ];
     }
 
-    public function createProvider(): iterable
+    public static function createProvider(): iterable
     {
-        $eventDispatcher = $this->getDispatcher();
-        $logger = $this->getLogger();
+        $eventDispatcher = self::getDispatcher();
+        $logger = self::getLogger();
 
         $transport = new EsmtpTransport('localhost', 25, false, $eventDispatcher, $logger);
 

composer.json

@@ -26,7 +26,7 @@
     },
     "require-dev": {
         "symfony/console": "^5.4|^6.0",
-        "symfony/http-client-contracts": "^1.1|^2|^3",
+        "symfony/http-client": "^5.4|^6.0",
         "symfony/messenger": "^6.2",
         "symfony/twig-bridge": "^6.2"
     },