bump up to superbalist/php-pubsub ^2.0 & add publishBatch method (#4)

Author: matthewgoslett

changelog.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 4.0.0 - 2017-05-16
+
+* Allow for google/cloud ^0.26.0|^0.27.0|^0.27.0
+* Bump up to superbalist/php-pubsub ^2.0
+* Add new publishBatch method to GoogleCloudPubSubAdapter
+
 ## 3.0.1 - 2017-04-03
 
 * Fix to gRPC timeouts

composer.json

@@ -10,8 +10,8 @@
   ],
   "require": {
     "php": ">=5.6.0",
-    "superbalist/php-pubsub": "^1.0",
-    "google/cloud": "^0.11.0|^0.12.0|^0.13.0|^0.20.0|^0.21.0|^0.22.0|^0.23.0|^0.24.0|^0.25.0"
+    "superbalist/php-pubsub": "^2.0",
+    "google/cloud": "^0.11.0|^0.12.0|^0.13.0|^0.20.0|^0.21.0|^0.22.0|^0.23.0|^0.24.0|^0.25.0|^0.26.0|^0.27.0|^0.28.0"
   },
   "autoload": {
     "psr-4": {

src/GoogleCloudPubSubAdapter.php

@@ -169,6 +169,21 @@ public function publish($channel, $message)
         $topic->publish(['data' => Utils::serializeMessage($message)]);
     }
 
+    /**
+     * Publish multiple messages to a channel.
+     *
+     * @param string $channel
+     * @param array $messages
+     */
+    public function publishBatch($channel, array $messages)
+    {
+        $topic = $this->getTopicForChannel($channel);
+        $messages = array_map(function ($message) {
+            return ['data' => Utils::serializeMessage($message)];
+        }, $messages);
+        $topic->publishBatch($messages);
+    }
+
     /**
      * Return a `Topic` instance from a channel name.
      *

tests/GoogleCloudPubSubAdapterTest.php

@@ -59,7 +59,7 @@ public function testPublishWhenTopicMustBeCreated()
             ->once();
         $topic->shouldReceive('publish')
             ->with([
-                'data' => 'a:1:{s:5:"hello";s:5:"world";}',
+                'data' => '{"hello":"world"}',
             ])
             ->once();
 
@@ -83,7 +83,7 @@ public function testPublishWhenTopicExists()
         $topic->shouldNotHaveReceived('create');
         $topic->shouldReceive('publish')
             ->with([
-                'data' => 'a:1:{s:5:"hello";s:5:"world";}',
+                'data' => '{"hello":"world"}',
             ])
             ->once();
 
@@ -105,7 +105,7 @@ public function testPublishWhenAutoTopicCreationIsDisabled()
         $topic->shouldNotHaveReceived('create');
         $topic->shouldReceive('publish')
             ->with([
-                'data' => 'a:1:{s:5:"hello";s:5:"world";}',
+                'data' => '{"hello":"world"}',
             ])
             ->once();
 
@@ -120,11 +120,39 @@ public function testPublishWhenAutoTopicCreationIsDisabled()
         $adapter->publish('channel_name', ['hello' => 'world']);
     }
 
+    public function testPublishBatch()
+    {
+        $topic = Mockery::mock(Topic::class);
+        $topic->shouldReceive('exists')
+            ->once()
+            ->andReturn(true);
+        $topic->shouldReceive('publishBatch')
+            ->with([
+                ['data' => '{"hello":"world"}'],
+                ['data' => '"booo!"'],
+            ])
+            ->once();
+
+        $client = Mockery::mock(PubSubClient::class);
+        $client->shouldReceive('topic')
+            ->with('channel_name')
+            ->once()
+            ->andReturn($topic);
+
+        $adapter = new GoogleCloudPubSubAdapter($client);
+
+        $messages = [
+            ['hello' => 'world'],
+            'booo!',
+        ];
+        $adapter->publishBatch('channel_name', $messages);
+    }
+
     public function testSubscribeWhenSubscriptionMustBeCreated()
     {
-        $message1 = new Message(['data' => 'a:1:{s:5:"hello";s:5:"world";}'], ['ackId' => 1]);
-        $message2 = new Message(['data' => 'this is a string'], ['ackId' => 2]);
-        $message3 = new Message(['data' => 'unsubscribe'], ['ackId' => 3]);
+        $message1 = new Message(['data' => '{"hello":"world"}'], ['ackId' => 1]);
+        $message2 = new Message(['data' => '"this is a string"'], ['ackId' => 2]);
+        $message3 = new Message(['data' => '"unsubscribe"'], ['ackId' => 3]);
 
         $messageBatch1 = [
             $message1,
@@ -198,9 +226,9 @@ public function testSubscribeWhenSubscriptionMustBeCreated()
 
     public function testSubscribeWhenSubscriptionExists()
     {
-        $message1 = new Message(['data' => 'a:1:{s:5:"hello";s:5:"world";}'], ['ackId' => 1]);
-        $message2 = new Message(['data' => 'this is a string'], ['ackId' => 2]);
-        $message3 = new Message(['data' => 'unsubscribe'], ['ackId' => 3]);
+        $message1 = new Message(['data' => '{"hello":"world"}'], ['ackId' => 1]);
+        $message2 = new Message(['data' => '"this is a string"'], ['ackId' => 2]);
+        $message3 = new Message(['data' => '"unsubscribe"'], ['ackId' => 3]);
 
         $messageBatch1 = [
             $message1,
@@ -272,9 +300,9 @@ public function testSubscribeWhenSubscriptionExists()
 
     public function testSubscribeWhenAutoTopicCreationIsDisabled()
     {
-        $message1 = new Message(['data' => 'a:1:{s:5:"hello";s:5:"world";}'], ['ackId' => 1]);
-        $message2 = new Message(['data' => 'this is a string'], ['ackId' => 2]);
-        $message3 = new Message(['data' => 'unsubscribe'], ['ackId' => 3]);
+        $message1 = new Message(['data' => '{"hello":"world"}'], ['ackId' => 1]);
+        $message2 = new Message(['data' => '"this is a string"'], ['ackId' => 2]);
+        $message3 = new Message(['data' => '"unsubscribe"'], ['ackId' => 3]);
 
         $messageBatch1 = [
             $message1,