Update to latest PHP 8.1 syntax

Signed-off-by: Abdul Malik Ikhsan <[email protected]>
laminas · Nov 2, 2024 · d5a54d6 · d5a54d6
1 parent 5182456
commit d5a54d6
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 34 deletions.
diff --git a/src/Http.php b/src/Http.php
@@ -207,21 +207,16 @@ public function getRequestSchemeQueryStringClient(array $params, $url)
      */
     protected function assessRequestAttempt(?Response $response = null)
     {
-        switch ($this->preferredRequestScheme) {
-            case OAuth::REQUEST_SCHEME_HEADER:
-                $this->preferredRequestScheme = OAuth::REQUEST_SCHEME_POSTBODY;
-                break;
-            case OAuth::REQUEST_SCHEME_POSTBODY:
-                $this->preferredRequestScheme = OAuth::REQUEST_SCHEME_QUERYSTRING;
-                break;
-            default:
-                throw new Exception\RuntimeException(
-                    'Could not retrieve a valid Token response from Token URL:'
-                    . ($response !== null
-                        ? PHP_EOL . $response->getBody()
-                        : ' No body - check for headers')
-                );
-        }
+        $this->preferredRequestScheme = match ($this->preferredRequestScheme) {
+            OAuth::REQUEST_SCHEME_HEADER => OAuth::REQUEST_SCHEME_POSTBODY,
+            OAuth::REQUEST_SCHEME_POSTBODY => OAuth::REQUEST_SCHEME_QUERYSTRING,
+            default => throw new Exception\RuntimeException(
+                'Could not retrieve a valid Token response from Token URL:'
+                . ($response !== null
+                    ? PHP_EOL . $response->getBody()
+                    : ' No body - check for headers')
+            ),
+        };
     }
 
     /**

diff --git a/src/Http/Utility.php b/src/Http/Utility.php
@@ -9,8 +9,9 @@
 use function explode;
 use function implode;
 use function md5;
+use function mt_getrandmax;
 use function preg_match;
-use function rand;
+use function random_int;
 use function rawurldecode;
 use function rawurlencode;
 use function str_replace;
@@ -179,7 +180,7 @@ public function parseQueryString($query)
      */
     public function generateNonce()
     {
-        return md5(uniqid(rand(), true));
+        return md5(uniqid(random_int(0, mt_getrandmax()), true));
     }
 
     /**

diff --git a/src/Signature/AbstractSignature.php b/src/Signature/AbstractSignature.php
@@ -29,13 +29,6 @@ abstract class AbstractSignature implements SignatureInterface
      */
     protected $key;
 
-    /**
-     * Consumer secret
-     *
-     * @var string
-     */
-    protected $consumerSecret;
-
     /**
      * Token secret
      *
@@ -51,9 +44,14 @@ abstract class AbstractSignature implements SignatureInterface
      * @param  null|string $hashAlgo
      * @return void
      */
-    public function __construct($consumerSecret, $tokenSecret = null, $hashAlgo = null)
-    {
-        $this->consumerSecret = $consumerSecret;
+    public function __construct(
+        /**
+         * Consumer secret
+         */
+        protected $consumerSecret,
+        $tokenSecret = null,
+        $hashAlgo = null
+    ) {
         if (isset($tokenSecret)) {
             $this->tokenSecret = $tokenSecret;
         }

diff --git a/src/Token/AbstractToken.php b/src/Token/AbstractToken.php
@@ -149,10 +149,7 @@ public function setParams(array $params)
      */
     public function getParam($key)
     {
-        if (isset($this->params[$key])) {
-            return $this->params[$key];
-        }
-        return null;
+        return $this->params[$key] ?? null;
     }
 
     /**
@@ -213,10 +210,8 @@ public function toString()
     /**
      * Convert Token to a string, specifically a raw encoded query string.
      * Aliases to self::toString()
-     *
-     * @return string
      */
-    public function __toString()
+    public function __toString(): string
     {
         return $this->toString();
     }