diff --git a/src/Jobs/PubSubJob.php b/src/Jobs/PubSubJob.php index 558b545..5479019 100644 --- a/src/Jobs/PubSubJob.php +++ b/src/Jobs/PubSubJob.php @@ -68,7 +68,7 @@ public function getJobId() */ public function getRawBody() { - return base64_decode($this->job->data()); + return $this->job->data(); } /** diff --git a/src/PubSubQueue.php b/src/PubSubQueue.php index ff707c2..4cdc054 100644 --- a/src/PubSubQueue.php +++ b/src/PubSubQueue.php @@ -116,7 +116,7 @@ public function pushRaw($payload, $queue = null, array $options = []) $this->subscribeToTopic($topic); - $publish = ['data' => base64_encode($payload)]; + $publish = ['data' => $payload]; if (! empty($options)) { $publish['attributes'] = $this->validateMessageAttributes($options); @@ -204,7 +204,7 @@ public function bulk($jobs, $data = '', $queue = null) foreach ((array) $jobs as $job) { $payload = $this->createPayload($job, $this->getQueue($queue), $data); - $payloads[] = ['data' => base64_encode($payload)] + (isset($job->orderingKey) ? ['orderingKey' => $job->orderingKey] : []); + $payloads[] = ['data' => $payload] + (isset($job->orderingKey) ? ['orderingKey' => $job->orderingKey] : []); } $topic = $this->getTopic($this->getQueue($queue), $this->topicAutoCreation); diff --git a/tests/Unit/Jobs/PubSubJobTests.php b/tests/Unit/Jobs/PubSubJobTests.php index 57acbe1..ffdf9c0 100644 --- a/tests/Unit/Jobs/PubSubJobTests.php +++ b/tests/Unit/Jobs/PubSubJobTests.php @@ -57,7 +57,7 @@ protected function setUp(): void { $this->messageId = '1234'; $this->messageData = json_encode(['id' => $this->messageId, 'foo' => 'bar']); - $this->messageEncodedData = base64_encode($this->messageData); + $this->messageEncodedData = $this->messageData; $this->container = $this->createMock(Container::class); $this->queue = $this->createMock(PubSubQueue::class); diff --git a/tests/Unit/PubSubQueueTests.php b/tests/Unit/PubSubQueueTests.php index b9a1a7a..dcbcbb1 100644 --- a/tests/Unit/PubSubQueueTests.php +++ b/tests/Unit/PubSubQueueTests.php @@ -101,7 +101,7 @@ public function testPushRaw(): void $this->topic->method('publish') ->willReturn($this->expectedResult) ->with($this->callback(function ($publish) use ($payload) { - $decoded_payload = base64_decode($publish['data']); + $decoded_payload = $publish['data']; return $decoded_payload === $payload; })); @@ -203,7 +203,7 @@ public function testPopWhenJobsAvailable(): void ->willReturn($this->topic); $this->message->method('data') - ->willReturn(base64_encode(json_encode(['foo' => 'bar']))); + ->willReturn(json_encode(['foo' => 'bar'])); $this->queue->setContainer($this->createMock(Container::class)); @@ -275,7 +275,7 @@ public function testBulk(): void ->method('publishBatch') ->willReturn($this->expectedResult) ->with($this->callback(function ($payloads) use ($jobs, $data) { - $decoded_payload = json_decode(base64_decode($payloads[0]['data']), true); + $decoded_payload = json_decode($payloads[0]['data'], true); return $decoded_payload['job'] === $jobs[0] && $decoded_payload['data'] === $data; }));