Replace docblock union-typehints in tests by native intersection type…

…-hints
usox · Nov 12, 2023 · 32ee179 · 32ee179
1 parent 1d572a9
commit 32ee179
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 22 deletions.
diff --git a/tests/Dispatch/MethodDispatcherTest.php b/tests/Dispatch/MethodDispatcherTest.php
@@ -16,16 +16,13 @@
 
 class MethodDispatcherTest extends MockeryTestCase
 {
-    /** @var MockInterface|SchemaLoaderInterface */
-    private MockInterface $schemaLoader;
+    private MockInterface&SchemaLoaderInterface $schemaLoader;
 
-    /** @var MethodValidatorInterface|MockInterface */
-    private MockInterface $methodValidator;
+    private MockInterface&MethodValidatorInterface $methodValidator;
 
-    /** @var MethodProviderInterface|MockInterface */
-    private MockInterface $methodProvider;
+    private MockInterface&MethodProviderInterface $methodProvider;
 
-    private MockInterface $logger;
+    private MockInterface&LoggerInterface $logger;
 
     private MethodDispatcher $subject;
 

diff --git a/tests/Dispatch/MethodValidatorTest.php b/tests/Dispatch/MethodValidatorTest.php
@@ -17,10 +17,9 @@
 
 class MethodValidatorTest extends MockeryTestCase
 {
-    /** @var Validator|MockInterface */
-    private MockInterface $schemaValidator;
+    private MockInterface&Validator $schemaValidator;
 
-    private MockInterface $errorFormatter;
+    private MockInterface&ErrorFormatter $errorFormatter;
 
     private MethodValidator $subject;
 

diff --git a/tests/Dispatch/RequestValidatorTest.php b/tests/Dispatch/RequestValidatorTest.php
@@ -17,11 +17,9 @@
 
 class RequestValidatorTest extends MockeryTestCase
 {
-    /** @var MockInterface|SchemaLoaderInterface */
-    private MockInterface $schemaLoader;
+    private MockInterface&SchemaLoaderInterface $schemaLoader;
 
-    /** @var MockInterface|Validator */
-    private MockInterface $validator;
+    private MockInterface&Validator $validator;
 
     private RequestValidator $subject;
 

diff --git a/tests/EndpointTest.php b/tests/EndpointTest.php
@@ -28,19 +28,19 @@
 
 class EndpointTest extends MockeryTestCase
 {
-    private MockInterface $requestValidator;
+    private MockInterface&RequestValidatorInterface $requestValidator;
 
-    private MockInterface $methodDispatcher;
+    private MockInterface&MethodDispatcherInterface $methodDispatcher;
 
-    private MockInterface $responseBuilder;
+    private MockInterface&ResponseBuilderInterface $responseBuilder;
 
-    private MockInterface $uuidFactory;
+    private MockInterface&UuidFactoryInterface $uuidFactory;
 
-    private MockInterface $streamFactory;
+    private MockInterface&StreamFactoryInterface $streamFactory;
 
-    private MockInterface $responseFactory;
+    private MockInterface&ResponseFactoryInterface $responseFactory;
 
-    private MockInterface $logger;
+    private MockInterface&LoggerInterface $logger;
 
     private Endpoint $subject;
 

diff --git a/tests/Response/ResponseBuilderTest.php b/tests/Response/ResponseBuilderTest.php
@@ -11,7 +11,6 @@
 
 class ResponseBuilderTest extends MockeryTestCase
 {
-    /** @var ResponseBuilder|null */
     private ResponseBuilder $subject;
 
     public function setUp(): void