Drop PHP 8.0 support

composer.json

@@ -13,13 +13,13 @@
         }
     ],
     "require": {
-        "php": "^8",
+        "php": "^8.1",
         "ext-hash": "^8",
         "psr/http-message": "^1.0.1",
         "thecodingmachine/safe": "^1.3.3"
     },
     "require-dev": {
-        "guzzlehttp/psr7": "^2.0.0",
+        "guzzlehttp/psr7": "^2.1.0",
         "wyrihaximus/async-test-utilities": "^4.1.0"
     },
     "autoload": {
@@ -41,7 +41,7 @@
             "infection/extension-installer": true
         },
         "platform": {
-            "php": "8.0.12"
+            "php": "8.1.12"
         },
         "sort-packages": true
     },

etc/qa/.phpunit.result.cache

@@ -1 +1 @@
-{"version":1,"defects":[],"times":{"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Definition\\AccessTokenTest::testAccessToken":0.004,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Definition\\ConsumerKeyTest::testAccessToken":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Definition\\ConsumerSecretTest::testAccessToken":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Definition\\RequestTokenTest::testAccessToken":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Definition\\TokenSecretTest::testAccessToken":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\RequestSigning\\RequestSignerTest::testImmutability":0.003,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\RequestSigning\\RequestSignerTest::testSign":0.006,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\RequestSigning\\RequestSignerTest::testSignToRequestAuthorization":0.002,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacMd5SignatureTest::testGetMethod":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacMd5SignatureTest::testSign with data set #0":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacMd5SignatureTest::testSign with data set #1":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacMd5SignatureTest::testSign with data set #2":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacMd5SignatureTest::testSign with data set #3":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacSha1SignatureTest::testGetMethod":0,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacSha1SignatureTest::testSign with data set #0":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacSha1SignatureTest::testSign with data set #1":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacSha1SignatureTest::testSign with data set #2":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacSha1SignatureTest::testSign with data set #3":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacSha256SignatureTest::testGetMethod":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacSha256SignatureTest::testSign with data set #0":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacSha256SignatureTest::testSign with data set #1":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacSha256SignatureTest::testSign with data set #2":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacSha256SignatureTest::testSign with data set #3":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacSha384SignatureTest::testGetMethod":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacSha384SignatureTest::testSign with data set #0":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacSha384SignatureTest::testSign with data set #1":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacSha384SignatureTest::testSign with data set #2":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacSha384SignatureTest::testSign with data set #3":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacSha512SignatureTest::testGetMethod":0,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacSha512SignatureTest::testSign with data set #0":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacSha512SignatureTest::testSign with data set #1":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacSha512SignatureTest::testSign with data set #2":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacSha512SignatureTest::testSign with data set #3":0.001}}
+{"version":1,"defects":[],"times":{"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Definition\\AccessTokenTest::testAccessToken":0.004,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Definition\\ConsumerKeyTest::testAccessToken":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Definition\\ConsumerSecretTest::testAccessToken":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Definition\\RequestTokenTest::testAccessToken":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Definition\\TokenSecretTest::testAccessToken":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\RequestSigning\\RequestSignerTest::testImmutability":0.003,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\RequestSigning\\RequestSignerTest::testSign":0.007,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\RequestSigning\\RequestSignerTest::testSignToRequestAuthorization":0.002,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacMd5SignatureTest::testGetMethod":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacMd5SignatureTest::testSign with data set #0":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacMd5SignatureTest::testSign with data set #1":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacMd5SignatureTest::testSign with data set #2":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacMd5SignatureTest::testSign with data set #3":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacSha1SignatureTest::testGetMethod":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacSha1SignatureTest::testSign with data set #0":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacSha1SignatureTest::testSign with data set #1":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacSha1SignatureTest::testSign with data set #2":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacSha1SignatureTest::testSign with data set #3":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacSha256SignatureTest::testGetMethod":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacSha256SignatureTest::testSign with data set #0":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacSha256SignatureTest::testSign with data set #1":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacSha256SignatureTest::testSign with data set #2":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacSha256SignatureTest::testSign with data set #3":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacSha384SignatureTest::testGetMethod":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacSha384SignatureTest::testSign with data set #0":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacSha384SignatureTest::testSign with data set #1":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacSha384SignatureTest::testSign with data set #2":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacSha384SignatureTest::testSign with data set #3":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacSha512SignatureTest::testGetMethod":0,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacSha512SignatureTest::testSign with data set #0":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacSha512SignatureTest::testSign with data set #1":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacSha512SignatureTest::testSign with data set #2":0.001,"ApiClients\\Tests\\Tools\\Psr7\\Oauth1\\Signature\\HmacSha512SignatureTest::testSign with data set #3":0.001}}

src/Definition/AccessToken.php

@@ -6,18 +6,21 @@
 
 final class AccessToken
 {
-    private string $accessToken;
-
-    public function __construct(string $accessToken)
+    public function __construct(public readonly string $accessToken)
     {
-        $this->accessToken = $accessToken;
     }
 
+    /**
+     * @deprecated Use accessToken property
+     */
     public function getAccessToken(): string
     {
         return $this->accessToken;
     }
 
+    /**
+     * @deprecated Use accessToken property
+     */
     public function getToken(): string
     {
         return $this->accessToken;

src/Definition/ConsumerKey.php

@@ -6,13 +6,13 @@
 
 final class ConsumerKey
 {
-    private string $consumerKey;
-
-    public function __construct(string $consumerKey)
+    public function __construct(public readonly string $consumerKey)
     {
-        $this->consumerKey = $consumerKey;
     }
 
+    /**
+     * @deprecated Use consumerKey property
+     */
     public function getConsumerKey(): string
     {
         return $this->consumerKey;

src/Definition/ConsumerSecret.php

@@ -6,13 +6,13 @@
 
 final class ConsumerSecret
 {
-    private string $consumerSecret;
-
-    public function __construct(string $consumerSecret)
+    public function __construct(public readonly string $consumerSecret)
     {
-        $this->consumerSecret = $consumerSecret;
     }
 
+    /**
+     * @deprecated Use consumerSecret property
+     */
     public function getConsumerSecret(): string
     {
         return $this->consumerSecret;

src/Definition/RequestToken.php

@@ -6,18 +6,21 @@
 
 final class RequestToken
 {
-    private string $requestToken;
-
-    public function __construct(string $requestToken)
+    public function __construct(public readonly string $requestToken)
     {
-        $this->requestToken = $requestToken;
     }
 
+    /**
+     * @deprecated Use requestToken property
+     */
     public function getRequestToken(): string
     {
         return $this->requestToken;
     }
 
+    /**
+     * @deprecated Use requestToken property
+     */
     public function getToken(): string
     {
         return $this->requestToken;

src/Definition/TokenSecret.php

@@ -6,13 +6,13 @@
 
 final class TokenSecret
 {
-    private string $tokenSecret;
-
-    public function __construct(string $tokenSecret)
+    public function __construct(public readonly string $tokenSecret)
     {
-        $this->tokenSecret = $tokenSecret;
     }
 
+    /**
+     * @deprecated Use tokenSecret property
+     */
     public function getTokenSecret(): string
     {
         return $this->tokenSecret;

src/RequestSigning/RequestSigner.php

@@ -27,19 +27,16 @@ final class RequestSigner
     private const START                = 0;
     private const DEFAULT_NONCE_LENGTH = 32;
 
-    private ConsumerKey $consumerKey;
-
     private ?AccessToken $accessToken = null;
 
     private Signature $signature;
 
     /**
      * @phpstan-ignore-next-line
      */
-    public function __construct(ConsumerKey $consumerKey, ConsumerSecret $consumerSecret, ?Signature $signature = null)
+    public function __construct(private ConsumerKey $consumerKey, ConsumerSecret $consumerSecret, ?Signature $signature = null)
     {
-        $this->consumerKey = $consumerKey;
-        $this->signature   = $signature ?? new HmacSha1Signature($consumerSecret);
+        $this->signature = $signature ?? new HmacSha1Signature($consumerSecret);
     }
 
     public function withAccessToken(AccessToken $accessToken, TokenSecret $tokenSecret): RequestSigner

src/Signature/Signature.php

@@ -12,13 +12,10 @@
 
 abstract class Signature
 {
-    private ConsumerSecret $consumerSecret;
-
     private ?TokenSecret $tokenSecret = null;
 
-    final public function __construct(ConsumerSecret $consumerSecret)
+    final public function __construct(private ConsumerSecret $consumerSecret)
     {
-        $this->consumerSecret = $consumerSecret;
     }
 
     final public function withTokenSecret(TokenSecret $tokenSecret): Signature

tests/Definition/AccessTokenTest.php

@@ -13,8 +13,9 @@ public function testAccessToken(): void
     {
         $token       = 'token';
         $accessToken = new AccessToken($token);
-        self::assertSame($token, $accessToken->getAccessToken());
-        self::assertSame($token, $accessToken->getToken());
+        self::assertSame($token, $accessToken->getAccessToken()); /** @phpstan-ignore-line */
+        self::assertSame($token, $accessToken->getToken()); /** @phpstan-ignore-line */
+        self::assertSame($token, $accessToken->accessToken);
         self::assertSame($token, (string) $accessToken);
     }
 }

tests/Definition/ConsumerKeyTest.php

@@ -13,7 +13,8 @@ public function testAccessToken(): void
     {
         $key         = 'key';
         $consumerKey = new ConsumerKey($key);
-        self::assertSame($key, $consumerKey->getConsumerKey());
+        self::assertSame($key, $consumerKey->getConsumerKey()); /** @phpstan-ignore-line */
+        self::assertSame($key, $consumerKey->consumerKey);
         self::assertSame($key, (string) $consumerKey);
     }
 }

tests/Definition/ConsumerSecretTest.php

@@ -13,7 +13,8 @@ public function testAccessToken(): void
     {
         $key            = 'key';
         $consumerSecret = new ConsumerSecret($key);
-        self::assertSame($key, $consumerSecret->getConsumerSecret());
+        self::assertSame($key, $consumerSecret->getConsumerSecret()); /** @phpstan-ignore-line */
+        self::assertSame($key, $consumerSecret->consumerSecret);
         self::assertSame($key, (string) $consumerSecret);
     }
 }

tests/Definition/RequestTokenTest.php

@@ -13,8 +13,9 @@ public function testAccessToken(): void
     {
         $token        = 'token';
         $requestToken = new RequestToken($token);
-        self::assertSame($token, $requestToken->getRequestToken());
-        self::assertSame($token, $requestToken->getToken());
+        self::assertSame($token, $requestToken->getRequestToken()); /** @phpstan-ignore-line */
+        self::assertSame($token, $requestToken->getToken()); /** @phpstan-ignore-line */
+        self::assertSame($token, $requestToken->requestToken);
         self::assertSame($token, (string) $requestToken);
     }
 }

tests/Definition/TokenSecretTest.php

@@ -13,7 +13,8 @@ public function testAccessToken(): void
     {
         $token       = 'tokenSecret';
         $tokenSecret = new TokenSecret($token);
-        self::assertSame($token, $tokenSecret->getTokenSecret());
+        self::assertSame($token, $tokenSecret->getTokenSecret()); /** @phpstan-ignore-line */
+        self::assertSame($token, $tokenSecret->tokenSecret);
         self::assertSame($token, (string) $tokenSecret);
     }
 }