Scalar return types and type hints

Author: WyriHaximus

src/Definition/AccessToken.php

@@ -20,23 +20,23 @@ public function __construct($accessToken)
     /**
      * @return string
      */
-    public function getAccessToken()
+    public function getAccessToken(): string
     {
         return $this->accessToken;
     }
 
     /**
      * @return string
      */
-    public function getToken()
+    public function getToken(): string
     {
         return (string) $this->accessToken;
     }
 
     /**
      * @return string
      */
-    public function __toString()
+    public function __toString(): string
     {
         return (string) $this->accessToken;
     }

src/Definition/ConsumerKey.php

@@ -20,15 +20,15 @@ public function __construct($consumerKey)
     /**
      * @return string
      */
-    public function getConsumerKey()
+    public function getConsumerKey(): string
     {
         return (string) $this->consumerKey;
     }
 
     /**
      * @return string
      */
-    public function __toString()
+    public function __toString(): string
     {
         return (string) $this->consumerKey;
     }

src/Definition/ConsumerSecret.php

@@ -20,15 +20,15 @@ public function __construct($consumerSecret)
     /**
      * @return string
      */
-    public function getConsumerSecret()
+    public function getConsumerSecret(): string
     {
         return (string) $this->consumerSecret;
     }
 
     /**
      * @return string
      */
-    public function __toString()
+    public function __toString(): string
     {
         return (string) $this->consumerSecret;
     }

src/Definition/RequestToken.php

@@ -20,23 +20,23 @@ public function __construct($requestToken)
     /**
      * @return string
      */
-    public function getRequestToken()
+    public function getRequestToken(): string
     {
         return $this->requestToken;
     }
 
     /**
      * @return string
      */
-    public function getToken()
+    public function getToken(): string
     {
         return (string) $this->requestToken;
     }
 
     /**
      * @return string
      */
-    public function __toString()
+    public function __toString(): string
     {
         return (string) $this->requestToken;
     }

src/Definition/TokenSecret.php

@@ -20,15 +20,15 @@ public function __construct($tokenSecret)
     /**
      * @return string
      */
-    public function getTokenSecret()
+    public function getTokenSecret(): string
     {
         return (string) $this->tokenSecret;
     }
 
     /**
      * @return string
      */
-    public function __toString()
+    public function __toString(): string
     {
         return (string) $this->tokenSecret;
     }

src/RequestSigning/RequestSigner.php

@@ -52,9 +52,9 @@ public function __construct(ConsumerKey $consumerKey, ConsumerSecret $consumerSe
     /**
      * @param AccessToken $accessToken
      * @param TokenSecret $tokenSecret
-     * @return static
+     * @return RequestSigner
      */
-    public function withAccessToken(AccessToken $accessToken, TokenSecret $tokenSecret)
+    public function withAccessToken(AccessToken $accessToken, TokenSecret $tokenSecret): RequestSigner
     {
         $clone = clone $this;
         $clone->accessToken = $accessToken;
@@ -67,9 +67,9 @@ public function withAccessToken(AccessToken $accessToken, TokenSecret $tokenSecr
     }
 
     /**
-     * @return static
+     * @return RequestSigner
      */
-    public function withoutAccessToken()
+    public function withoutAccessToken(): RequestSigner
     {
         $clone = clone $this;
         $clone->accessToken = null;
@@ -85,7 +85,7 @@ public function withoutAccessToken()
      * @param RequestInterface $request
      * @return RequestInterface
      */
-    public function sign(RequestInterface $request)
+    public function sign(RequestInterface $request): RequestInterface
     {
         $parameters = [
             'oauth_consumer_key' => (string) $this->consumerKey,
@@ -106,9 +106,9 @@ public function sign(RequestInterface $request)
 
     public function signToRequestAuthorization(
         RequestInterface $request,
-        $callbackUri,
+        string $callbackUri,
         array $additionalParameters = []
-    ) {
+    ): RequestInterface {
         $parameters = [
             'oauth_consumer_key' => (string) $this->consumerKey,
             'oauth_nonce' => $this->generateNonce(),
@@ -130,7 +130,7 @@ public function signToRequestAuthorization(
      * @param array $parameters
      * @return array
      */
-    private function mergeSignatureParameter(RequestInterface $request, array $parameters)
+    private function mergeSignatureParameter(RequestInterface $request, array $parameters): array
     {
         $body = [];
         if ($request->getMethod() === 'POST' &&
@@ -148,7 +148,7 @@ private function mergeSignatureParameter(RequestInterface $request, array $param
     /**
      * @return string
      */
-    private function generateTimestamp()
+    private function generateTimestamp(): string
     {
         $dateTime = new \DateTimeImmutable();
 
@@ -159,7 +159,7 @@ private function generateTimestamp()
      * @param int $length
      * @return string
      */
-    private function generateNonce($length = 32)
+    private function generateNonce(int $length = 32): string
     {
         $pool = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
 
@@ -170,7 +170,7 @@ private function generateNonce($length = 32)
      * @param array $parameters
      * @return string
      */
-    private function generateAuthorizationheader(array $parameters)
+    private function generateAuthorizationheader(array $parameters): string
     {
         array_walk($parameters, function (&$value, $key) {
             $value = rawurlencode($key).'="'.rawurlencode($value).'"';

src/Signature/HmacMd5Signature.php

@@ -7,7 +7,7 @@ final class HmacMd5Signature extends HmacSignature
     /**
      * @return string
      */
-    protected function getHashingAlgorithm()
+    protected function getHashingAlgorithm(): string
     {
         return 'md5';
     }

src/Signature/HmacSha1Signature.php

@@ -7,7 +7,7 @@ final class HmacSha1Signature extends HmacSignature
     /**
      * @return string
      */
-    protected function getHashingAlgorithm()
+    protected function getHashingAlgorithm(): string
     {
         return 'sha1';
     }

src/Signature/HmacSha256Signature.php

@@ -7,7 +7,7 @@ final class HmacSha256Signature extends HmacSignature
     /**
      * @return string
      */
-    protected function getHashingAlgorithm()
+    protected function getHashingAlgorithm(): string
     {
         return 'sha256';
     }

src/Signature/HmacSha384Signature.php

@@ -7,7 +7,7 @@ final class HmacSha384Signature extends HmacSignature
     /**
      * @return string
      */
-    protected function getHashingAlgorithm()
+    protected function getHashingAlgorithm(): string
     {
         return 'sha384';
     }