bump up to ^2.0 of superbalist/php-pubsub-google-cloud + add client_identifier support

Author: matthewgoslett

changelog.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 2.0.0 - 2016-10-05
+
+* Bump up version ^2.0 of superbalist/php-pubsub-google-cloud
+* Add support for `client_identifier` config var added to superbalist/php-pubsub-google-cloud package
+
 ## 1.0.2 - 2016-09-15
 
 * Add support for configuring auto topic & subscription creation for the php-pubsub-google-cloud adapter

composer.json

@@ -13,7 +13,7 @@
     "illuminate/support": "^5.3",
     "superbalist/php-pubsub": "^1.0",
     "superbalist/php-pubsub-redis": "^1.0",
-    "superbalist/php-pubsub-google-cloud": "^1.0",
+    "superbalist/php-pubsub-google-cloud": "^2.0",
     "illuminate/console": "^5.3"
   },
   "autoload": {

config/pubsub.php

@@ -57,6 +57,7 @@
             'driver' => 'gcloud',
             'project_id' => env('GOOGLE_CLOUD_PROJECT_ID'),
             'key_file' => env('GOOGLE_CLOUD_KEY_FILE'),
+            'client_identifier' => null,
             'auto_create_topics' => true,
             'auto_create_subscriptions' => true,
         ],

src/PubSubConnectionFactory.php

@@ -110,9 +110,10 @@ protected function makeGoogleCloudAdapter(array $config)
         ];
         $client = $this->container->make('pubsub.gcloud.pub_sub_client', ['config' => $clientConfig]);
 
+        $clientIdentifier = array_get($config, 'client_identifier');
         $autoCreateTopics = array_get($config, 'auto_create_topics', true);
         $autoCreateSubscriptions = array_get($config, 'auto_create_subscriptions', true);
 
-        return new GoogleCloudPubSubAdapter($client, $autoCreateTopics, $autoCreateSubscriptions);
+        return new GoogleCloudPubSubAdapter($client, $clientIdentifier, $autoCreateTopics, $autoCreateSubscriptions);
     }
 }

tests/PubSubConnectionFactoryTest.php

@@ -163,13 +163,15 @@ public function testMakeGoogleCloudAdapter()
         $config = [
             'project_id' => '12345',
             'key_file' => 'my_key_file.json',
+            'client_identifier' => 'blah',
+            'auto_create_topics' => false,
         ];
         $adapter = $factory->make('gcloud', $config);
         $this->assertInstanceOf(GoogleCloudPubSubAdapter::class, $adapter);
 
-        $config['auto_create_topics'] = false;
         $adapter = $factory->make('gcloud', $config); /** @var GoogleCloudPubSubAdapter $adapter */
         $this->assertInstanceOf(GoogleCloudPubSubAdapter::class, $adapter);
+        $this->assertEquals('blah', $adapter->getClientIdentifier());
         $this->assertFalse($adapter->areTopicsAutoCreated());
         $this->assertTrue($adapter->areSubscriptionsAutoCreated());
     }