Fix more attributes; void returns; assert string contains; resource;

andrewmy · andrewmy · commit 69383000b4d0 · 2021-01-24T20:58:12.000+02:00
diff --git a/pkg/dbal/Tests/DbalConnectionFactoryTest.php b/pkg/dbal/Tests/DbalConnectionFactoryTest.php
@@ -5,12 +5,14 @@
 use Enqueue\Dbal\DbalConnectionFactory;
 use Enqueue\Dbal\DbalContext;
 use Enqueue\Test\ClassExtensionTrait;
+use Enqueue\Test\ReadAttributeTrait;
 use Interop\Queue\ConnectionFactory;
 use PHPUnit\Framework\TestCase;
 
 class DbalConnectionFactoryTest extends TestCase
 {
     use ClassExtensionTrait;
+    use ReadAttributeTrait;
 
     public function testShouldImplementConnectionFactoryInterface()
     {
diff --git a/pkg/dbal/Tests/DbalContextTest.php b/pkg/dbal/Tests/DbalContextTest.php
@@ -9,6 +9,7 @@
 use Enqueue\Dbal\DbalMessage;
 use Enqueue\Dbal\DbalProducer;
 use Enqueue\Test\ClassExtensionTrait;
+use Enqueue\Test\ReadAttributeTrait;
 use Interop\Queue\Context;
 use Interop\Queue\Destination;
 use Interop\Queue\Exception\InvalidDestinationException;
@@ -19,6 +20,7 @@
 class DbalContextTest extends TestCase
 {
     use ClassExtensionTrait;
+    use ReadAttributeTrait;
 
     public function testShouldImplementContextInterface()
     {
diff --git a/pkg/enqueue-bundle/Tests/Functional/RoutesCommandTest.php b/pkg/enqueue-bundle/Tests/Functional/RoutesCommandTest.php
@@ -26,11 +26,11 @@ public function testShouldDisplayRegisteredTopics()
         $tester->execute([]);
 
         $this->assertSame(0, $tester->getStatusCode());
-        $this->assertContains('| topic', $tester->getDisplay());
-        $this->assertContains('| theTopic', $tester->getDisplay());
-        $this->assertContains('| default (prefixed)', $tester->getDisplay());
-        $this->assertContains('| test_topic_subscriber_processor', $tester->getDisplay());
-        $this->assertContains('| (hidden)', $tester->getDisplay());
+        $this->assertStringContainsString('| topic', $tester->getDisplay());
+        $this->assertStringContainsString('| theTopic', $tester->getDisplay());
+        $this->assertStringContainsString('| default (prefixed)', $tester->getDisplay());
+        $this->assertStringContainsString('| test_topic_subscriber_processor', $tester->getDisplay());
+        $this->assertStringContainsString('| (hidden)', $tester->getDisplay());
     }
 
     public function testShouldDisplayCommands()
@@ -42,10 +42,10 @@ public function testShouldDisplayCommands()
         $tester->execute([]);
 
         $this->assertSame(0, $tester->getStatusCode());
-        $this->assertContains('| command', $tester->getDisplay());
-        $this->assertContains('| theCommand', $tester->getDisplay());
-        $this->assertContains('| test_command_subscriber_processor', $tester->getDisplay());
-        $this->assertContains('| default (prefixed)', $tester->getDisplay());
-        $this->assertContains('| (hidden)', $tester->getDisplay());
+        $this->assertStringContainsString('| command', $tester->getDisplay());
+        $this->assertStringContainsString('| theCommand', $tester->getDisplay());
+        $this->assertStringContainsString('| test_command_subscriber_processor', $tester->getDisplay());
+        $this->assertStringContainsString('| default (prefixed)', $tester->getDisplay());
+        $this->assertStringContainsString('| (hidden)', $tester->getDisplay());
     }
 }
diff --git a/pkg/enqueue/Tests/Consumption/QueueConsumerTest.php b/pkg/enqueue/Tests/Consumption/QueueConsumerTest.php
@@ -206,7 +206,6 @@ public function testShouldUseContextSubscriptionConsumerIfSupport()
         $contextSubscriptionConsumer
             ->expects($this->once())
             ->method('consume')
-            ->willReturn(null)
         ;
 
         $fallbackSubscriptionConsumer = $this->createSubscriptionConsumerMock();
@@ -254,7 +253,6 @@ public function testShouldUseFallbackSubscriptionConsumerIfNotSupported()
         $fallbackSubscriptionConsumer
             ->expects($this->once())
             ->method('consume')
-            ->willReturn(null)
         ;
 
         $contextMock = $this->createContextWithoutSubscriptionConsumerMock();
@@ -291,7 +289,6 @@ public function testShouldSubscribeToGivenQueueWithExpectedTimeout()
             ->expects($this->once())
             ->method('consume')
             ->with(12345)
-            ->willReturn(null)
         ;
 
         $contextMock = $this->createContextWithoutSubscriptionConsumerMock();
@@ -322,7 +319,6 @@ public function testShouldSubscribeToGivenQueueAndQuitAfterFifthConsumeCycle()
         $subscriptionConsumerMock
             ->expects($this->exactly(5))
             ->method('consume')
-            ->willReturn(null)
         ;
 
         $contextMock = $this->createContextWithoutSubscriptionConsumerMock();
diff --git a/pkg/enqueue/Tests/Symfony/Client/RoutesCommandTest.php b/pkg/enqueue/Tests/Symfony/Client/RoutesCommandTest.php
@@ -116,7 +116,7 @@ public function testShouldUseFooDriver()
             '--client' => 'foo',
         ]);
 
-        $this->assertContains('Found 1 routes', $tester->getDisplay());
+        $this->assertStringContainsString('Found 1 routes', $tester->getDisplay());
     }
 
     public function testThrowIfClientNotFound()
diff --git a/pkg/enqueue/Tests/Symfony/Client/SetupBrokerCommandTest.php b/pkg/enqueue/Tests/Symfony/Client/SetupBrokerCommandTest.php
@@ -78,7 +78,7 @@ public function testShouldCallDriverSetupBrokerMethod()
         $tester = new CommandTester($command);
         $tester->execute([]);
 
-        $this->assertContains('Broker set up', $tester->getDisplay());
+        $this->assertStringContainsString('Broker set up', $tester->getDisplay());
     }
 
     public function testShouldCallRequestedClientDriverSetupBrokerMethod()
@@ -105,7 +105,7 @@ public function testShouldCallRequestedClientDriverSetupBrokerMethod()
             '--client' => 'foo',
         ]);
 
-        $this->assertContains('Broker set up', $tester->getDisplay());
+        $this->assertStringContainsString('Broker set up', $tester->getDisplay());
     }
 
     public function testShouldThrowIfClientNotFound()
diff --git a/pkg/enqueue/Tests/Symfony/Client/SimpleSetupBrokerCommandTest.php b/pkg/enqueue/Tests/Symfony/Client/SimpleSetupBrokerCommandTest.php
@@ -74,7 +74,7 @@ public function testShouldCallDriverSetupBrokerMethod()
         $tester = new CommandTester($command);
         $tester->execute([]);
 
-        $this->assertContains('Broker set up', $tester->getDisplay());
+        $this->assertStringContainsString('Broker set up', $tester->getDisplay());
     }
 
     /**
diff --git a/pkg/enqueue/Tests/Util/UUIDTest.php b/pkg/enqueue/Tests/Util/UUIDTest.php
@@ -11,7 +11,7 @@ public function testShouldGenerateUniqueId()
     {
         $uuid = UUID::generate();
 
-        $this->assertInternalType('string', $uuid);
+        $this->assertIsString($uuid);
         $this->assertEquals(36, strlen($uuid));
     }
 
diff --git a/pkg/fs/Tests/FsConnectionFactoryConfigTest.php b/pkg/fs/Tests/FsConnectionFactoryConfigTest.php
@@ -4,6 +4,7 @@
 
 use Enqueue\Fs\FsConnectionFactory;
 use Enqueue\Test\ClassExtensionTrait;
+use Enqueue\Test\ReadAttributeTrait;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -12,6 +13,7 @@
 class FsConnectionFactoryConfigTest extends TestCase
 {
     use ClassExtensionTrait;
+    use ReadAttributeTrait;
 
     public function testThrowNeitherArrayStringNorNullGivenAsConfig()
     {
diff --git a/pkg/gearman/Tests/GearmanConnectionFactoryConfigTest.php b/pkg/gearman/Tests/GearmanConnectionFactoryConfigTest.php
@@ -4,6 +4,7 @@
 
 use Enqueue\Gearman\GearmanConnectionFactory;
 use Enqueue\Test\ClassExtensionTrait;
+use Enqueue\Test\ReadAttributeTrait;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -12,6 +13,7 @@
 class GearmanConnectionFactoryConfigTest extends TestCase
 {
     use ClassExtensionTrait;
+    use ReadAttributeTrait;
     use SkipIfGearmanExtensionIsNotInstalledTrait;
 
     public function testThrowNeitherArrayStringNorNullGivenAsConfig()
diff --git a/pkg/gps/Tests/GpsConnectionFactoryConfigTest.php b/pkg/gps/Tests/GpsConnectionFactoryConfigTest.php
@@ -4,6 +4,7 @@
 
 use Enqueue\Gps\GpsConnectionFactory;
 use Enqueue\Test\ClassExtensionTrait;
+use Enqueue\Test\ReadAttributeTrait;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -12,6 +13,7 @@
 class GpsConnectionFactoryConfigTest extends TestCase
 {
     use ClassExtensionTrait;
+    use ReadAttributeTrait;
 
     public function testThrowNeitherArrayStringNorNullGivenAsConfig()
     {
diff --git a/pkg/mongodb/Tests/MongodbConnectionFactoryTest.php b/pkg/mongodb/Tests/MongodbConnectionFactoryTest.php
@@ -5,6 +5,7 @@
 use Enqueue\Mongodb\MongodbConnectionFactory;
 use Enqueue\Mongodb\MongodbContext;
 use Enqueue\Test\ClassExtensionTrait;
+use Enqueue\Test\ReadAttributeTrait;
 use Interop\Queue\ConnectionFactory;
 use PHPUnit\Framework\TestCase;
 
@@ -14,6 +15,7 @@
 class MongodbConnectionFactoryTest extends TestCase
 {
     use ClassExtensionTrait;
+    use ReadAttributeTrait;
 
     public function testShouldImplementConnectionFactoryInterface()
     {
diff --git a/pkg/mongodb/Tests/MongodbContextTest.php b/pkg/mongodb/Tests/MongodbContextTest.php
@@ -8,6 +8,7 @@
 use Enqueue\Mongodb\MongodbMessage;
 use Enqueue\Mongodb\MongodbProducer;
 use Enqueue\Test\ClassExtensionTrait;
+use Enqueue\Test\ReadAttributeTrait;
 use Interop\Queue\Context;
 use Interop\Queue\Destination;
 use Interop\Queue\Exception\InvalidDestinationException;
@@ -21,6 +22,7 @@
 class MongodbContextTest extends TestCase
 {
     use ClassExtensionTrait;
+    use ReadAttributeTrait;
 
     public function testShouldImplementContextInterface()
     {
diff --git a/pkg/pheanstalk/Tests/PheanstalkConnectionFactoryConfigTest.php b/pkg/pheanstalk/Tests/PheanstalkConnectionFactoryConfigTest.php
@@ -4,6 +4,7 @@
 
 use Enqueue\Pheanstalk\PheanstalkConnectionFactory;
 use Enqueue\Test\ClassExtensionTrait;
+use Enqueue\Test\ReadAttributeTrait;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -12,6 +13,7 @@
 class PheanstalkConnectionFactoryConfigTest extends TestCase
 {
     use ClassExtensionTrait;
+    use ReadAttributeTrait;
 
     public function testThrowNeitherArrayStringNorNullGivenAsConfig()
     {
diff --git a/pkg/rdkafka/Tests/JsonSerializerTest.php b/pkg/rdkafka/Tests/JsonSerializerTest.php
@@ -43,7 +43,7 @@ public function testThrowIfFailedToEncodeMessageToJson()
         $resource = fopen(__FILE__, 'r');
 
         //guard
-        $this->assertInternalType('resource', $resource);
+        $this->assertIsResource($resource);
 
         $message = new RdKafkaMessage('theBody', ['aProp' => $resource]);
 
diff --git a/pkg/rdkafka/Tests/RdKafkaConnectionFactoryTest.php b/pkg/rdkafka/Tests/RdKafkaConnectionFactoryTest.php
@@ -3,13 +3,16 @@
 namespace Enqueue\RdKafka\Tests;
 
 use Enqueue\RdKafka\RdKafkaConnectionFactory;
+use Enqueue\Test\ReadAttributeTrait;
 use PHPUnit\Framework\TestCase;
 
 /**
  * @group rdkafka
  */
 class RdKafkaConnectionFactoryTest extends TestCase
 {
+    use ReadAttributeTrait;
+
     public function testThrowNeitherArrayStringNorNullGivenAsConfig()
     {
         $this->expectException(\LogicException::class);
diff --git a/pkg/redis/Tests/Spec/JsonSerializerTest.php b/pkg/redis/Tests/Spec/JsonSerializerTest.php
@@ -43,7 +43,7 @@ public function testThrowIfFailedToEncodeMessageToJson()
         $resource = fopen(__FILE__, 'r');
 
         //guard
-        $this->assertInternalType('resource', $resource);
+        $this->assertIsResource($resource);
 
         $message = new RedisMessage('theBody', ['aProp' => $resource]);
 
diff --git a/pkg/sns/Tests/SnsConnectionFactoryConfigTest.php b/pkg/sns/Tests/SnsConnectionFactoryConfigTest.php
@@ -4,6 +4,7 @@
 
 use Enqueue\Sns\SnsConnectionFactory;
 use Enqueue\Test\ClassExtensionTrait;
+use Enqueue\Test\ReadAttributeTrait;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -12,6 +13,7 @@
 class SnsConnectionFactoryConfigTest extends TestCase
 {
     use ClassExtensionTrait;
+    use ReadAttributeTrait;
 
     public function testThrowNeitherArrayStringNorNullGivenAsConfig()
     {
diff --git a/pkg/sqs/Tests/SqsConnectionFactoryConfigTest.php b/pkg/sqs/Tests/SqsConnectionFactoryConfigTest.php
@@ -4,6 +4,7 @@
 
 use Enqueue\Sqs\SqsConnectionFactory;
 use Enqueue\Test\ClassExtensionTrait;
+use Enqueue\Test\ReadAttributeTrait;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -12,6 +13,7 @@
 class SqsConnectionFactoryConfigTest extends TestCase
 {
     use ClassExtensionTrait;
+    use ReadAttributeTrait;
 
     public function testThrowNeitherArrayStringNorNullGivenAsConfig()
     {
diff --git a/pkg/stomp/Tests/Functional/StompConnectionFactoryTest.php b/pkg/stomp/Tests/Functional/StompConnectionFactoryTest.php
@@ -4,6 +4,7 @@
 
 use Enqueue\Stomp\StompConnectionFactory;
 use Enqueue\Test\RabbitmqStompExtension;
+use Enqueue\Test\ReadAttributeTrait;
 use Stomp\Network\Observer\Exception\HeartbeatException;
 use Stomp\Network\Observer\HeartbeatEmitter;
 use Stomp\Network\Observer\ServerAliveObserver;
@@ -14,6 +15,7 @@
 class StompConnectionFactoryTest extends \PHPUnit\Framework\TestCase
 {
     use RabbitmqStompExtension;
+    use ReadAttributeTrait;
 
     public function testShouldNotCreateConnectionWithSendHeartbeat()
     {
diff --git a/pkg/stomp/Tests/StompConnectionFactoryConfigTest.php b/pkg/stomp/Tests/StompConnectionFactoryConfigTest.php
@@ -4,6 +4,7 @@
 
 use Enqueue\Stomp\StompConnectionFactory;
 use Enqueue\Test\ClassExtensionTrait;
+use Enqueue\Test\ReadAttributeTrait;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -12,6 +13,7 @@
 class StompConnectionFactoryConfigTest extends TestCase
 {
     use ClassExtensionTrait;
+    use ReadAttributeTrait;
 
     public function testThrowNeitherArrayStringNorNullGivenAsConfig()
     {
diff --git a/pkg/wamp/Tests/Spec/JsonSerializerTest.php b/pkg/wamp/Tests/Spec/JsonSerializerTest.php
@@ -43,7 +43,7 @@ public function testThrowIfFailedToEncodeMessageToJson()
         $resource = fopen(__FILE__, 'r');
 
         //guard
-        $this->assertInternalType('resource', $resource);
+        $this->assertIsResource($resource);
 
         $message = new WampMessage('theBody', ['aProp' => $resource]);
 

Original file line number	Diff line number	Diff line change
`@@ -5,12 +5,14 @@`
`5`	`5`	`use Enqueue\Dbal\DbalConnectionFactory;`
`6`	`6`	`use Enqueue\Dbal\DbalContext;`
`7`	`7`	`use Enqueue\Test\ClassExtensionTrait;`
	`8`	`+use Enqueue\Test\ReadAttributeTrait;`
`8`	`9`	`use Interop\Queue\ConnectionFactory;`
`9`	`10`	`use PHPUnit\Framework\TestCase;`
`10`	`11`
`11`	`12`	`class DbalConnectionFactoryTest extends TestCase`
`12`	`13`	`{`
`13`	`14`	`use ClassExtensionTrait;`
	`15`	`+ use ReadAttributeTrait;`
`14`	`16`
`15`	`17`	`public function testShouldImplementConnectionFactoryInterface()`
`16`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`use Enqueue\Dbal\DbalMessage;`
`10`	`10`	`use Enqueue\Dbal\DbalProducer;`
`11`	`11`	`use Enqueue\Test\ClassExtensionTrait;`
	`12`	`+use Enqueue\Test\ReadAttributeTrait;`
`12`	`13`	`use Interop\Queue\Context;`
`13`	`14`	`use Interop\Queue\Destination;`
`14`	`15`	`use Interop\Queue\Exception\InvalidDestinationException;`
`@@ -19,6 +20,7 @@`
`19`	`20`	`class DbalContextTest extends TestCase`
`20`	`21`	`{`
`21`	`22`	`use ClassExtensionTrait;`
	`23`	`+ use ReadAttributeTrait;`
`22`	`24`
`23`	`25`	`public function testShouldImplementContextInterface()`
`24`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ public function testShouldUseFooDriver()`
`116`	`116`	`'--client' => 'foo',`
`117`	`117`	`]);`
`118`	`118`
`119`		`- $this->assertContains('Found 1 routes', $tester->getDisplay());`
	`119`	`+ $this->assertStringContainsString('Found 1 routes', $tester->getDisplay());`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`public function testThrowIfClientNotFound()`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public function testShouldCallDriverSetupBrokerMethod()`
`78`	`78`	`$tester = new CommandTester($command);`
`79`	`79`	`$tester->execute([]);`
`80`	`80`
`81`		`- $this->assertContains('Broker set up', $tester->getDisplay());`
	`81`	`+ $this->assertStringContainsString('Broker set up', $tester->getDisplay());`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`public function testShouldCallRequestedClientDriverSetupBrokerMethod()`
`@@ -105,7 +105,7 @@ public function testShouldCallRequestedClientDriverSetupBrokerMethod()`
`105`	`105`	`'--client' => 'foo',`
`106`	`106`	`]);`
`107`	`107`
`108`		`- $this->assertContains('Broker set up', $tester->getDisplay());`
	`108`	`+ $this->assertStringContainsString('Broker set up', $tester->getDisplay());`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`public function testShouldThrowIfClientNotFound()`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public function testShouldCallDriverSetupBrokerMethod()`
`74`	`74`	`$tester = new CommandTester($command);`
`75`	`75`	`$tester->execute([]);`
`76`	`76`
`77`		`- $this->assertContains('Broker set up', $tester->getDisplay());`
	`77`	`+ $this->assertStringContainsString('Broker set up', $tester->getDisplay());`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public function testShouldGenerateUniqueId()`
`11`	`11`	`{`
`12`	`12`	`$uuid = UUID::generate();`
`13`	`13`
`14`		`- $this->assertInternalType('string', $uuid);`
	`14`	`+ $this->assertIsString($uuid);`
`15`	`15`	`$this->assertEquals(36, strlen($uuid));`
`16`	`16`	`}`
`17`	`17`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`use Enqueue\Fs\FsConnectionFactory;`
`6`	`6`	`use Enqueue\Test\ClassExtensionTrait;`
	`7`	`+use Enqueue\Test\ReadAttributeTrait;`
`7`	`8`	`use PHPUnit\Framework\TestCase;`
`8`	`9`
`9`	`10`	`/**`
`@@ -12,6 +13,7 @@`
`12`	`13`	`class FsConnectionFactoryConfigTest extends TestCase`
`13`	`14`	`{`
`14`	`15`	`use ClassExtensionTrait;`
	`16`	`+ use ReadAttributeTrait;`
`15`	`17`
`16`	`18`	`public function testThrowNeitherArrayStringNorNullGivenAsConfig()`
`17`	`19`	`{`