From 666792775bae8e2d8a554dcc68b642fa0b9a954a Mon Sep 17 00:00:00 2001
From: Michael Bausor <michaelbausor@google.com>
Date: Mon, 10 Dec 2018 15:36:27 -0800
Subject: [PATCH 1/4] Add internal tags

---
 src/Call.php           | 2 ++
 src/RequestBuilder.php | 2 ++
 src/UriTrait.php       | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/src/Call.php b/src/Call.php
index 698c17a26..7ac8710e8 100644
--- a/src/Call.php
+++ b/src/Call.php
@@ -36,6 +36,8 @@
 
 /**
  * Contains information necessary to manage a network request.
+ *
+ * @internal
  */
 class Call
 {
diff --git a/src/RequestBuilder.php b/src/RequestBuilder.php
index 7b096c833..ff563557d 100644
--- a/src/RequestBuilder.php
+++ b/src/RequestBuilder.php
@@ -42,6 +42,8 @@
 
 /**
  * Builds a PSR-7 request from a set of request information.
+ *
+ * @internal
  */
 class RequestBuilder
 {
diff --git a/src/UriTrait.php b/src/UriTrait.php
index 3ba9b48b6..bf9094ee7 100644
--- a/src/UriTrait.php
+++ b/src/UriTrait.php
@@ -37,6 +37,8 @@
 
 /**
  * Provides a light wrapper around often used URI related functions.
+ *
+ * @internal
  */
 trait UriTrait
 {

From 44198b5bb38f98bd8192a69271305619556caef9 Mon Sep 17 00:00:00 2001
From: Michael Bausor <michaelbausor@google.com>
Date: Thu, 13 Dec 2018 15:00:19 -0800
Subject: [PATCH 2/4] Remove internal from call; remove Message tags

---
 src/Call.php | 14 +++++---------
 src/Page.php |  4 ++--
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/Call.php b/src/Call.php
index 7ac8710e8..6cac07d3f 100644
--- a/src/Call.php
+++ b/src/Call.php
@@ -32,12 +32,8 @@
 
 namespace Google\ApiCore;
 
-use Google\Protobuf\Internal\Message;
-
 /**
  * Contains information necessary to manage a network request.
- *
- * @internal
  */
 class Call
 {
@@ -55,14 +51,14 @@ class Call
     /**
      * @param string $method
      * @param string $decodeType
-     * @param Message $message
+     * @param mixed $message
      * @param array $descriptor
      * @param int $callType
      */
     public function __construct(
         $method,
         $decodeType,
-        Message $message = null,
+        $message = null,
         $descriptor = [],
         $callType = Call::UNARY_CALL
     ) {
@@ -98,7 +94,7 @@ public function getDecodeType()
     }
 
     /**
-     * @return Message
+     * @return mixed
      */
     public function getMessage()
     {
@@ -114,10 +110,10 @@ public function getDescriptor()
     }
 
     /**
-     * @param Message $message
+     * @param mixed $message
      * @return Call
      */
-    public function withMessage(Message $message)
+    public function withMessage($message)
     {
         return new static(
             $this->method,
diff --git a/src/Page.php b/src/Page.php
index 7093ce099..63eba710d 100644
--- a/src/Page.php
+++ b/src/Page.php
@@ -196,7 +196,7 @@ public function iteratePages()
     /**
      * Gets the request object used to generate the Page.
      *
-     * @return \Google\Protobuf\Internal\Message
+     * @return mixed
      */
     public function getRequestObject()
     {
@@ -206,7 +206,7 @@ public function getRequestObject()
     /**
      * Gets the API response object.
      *
-     * @return \Google\Protobuf\Internal\Message
+     * @return mixed
      */
     public function getResponseObject()
     {

From 65ae75500227f03f77b4b76ecbac038a2ff0a27b Mon Sep 17 00:00:00 2001
From: Michael Bausor <michaelbausor@google.com>
Date: Fri, 14 Dec 2018 12:46:33 -0800
Subject: [PATCH 3/4] Address PR comments

---
 src/Call.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Call.php b/src/Call.php
index 6cac07d3f..d5e8d5046 100644
--- a/src/Call.php
+++ b/src/Call.php
@@ -32,6 +32,8 @@
 
 namespace Google\ApiCore;
 
+use Google\Protobuf\Internal\Message;
+
 /**
  * Contains information necessary to manage a network request.
  */
@@ -51,7 +53,7 @@ class Call
     /**
      * @param string $method
      * @param string $decodeType
-     * @param mixed $message
+     * @param mixed|Message $message
      * @param array $descriptor
      * @param int $callType
      */
@@ -94,7 +96,7 @@ public function getDecodeType()
     }
 
     /**
-     * @return mixed
+     * @return mixed|Message
      */
     public function getMessage()
     {
@@ -110,7 +112,7 @@ public function getDescriptor()
     }
 
     /**
-     * @param mixed $message
+     * @param mixed|Message $message
      * @return Call
      */
     public function withMessage($message)

From e70e65917e8999561cb7c306e8c7958949d46384 Mon Sep 17 00:00:00 2001
From: Michael Bausor <michaelbausor@google.com>
Date: Fri, 14 Dec 2018 12:47:52 -0800
Subject: [PATCH 4/4] Update Page comments

---
 src/Page.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Page.php b/src/Page.php
index 63eba710d..ffac92b58 100644
--- a/src/Page.php
+++ b/src/Page.php
@@ -196,7 +196,7 @@ public function iteratePages()
     /**
      * Gets the request object used to generate the Page.
      *
-     * @return mixed
+     * @return mixed|Message
      */
     public function getRequestObject()
     {
@@ -206,7 +206,7 @@ public function getRequestObject()
     /**
      * Gets the API response object.
      *
-     * @return mixed
+     * @return mixed|Message
      */
     public function getResponseObject()
     {