From 40b92672af3f4c215ac1f5fe657699e954911356 Mon Sep 17 00:00:00 2001
From: m1ke <git@m1ke.me>
Date: Tue, 18 May 2021 12:56:32 +0100
Subject: [PATCH] Update grpc lock version and update code to match; tests are
 passing

---
 composer.lock                                      | 14 +++++++-------
 .../Interceptor/ClientAuthenticatorInterceptor.php |  6 +++---
 lib/Rpc/Interceptor/MetadataInterceptor.php        |  6 +++---
 lib/Rpc/Interceptor/TimeoutInterceptor.php         |  6 +++---
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/composer.lock b/composer.lock
index cd41f66..5b83870 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "a75315965bcc27556c1a315e9c153fdd",
+    "content-hash": "b39cd44dbbb8032fbfce152ecb41db05",
     "packages": [
         {
             "name": "composer/ca-bundle",
@@ -535,20 +535,20 @@
         },
         {
             "name": "grpc/grpc",
-            "version": "1.22.0",
+            "version": "1.36.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/grpc/grpc-php.git",
-                "reference": "88235e786ef9b55fcb049f00c5c5202f8086a299"
+                "reference": "6145dd917d340b579f0b663940b17cc93172b79a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/grpc/grpc-php/zipball/88235e786ef9b55fcb049f00c5c5202f8086a299",
-                "reference": "88235e786ef9b55fcb049f00c5c5202f8086a299",
+                "url": "https://api.github.com/repos/grpc/grpc-php/zipball/6145dd917d340b579f0b663940b17cc93172b79a",
+                "reference": "6145dd917d340b579f0b663940b17cc93172b79a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.0"
+                "php": ">=7.0.0"
             },
             "require-dev": {
                 "google/auth": "^v1.3.0"
@@ -572,7 +572,7 @@
             "keywords": [
                 "rpc"
             ],
-            "time": "2019-07-03T19:57:39+00:00"
+            "time": "2021-03-01T21:52:11+00:00"
         },
         {
             "name": "jms/metadata",
diff --git a/lib/Rpc/Interceptor/ClientAuthenticatorInterceptor.php b/lib/Rpc/Interceptor/ClientAuthenticatorInterceptor.php
index d3ea1d2..0be10e7 100644
--- a/lib/Rpc/Interceptor/ClientAuthenticatorInterceptor.php
+++ b/lib/Rpc/Interceptor/ClientAuthenticatorInterceptor.php
@@ -37,9 +37,9 @@ public function __construct($memberId, $cryptoEngine)
     public function interceptUnaryUnary($method,
                                         $argument,
                                         $deserialize,
+	                                    $continuation,
                                         array $metadata = [],
-                                        array $options = [],
-                                        $continuation)
+                                        array $options = [])
     {
         /** @var Message $argument */
         $now = round(microtime(true) * 1000);
@@ -64,6 +64,6 @@ public function interceptUnaryUnary($method,
             AuthenticationContext::clearAccessToken();
         }
 
-        return parent::interceptUnaryUnary($method, $argument, $deserialize, $metadata, $options, $continuation);
+        return parent::interceptUnaryUnary($method, $argument, $deserialize, $continuation, $metadata, $options);
     }
 }
diff --git a/lib/Rpc/Interceptor/MetadataInterceptor.php b/lib/Rpc/Interceptor/MetadataInterceptor.php
index 0ebd0b1..0717940 100644
--- a/lib/Rpc/Interceptor/MetadataInterceptor.php
+++ b/lib/Rpc/Interceptor/MetadataInterceptor.php
@@ -21,11 +21,11 @@ public function __construct($metadata)
     public function interceptUnaryUnary($method,
                                         $argument,
                                         $deserialize,
+	                                    $continuation,
                                         array $metadata = [],
-                                        array $options = [],
-                                        $continuation)
+                                        array $options = [])
     {
         $metadata = array_merge($metadata, $this->metadata);
-        return parent::interceptUnaryUnary($method, $argument, $deserialize, $metadata, $options, $continuation);
+        return parent::interceptUnaryUnary($method, $argument, $deserialize, $continuation, $metadata, $options);
     }
 }
diff --git a/lib/Rpc/Interceptor/TimeoutInterceptor.php b/lib/Rpc/Interceptor/TimeoutInterceptor.php
index f0c4416..747579f 100644
--- a/lib/Rpc/Interceptor/TimeoutInterceptor.php
+++ b/lib/Rpc/Interceptor/TimeoutInterceptor.php
@@ -25,11 +25,11 @@ public function __construct($timeout)
     public function interceptUnaryUnary($method,
                                         $argument,
                                         $deserialize,
+	                                    $continuation,
                                         array $metadata = [],
-                                        array $options = [],
-                                        $continuation)
+                                        array $options = [])
     {
         $options['timeout'] = ($this->timeout * 1000);
-        return parent::interceptUnaryUnary($method, $argument, $deserialize, $metadata, $options, $continuation);
+        return parent::interceptUnaryUnary($method, $argument, $deserialize, $continuation, $metadata, $options);
     }
 }