fix conflict

Author: taylorotwell

src/Illuminate/Queue/InvalidPayloadException.php

@@ -6,14 +6,24 @@
 
 class InvalidPayloadException extends InvalidArgumentException
 {
+    /**
+     * The value that failed to decode.
+     *
+     * @var mixed
+     */
+    public $value;
+
     /**
      * Create a new exception instance.
      *
      * @param  string|null  $message
+     * @param  mixed  $value
      * @return void
      */
-    public function __construct($message = null)
+    public function __construct($message = null, $value = null)
     {
         parent::__construct($message ?: json_last_error());
+
+        $this->value = $value;
     }
 }

src/Illuminate/Queue/Queue.php

@@ -102,11 +102,11 @@ protected function createPayload($job, $queue, $data = '')
             $job = CallQueuedClosure::create($job);
         }
 
-        $payload = json_encode($this->createPayloadArray($job, $queue, $data), \JSON_UNESCAPED_UNICODE);
+        $payload = json_encode($value = $this->createPayloadArray($job, $queue, $data), \JSON_UNESCAPED_UNICODE);
 
         if (json_last_error() !== JSON_ERROR_NONE) {
             throw new InvalidPayloadException(
-                'Unable to JSON encode payload. Error code: '.json_last_error()
+                'Unable to JSON encode payload. Error code: '.json_last_error(), $value
             );
         }