Merge branch '5.5'

laravel · Dec 9, 2017 · 46bf9c2 · 46bf9c2
2 parents c877cb0 + 8ea42ba
commit 46bf9c2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/src/Illuminate/Database/Query/Builder.php b/src/Illuminate/Database/Query/Builder.php
@@ -993,16 +993,12 @@ public function orWhereDate($column, $operator, $value)
      *
      * @param  string  $column
      * @param  string   $operator
-     * @param  string   $value
+     * @param  int   $value
      * @param  string   $boolean
      * @return \Illuminate\Database\Query\Builder|static
      */
-    public function whereTime($column, $operator, $value = null, $boolean = 'and')
+    public function whereTime($column, $operator, $value, $boolean = 'and')
     {
-        list($value, $operator) = $this->prepareValueAndOperator(
-            $value, $operator, func_num_args() == 2
-        );
-
         return $this->addDateBasedWhere('Time', $column, $operator, $value, $boolean);
     }
 

diff --git a/src/Illuminate/Queue/SqsQueue.php b/src/Illuminate/Queue/SqsQueue.php
@@ -121,7 +121,7 @@ public function pop($queue = null)
             'AttributeNames' => ['ApproximateReceiveCount'],
         ]);
 
-        if (count($response['Messages']) > 0) {
+        if (! is_null($response['Messages']) && count($response['Messages']) > 0) {
             return new SqsJob(
                 $this->container, $this->sqs, $response['Messages'][0],
                 $this->connectionName, $queue

diff --git a/tests/Queue/QueueSqsQueueTest.php b/tests/Queue/QueueSqsQueueTest.php
@@ -52,6 +52,10 @@ public function setUp()
             ],
         ]);
 
+        $this->mockedReceiveEmptyMessageResponseModel = new Result([
+            'Messages' => null,
+        ]);
+
         $this->mockedQueueAttributesResponseModel = new Result([
             'Attributes' => [
                 'ApproximateNumberOfMessages' => 1,
@@ -69,6 +73,16 @@ public function testPopProperlyPopsJobOffOfSqs()
         $this->assertInstanceOf('Illuminate\Queue\Jobs\SqsJob', $result);
     }
 
+    public function testPopProperlyHandlesEmptyMessage()
+    {
+        $queue = $this->getMockBuilder('Illuminate\Queue\SqsQueue')->setMethods(['getQueue'])->setConstructorArgs([$this->sqs, $this->queueName, $this->account])->getMock();
+        $queue->setContainer(m::mock('Illuminate\Container\Container'));
+        $queue->expects($this->once())->method('getQueue')->with($this->queueName)->will($this->returnValue($this->queueUrl));
+        $this->sqs->shouldReceive('receiveMessage')->once()->with(['QueueUrl' => $this->queueUrl, 'AttributeNames' => ['ApproximateReceiveCount']])->andReturn($this->mockedReceiveEmptyMessageResponseModel);
+        $result = $queue->pop($this->queueName);
+        $this->assertNull($result);
+    }
+
     public function testDelayedPushWithDateTimeProperlyPushesJobOntoSqs()
     {
         $now = \Illuminate\Support\Carbon::now();