Skip to content

Commit da22b90

Browse files
andrewmyandrewmy
committed
Fix more attributes; nullable params
1 parent d38fc1d commit da22b90

17 files changed

+40
-9
lines changed

‎pkg/amqp-ext/Tests/AmqpContextTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use Enqueue\Null\NullQueue;
1010
use Enqueue\Null\NullTopic;
1111
use Enqueue\Test\ClassExtensionTrait;
12+
use Enqueue\Test\ReadAttributeTrait;
1213
use Interop\Amqp\Impl\AmqpMessage;
1314
use Interop\Amqp\Impl\AmqpQueue;
1415
use Interop\Amqp\Impl\AmqpTopic;
@@ -20,6 +21,7 @@
2021
class AmqpContextTest extends TestCase
2122
{
2223
use ClassExtensionTrait;
24+
use ReadAttributeTrait;
2325

2426
public function testShouldImplementQueueInteropContextInterface()
2527
{

‎pkg/async-command/Tests/RunCommandProcessorTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,14 @@
33
namespace Enqueue\AsyncCommand\Tests;
44

55
use Enqueue\AsyncCommand\RunCommandProcessor;
6+
use Enqueue\Test\ReadAttributeTrait;
67
use Interop\Queue\Processor;
78
use PHPUnit\Framework\TestCase;
89

910
class RunCommandProcessorTest extends TestCase
1011
{
12+
use ReadAttributeTrait;
13+
1114
public function testShouldImplementProcessorInterface()
1215
{
1316
$rc = new \ReflectionClass(RunCommandProcessor::class);

‎pkg/async-event-dispatcher/Tests/AsyncListenerTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use Enqueue\Null\NullMessage;
99
use Enqueue\Null\NullQueue;
1010
use Enqueue\Test\ClassExtensionTrait;
11+
use Enqueue\Test\ReadAttributeTrait;
1112
use Interop\Queue\Context;
1213
use Interop\Queue\Producer;
1314
use PHPUnit\Framework\MockObject\MockObject;
@@ -20,6 +21,7 @@
2021
class AsyncListenerTest extends TestCase
2122
{
2223
use ClassExtensionTrait;
24+
use ReadAttributeTrait;
2325

2426
public function testCouldBeConstructedWithContextAndRegistryAndEventQueueAsString()
2527
{

‎pkg/async-event-dispatcher/Tests/ContainerAwareRegistryTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@
66
use Enqueue\AsyncEventDispatcher\EventTransformer;
77
use Enqueue\AsyncEventDispatcher\Registry;
88
use Enqueue\Test\ClassExtensionTrait;
9+
use Enqueue\Test\ReadAttributeTrait;
910
use PHPUnit\Framework\TestCase;
1011
use Symfony\Component\DependencyInjection\Container;
1112

1213
class ContainerAwareRegistryTest extends TestCase
1314
{
1415
use ClassExtensionTrait;
16+
use ReadAttributeTrait;
1517

1618
public function testShouldImplementRegistryInterface()
1719
{

‎pkg/dbal/Tests/DbalSubscriptionConsumerTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use Enqueue\Dbal\DbalConsumer;
88
use Enqueue\Dbal\DbalContext;
99
use Enqueue\Dbal\DbalSubscriptionConsumer;
10+
use Enqueue\Test\ReadAttributeTrait;
1011
use Interop\Queue\Consumer;
1112
use Interop\Queue\Queue;
1213
use Interop\Queue\SubscriptionConsumer;
@@ -15,6 +16,8 @@
1516

1617
class DbalSubscriptionConsumerTest extends TestCase
1718
{
19+
use ReadAttributeTrait;
20+
1821
public function testShouldImplementSubscriptionConsumerInterface()
1922
{
2023
$rc = new \ReflectionClass(DbalSubscriptionConsumer::class);

‎pkg/dbal/Tests/ManagerRegistryConnectionFactoryTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@
77
use Enqueue\Dbal\DbalContext;
88
use Enqueue\Dbal\ManagerRegistryConnectionFactory;
99
use Enqueue\Test\ClassExtensionTrait;
10+
use Enqueue\Test\ReadAttributeTrait;
1011
use Interop\Queue\ConnectionFactory;
1112
use PHPUnit\Framework\MockObject\MockObject;
1213
use PHPUnit\Framework\TestCase;
1314

1415
class ManagerRegistryConnectionFactoryTest extends TestCase
1516
{
1617
use ClassExtensionTrait;
18+
use ReadAttributeTrait;
1719

1820
public function testShouldImplementConnectionFactoryInterface()
1921
{

‎pkg/enqueue/Tests/Client/ConsumptionExtension/ExclusiveCommandExtensionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ private function createDriverStub(?RouteCollection $routeCollection = null): Dri
252252
$driver
253253
->expects($this->any())
254254
->method('getRouteCollection')
255-
->willReturn($routeCollection ?? new RouteCollection())
255+
->willReturn($routeCollection ?? new RouteCollection([]))
256256
;
257257

258258
return $driver;

‎pkg/enqueue/Tests/Client/RouterProcessorTest.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
use Enqueue\Null\NullContext;
1414
use Enqueue\Null\NullMessage;
1515
use Enqueue\Test\ClassExtensionTrait;
16+
use Enqueue\Test\ReadAttributeTrait;
1617
use Interop\Queue\Destination;
1718
use Interop\Queue\Message as TransportMessage;
1819
use Interop\Queue\Processor;
@@ -21,6 +22,7 @@
2122
class RouterProcessorTest extends TestCase
2223
{
2324
use ClassExtensionTrait;
25+
use ReadAttributeTrait;
2426

2527
public function testShouldImplementProcessorInterface()
2628
{
@@ -195,15 +197,15 @@ public function testShouldDoNotModifyOriginalMessage()
195197
}
196198

197199
/**
198-
* @return \PHPUnit\Framework\MockObject\MockObject
200+
* @return \PHPUnit\Framework\MockObject\MockObject|DriverInterface
199201
*/
200-
private function createDriverStub(RouteCollection $routeCollection = null): DriverInterface
202+
private function createDriverStub(?RouteCollection $routeCollection = null): DriverInterface
201203
{
202204
$driver = $this->createMock(DriverInterface::class);
203205
$driver
204206
->expects($this->any())
205207
->method('getRouteCollection')
206-
->willReturn($routeCollection)
208+
->willReturn($routeCollection ?? new RouteCollection([]))
207209
;
208210

209211
return $driver;

‎pkg/enqueue/Tests/Consumption/FallbackSubscriptionConsumerTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace Enqueue\Tests\Consumption;
44

55
use Enqueue\Consumption\FallbackSubscriptionConsumer;
6+
use Enqueue\Test\ReadAttributeTrait;
67
use Interop\Queue\Consumer;
78
use Interop\Queue\Message as InteropMessage;
89
use Interop\Queue\Queue as InteropQueue;
@@ -11,6 +12,8 @@
1112

1213
class FallbackSubscriptionConsumerTest extends TestCase
1314
{
15+
use ReadAttributeTrait;
16+
1417
public function testShouldImplementSubscriptionConsumerInterface()
1518
{
1619
$rc = new \ReflectionClass(FallbackSubscriptionConsumer::class);

‎pkg/enqueue/Tests/Symfony/Client/ConsumeCommandTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -605,13 +605,13 @@ private function createQueueConsumerMock()
605605
/**
606606
* @return \PHPUnit\Framework\MockObject\MockObject|DriverInterface
607607
*/
608-
private function createDriverStub(RouteCollection $routeCollection = null): DriverInterface
608+
private function createDriverStub(?RouteCollection $routeCollection = null): DriverInterface
609609
{
610610
$driverMock = $this->createMock(DriverInterface::class);
611611
$driverMock
612612
->expects($this->any())
613613
->method('getRouteCollection')
614-
->willReturn($routeCollection)
614+
->willReturn($routeCollection ?? new RouteCollection([]))
615615
;
616616

617617
$driverMock

‎pkg/enqueue/Tests/Symfony/Client/RoutesCommandTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ public function testShouldOutputRouteOptions()
331331
}
332332

333333
/**
334-
* @return \PHPUnit\Framework\MockObject\MockObject
334+
* @return \PHPUnit\Framework\MockObject\MockObject|DriverInterface
335335
*/
336336
private function createDriverStub(Config $config, RouteCollection $routeCollection): DriverInterface
337337
{

‎pkg/enqueue/Tests/Symfony/Client/SimpleConsumeCommandTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,13 +122,13 @@ private function createQueueConsumerMock()
122122
/**
123123
* @return \PHPUnit\Framework\MockObject\MockObject|DriverInterface
124124
*/
125-
private function createDriverStub(RouteCollection $routeCollection = null): DriverInterface
125+
private function createDriverStub(?RouteCollection $routeCollection = null): DriverInterface
126126
{
127127
$driverMock = $this->createMock(DriverInterface::class);
128128
$driverMock
129129
->expects($this->any())
130130
->method('getRouteCollection')
131-
->willReturn($routeCollection)
131+
->willReturn($routeCollection ?? new RouteCollection([]))
132132
;
133133

134134
$driverMock

‎pkg/fs/Tests/FsConnectionFactoryTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@
55
use Enqueue\Fs\FsConnectionFactory;
66
use Enqueue\Fs\FsContext;
77
use Enqueue\Test\ClassExtensionTrait;
8+
use Enqueue\Test\ReadAttributeTrait;
89
use Interop\Queue\ConnectionFactory;
910

1011
class FsConnectionFactoryTest extends \PHPUnit\Framework\TestCase
1112
{
1213
use ClassExtensionTrait;
14+
use ReadAttributeTrait;
1315

1416
public function testShouldImplementConnectionFactoryInterface()
1517
{

‎pkg/fs/Tests/FsContextTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,15 @@
99
use Enqueue\Fs\FsProducer;
1010
use Enqueue\Null\NullQueue;
1111
use Enqueue\Test\ClassExtensionTrait;
12+
use Enqueue\Test\ReadAttributeTrait;
1213
use Interop\Queue\Context;
1314
use Interop\Queue\Exception\InvalidDestinationException;
1415
use Makasim\File\TempFile;
1516

1617
class FsContextTest extends \PHPUnit\Framework\TestCase
1718
{
1819
use ClassExtensionTrait;
20+
use ReadAttributeTrait;
1921

2022
public function testShouldImplementContextInterface()
2123
{

‎pkg/mongodb/Tests/MongodbSubscriptionConsumerTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,16 @@
77
use Enqueue\Mongodb\MongodbConsumer;
88
use Enqueue\Mongodb\MongodbContext;
99
use Enqueue\Mongodb\MongodbSubscriptionConsumer;
10+
use Enqueue\Test\ReadAttributeTrait;
1011
use Interop\Queue\Consumer;
1112
use Interop\Queue\Queue;
1213
use Interop\Queue\SubscriptionConsumer;
1314
use PHPUnit\Framework\TestCase;
1415

1516
class MongodbSubscriptionConsumerTest extends TestCase
1617
{
18+
use ReadAttributeTrait;
19+
1720
public function testShouldImplementSubscriptionConsumerInterface()
1821
{
1922
$rc = new \ReflectionClass(MongodbSubscriptionConsumer::class);

‎pkg/redis/Tests/RedisConnectionFactoryConfigTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use Enqueue\Redis\Redis;
66
use Enqueue\Redis\RedisConnectionFactory;
77
use Enqueue\Test\ClassExtensionTrait;
8+
use Enqueue\Test\ReadAttributeTrait;
89
use PHPUnit\Framework\TestCase;
910

1011
/**
@@ -13,6 +14,7 @@
1314
class RedisConnectionFactoryConfigTest extends TestCase
1415
{
1516
use ClassExtensionTrait;
17+
use ReadAttributeTrait;
1618

1719
public function testThrowNeitherArrayStringNorNullGivenAsConfig()
1820
{

‎pkg/redis/Tests/RedisSubscriptionConsumerTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,16 @@
55
use Enqueue\Redis\RedisConsumer;
66
use Enqueue\Redis\RedisContext;
77
use Enqueue\Redis\RedisSubscriptionConsumer;
8+
use Enqueue\Test\ReadAttributeTrait;
89
use Interop\Queue\Consumer;
910
use Interop\Queue\Queue;
1011
use Interop\Queue\SubscriptionConsumer;
1112
use PHPUnit\Framework\TestCase;
1213

1314
class RedisSubscriptionConsumerTest extends TestCase
1415
{
16+
use ReadAttributeTrait;
17+
1518
public function testShouldImplementSubscriptionConsumerInterface()
1619
{
1720
$rc = new \ReflectionClass(RedisSubscriptionConsumer::class);

0 commit comments

Comments
 (0)