Use typed properties in tests as much as possible

nicolas-grekas · nicolas-grekas · commit b463bcf1f305 · 2023-07-25T10:53:33.000+02:00
diff --git a/Tests/ChatterTest.php b/Tests/ChatterTest.php
@@ -22,11 +22,8 @@
 
 class ChatterTest extends TestCase
 {
-    /** @var MockObject&TransportInterface */
-    private $transport;
-
-    /** @var MockObject&MessageBusInterface */
-    private $bus;
+    private MockObject&TransportInterface $transport;
+    private MockObject&MessageBusInterface $bus;
 
     protected function setUp(): void
     {
diff --git a/Tests/Event/FailedMessageEventTest.php b/Tests/Event/FailedMessageEventTest.php
@@ -56,7 +56,7 @@ public function testFailedMessageEventIsDisptachIfError()
         $clientMock = $this->createMock(HttpClientInterface::class);
 
         $transport = new class($clientMock, $eventDispatcherMock) extends AbstractTransport {
-            public $exception;
+            public NullTransportException $exception;
 
             public function __construct($client, EventDispatcherInterface $dispatcher = null)
             {
diff --git a/Tests/Fixtures/TestOptions.php b/Tests/Fixtures/TestOptions.php
@@ -15,7 +15,7 @@
 
 final class TestOptions implements MessageOptionsInterface
 {
-    private $options;
+    private array $options;
 
     public function __construct(array $options = [])
     {
diff --git a/Tests/Mailer/DummyMailer.php b/Tests/Mailer/DummyMailer.php
@@ -20,7 +20,7 @@
  */
 class DummyMailer implements MailerInterface
 {
-    private $sentMessage;
+    private RawMessage $sentMessage;
 
     public function send(RawMessage $message, Envelope $envelope = null): void
     {
diff --git a/Tests/TexterTest.php b/Tests/TexterTest.php
@@ -22,11 +22,8 @@
 
 class TexterTest extends TestCase
 {
-    /** @var MockObject&TransportInterface */
-    private $transport;
-
-    /** @var MockObject&MessageBusInterface */
-    private $bus;
+    private MockObject&TransportInterface $transport;
+    private MockObject&MessageBusInterface $bus;
 
     protected function setUp(): void
     {
diff --git a/Tests/Transport/NullTransportFactoryTest.php b/Tests/Transport/NullTransportFactoryTest.php
@@ -24,10 +24,7 @@
  */
 class NullTransportFactoryTest extends TestCase
 {
-    /**
-     * @var NullTransportFactory
-     */
-    private $nullTransportFactory;
+    private NullTransportFactory $nullTransportFactory;
 
     protected function setUp(): void
     {

Original file line number	Diff line number	Diff line change
`@@ -22,11 +22,8 @@`
`22`	`22`
`23`	`23`	`class ChatterTest extends TestCase`
`24`	`24`	`{`
`25`		`- /** @var MockObject&TransportInterface */`
`26`		`- private $transport;`
`27`		`-`
`28`		`- /** @var MockObject&MessageBusInterface */`
`29`		`- private $bus;`
	`25`	`+ private MockObject&TransportInterface $transport;`
	`26`	`+ private MockObject&MessageBusInterface $bus;`
`30`	`27`
`31`	`28`	`protected function setUp(): void`
`32`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public function testFailedMessageEventIsDisptachIfError()`
`56`	`56`	`$clientMock = $this->createMock(HttpClientInterface::class);`
`57`	`57`
`58`	`58`	`$transport = new class($clientMock, $eventDispatcherMock) extends AbstractTransport {`
`59`		`- public $exception;`
	`59`	`+ public NullTransportException $exception;`
`60`	`60`
`61`	`61`	`public function __construct($client, EventDispatcherInterface $dispatcher = null)`
`62`	`62`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`
`16`	`16`	`final class TestOptions implements MessageOptionsInterface`
`17`	`17`	`{`
`18`		`- private $options;`
	`18`	`+ private array $options;`
`19`	`19`
`20`	`20`	`public function __construct(array $options = [])`
`21`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`*/`
`21`	`21`	`class DummyMailer implements MailerInterface`
`22`	`22`	`{`
`23`		`- private $sentMessage;`
	`23`	`+ private RawMessage $sentMessage;`
`24`	`24`
`25`	`25`	`public function send(RawMessage $message, Envelope $envelope = null): void`
`26`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,10 +24,7 @@`
`24`	`24`	`*/`
`25`	`25`	`class NullTransportFactoryTest extends TestCase`
`26`	`26`	`{`
`27`		`- /**`
`28`		`- * @var NullTransportFactory`
`29`		`- */`
`30`		`- private $nullTransportFactory;`
	`27`	`+ private NullTransportFactory $nullTransportFactory;`
`31`	`28`
`32`	`29`	`protected function setUp(): void`
`33`	`30`	`{`