Skip to content

Commit 105b568

Browse files
WyriHaximusWyriHaximus
authored
Merge pull request #64 from php-api-clients/drop-php-8.0-support
Drop PHP 8.0 support
2 parents cb54da8 + 788bde6 commit 105b568

15 files changed

+55
-50
lines changed

‎composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
}
1414
],
1515
"require": {
16-
"php": "^8",
16+
"php": "^8.1",
1717
"ext-hash": "^8",
1818
"psr/http-message": "^1.0.1",
1919
"thecodingmachine/safe": "^1.3.3"
2020
},
2121
"require-dev": {
22-
"guzzlehttp/psr7": "^2.0.0",
22+
"guzzlehttp/psr7": "^2.1.0",
2323
"wyrihaximus/async-test-utilities": "^4.1.0"
2424
},
2525
"autoload": {
@@ -41,7 +41,7 @@
4141
"infection/extension-installer": true
4242
},
4343
"platform": {
44-
"php": "8.0.12"
44+
"php": "8.1.12"
4545
},
4646
"sort-packages": true
4747
},

‎composer.lock

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎etc/qa/.phpunit.result.cache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +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}}
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.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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,21 @@
66

77
final class AccessToken
88
{
9-
private string $accessToken;
10-
11-
public function __construct(string $accessToken)
9+
public function __construct(public readonly string $accessToken)
1210
{
13-
$this->accessToken = $accessToken;
1411
}
1512

13+
/**
14+
* @deprecated Use accessToken property
15+
*/
1616
public function getAccessToken(): string
1717
{
1818
return $this->accessToken;
1919
}
2020

21+
/**
22+
* @deprecated Use accessToken property
23+
*/
2124
public function getToken(): string
2225
{
2326
return $this->accessToken;

‎src/Definition/ConsumerKey.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66

77
final class ConsumerKey
88
{
9-
private string $consumerKey;
10-
11-
public function __construct(string $consumerKey)
9+
public function __construct(public readonly string $consumerKey)
1210
{
13-
$this->consumerKey = $consumerKey;
1411
}
1512

13+
/**
14+
* @deprecated Use consumerKey property
15+
*/
1616
public function getConsumerKey(): string
1717
{
1818
return $this->consumerKey;

‎src/Definition/ConsumerSecret.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66

77
final class ConsumerSecret
88
{
9-
private string $consumerSecret;
10-
11-
public function __construct(string $consumerSecret)
9+
public function __construct(public readonly string $consumerSecret)
1210
{
13-
$this->consumerSecret = $consumerSecret;
1411
}
1512

13+
/**
14+
* @deprecated Use consumerSecret property
15+
*/
1616
public function getConsumerSecret(): string
1717
{
1818
return $this->consumerSecret;

‎src/Definition/RequestToken.php

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,21 @@
66

77
final class RequestToken
88
{
9-
private string $requestToken;
10-
11-
public function __construct(string $requestToken)
9+
public function __construct(public readonly string $requestToken)
1210
{
13-
$this->requestToken = $requestToken;
1411
}
1512

13+
/**
14+
* @deprecated Use requestToken property
15+
*/
1616
public function getRequestToken(): string
1717
{
1818
return $this->requestToken;
1919
}
2020

21+
/**
22+
* @deprecated Use requestToken property
23+
*/
2124
public function getToken(): string
2225
{
2326
return $this->requestToken;

‎src/Definition/TokenSecret.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66

77
final class TokenSecret
88
{
9-
private string $tokenSecret;
10-
11-
public function __construct(string $tokenSecret)
9+
public function __construct(public readonly string $tokenSecret)
1210
{
13-
$this->tokenSecret = $tokenSecret;
1411
}
1512

13+
/**
14+
* @deprecated Use tokenSecret property
15+
*/
1616
public function getTokenSecret(): string
1717
{
1818
return $this->tokenSecret;

‎src/RequestSigning/RequestSigner.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,16 @@ final class RequestSigner
2727
private const START = 0;
2828
private const DEFAULT_NONCE_LENGTH = 32;
2929

30-
private ConsumerKey $consumerKey;
31-
3230
private ?AccessToken $accessToken = null;
3331

3432
private Signature $signature;
3533

3634
/**
3735
* @phpstan-ignore-next-line
3836
*/
39-
public function __construct(ConsumerKey $consumerKey, ConsumerSecret $consumerSecret, ?Signature $signature = null)
37+
public function __construct(private ConsumerKey $consumerKey, ConsumerSecret $consumerSecret, ?Signature $signature = null)
4038
{
41-
$this->consumerKey = $consumerKey;
42-
$this->signature = $signature ?? new HmacSha1Signature($consumerSecret);
39+
$this->signature = $signature ?? new HmacSha1Signature($consumerSecret);
4340
}
4441

4542
public function withAccessToken(AccessToken $accessToken, TokenSecret $tokenSecret): RequestSigner

‎src/Signature/Signature.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,10 @@
1212

1313
abstract class Signature
1414
{
15-
private ConsumerSecret $consumerSecret;
16-
1715
private ?TokenSecret $tokenSecret = null;
1816

19-
final public function __construct(ConsumerSecret $consumerSecret)
17+
final public function __construct(private ConsumerSecret $consumerSecret)
2018
{
21-
$this->consumerSecret = $consumerSecret;
2219
}
2320

2421
final public function withTokenSecret(TokenSecret $tokenSecret): Signature

‎tests/Definition/AccessTokenTest.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ public function testAccessToken(): void
1313
{
1414
$token = 'token';
1515
$accessToken = new AccessToken($token);
16-
self::assertSame($token, $accessToken->getAccessToken());
17-
self::assertSame($token, $accessToken->getToken());
16+
self::assertSame($token, $accessToken->getAccessToken()); /** @phpstan-ignore-line */
17+
self::assertSame($token, $accessToken->getToken()); /** @phpstan-ignore-line */
18+
self::assertSame($token, $accessToken->accessToken);
1819
self::assertSame($token, (string) $accessToken);
1920
}
2021
}

‎tests/Definition/ConsumerKeyTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ public function testAccessToken(): void
1313
{
1414
$key = 'key';
1515
$consumerKey = new ConsumerKey($key);
16-
self::assertSame($key, $consumerKey->getConsumerKey());
16+
self::assertSame($key, $consumerKey->getConsumerKey()); /** @phpstan-ignore-line */
17+
self::assertSame($key, $consumerKey->consumerKey);
1718
self::assertSame($key, (string) $consumerKey);
1819
}
1920
}

‎tests/Definition/ConsumerSecretTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ public function testAccessToken(): void
1313
{
1414
$key = 'key';
1515
$consumerSecret = new ConsumerSecret($key);
16-
self::assertSame($key, $consumerSecret->getConsumerSecret());
16+
self::assertSame($key, $consumerSecret->getConsumerSecret()); /** @phpstan-ignore-line */
17+
self::assertSame($key, $consumerSecret->consumerSecret);
1718
self::assertSame($key, (string) $consumerSecret);
1819
}
1920
}

‎tests/Definition/RequestTokenTest.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ public function testAccessToken(): void
1313
{
1414
$token = 'token';
1515
$requestToken = new RequestToken($token);
16-
self::assertSame($token, $requestToken->getRequestToken());
17-
self::assertSame($token, $requestToken->getToken());
16+
self::assertSame($token, $requestToken->getRequestToken()); /** @phpstan-ignore-line */
17+
self::assertSame($token, $requestToken->getToken()); /** @phpstan-ignore-line */
18+
self::assertSame($token, $requestToken->requestToken);
1819
self::assertSame($token, (string) $requestToken);
1920
}
2021
}

‎tests/Definition/TokenSecretTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ public function testAccessToken(): void
1313
{
1414
$token = 'tokenSecret';
1515
$tokenSecret = new TokenSecret($token);
16-
self::assertSame($token, $tokenSecret->getTokenSecret());
16+
self::assertSame($token, $tokenSecret->getTokenSecret()); /** @phpstan-ignore-line */
17+
self::assertSame($token, $tokenSecret->tokenSecret);
1718
self::assertSame($token, (string) $tokenSecret);
1819
}
1920
}

0 commit comments

Comments
 (0)