Change queue version number and handle the breaking change

Author: kainxspirits

README.md

@@ -1,48 +1,48 @@
-# Laravel PubSub Queue
-
-[![Travis](https://img.shields.io/travis/kainxspirits/laravel-pubsub-queue.svg)](https://github.com/kainxspirits/laravel-pubsub-queue)
-[![StyleCI](https://styleci.io/repos/131718560/shield)](https://styleci.io/repos/131718560)
-
-This package is a Laravel queue driver that use the [Google PubSub](https://github.com/GoogleCloudPlatform/google-cloud-php-pubsub) service.
-
-## Installation
-
-You can easily install this package with [Composer](https://getcomposer.org) by running this command :
-
-```bash
-composer require kainxspirits/laravel-pubsub-queue
-```
-
-If you disabled package discovery, you can still manually register this package by adding the following line to the providers of your `config/app.php` file :
-
-```php
-Kainxspirits\PubSubQueue\PubSubQueueServiceProvider::class,
-```
-
-## Configuration
-
-Add a `pubsub` connection to your `config/queue.php` file. From there, you can use any configuration values from the original pubsub client. Just make sure to use snake_case for the keys name.
-
-You can check [Google Cloud PubSub client](http://googlecloudplatform.github.io/google-cloud-php/#/docs/google-cloud/v0.62.0/pubsub/pubsubclient?method=__construct) for more details about the different options.
-
-```php
-'pubsub' => [
-    'driver' => 'pubsub',
-    'queue' => env('PUBSUB_QUEUE', 'default'),
-    'project_id' => env('PUBSUB_PROJECT_ID', 'your-project-id'),
-    'retries' => 3,
-    'request_timeout' => 60
-],
-```
-
-## Testing
-
-You can run the tests with :
-
-```bash
-vendor/bin/phpunit
-```
-
-## License
-
-This project is licensed under the terms of the MIT license. See [License File](LICENSE) for more information.
+# Laravel PubSub Queue
+
+[![Travis](https://img.shields.io/travis/kainxspirits/laravel-pubsub-queue.svg)](https://github.com/kainxspirits/laravel-pubsub-queue)
+[![StyleCI](https://styleci.io/repos/131718560/shield)](https://styleci.io/repos/131718560)
+
+This package is a Laravel 5.7 queue driver that use the [Google PubSub](https://github.com/GoogleCloudPlatform/google-cloud-php-pubsub) service.
+
+## Installation
+
+You can easily install this package with [Composer](https://getcomposer.org) by running this command :
+
+```bash
+composer require kainxspirits/laravel-pubsub-queue
+```
+
+If you disabled package discovery, you can still manually register this package by adding the following line to the providers of your `config/app.php` file :
+
+```php
+Kainxspirits\PubSubQueue\PubSubQueueServiceProvider::class,
+```
+
+## Configuration
+
+Add a `pubsub` connection to your `config/queue.php` file. From there, you can use any configuration values from the original pubsub client. Just make sure to use snake_case for the keys name.
+
+You can check [Google Cloud PubSub client](http://googlecloudplatform.github.io/google-cloud-php/#/docs/google-cloud/v0.62.0/pubsub/pubsubclient?method=__construct) for more details about the different options.
+
+```php
+'pubsub' => [
+    'driver' => 'pubsub',
+    'queue' => env('PUBSUB_QUEUE', 'default'),
+    'project_id' => env('PUBSUB_PROJECT_ID', 'your-project-id'),
+    'retries' => 3,
+    'request_timeout' => 60
+],
+```
+
+## Testing
+
+You can run the tests with :
+
+```bash
+vendor/bin/phpunit
+```
+
+## License
+
+This project is licensed under the terms of the MIT license. See [License File](LICENSE) for more information.

composer.json

@@ -1,49 +1,49 @@
-{
-    "name": "kainxspirits/laravel-pubsub-queue",
-    "description": "Queue driver for Google Cloud Pub/Sub.",
-    "keywords": [
-        "kainxspirits",
-        "laravel",
-        "queue",
-        "gcp",
-        "google",
-        "pubsub"
-    ],
-    "license": "MIT",
-    "type": "library",
-    "authors": [
-        {
-            "name": "Kendryck",
-            "email": "kainxspirits@users.noreply.github.com"
-        }
-    ],
-    "require": {
-        "php" : ">=7.1",
-        "illuminate/queue": "^5.6",
-        "google/cloud-pubsub": "^1.1"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "^7.1"
-    },
-    "autoload": {
-        "psr-4": {
-            "Kainxspirits\\PubSubQueue\\": "src/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Kainxspirits\\PubSubQueue\\Tests\\": "tests/"
-        }
-    },
-    "scripts": {
-        "test": "vendor/bin/phpunit"
-    },
-    "extra": {
-        "laravel": {
-            "providers": [
-                "Kainxspirits\\PubSubQueue\\PubSubQueueServiceProvider"
-            ]
-        }
-    },
-    "minimum-stability": "stable"
-}
+{
+    "name": "kainxspirits/laravel-pubsub-queue",
+    "description": "Queue driver for Google Cloud Pub/Sub.",
+    "keywords": [
+        "kainxspirits",
+        "laravel",
+        "queue",
+        "gcp",
+        "google",
+        "pubsub"
+    ],
+    "license": "MIT",
+    "type": "library",
+    "authors": [
+        {
+            "name": "Kendryck",
+            "email": "kainxspirits@users.noreply.github.com"
+        }
+    ],
+    "require": {
+        "php" : ">=7.1",
+        "illuminate/queue": "~5.7.0",
+        "google/cloud-pubsub": "^1.1"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^7.1"
+    },
+    "autoload": {
+        "psr-4": {
+            "Kainxspirits\\PubSubQueue\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Kainxspirits\\PubSubQueue\\Tests\\": "tests/"
+        }
+    },
+    "scripts": {
+        "test": "vendor/bin/phpunit"
+    },
+    "extra": {
+        "laravel": {
+            "providers": [
+                "Kainxspirits\\PubSubQueue\\PubSubQueueServiceProvider"
+            ]
+        }
+    },
+    "minimum-stability": "stable"
+}

src/PubSubQueue.php

@@ -62,7 +62,7 @@ public function size($queue = null)
      */
     public function push($job, $data = '', $queue = null)
     {
-        return $this->pushRaw($this->createPayload($job, $data), $queue);
+        return $this->pushRaw($this->createPayload($job, $queue, $data), $queue);
     }
 
     /**
@@ -102,7 +102,7 @@ public function pushRaw($payload, $queue = null, array $options = [])
     public function later($delay, $job, $data = '', $queue = null)
     {
         return $this->pushRaw(
-            $this->createPayload($job, $data),
+            $this->createPayload($job, $queue, $data),
             $queue,
             ['available_at' => $this->availableAt($delay)]
         );
@@ -153,7 +153,7 @@ public function bulk($jobs, $data = '', $queue = null)
         $payloads = [];
 
         foreach ((array) $jobs as $job) {
-            $payloads[] = ['data' => $this->createPayload($job, $data)];
+            $payloads[] = ['data' => $this->createPayload($job, $queue, $data)];
         }
 
         $topic = $this->getTopic($queue, true);
@@ -203,9 +203,9 @@ public function acknowledgeAndPublish(Message $message, $queue = null, $options
     /**
      * {@inheritdoc}
      */
-    protected function createPayload($job, $data = '')
+    protected function createPayload($job, $queue = null, $data = '')
     {
-        $payload = parent::createPayload($job, $data);
+        $payload = parent::createPayload($job, $queue, $data);
 
         return base64_encode($payload);
     }