redid

ASKozienko · ASKozienko · commit 467048c6d6a2 · 2019-02-21T14:39:07.000+02:00
diff --git a/pkg/redis/LuaScripts.php b/pkg/redis/LuaScripts.php
@@ -7,6 +7,8 @@
 class LuaScripts
 {
     /**
+     * Lua script to receive message.
+     *
      * KEYS[1] - The queue we are reading message
      * KEYS[2] - The reserved queue we are moving message to
      * ARGV[1] - Now timestamp
diff --git a/pkg/redis/RedisBlockingConsumeStrategy.php b/pkg/redis/RedisBlockingConsumeStrategy.php
@@ -63,7 +63,7 @@ public function receiveMessage(array $queues, int $timeout, int $redeliveryDelay
 
     public function receiveMessageNoWait(RedisDestination $queue, int $redeliveryDelay): ?RedisMessage
     {
-        $this->migrateExpiredMessages($this->context->getRedis(), [$queue]);
+        $this->migrateExpiredMessages($this->context->getRedis(), [$queue->getName()]);
 
         if ($result = $this->context->getRedis()->rpop($queue->getName())) {
             return $this->processResult($result, $redeliveryDelay);
diff --git a/pkg/redis/RedisConnectionFactory.php b/pkg/redis/RedisConnectionFactory.php
@@ -94,7 +94,7 @@ public function createContext(): Context
             }, $this->config);
         }
 
-        return new RedisContext($this->createRedis(), $this->config['redelivery_delay']);
+        return new RedisContext($this->createRedis(), $this->config);
     }
 
     private function createRedis(): Redis
diff --git a/pkg/redis/RedisNonBlockingConsumeStrategy.php b/pkg/redis/RedisNonBlockingConsumeStrategy.php
@@ -65,7 +65,7 @@ public function receiveMessage(array $queues, int $timeout, int $redeliveryDelay
 
     public function receiveMessageNoWait(RedisDestination $queue, int $redeliveryDelay): ?RedisMessage
     {
-        $this->migrateExpiredMessages($this->context->getRedis(), [$queue]);
+        $this->migrateExpiredMessages($this->context->getRedis(), [$queue->getName()]);
 
         if ($result = $this->context->getRedis()->rpop($queue->getName())) {
             return $this->processResult($result->getMessage(), $queue->getName());
diff --git a/pkg/redis/Tests/RedisConsumerTest.php b/pkg/redis/Tests/RedisConsumerTest.php
@@ -136,7 +136,7 @@ public function testShouldReceiveMessage()
         $result = $consumer->receive(2000);
 
         $this->assertNotNull($result);
-        $this->assertSame($message, $result);;
+        $this->assertSame($message, $result);
     }
 
     public function testShouldReceiveNoWaitMessage()
@@ -157,7 +157,7 @@ public function testShouldReceiveNoWaitMessage()
         $result = $consumer->receiveNoWait();
 
         $this->assertNotNull($result);
-        $this->assertSame($message, $result);;
+        $this->assertSame($message, $result);
     }
 
     /**
diff --git a/pkg/redis/Tests/RedisSubscriptionConsumerTest.php b/pkg/redis/Tests/RedisSubscriptionConsumerTest.php
@@ -178,7 +178,7 @@ private function createRedisContextMock()
     }
 
     /**
-     * @param null|mixed $queueName
+     * @param mixed|null $queueName
      *
      * @return Consumer|\PHPUnit_Framework_MockObject_MockObject
      */

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,8 @@`
`7`	`7`	`class LuaScripts`
`8`	`8`	`{`
`9`	`9`	`/**`
	`10`	`+ * Lua script to receive message.`
	`11`	`+ *`
`10`	`12`	`* KEYS[1] - The queue we are reading message`
`11`	`13`	`* KEYS[2] - The reserved queue we are moving message to`
`12`	`14`	`* ARGV[1] - Now timestamp`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public function receiveMessage(array $queues, int $timeout, int $redeliveryDelay`
`63`	`63`
`64`	`64`	`public function receiveMessageNoWait(RedisDestination $queue, int $redeliveryDelay): ?RedisMessage`
`65`	`65`	`{`
`66`		`- $this->migrateExpiredMessages($this->context->getRedis(), [$queue]);`
	`66`	`+ $this->migrateExpiredMessages($this->context->getRedis(), [$queue->getName()]);`
`67`	`67`
`68`	`68`	`if ($result = $this->context->getRedis()->rpop($queue->getName())) {`
`69`	`69`	`return $this->processResult($result, $redeliveryDelay);`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public function createContext(): Context`
`94`	`94`	`}, $this->config);`
`95`	`95`	`}`
`96`	`96`
`97`		`- return new RedisContext($this->createRedis(), $this->config['redelivery_delay']);`
	`97`	`+ return new RedisContext($this->createRedis(), $this->config);`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`private function createRedis(): Redis`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public function receiveMessage(array $queues, int $timeout, int $redeliveryDelay`
`65`	`65`
`66`	`66`	`public function receiveMessageNoWait(RedisDestination $queue, int $redeliveryDelay): ?RedisMessage`
`67`	`67`	`{`
`68`		`- $this->migrateExpiredMessages($this->context->getRedis(), [$queue]);`
	`68`	`+ $this->migrateExpiredMessages($this->context->getRedis(), [$queue->getName()]);`
`69`	`69`
`70`	`70`	`if ($result = $this->context->getRedis()->rpop($queue->getName())) {`
`71`	`71`	`return $this->processResult($result->getMessage(), $queue->getName());`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ public function testShouldReceiveMessage()`
`136`	`136`	`$result = $consumer->receive(2000);`
`137`	`137`
`138`	`138`	`$this->assertNotNull($result);`
`139`		`- $this->assertSame($message, $result);;`
	`139`	`+ $this->assertSame($message, $result);`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`public function testShouldReceiveNoWaitMessage()`
`@@ -157,7 +157,7 @@ public function testShouldReceiveNoWaitMessage()`
`157`	`157`	`$result = $consumer->receiveNoWait();`
`158`	`158`
`159`	`159`	`$this->assertNotNull($result);`
`160`		`- $this->assertSame($message, $result);;`
	`160`	`+ $this->assertSame($message, $result);`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ private function createRedisContextMock()`
`178`	`178`	`}`
`179`	`179`
`180`	`180`	`/**`
`181`		`- * @param null\|mixed $queueName`
	`181`	`+ * @param mixed\|null $queueName`
`182`	`182`	`*`
`183`	`183`	`* @return Consumer\|\PHPUnit_Framework_MockObject_MockObject`
`184`	`184`	`*/`