Merge pull request #1265 from abraham/null

Fix implicitly marking parameter as nullable

Author: abraham

Diff for: src/HmacSha1.php

@@ -32,7 +32,7 @@ public function getName()
     public function buildSignature(
         Request $request,
         Consumer $consumer,
-        Token $token = null,
+        ?Token $token = null,
     ): string {
         $signatureBase = $request->getSignatureBaseString();
 

Diff for: src/Request.php

@@ -40,19 +40,19 @@ public function __construct(
     /**
      * pretty much a helper function to set up the request
      *
-     * @param Consumer $consumer
-     * @param Token    $token
-     * @param string   $httpMethod
-     * @param string   $httpUrl
-     * @param array    $parameters
+     * @param Consumer   $consumer
+     * @param string     $httpMethod
+     * @param string     $httpUrl
+     * @param Token|null $token
+     * @param array      $parameters
      *
      * @return Request
      */
     public static function fromConsumerAndToken(
         Consumer $consumer,
-        Token $token = null,
         string $httpMethod,
         string $httpUrl,
+        ?Token $token = null,
         array $parameters = [],
         array $options = [],
     ) {
@@ -246,12 +246,12 @@ public function __toString(): string
     /**
      * @param SignatureMethod $signatureMethod
      * @param Consumer        $consumer
-     * @param Token           $token
+     * @param Token|null      $token
      */
     public function signRequest(
         SignatureMethod $signatureMethod,
         Consumer $consumer,
-        Token $token = null,
+        ?Token $token = null,
     ) {
         $this->setParameter(
             'oauth_signature_method',
@@ -264,14 +264,14 @@ public function signRequest(
     /**
      * @param SignatureMethod $signatureMethod
      * @param Consumer        $consumer
-     * @param Token           $token
+     * @param Token|null      $token
      *
      * @return string
      */
     public function buildSignature(
         SignatureMethod $signatureMethod,
         Consumer $consumer,
-        Token $token = null,
+        ?Token $token = null,
     ): string {
         return $signatureMethod->buildSignature($this, $consumer, $token);
     }

Diff for: src/SignatureMethod.php

@@ -30,14 +30,14 @@ abstract public function getName();
      *
      * @param Request $request
      * @param Consumer $consumer
-     * @param Token $token
+     * @param Token|null $token
      *
      * @return string
      */
     abstract public function buildSignature(
         Request $request,
         Consumer $consumer,
-        Token $token = null,
+        ?Token $token = null,
     );
 
     /**

Diff for: src/TwitterOAuth.php

@@ -205,9 +205,9 @@ public function oauth2(string $path, array $parameters = [])
         $url = sprintf('%s/%s', self::API_HOST, $path);
         $request = Request::fromConsumerAndToken(
             $this->consumer,
-            $this->token,
             $method,
             $url,
+            $this->token,
             $parameters,
         );
         $authorization =
@@ -606,9 +606,9 @@ private function oAuthRequest(
     ) {
         $request = Request::fromConsumerAndToken(
             $this->consumer,
-            $this->token,
             $method,
             $url,
+            $this->token,
             $parameters,
             $options,
         );