Fix more attributes and nullables

andrewmy · andrewmy · commit 689c70ae8473 · 2021-01-24T21:07:30.000+02:00
diff --git a/pkg/amqp-bunny/Tests/AmqpConnectionFactoryTest.php b/pkg/amqp-bunny/Tests/AmqpConnectionFactoryTest.php
@@ -5,12 +5,14 @@
 use Enqueue\AmqpBunny\AmqpConnectionFactory;
 use Enqueue\AmqpTools\RabbitMqDlxDelayStrategy;
 use Enqueue\Test\ClassExtensionTrait;
+use Enqueue\Test\ReadAttributeTrait;
 use Interop\Queue\ConnectionFactory;
 use PHPUnit\Framework\TestCase;
 
 class AmqpConnectionFactoryTest extends TestCase
 {
     use ClassExtensionTrait;
+    use ReadAttributeTrait;
 
     public function testShouldImplementConnectionFactoryInterface()
     {
diff --git a/pkg/amqp-lib/Tests/AmqpConnectionFactoryTest.php b/pkg/amqp-lib/Tests/AmqpConnectionFactoryTest.php
@@ -5,12 +5,14 @@
 use Enqueue\AmqpLib\AmqpConnectionFactory;
 use Enqueue\AmqpTools\RabbitMqDlxDelayStrategy;
 use Enqueue\Test\ClassExtensionTrait;
+use Enqueue\Test\ReadAttributeTrait;
 use Interop\Queue\ConnectionFactory;
 use PHPUnit\Framework\TestCase;
 
 class AmqpConnectionFactoryTest extends TestCase
 {
     use ClassExtensionTrait;
+    use ReadAttributeTrait;
 
     public function testShouldImplementConnectionFactoryInterface()
     {
diff --git a/pkg/dbal/Tests/DbalConnectionFactoryTest.php b/pkg/dbal/Tests/DbalConnectionFactoryTest.php
@@ -28,7 +28,7 @@ public function testShouldCreateLazyContext()
         $this->assertInstanceOf(DbalContext::class, $context);
 
         $this->assertAttributeEquals(null, 'connection', $context);
-        $this->assertAttributeInternalType('callable', 'connectionFactory', $context);
+        $this->assertIsCallable($this->readAttribute($context, 'connectionFactory'));
     }
 
     public function testShouldParseGenericDSN()
diff --git a/pkg/dbal/Tests/ManagerRegistryConnectionFactoryTest.php b/pkg/dbal/Tests/ManagerRegistryConnectionFactoryTest.php
@@ -73,7 +73,7 @@ public function testShouldCreateLazyContext()
         $this->assertInstanceOf(DbalContext::class, $context);
 
         $this->assertAttributeEquals(null, 'connection', $context);
-        $this->assertAttributeInternalType('callable', 'connectionFactory', $context);
+        $this->assertIsCallable($this->readAttribute($context, 'connectionFactory'));
     }
 
     /**
diff --git a/pkg/enqueue/Tests/Consumption/QueueConsumerTest.php b/pkg/enqueue/Tests/Consumption/QueueConsumerTest.php
@@ -1537,6 +1537,9 @@ private function createExtension()
      */
     private function createConsumerStub($queue = null): Consumer
     {
+        if ($queue === null) {
+            $queue = 'queue';
+        }
         if (is_string($queue)) {
             $queue = new NullQueue($queue);
         }
diff --git a/pkg/enqueue/Tests/Symfony/Client/ConsumeCommandTest.php b/pkg/enqueue/Tests/Symfony/Client/ConsumeCommandTest.php
@@ -677,6 +677,9 @@ private function createExtension()
      */
     private function createConsumerStub($queue = null): Consumer
     {
+        if ($queue === null) {
+            $queue = 'queue';
+        }
         if (is_string($queue)) {
             $queue = new NullQueue($queue);
         }
diff --git a/pkg/enqueue/Tests/Symfony/Consumption/ConsumeCommandTest.php b/pkg/enqueue/Tests/Symfony/Consumption/ConsumeCommandTest.php
@@ -221,6 +221,9 @@ private function createExtension()
      */
     private function createConsumerStub($queue = null): Consumer
     {
+        if ($queue === null) {
+            $queue = 'queue';
+        }
         if (is_string($queue)) {
             $queue = new NullQueue($queue);
         }
diff --git a/pkg/fs/Tests/LegacyFilesystemLockTest.php b/pkg/fs/Tests/LegacyFilesystemLockTest.php
@@ -6,12 +6,14 @@
 use Enqueue\Fs\LegacyFilesystemLock;
 use Enqueue\Fs\Lock;
 use Enqueue\Test\ClassExtensionTrait;
+use Enqueue\Test\ReadAttributeTrait;
 use Makasim\File\TempFile;
 use PHPUnit\Framework\TestCase;
 
 class LegacyFilesystemLockTest extends TestCase
 {
     use ClassExtensionTrait;
+    use ReadAttributeTrait;
 
     public function testShouldImplementLockInterface()
     {
diff --git a/pkg/redis/Tests/RedisProducerTest.php b/pkg/redis/Tests/RedisProducerTest.php
@@ -67,7 +67,7 @@ public function testShouldCallLPushOnSend()
                 $this->assertNotEmpty($message['headers']['message_id']);
                 $this->assertSame(0, $message['headers']['attempts']);
 
-                return true;
+                return 1;
             })
         ;
 
diff --git a/pkg/stomp/Tests/StompConsumerTest.php b/pkg/stomp/Tests/StompConsumerTest.php
@@ -523,8 +523,8 @@ public function testShouldGenerateUniqueSubscriptionIdPerConsumer()
         $fooConsumer = new StompConsumer($this->createStompClientMock(), $destination);
         $barConsumer = new StompConsumer($this->createStompClientMock(), $destination);
 
-        $this->assertAttributeNotEmpty('subscriptionId', $fooConsumer);
-        $this->assertAttributeNotEmpty('subscriptionId', $barConsumer);
+        $this->assertNotEmpty($this->readAttribute($fooConsumer, 'subscriptionId'));
+        $this->assertNotEmpty($this->readAttribute($barConsumer, 'subscriptionId'));
 
         $fooSubscriptionId = $this->readAttribute($fooConsumer, 'subscriptionId');
         $barSubscriptionId = $this->readAttribute($barConsumer, 'subscriptionId');

Original file line number	Diff line number	Diff line change
`@@ -5,12 +5,14 @@`
`5`	`5`	`use Enqueue\AmqpBunny\AmqpConnectionFactory;`
`6`	`6`	`use Enqueue\AmqpTools\RabbitMqDlxDelayStrategy;`
`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 AmqpConnectionFactoryTest 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
`@@ -5,12 +5,14 @@`
`5`	`5`	`use Enqueue\AmqpLib\AmqpConnectionFactory;`
`6`	`6`	`use Enqueue\AmqpTools\RabbitMqDlxDelayStrategy;`
`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 AmqpConnectionFactoryTest 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
`@@ -28,7 +28,7 @@ public function testShouldCreateLazyContext()`
`28`	`28`	`$this->assertInstanceOf(DbalContext::class, $context);`
`29`	`29`
`30`	`30`	`$this->assertAttributeEquals(null, 'connection', $context);`
`31`		`- $this->assertAttributeInternalType('callable', 'connectionFactory', $context);`
	`31`	`+ $this->assertIsCallable($this->readAttribute($context, 'connectionFactory'));`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`public function testShouldParseGenericDSN()`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public function testShouldCreateLazyContext()`
`73`	`73`	`$this->assertInstanceOf(DbalContext::class, $context);`
`74`	`74`
`75`	`75`	`$this->assertAttributeEquals(null, 'connection', $context);`
`76`		`- $this->assertAttributeInternalType('callable', 'connectionFactory', $context);`
	`76`	`+ $this->assertIsCallable($this->readAttribute($context, 'connectionFactory'));`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -1537,6 +1537,9 @@ private function createExtension()`
`1537`	`1537`	`*/`
`1538`	`1538`	`private function createConsumerStub($queue = null): Consumer`
`1539`	`1539`	`{`
	`1540`	`+ if ($queue === null) {`
	`1541`	`+ $queue = 'queue';`
	`1542`	`+ }`
`1540`	`1543`	`if (is_string($queue)) {`
`1541`	`1544`	`$queue = new NullQueue($queue);`
`1542`	`1545`	`}`
Original file line number	Diff line number	Diff line change
`@@ -677,6 +677,9 @@ private function createExtension()`
`677`	`677`	`*/`
`678`	`678`	`private function createConsumerStub($queue = null): Consumer`
`679`	`679`	`{`
	`680`	`+ if ($queue === null) {`
	`681`	`+ $queue = 'queue';`
	`682`	`+ }`
`680`	`683`	`if (is_string($queue)) {`
`681`	`684`	`$queue = new NullQueue($queue);`
`682`	`685`	`}`
Original file line number	Diff line number	Diff line change
`@@ -221,6 +221,9 @@ private function createExtension()`
`221`	`221`	`*/`
`222`	`222`	`private function createConsumerStub($queue = null): Consumer`
`223`	`223`	`{`
	`224`	`+ if ($queue === null) {`
	`225`	`+ $queue = 'queue';`
	`226`	`+ }`
`224`	`227`	`if (is_string($queue)) {`
`225`	`228`	`$queue = new NullQueue($queue);`
`226`	`229`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,12 +6,14 @@`
`6`	`6`	`use Enqueue\Fs\LegacyFilesystemLock;`
`7`	`7`	`use Enqueue\Fs\Lock;`
`8`	`8`	`use Enqueue\Test\ClassExtensionTrait;`
	`9`	`+use Enqueue\Test\ReadAttributeTrait;`
`9`	`10`	`use Makasim\File\TempFile;`
`10`	`11`	`use PHPUnit\Framework\TestCase;`
`11`	`12`
`12`	`13`	`class LegacyFilesystemLockTest extends TestCase`
`13`	`14`	`{`
`14`	`15`	`use ClassExtensionTrait;`
	`16`	`+ use ReadAttributeTrait;`
`15`	`17`
`16`	`18`	`public function testShouldImplementLockInterface()`
`17`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public function testShouldCallLPushOnSend()`
`67`	`67`	`$this->assertNotEmpty($message['headers']['message_id']);`
`68`	`68`	`$this->assertSame(0, $message['headers']['attempts']);`
`69`	`69`
`70`		`- return true;`
	`70`	`+ return 1;`
`71`	`71`	`})`
`72`	`72`	`;`
`73`	`73`