Merge branch '5.7' of https://github.com/tjmartin69/framework into tj…

…martin69-5.7
TheNodi · Oct 25, 2018 · e91ef69 · e91ef69
2 parents 005b44d + 1d23911
commit e91ef69
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 7 deletions.
diff --git a/src/Illuminate/Queue/Queue.php b/src/Illuminate/Queue/Queue.php
@@ -27,9 +27,9 @@ abstract class Queue
     /**
      * The create payload callback.
      *
-     * @var callable|null
+     * @var callable[]
      */
-    protected static $createPayloadCallback;
+    protected static $createPayloadCallback = [];
 
     /**
      * Push a new job onto the queue.
@@ -197,7 +197,11 @@ protected function createStringPayload($job, $queue, $data)
      */
     public static function createPayloadUsing($callback)
     {
-        static::$createPayloadCallback = $callback;
+        if (is_null($callback)) {
+            static::$createPayloadCallback = [];
+        } else {
+            static::$createPayloadCallback[] = $callback;
+        }
     }
 
     /**
@@ -209,10 +213,12 @@ public static function createPayloadUsing($callback)
      */
     protected function withCreatePayloadHooks($queue, array $payload)
     {
-        if (static::$createPayloadCallback) {
-            return array_merge($payload, call_user_func(
-                static::$createPayloadCallback, $this->getConnectionName(), $queue, $payload
-            ));
+        if (! empty(static::$createPayloadCallback)) {
+            foreach (static::$createPayloadCallback as $callback) {
+                $payload = array_merge($payload, call_user_func(
+                    $callback, $this->getConnectionName(), $queue, $payload
+                ));
+            }
         }
 
         return $payload;

diff --git a/tests/Queue/QueueRedisQueueTest.php b/tests/Queue/QueueRedisQueueTest.php
@@ -44,6 +44,27 @@ public function testPushProperlyPushesJobOntoRedisWithCustomPayloadHook()
         Queue::createPayloadUsing(null);
     }
 
+    public function testPushProperlyPushesJobOntoRedisWithTwoCustomPayloadHook()
+    {
+        $queue = $this->getMockBuilder(RedisQueue::class)->setMethods(['getRandomId'])->setConstructorArgs([$redis = m::mock(Factory::class), 'default'])->getMock();
+        $queue->expects($this->once())->method('getRandomId')->will($this->returnValue('foo'));
+        $redis->shouldReceive('connection')->once()->andReturn($redis);
+        $redis->shouldReceive('rpush')->once()->with('queues:default', json_encode(['displayName' => 'foo', 'job' => 'foo', 'maxTries' => null, 'timeout' => null, 'data' => ['data'], 'custom' => 'taylor', 'bar' => 'foo', 'id' => 'foo', 'attempts' => 0]));
+
+        Queue::createPayloadUsing(function ($connection, $queue, $payload) {
+            return ['custom' => 'taylor'];
+        });
+
+        Queue::createPayloadUsing(function ($connection, $queue, $payload) {
+            return ['bar' => 'foo'];
+        });
+
+        $id = $queue->push('foo', ['data']);
+        $this->assertEquals('foo', $id);
+
+        Queue::createPayloadUsing(null);
+    }
+
     public function testDelayedPushProperlyPushesJobOntoRedis()
     {
         $queue = $this->getMockBuilder(RedisQueue::class)->setMethods(['availableAt', 'getRandomId'])->setConstructorArgs([$redis = m::mock(Factory::class), 'default'])->getMock();