Re-generate library using PubSub/synth.py

PubSub/src/V1/Gapic/PublisherGapicClient.php

@@ -121,6 +121,7 @@ private static function getClientDefaults()
             'serviceAddress' => self::SERVICE_ADDRESS.':'.self::DEFAULT_SERVICE_PORT,
             'clientConfig' => __DIR__.'/../resources/publisher_client_config.json',
             'descriptorsConfigPath' => __DIR__.'/../resources/publisher_descriptor_config.php',
+            'gcpApiConfigPath' => __DIR__.'/../resources/publisher_grpc_config.json',
             'credentialsConfig' => [
                 'scopes' => self::$serviceScopes,
             ],
@@ -515,19 +516,22 @@ public function getTopic($topic, array $optionalArgs = [])
      * $publisherClient = new PublisherClient();
      * try {
      *     $formattedProject = $publisherClient->projectName('[PROJECT]');
-     *     // Iterate through all elements
-     *     $pagedResponse = $publisherClient->listTopics($formattedProject);
-     *     foreach ($pagedResponse->iterateAllElements() as $element) {
-     *         // doSomethingWith($element);
-     *     }
-     *
-     *     // OR iterate over pages of elements
+     *     // Iterate over pages of elements
      *     $pagedResponse = $publisherClient->listTopics($formattedProject);
      *     foreach ($pagedResponse->iteratePages() as $page) {
      *         foreach ($page as $element) {
      *             // doSomethingWith($element);
      *         }
      *     }
+     *
+     *
+     *     // Alternatively:
+     *
+     *     // Iterate through all elements
+     *     $pagedResponse = $publisherClient->listTopics($formattedProject);
+     *     foreach ($pagedResponse->iterateAllElements() as $element) {
+     *         // doSomethingWith($element);
+     *     }
      * } finally {
      *     $publisherClient->close();
      * }
@@ -586,19 +590,22 @@ public function listTopics($project, array $optionalArgs = [])
      * $publisherClient = new PublisherClient();
      * try {
      *     $formattedTopic = $publisherClient->topicName('[PROJECT]', '[TOPIC]');
-     *     // Iterate through all elements
-     *     $pagedResponse = $publisherClient->listTopicSubscriptions($formattedTopic);
-     *     foreach ($pagedResponse->iterateAllElements() as $element) {
-     *         // doSomethingWith($element);
-     *     }
-     *
-     *     // OR iterate over pages of elements
+     *     // Iterate over pages of elements
      *     $pagedResponse = $publisherClient->listTopicSubscriptions($formattedTopic);
      *     foreach ($pagedResponse->iteratePages() as $page) {
      *         foreach ($page as $element) {
      *             // doSomethingWith($element);
      *         }
      *     }
+     *
+     *
+     *     // Alternatively:
+     *
+     *     // Iterate through all elements
+     *     $pagedResponse = $publisherClient->listTopicSubscriptions($formattedTopic);
+     *     foreach ($pagedResponse->iterateAllElements() as $element) {
+     *         // doSomethingWith($element);
+     *     }
      * } finally {
      *     $publisherClient->close();
      * }

PubSub/src/V1/Gapic/SubscriberGapicClient.php

@@ -137,6 +137,7 @@ private static function getClientDefaults()
             'serviceAddress' => self::SERVICE_ADDRESS.':'.self::DEFAULT_SERVICE_PORT,
             'clientConfig' => __DIR__.'/../resources/subscriber_client_config.json',
             'descriptorsConfigPath' => __DIR__.'/../resources/subscriber_descriptor_config.php',
+            'gcpApiConfigPath' => __DIR__.'/../resources/subscriber_grpc_config.json',
             'credentialsConfig' => [
                 'scopes' => self::$serviceScopes,
             ],
@@ -599,19 +600,22 @@ public function updateSubscription($subscription, $updateMask, array $optionalAr
      * $subscriberClient = new SubscriberClient();
      * try {
      *     $formattedProject = $subscriberClient->projectName('[PROJECT]');
-     *     // Iterate through all elements
-     *     $pagedResponse = $subscriberClient->listSubscriptions($formattedProject);
-     *     foreach ($pagedResponse->iterateAllElements() as $element) {
-     *         // doSomethingWith($element);
-     *     }
-     *
-     *     // OR iterate over pages of elements
+     *     // Iterate over pages of elements
      *     $pagedResponse = $subscriberClient->listSubscriptions($formattedProject);
      *     foreach ($pagedResponse->iteratePages() as $page) {
      *         foreach ($page as $element) {
      *             // doSomethingWith($element);
      *         }
      *     }
+     *
+     *
+     *     // Alternatively:
+     *
+     *     // Iterate through all elements
+     *     $pagedResponse = $subscriberClient->listSubscriptions($formattedProject);
+     *     foreach ($pagedResponse->iterateAllElements() as $element) {
+     *         // doSomethingWith($element);
+     *     }
      * } finally {
      *     $subscriberClient->close();
      * }
@@ -897,19 +901,22 @@ public function pull($subscription, $maxMessages, array $optionalArgs = [])
      *     $request = new StreamingPullRequest();
      *     $request->setSubscription($formattedSubscription);
      *     $request->setStreamAckDeadlineSeconds($streamAckDeadlineSeconds);
-     *     $requests = [$request];
-     *
      *     // Write all requests to the server, then read all responses until the
      *     // stream is complete
+     *     $requests = [$request];
      *     $stream = $subscriberClient->streamingPull();
      *     $stream->writeAll($requests);
      *     foreach ($stream->closeWriteAndReadAll() as $element) {
      *         // doSomethingWith($element);
      *     }
      *
-     *     // OR write requests individually, making read() calls if
+     *
+     *     // Alternatively:
+     *
+     *     // Write requests individually, making read() calls if
      *     // required. Call closeWrite() once writes are complete, and read the
      *     // remaining responses from the server.
+     *     $requests = [$request];
      *     $stream = $subscriberClient->streamingPull();
      *     foreach ($requests as $request) {
      *         $stream->write($request);
@@ -1017,19 +1024,22 @@ public function modifyPushConfig($subscription, $pushConfig, array $optionalArgs
      * $subscriberClient = new SubscriberClient();
      * try {
      *     $formattedProject = $subscriberClient->projectName('[PROJECT]');
-     *     // Iterate through all elements
-     *     $pagedResponse = $subscriberClient->listSnapshots($formattedProject);
-     *     foreach ($pagedResponse->iterateAllElements() as $element) {
-     *         // doSomethingWith($element);
-     *     }
-     *
-     *     // OR iterate over pages of elements
+     *     // Iterate over pages of elements
      *     $pagedResponse = $subscriberClient->listSnapshots($formattedProject);
      *     foreach ($pagedResponse->iteratePages() as $page) {
      *         foreach ($page as $element) {
      *             // doSomethingWith($element);
      *         }
      *     }
+     *
+     *
+     *     // Alternatively:
+     *
+     *     // Iterate through all elements
+     *     $pagedResponse = $subscriberClient->listSnapshots($formattedProject);
+     *     foreach ($pagedResponse->iterateAllElements() as $element) {
+     *         // doSomethingWith($element);
+     *     }
      * } finally {
      *     $subscriberClient->close();
      * }