Skip to content

Commit

Permalink
Drop PHP 8.0 support
Browse files Browse the repository at this point in the history
  • Loading branch information
WyriHaximus committed Jan 2, 2022
1 parent cb54da8 commit 788bde6
Show file tree
Hide file tree
Showing 15 changed files with 55 additions and 50 deletions.
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -41,7 +41,7 @@
"infection/extension-installer": true
},
"platform": {
"php": "8.0.12"
"php": "8.1.12"
},
"sort-packages": true
},
Expand Down
20 changes: 10 additions & 10 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion etc/qa/.phpunit.result.cache
Original file line number Diff line number Diff line change
@@ -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}}
11 changes: 7 additions & 4 deletions src/Definition/AccessToken.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions src/Definition/ConsumerKey.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions src/Definition/ConsumerSecret.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
11 changes: 7 additions & 4 deletions src/Definition/RequestToken.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions src/Definition/TokenSecret.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 2 additions & 5 deletions src/RequestSigning/RequestSigner.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions src/Signature/Signature.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions tests/Definition/AccessTokenTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
3 changes: 2 additions & 1 deletion tests/Definition/ConsumerKeyTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
3 changes: 2 additions & 1 deletion tests/Definition/ConsumerSecretTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
5 changes: 3 additions & 2 deletions tests/Definition/RequestTokenTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
3 changes: 2 additions & 1 deletion tests/Definition/TokenSecretTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

0 comments on commit 788bde6

Please sign in to comment.