From b9fc3bafefbff496b1d4ca3684d7d7dcd453004b Mon Sep 17 00:00:00 2001
From: Jesse Evers <jesse@jesseevers.com>
Date: Thu, 16 Sep 2021 11:58:25 -0700
Subject: [PATCH] Fix PHP 7.4 compat bug in Config/Authentication

---
 lib/Authentication.php | 10 +++++-----
 lib/Configuration.php  | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/Authentication.php b/lib/Authentication.php
index cd1889642..509e59d36 100644
--- a/lib/Authentication.php
+++ b/lib/Authentication.php
@@ -328,7 +328,7 @@ public function getRestrictedDataToken(string $path, string $method, ?bool $gene
      * 
      * @return string
      */
-    public function getLwaClientId(): string
+    public function getLwaClientId(): ?string
     {
         return $this->lwaClientId;
     }
@@ -349,7 +349,7 @@ public function setLwaClientId(string $lwaClientId): void
      * 
      * @return string
      */
-    public function getLwaClientSecret(): string
+    public function getLwaClientSecret(): ?string
     {
         return $this->lwaClientSecret;
     }
@@ -370,7 +370,7 @@ public function setLwaClientSecret(string $lwaClientSecret): void
      * 
      * @return string|null
      */
-    public function getLwaRefreshToken()
+    public function getLwaRefreshToken(): ?string
     {
         return $this->lwaRefreshToken;
     }
@@ -391,7 +391,7 @@ public function setLwaRefreshToken(?string $lwaRefreshToken = null): void
      * 
      * @return string
      */
-    public function getAwsAccessKeyId(): string
+    public function getAwsAccessKeyId(): ?string
     {
         return $this->awsAccessKeyId;
     }
@@ -412,7 +412,7 @@ public function setAwsAccessKeyId(string $awsAccessKeyId): void
      * 
      * @return string|null
      */
-    public function getAwsSecretAccessKey(): string|null
+    public function getAwsSecretAccessKey(): ?string
     {
         return $this->awsSecretAccessKey;
     }
diff --git a/lib/Configuration.php b/lib/Configuration.php
index dc927a022..645915d20 100644
--- a/lib/Configuration.php
+++ b/lib/Configuration.php
@@ -256,7 +256,7 @@ public function getRequestDatetime()
      * 
      * @return string
      */
-    public function getLwaClientId(): string
+    public function getLwaClientId(): ?string
     {
         return $this->auth->getLwaClientId();
     }
@@ -277,7 +277,7 @@ public function setLwaClientId(string $lwaClientId): void
      * 
      * @return string
      */
-    public function getLwaClientSecret(): string
+    public function getLwaClientSecret(): ?string
     {
         return $this->auth->getLwaClientSecret();
     }
@@ -296,9 +296,9 @@ public function setLwaClientSecret(string $lwaClientSecret): void
     /**
      * Get LWA refresh token.
      * 
-     * @return string|null
+     * @return string
      */
-    public function getLwaRefreshToken()
+    public function getLwaRefreshToken(): ?string
     {
         return $this->auth->getLwaRefreshToken();
     }
@@ -319,7 +319,7 @@ public function setLwaRefreshToken(?string $lwaRefreshToken = null): void
      * 
      * @return string
      */
-    public function getAwsAccessKeyId(): string
+    public function getAwsAccessKeyId(): ?string
     {
         return $this->auth->getAwsAccessKeyId();
     }
@@ -340,7 +340,7 @@ public function setAwsAccessKeyId(string $awsAccessKeyId): void
      * 
      * @return string|null
      */
-    public function getAwsSecretAccessKey(): string|null
+    public function getAwsSecretAccessKey(): ?string
     {
         return $this->auth->getAwsSecretAccessKey();
     }