Fix more attributes; nullable params

andrewmy · andrewmy · commit da22b9010ffd · 2021-01-24T20:45:22.000+02:00
diff --git a/pkg/amqp-ext/Tests/AmqpContextTest.php b/pkg/amqp-ext/Tests/AmqpContextTest.php
@@ -9,6 +9,7 @@
 use Enqueue\Null\NullQueue;
 use Enqueue\Null\NullTopic;
 use Enqueue\Test\ClassExtensionTrait;
+use Enqueue\Test\ReadAttributeTrait;
 use Interop\Amqp\Impl\AmqpMessage;
 use Interop\Amqp\Impl\AmqpQueue;
 use Interop\Amqp\Impl\AmqpTopic;
@@ -20,6 +21,7 @@
 class AmqpContextTest extends TestCase
 {
     use ClassExtensionTrait;
+    use ReadAttributeTrait;
 
     public function testShouldImplementQueueInteropContextInterface()
     {
diff --git a/pkg/async-command/Tests/RunCommandProcessorTest.php b/pkg/async-command/Tests/RunCommandProcessorTest.php
@@ -3,11 +3,14 @@
 namespace Enqueue\AsyncCommand\Tests;
 
 use Enqueue\AsyncCommand\RunCommandProcessor;
+use Enqueue\Test\ReadAttributeTrait;
 use Interop\Queue\Processor;
 use PHPUnit\Framework\TestCase;
 
 class RunCommandProcessorTest extends TestCase
 {
+    use ReadAttributeTrait;
+
     public function testShouldImplementProcessorInterface()
     {
         $rc = new \ReflectionClass(RunCommandProcessor::class);
diff --git a/pkg/async-event-dispatcher/Tests/AsyncListenerTest.php b/pkg/async-event-dispatcher/Tests/AsyncListenerTest.php
@@ -8,6 +8,7 @@
 use Enqueue\Null\NullMessage;
 use Enqueue\Null\NullQueue;
 use Enqueue\Test\ClassExtensionTrait;
+use Enqueue\Test\ReadAttributeTrait;
 use Interop\Queue\Context;
 use Interop\Queue\Producer;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -20,6 +21,7 @@
 class AsyncListenerTest extends TestCase
 {
     use ClassExtensionTrait;
+    use ReadAttributeTrait;
 
     public function testCouldBeConstructedWithContextAndRegistryAndEventQueueAsString()
     {
diff --git a/pkg/async-event-dispatcher/Tests/ContainerAwareRegistryTest.php b/pkg/async-event-dispatcher/Tests/ContainerAwareRegistryTest.php
@@ -6,12 +6,14 @@
 use Enqueue\AsyncEventDispatcher\EventTransformer;
 use Enqueue\AsyncEventDispatcher\Registry;
 use Enqueue\Test\ClassExtensionTrait;
+use Enqueue\Test\ReadAttributeTrait;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\Container;
 
 class ContainerAwareRegistryTest extends TestCase
 {
     use ClassExtensionTrait;
+    use ReadAttributeTrait;
 
     public function testShouldImplementRegistryInterface()
     {
diff --git a/pkg/dbal/Tests/DbalSubscriptionConsumerTest.php b/pkg/dbal/Tests/DbalSubscriptionConsumerTest.php
@@ -7,6 +7,7 @@
 use Enqueue\Dbal\DbalConsumer;
 use Enqueue\Dbal\DbalContext;
 use Enqueue\Dbal\DbalSubscriptionConsumer;
+use Enqueue\Test\ReadAttributeTrait;
 use Interop\Queue\Consumer;
 use Interop\Queue\Queue;
 use Interop\Queue\SubscriptionConsumer;
@@ -15,6 +16,8 @@
 
 class DbalSubscriptionConsumerTest extends TestCase
 {
+    use ReadAttributeTrait;
+
     public function testShouldImplementSubscriptionConsumerInterface()
     {
         $rc = new \ReflectionClass(DbalSubscriptionConsumer::class);
diff --git a/pkg/dbal/Tests/ManagerRegistryConnectionFactoryTest.php b/pkg/dbal/Tests/ManagerRegistryConnectionFactoryTest.php
@@ -7,13 +7,15 @@
 use Enqueue\Dbal\DbalContext;
 use Enqueue\Dbal\ManagerRegistryConnectionFactory;
 use Enqueue\Test\ClassExtensionTrait;
+use Enqueue\Test\ReadAttributeTrait;
 use Interop\Queue\ConnectionFactory;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class ManagerRegistryConnectionFactoryTest extends TestCase
 {
     use ClassExtensionTrait;
+    use ReadAttributeTrait;
 
     public function testShouldImplementConnectionFactoryInterface()
     {
diff --git a/pkg/enqueue/Tests/Client/ConsumptionExtension/ExclusiveCommandExtensionTest.php b/pkg/enqueue/Tests/Client/ConsumptionExtension/ExclusiveCommandExtensionTest.php
@@ -252,7 +252,7 @@ private function createDriverStub(?RouteCollection $routeCollection = null): Dri
         $driver
             ->expects($this->any())
             ->method('getRouteCollection')
-            ->willReturn($routeCollection ?? new RouteCollection())
+            ->willReturn($routeCollection ?? new RouteCollection([]))
         ;
 
         return $driver;
diff --git a/pkg/enqueue/Tests/Client/RouterProcessorTest.php b/pkg/enqueue/Tests/Client/RouterProcessorTest.php
@@ -13,6 +13,7 @@
 use Enqueue\Null\NullContext;
 use Enqueue\Null\NullMessage;
 use Enqueue\Test\ClassExtensionTrait;
+use Enqueue\Test\ReadAttributeTrait;
 use Interop\Queue\Destination;
 use Interop\Queue\Message as TransportMessage;
 use Interop\Queue\Processor;
@@ -21,6 +22,7 @@
 class RouterProcessorTest extends TestCase
 {
     use ClassExtensionTrait;
+    use ReadAttributeTrait;
 
     public function testShouldImplementProcessorInterface()
     {
@@ -195,15 +197,15 @@ public function testShouldDoNotModifyOriginalMessage()
     }
 
     /**
-     * @return \PHPUnit\Framework\MockObject\MockObject
+     * @return \PHPUnit\Framework\MockObject\MockObject|DriverInterface
      */
-    private function createDriverStub(RouteCollection $routeCollection = null): DriverInterface
+    private function createDriverStub(?RouteCollection $routeCollection = null): DriverInterface
     {
         $driver = $this->createMock(DriverInterface::class);
         $driver
             ->expects($this->any())
             ->method('getRouteCollection')
-            ->willReturn($routeCollection)
+            ->willReturn($routeCollection ?? new RouteCollection([]))
         ;
 
         return $driver;
diff --git a/pkg/enqueue/Tests/Consumption/FallbackSubscriptionConsumerTest.php b/pkg/enqueue/Tests/Consumption/FallbackSubscriptionConsumerTest.php
@@ -3,6 +3,7 @@
 namespace Enqueue\Tests\Consumption;
 
 use Enqueue\Consumption\FallbackSubscriptionConsumer;
+use Enqueue\Test\ReadAttributeTrait;
 use Interop\Queue\Consumer;
 use Interop\Queue\Message as InteropMessage;
 use Interop\Queue\Queue as InteropQueue;
@@ -11,6 +12,8 @@
 
 class FallbackSubscriptionConsumerTest extends TestCase
 {
+    use ReadAttributeTrait;
+
     public function testShouldImplementSubscriptionConsumerInterface()
     {
         $rc = new \ReflectionClass(FallbackSubscriptionConsumer::class);
diff --git a/pkg/enqueue/Tests/Symfony/Client/ConsumeCommandTest.php b/pkg/enqueue/Tests/Symfony/Client/ConsumeCommandTest.php
@@ -605,13 +605,13 @@ private function createQueueConsumerMock()
     /**
      * @return \PHPUnit\Framework\MockObject\MockObject|DriverInterface
      */
-    private function createDriverStub(RouteCollection $routeCollection = null): DriverInterface
+    private function createDriverStub(?RouteCollection $routeCollection = null): DriverInterface
     {
         $driverMock = $this->createMock(DriverInterface::class);
         $driverMock
             ->expects($this->any())
             ->method('getRouteCollection')
-            ->willReturn($routeCollection)
+            ->willReturn($routeCollection ?? new RouteCollection([]))
         ;
 
         $driverMock
diff --git a/pkg/enqueue/Tests/Symfony/Client/RoutesCommandTest.php b/pkg/enqueue/Tests/Symfony/Client/RoutesCommandTest.php
@@ -331,7 +331,7 @@ public function testShouldOutputRouteOptions()
     }
 
     /**
-     * @return \PHPUnit\Framework\MockObject\MockObject
+     * @return \PHPUnit\Framework\MockObject\MockObject|DriverInterface
      */
     private function createDriverStub(Config $config, RouteCollection $routeCollection): DriverInterface
     {
diff --git a/pkg/enqueue/Tests/Symfony/Client/SimpleConsumeCommandTest.php b/pkg/enqueue/Tests/Symfony/Client/SimpleConsumeCommandTest.php
@@ -122,13 +122,13 @@ private function createQueueConsumerMock()
     /**
      * @return \PHPUnit\Framework\MockObject\MockObject|DriverInterface
      */
-    private function createDriverStub(RouteCollection $routeCollection = null): DriverInterface
+    private function createDriverStub(?RouteCollection $routeCollection = null): DriverInterface
     {
         $driverMock = $this->createMock(DriverInterface::class);
         $driverMock
             ->expects($this->any())
             ->method('getRouteCollection')
-            ->willReturn($routeCollection)
+            ->willReturn($routeCollection ?? new RouteCollection([]))
         ;
 
         $driverMock
diff --git a/pkg/fs/Tests/FsConnectionFactoryTest.php b/pkg/fs/Tests/FsConnectionFactoryTest.php
@@ -5,11 +5,13 @@
 use Enqueue\Fs\FsConnectionFactory;
 use Enqueue\Fs\FsContext;
 use Enqueue\Test\ClassExtensionTrait;
+use Enqueue\Test\ReadAttributeTrait;
 use Interop\Queue\ConnectionFactory;
 
 class FsConnectionFactoryTest extends \PHPUnit\Framework\TestCase
 {
     use ClassExtensionTrait;
+    use ReadAttributeTrait;
 
     public function testShouldImplementConnectionFactoryInterface()
     {
diff --git a/pkg/fs/Tests/FsContextTest.php b/pkg/fs/Tests/FsContextTest.php
@@ -9,13 +9,15 @@
 use Enqueue\Fs\FsProducer;
 use Enqueue\Null\NullQueue;
 use Enqueue\Test\ClassExtensionTrait;
+use Enqueue\Test\ReadAttributeTrait;
 use Interop\Queue\Context;
 use Interop\Queue\Exception\InvalidDestinationException;
 use Makasim\File\TempFile;
 
 class FsContextTest extends \PHPUnit\Framework\TestCase
 {
     use ClassExtensionTrait;
+    use ReadAttributeTrait;
 
     public function testShouldImplementContextInterface()
     {
diff --git a/pkg/mongodb/Tests/MongodbSubscriptionConsumerTest.php b/pkg/mongodb/Tests/MongodbSubscriptionConsumerTest.php
@@ -7,13 +7,16 @@
 use Enqueue\Mongodb\MongodbConsumer;
 use Enqueue\Mongodb\MongodbContext;
 use Enqueue\Mongodb\MongodbSubscriptionConsumer;
+use Enqueue\Test\ReadAttributeTrait;
 use Interop\Queue\Consumer;
 use Interop\Queue\Queue;
 use Interop\Queue\SubscriptionConsumer;
 use PHPUnit\Framework\TestCase;
 
 class MongodbSubscriptionConsumerTest extends TestCase
 {
+    use ReadAttributeTrait;
+
     public function testShouldImplementSubscriptionConsumerInterface()
     {
         $rc = new \ReflectionClass(MongodbSubscriptionConsumer::class);
diff --git a/pkg/redis/Tests/RedisConnectionFactoryConfigTest.php b/pkg/redis/Tests/RedisConnectionFactoryConfigTest.php
@@ -5,6 +5,7 @@
 use Enqueue\Redis\Redis;
 use Enqueue\Redis\RedisConnectionFactory;
 use Enqueue\Test\ClassExtensionTrait;
+use Enqueue\Test\ReadAttributeTrait;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -13,6 +14,7 @@
 class RedisConnectionFactoryConfigTest extends TestCase
 {
     use ClassExtensionTrait;
+    use ReadAttributeTrait;
 
     public function testThrowNeitherArrayStringNorNullGivenAsConfig()
     {
diff --git a/pkg/redis/Tests/RedisSubscriptionConsumerTest.php b/pkg/redis/Tests/RedisSubscriptionConsumerTest.php
@@ -5,13 +5,16 @@
 use Enqueue\Redis\RedisConsumer;
 use Enqueue\Redis\RedisContext;
 use Enqueue\Redis\RedisSubscriptionConsumer;
+use Enqueue\Test\ReadAttributeTrait;
 use Interop\Queue\Consumer;
 use Interop\Queue\Queue;
 use Interop\Queue\SubscriptionConsumer;
 use PHPUnit\Framework\TestCase;
 
 class RedisSubscriptionConsumerTest extends TestCase
 {
+    use ReadAttributeTrait;
+
     public function testShouldImplementSubscriptionConsumerInterface()
     {
         $rc = new \ReflectionClass(RedisSubscriptionConsumer::class);

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`use Enqueue\Null\NullQueue;`
`10`	`10`	`use Enqueue\Null\NullTopic;`
`11`	`11`	`use Enqueue\Test\ClassExtensionTrait;`
	`12`	`+use Enqueue\Test\ReadAttributeTrait;`
`12`	`13`	`use Interop\Amqp\Impl\AmqpMessage;`
`13`	`14`	`use Interop\Amqp\Impl\AmqpQueue;`
`14`	`15`	`use Interop\Amqp\Impl\AmqpTopic;`
`@@ -20,6 +21,7 @@`
`20`	`21`	`class AmqpContextTest extends TestCase`
`21`	`22`	`{`
`22`	`23`	`use ClassExtensionTrait;`
	`24`	`+ use ReadAttributeTrait;`
`23`	`25`
`24`	`26`	`public function testShouldImplementQueueInteropContextInterface()`
`25`	`27`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,11 +3,14 @@`
`3`	`3`	`namespace Enqueue\AsyncCommand\Tests;`
`4`	`4`
`5`	`5`	`use Enqueue\AsyncCommand\RunCommandProcessor;`
	`6`	`+use Enqueue\Test\ReadAttributeTrait;`
`6`	`7`	`use Interop\Queue\Processor;`
`7`	`8`	`use PHPUnit\Framework\TestCase;`
`8`	`9`
`9`	`10`	`class RunCommandProcessorTest extends TestCase`
`10`	`11`	`{`
	`12`	`+ use ReadAttributeTrait;`
	`13`	`+`
`11`	`14`	`public function testShouldImplementProcessorInterface()`
`12`	`15`	`{`
`13`	`16`	`$rc = new \ReflectionClass(RunCommandProcessor::class);`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`use Enqueue\Null\NullMessage;`
`9`	`9`	`use Enqueue\Null\NullQueue;`
`10`	`10`	`use Enqueue\Test\ClassExtensionTrait;`
	`11`	`+use Enqueue\Test\ReadAttributeTrait;`
`11`	`12`	`use Interop\Queue\Context;`
`12`	`13`	`use Interop\Queue\Producer;`
`13`	`14`	`use PHPUnit\Framework\MockObject\MockObject;`
`@@ -20,6 +21,7 @@`
`20`	`21`	`class AsyncListenerTest extends TestCase`
`21`	`22`	`{`
`22`	`23`	`use ClassExtensionTrait;`
	`24`	`+ use ReadAttributeTrait;`
`23`	`25`
`24`	`26`	`public function testCouldBeConstructedWithContextAndRegistryAndEventQueueAsString()`
`25`	`27`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,12 +6,14 @@`
`6`	`6`	`use Enqueue\AsyncEventDispatcher\EventTransformer;`
`7`	`7`	`use Enqueue\AsyncEventDispatcher\Registry;`
`8`	`8`	`use Enqueue\Test\ClassExtensionTrait;`
	`9`	`+use Enqueue\Test\ReadAttributeTrait;`
`9`	`10`	`use PHPUnit\Framework\TestCase;`
`10`	`11`	`use Symfony\Component\DependencyInjection\Container;`
`11`	`12`
`12`	`13`	`class ContainerAwareRegistryTest extends TestCase`
`13`	`14`	`{`
`14`	`15`	`use ClassExtensionTrait;`
	`16`	`+ use ReadAttributeTrait;`
`15`	`17`
`16`	`18`	`public function testShouldImplementRegistryInterface()`
`17`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,13 +7,15 @@`
`7`	`7`	`use Enqueue\Dbal\DbalContext;`
`8`	`8`	`use Enqueue\Dbal\ManagerRegistryConnectionFactory;`
`9`	`9`	`use Enqueue\Test\ClassExtensionTrait;`
	`10`	`+use Enqueue\Test\ReadAttributeTrait;`
`10`	`11`	`use Interop\Queue\ConnectionFactory;`
`11`	`12`	`use PHPUnit\Framework\MockObject\MockObject;`
`12`	`13`	`use PHPUnit\Framework\TestCase;`
`13`	`14`
`14`	`15`	`class ManagerRegistryConnectionFactoryTest extends TestCase`
`15`	`16`	`{`
`16`	`17`	`use ClassExtensionTrait;`
	`18`	`+ use ReadAttributeTrait;`
`17`	`19`
`18`	`20`	`public function testShouldImplementConnectionFactoryInterface()`
`19`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,7 @@ private function createDriverStub(?RouteCollection $routeCollection = null): Dri`
`252`	`252`	`$driver`
`253`	`253`	`->expects($this->any())`
`254`	`254`	`->method('getRouteCollection')`
`255`		`- ->willReturn($routeCollection ?? new RouteCollection())`
	`255`	`+ ->willReturn($routeCollection ?? new RouteCollection([]))`
`256`	`256`	`;`
`257`	`257`
`258`	`258`	`return $driver;`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`namespace Enqueue\Tests\Consumption;`
`4`	`4`
`5`	`5`	`use Enqueue\Consumption\FallbackSubscriptionConsumer;`
	`6`	`+use Enqueue\Test\ReadAttributeTrait;`
`6`	`7`	`use Interop\Queue\Consumer;`
`7`	`8`	`use Interop\Queue\Message as InteropMessage;`
`8`	`9`	`use Interop\Queue\Queue as InteropQueue;`
`@@ -11,6 +12,8 @@`
`11`	`12`
`12`	`13`	`class FallbackSubscriptionConsumerTest extends TestCase`
`13`	`14`	`{`
	`15`	`+ use ReadAttributeTrait;`
	`16`	`+`
`14`	`17`	`public function testShouldImplementSubscriptionConsumerInterface()`
`15`	`18`	`{`
`16`	`19`	`$rc = new \ReflectionClass(FallbackSubscriptionConsumer::class);`