Skip to content

Commit 6938300

Browse files
andrewmyandrewmy
committed
Fix more attributes; void returns; assert string contains; resource;
1 parent da22b90 commit 6938300

22 files changed

+45
-22
lines changed

‎pkg/dbal/Tests/DbalConnectionFactoryTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@
55
use Enqueue\Dbal\DbalConnectionFactory;
66
use Enqueue\Dbal\DbalContext;
77
use Enqueue\Test\ClassExtensionTrait;
8+
use Enqueue\Test\ReadAttributeTrait;
89
use Interop\Queue\ConnectionFactory;
910
use PHPUnit\Framework\TestCase;
1011

1112
class DbalConnectionFactoryTest extends TestCase
1213
{
1314
use ClassExtensionTrait;
15+
use ReadAttributeTrait;
1416

1517
public function testShouldImplementConnectionFactoryInterface()
1618
{

‎pkg/dbal/Tests/DbalContextTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use Enqueue\Dbal\DbalMessage;
1010
use Enqueue\Dbal\DbalProducer;
1111
use Enqueue\Test\ClassExtensionTrait;
12+
use Enqueue\Test\ReadAttributeTrait;
1213
use Interop\Queue\Context;
1314
use Interop\Queue\Destination;
1415
use Interop\Queue\Exception\InvalidDestinationException;
@@ -19,6 +20,7 @@
1920
class DbalContextTest extends TestCase
2021
{
2122
use ClassExtensionTrait;
23+
use ReadAttributeTrait;
2224

2325
public function testShouldImplementContextInterface()
2426
{

‎pkg/enqueue-bundle/Tests/Functional/RoutesCommandTest.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ public function testShouldDisplayRegisteredTopics()
2626
$tester->execute([]);
2727

2828
$this->assertSame(0, $tester->getStatusCode());
29-
$this->assertContains('| topic', $tester->getDisplay());
30-
$this->assertContains('| theTopic', $tester->getDisplay());
31-
$this->assertContains('| default (prefixed)', $tester->getDisplay());
32-
$this->assertContains('| test_topic_subscriber_processor', $tester->getDisplay());
33-
$this->assertContains('| (hidden)', $tester->getDisplay());
29+
$this->assertStringContainsString('| topic', $tester->getDisplay());
30+
$this->assertStringContainsString('| theTopic', $tester->getDisplay());
31+
$this->assertStringContainsString('| default (prefixed)', $tester->getDisplay());
32+
$this->assertStringContainsString('| test_topic_subscriber_processor', $tester->getDisplay());
33+
$this->assertStringContainsString('| (hidden)', $tester->getDisplay());
3434
}
3535

3636
public function testShouldDisplayCommands()
@@ -42,10 +42,10 @@ public function testShouldDisplayCommands()
4242
$tester->execute([]);
4343

4444
$this->assertSame(0, $tester->getStatusCode());
45-
$this->assertContains('| command', $tester->getDisplay());
46-
$this->assertContains('| theCommand', $tester->getDisplay());
47-
$this->assertContains('| test_command_subscriber_processor', $tester->getDisplay());
48-
$this->assertContains('| default (prefixed)', $tester->getDisplay());
49-
$this->assertContains('| (hidden)', $tester->getDisplay());
45+
$this->assertStringContainsString('| command', $tester->getDisplay());
46+
$this->assertStringContainsString('| theCommand', $tester->getDisplay());
47+
$this->assertStringContainsString('| test_command_subscriber_processor', $tester->getDisplay());
48+
$this->assertStringContainsString('| default (prefixed)', $tester->getDisplay());
49+
$this->assertStringContainsString('| (hidden)', $tester->getDisplay());
5050
}
5151
}

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,6 @@ public function testShouldUseContextSubscriptionConsumerIfSupport()
206206
$contextSubscriptionConsumer
207207
->expects($this->once())
208208
->method('consume')
209-
->willReturn(null)
210209
;
211210

212211
$fallbackSubscriptionConsumer = $this->createSubscriptionConsumerMock();
@@ -254,7 +253,6 @@ public function testShouldUseFallbackSubscriptionConsumerIfNotSupported()
254253
$fallbackSubscriptionConsumer
255254
->expects($this->once())
256255
->method('consume')
257-
->willReturn(null)
258256
;
259257

260258
$contextMock = $this->createContextWithoutSubscriptionConsumerMock();
@@ -291,7 +289,6 @@ public function testShouldSubscribeToGivenQueueWithExpectedTimeout()
291289
->expects($this->once())
292290
->method('consume')
293291
->with(12345)
294-
->willReturn(null)
295292
;
296293

297294
$contextMock = $this->createContextWithoutSubscriptionConsumerMock();
@@ -322,7 +319,6 @@ public function testShouldSubscribeToGivenQueueAndQuitAfterFifthConsumeCycle()
322319
$subscriptionConsumerMock
323320
->expects($this->exactly(5))
324321
->method('consume')
325-
->willReturn(null)
326322
;
327323

328324
$contextMock = $this->createContextWithoutSubscriptionConsumerMock();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public function testShouldUseFooDriver()
116116
'--client' => 'foo',
117117
]);
118118

119-
$this->assertContains('Found 1 routes', $tester->getDisplay());
119+
$this->assertStringContainsString('Found 1 routes', $tester->getDisplay());
120120
}
121121

122122
public function testThrowIfClientNotFound()

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public function testShouldCallDriverSetupBrokerMethod()
7878
$tester = new CommandTester($command);
7979
$tester->execute([]);
8080

81-
$this->assertContains('Broker set up', $tester->getDisplay());
81+
$this->assertStringContainsString('Broker set up', $tester->getDisplay());
8282
}
8383

8484
public function testShouldCallRequestedClientDriverSetupBrokerMethod()
@@ -105,7 +105,7 @@ public function testShouldCallRequestedClientDriverSetupBrokerMethod()
105105
'--client' => 'foo',
106106
]);
107107

108-
$this->assertContains('Broker set up', $tester->getDisplay());
108+
$this->assertStringContainsString('Broker set up', $tester->getDisplay());
109109
}
110110

111111
public function testShouldThrowIfClientNotFound()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public function testShouldCallDriverSetupBrokerMethod()
7474
$tester = new CommandTester($command);
7575
$tester->execute([]);
7676

77-
$this->assertContains('Broker set up', $tester->getDisplay());
77+
$this->assertStringContainsString('Broker set up', $tester->getDisplay());
7878
}
7979

8080
/**

‎pkg/enqueue/Tests/Util/UUIDTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public function testShouldGenerateUniqueId()
1111
{
1212
$uuid = UUID::generate();
1313

14-
$this->assertInternalType('string', $uuid);
14+
$this->assertIsString($uuid);
1515
$this->assertEquals(36, strlen($uuid));
1616
}
1717

‎pkg/fs/Tests/FsConnectionFactoryConfigTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use Enqueue\Fs\FsConnectionFactory;
66
use Enqueue\Test\ClassExtensionTrait;
7+
use Enqueue\Test\ReadAttributeTrait;
78
use PHPUnit\Framework\TestCase;
89

910
/**
@@ -12,6 +13,7 @@
1213
class FsConnectionFactoryConfigTest extends TestCase
1314
{
1415
use ClassExtensionTrait;
16+
use ReadAttributeTrait;
1517

1618
public function testThrowNeitherArrayStringNorNullGivenAsConfig()
1719
{

‎pkg/gearman/Tests/GearmanConnectionFactoryConfigTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use Enqueue\Gearman\GearmanConnectionFactory;
66
use Enqueue\Test\ClassExtensionTrait;
7+
use Enqueue\Test\ReadAttributeTrait;
78
use PHPUnit\Framework\TestCase;
89

910
/**
@@ -12,6 +13,7 @@
1213
class GearmanConnectionFactoryConfigTest extends TestCase
1314
{
1415
use ClassExtensionTrait;
16+
use ReadAttributeTrait;
1517
use SkipIfGearmanExtensionIsNotInstalledTrait;
1618

1719
public function testThrowNeitherArrayStringNorNullGivenAsConfig()

‎pkg/gps/Tests/GpsConnectionFactoryConfigTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use Enqueue\Gps\GpsConnectionFactory;
66
use Enqueue\Test\ClassExtensionTrait;
7+
use Enqueue\Test\ReadAttributeTrait;
78
use PHPUnit\Framework\TestCase;
89

910
/**
@@ -12,6 +13,7 @@
1213
class GpsConnectionFactoryConfigTest extends TestCase
1314
{
1415
use ClassExtensionTrait;
16+
use ReadAttributeTrait;
1517

1618
public function testThrowNeitherArrayStringNorNullGivenAsConfig()
1719
{

‎pkg/mongodb/Tests/MongodbConnectionFactoryTest.php

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

@@ -14,6 +15,7 @@
1415
class MongodbConnectionFactoryTest extends TestCase
1516
{
1617
use ClassExtensionTrait;
18+
use ReadAttributeTrait;
1719

1820
public function testShouldImplementConnectionFactoryInterface()
1921
{

‎pkg/mongodb/Tests/MongodbContextTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use Enqueue\Mongodb\MongodbMessage;
99
use Enqueue\Mongodb\MongodbProducer;
1010
use Enqueue\Test\ClassExtensionTrait;
11+
use Enqueue\Test\ReadAttributeTrait;
1112
use Interop\Queue\Context;
1213
use Interop\Queue\Destination;
1314
use Interop\Queue\Exception\InvalidDestinationException;
@@ -21,6 +22,7 @@
2122
class MongodbContextTest extends TestCase
2223
{
2324
use ClassExtensionTrait;
25+
use ReadAttributeTrait;
2426

2527
public function testShouldImplementContextInterface()
2628
{

‎pkg/pheanstalk/Tests/PheanstalkConnectionFactoryConfigTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use Enqueue\Pheanstalk\PheanstalkConnectionFactory;
66
use Enqueue\Test\ClassExtensionTrait;
7+
use Enqueue\Test\ReadAttributeTrait;
78
use PHPUnit\Framework\TestCase;
89

910
/**
@@ -12,6 +13,7 @@
1213
class PheanstalkConnectionFactoryConfigTest extends TestCase
1314
{
1415
use ClassExtensionTrait;
16+
use ReadAttributeTrait;
1517

1618
public function testThrowNeitherArrayStringNorNullGivenAsConfig()
1719
{

‎pkg/rdkafka/Tests/JsonSerializerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public function testThrowIfFailedToEncodeMessageToJson()
4343
$resource = fopen(__FILE__, 'r');
4444

4545
//guard
46-
$this->assertInternalType('resource', $resource);
46+
$this->assertIsResource($resource);
4747

4848
$message = new RdKafkaMessage('theBody', ['aProp' => $resource]);
4949

‎pkg/rdkafka/Tests/RdKafkaConnectionFactoryTest.php

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

55
use Enqueue\RdKafka\RdKafkaConnectionFactory;
6+
use Enqueue\Test\ReadAttributeTrait;
67
use PHPUnit\Framework\TestCase;
78

89
/**
910
* @group rdkafka
1011
*/
1112
class RdKafkaConnectionFactoryTest extends TestCase
1213
{
14+
use ReadAttributeTrait;
15+
1316
public function testThrowNeitherArrayStringNorNullGivenAsConfig()
1417
{
1518
$this->expectException(\LogicException::class);

‎pkg/redis/Tests/Spec/JsonSerializerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public function testThrowIfFailedToEncodeMessageToJson()
4343
$resource = fopen(__FILE__, 'r');
4444

4545
//guard
46-
$this->assertInternalType('resource', $resource);
46+
$this->assertIsResource($resource);
4747

4848
$message = new RedisMessage('theBody', ['aProp' => $resource]);
4949

‎pkg/sns/Tests/SnsConnectionFactoryConfigTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use Enqueue\Sns\SnsConnectionFactory;
66
use Enqueue\Test\ClassExtensionTrait;
7+
use Enqueue\Test\ReadAttributeTrait;
78
use PHPUnit\Framework\TestCase;
89

910
/**
@@ -12,6 +13,7 @@
1213
class SnsConnectionFactoryConfigTest extends TestCase
1314
{
1415
use ClassExtensionTrait;
16+
use ReadAttributeTrait;
1517

1618
public function testThrowNeitherArrayStringNorNullGivenAsConfig()
1719
{

‎pkg/sqs/Tests/SqsConnectionFactoryConfigTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use Enqueue\Sqs\SqsConnectionFactory;
66
use Enqueue\Test\ClassExtensionTrait;
7+
use Enqueue\Test\ReadAttributeTrait;
78
use PHPUnit\Framework\TestCase;
89

910
/**
@@ -12,6 +13,7 @@
1213
class SqsConnectionFactoryConfigTest extends TestCase
1314
{
1415
use ClassExtensionTrait;
16+
use ReadAttributeTrait;
1517

1618
public function testThrowNeitherArrayStringNorNullGivenAsConfig()
1719
{

‎pkg/stomp/Tests/Functional/StompConnectionFactoryTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use Enqueue\Stomp\StompConnectionFactory;
66
use Enqueue\Test\RabbitmqStompExtension;
7+
use Enqueue\Test\ReadAttributeTrait;
78
use Stomp\Network\Observer\Exception\HeartbeatException;
89
use Stomp\Network\Observer\HeartbeatEmitter;
910
use Stomp\Network\Observer\ServerAliveObserver;
@@ -14,6 +15,7 @@
1415
class StompConnectionFactoryTest extends \PHPUnit\Framework\TestCase
1516
{
1617
use RabbitmqStompExtension;
18+
use ReadAttributeTrait;
1719

1820
public function testShouldNotCreateConnectionWithSendHeartbeat()
1921
{

‎pkg/stomp/Tests/StompConnectionFactoryConfigTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use Enqueue\Stomp\StompConnectionFactory;
66
use Enqueue\Test\ClassExtensionTrait;
7+
use Enqueue\Test\ReadAttributeTrait;
78
use PHPUnit\Framework\TestCase;
89

910
/**
@@ -12,6 +13,7 @@
1213
class StompConnectionFactoryConfigTest extends TestCase
1314
{
1415
use ClassExtensionTrait;
16+
use ReadAttributeTrait;
1517

1618
public function testThrowNeitherArrayStringNorNullGivenAsConfig()
1719
{

‎pkg/wamp/Tests/Spec/JsonSerializerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public function testThrowIfFailedToEncodeMessageToJson()
4343
$resource = fopen(__FILE__, 'r');
4444

4545
//guard
46-
$this->assertInternalType('resource', $resource);
46+
$this->assertIsResource($resource);
4747

4848
$message = new WampMessage('theBody', ['aProp' => $resource]);
4949

0 commit comments

Comments
 (0)