Skip to content

Commit 17ce1e2

Browse files
committed
🚿 AccessToken: remove unnecessary public setExpiry()
1 parent e052d34 commit 17ce1e2

File tree

2 files changed

+7
-15
lines changed

2 files changed

+7
-15
lines changed

src/Core/AccessToken.php

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -86,17 +86,10 @@ final class AccessToken extends SettingsContainerAbstract{
8686
*/
8787
protected string|null $provider = null;
8888

89-
/**
90-
* Expiry setter
91-
*/
92-
protected function set_expires(DateTime|DateInterval|int|null $expires = null):void{
93-
$this->setExpiry($expires);
94-
}
95-
9689
/**
9790
* Sets the expiration for this token, clamps the expiry to EXPIRY_MAX
9891
*/
99-
public function setExpiry(DateTime|DateInterval|int|null $expires = null):AccessToken{
92+
protected function set_expires(DateTime|DateInterval|int|null $expires = null):void{
10093
$now = time();
10194
$max = ($now + $this::EXPIRY_MAX);
10295

@@ -114,7 +107,6 @@ public function setExpiry(DateTime|DateInterval|int|null $expires = null):Access
114107
$this->expires = $max;
115108
}
116109

117-
return $this;
118110
}
119111

120112
/**

tests/Core/AccessTokenTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,31 +91,31 @@ public static function isExpiredDataProvider():array{
9191
}
9292

9393
#[DataProvider('isExpiredDataProvider')]
94-
public function testIsExpired(int $expires, bool $isExpired):void{
95-
$this->token->setExpiry($expires);
94+
public function testIsExpired(int $expiry, bool $isExpired):void{
95+
$this->token->expires = $expiry;
9696
$this::assertSame($isExpired, $this->token->isExpired());
9797
}
9898

9999
#[Group('slow')]
100100
public function testIsExpiredVariable():void{
101101
$expiry = (time() + 3600);
102-
$this->token->setExpiry($expiry);
102+
$this->token->expires = $expiry;
103103
$this::assertSame($expiry, $this->token->expires);
104104
$this::assertFalse($this->token->isExpired());
105105

106106
$expiry = 3600;
107-
$this->token->setExpiry($expiry);
107+
$this->token->expires = $expiry;
108108
$this::assertSame((time() + $expiry), $this->token->expires);
109109
$this::assertFalse($this->token->isExpired());
110110

111111
$expiry = 2;
112-
$this->token->setExpiry($expiry);
112+
$this->token->expires = $expiry;
113113
$this::assertSame((time() + $expiry), $this->token->expires);
114114
sleep(3);
115115
$this::assertTrue($this->token->isExpired());
116116

117117
$expiry = (time() + 2);
118-
$this->token->setExpiry($expiry);
118+
$this->token->expires = $expiry;
119119
$this::assertSame($expiry, $this->token->expires);
120120
sleep(3);
121121
$this::assertTrue($this->token->isExpired());

0 commit comments

Comments
 (0)