Add type casting to avoid deprecation issues

Signed-off-by: Karyna Tsymbal <[email protected]>
laminas · Jul 22, 2022 · 3457c37 · 3457c37
1 parent f527f1d
commit 3457c37
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 19 deletions.
diff --git a/src/Http/Utility.php b/src/Http/Utility.php
@@ -120,15 +120,15 @@ public function toAuthorizationHeader(array $params, $realm = null, $excludeCust
      */
     public function sign(
         array $params,
-        string $signatureMethod,
+        $signatureMethod,
         $consumerSecret,
         $tokenSecret = null,
         $method = null,
         $url = null
     ) {
         $className = '';
         $hashAlgo  = null;
-        $parts     = explode('-', $signatureMethod);
+        $parts     = explode('-', (string) $signatureMethod);
         if (count($parts) > 1) {
             $className = 'Laminas\OAuth\Signature\\' . ucfirst(strtolower($parts[0]));
             $hashAlgo  = $parts[1];
@@ -189,9 +189,9 @@ public function generateTimestamp()
      * @param  string $value
      * @return string
      */
-    public static function urlEncode(string $value)
+    public static function urlEncode($value)
     {
-        $encoded = rawurlencode($value);
+        $encoded = rawurlencode((string) $value);
         $encoded = str_replace('%7E', '~', $encoded);
         return $encoded;
     }

diff --git a/test/OAuthTest.php b/test/OAuthTest.php
@@ -94,9 +94,7 @@ public function testOauthClientUsingGetRequestParametersForSignature()
               ->setTokenSecret('456');
 
         $client = new OAuthClient([
-            'token' => $token,
-            'consumerSecret' => '', // for PHP 8.1 compatibility
-            'consumerKey' => ''
+            'token' => $token
         ], 'http://www.example.com');
         $client->getRequest()->getQuery()->set('foo', 'bar');
         $client->prepareOAuth();
@@ -126,9 +124,7 @@ public function testOauthClientUsingPostRequestParametersForSignature()
               ->setTokenSecret('456');
 
         $client = new OAuthClient([
-            'token' => $token,
-            'consumerSecret' => '', // for PHP 8.1 compatibility
-            'consumerKey' => ''
+            'token' => $token
         ], 'http://www.example.com');
         $client->getRequest()->getPost()->set('foo', 'bar');
         $client->prepareOAuth();
@@ -158,9 +154,7 @@ public function testOauthClientUsingPostAndGetRequestParametersForSignature()
               ->setTokenSecret('456');
 
         $client = new OAuthClient([
-            'token' => $token,
-            'consumerSecret' => '', // for PHP 8.1 compatibility
-            'consumerKey' => ''
+            'token' => $token
         ], 'http://www.example.com');
         $client->getRequest()->getPost()->set('foo', 'bar');
         $client->getRequest()->getQuery()->set('baz', 'bat');
@@ -192,9 +186,7 @@ public function testOAuthClientDoesntOverrideExistingHeaders()
               ->setTokenSecret('456');
 
         $client = new OAuthClient([
-            'token' => $token,
-            'consumerSecret' => '', // for PHP 8.1 compatibility
-            'consumerKey' => ''
+            'token' => $token
         ], 'http://www.example.com');
 
         $dummyHeader = Header\ContentType::fromString('Content-Type: application/octet-stream');

diff --git a/test/TestAsset/HTTPUtility32874.php b/test/TestAsset/HTTPUtility32874.php
@@ -22,7 +22,7 @@ public function generateTimestamp()
 
     public function sign(
         array $params,
-        string $signatureMethod,
+        $signatureMethod,
         $consumerSecret,
         $accessTokenSecret = null,
         $method = null,

diff --git a/test/TestAsset/HTTPUtility39745.php b/test/TestAsset/HTTPUtility39745.php
@@ -22,7 +22,7 @@ public function generateTimestamp()
 
     public function sign(
         array $params,
-        string $signatureMethod,
+        $signatureMethod,
         $consumerSecret,
         $accessTokenSecret = null,
         $method = null,

diff --git a/test/TestAsset/HTTPUtility90244.php b/test/TestAsset/HTTPUtility90244.php
@@ -22,7 +22,7 @@ public function generateTimestamp()
 
     public function sign(
         array $params,
-        string $signatureMethod,
+        $signatureMethod,
         $consumerSecret,
         $accessTokenSecret = null,
         $method = null,