Skip to content

Commit 7631f77

Browse files
cicnavicicnavi
committed
Rename JwksFactory to JwksDecoratorFactory
1 parent 83f6c9b commit 7631f77

34 files changed

Lines changed: 164 additions & 164 deletions

‎src/Core.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
use SimpleSAML\OpenID\Factories\ClaimFactory;
1717
use SimpleSAML\OpenID\Factories\DateIntervalDecoratorFactory;
1818
use SimpleSAML\OpenID\Factories\JwsSerializerManagerDecoratorFactory;
19-
use SimpleSAML\OpenID\Jwks\Factories\JwksFactory;
19+
use SimpleSAML\OpenID\Jwks\Factories\JwksDecoratorFactory;
2020
use SimpleSAML\OpenID\Jws\Factories\JwsDecoratorBuilderFactory;
2121
use SimpleSAML\OpenID\Jws\Factories\JwsVerifierDecoratorFactory;
2222
use SimpleSAML\OpenID\Jws\JwsDecoratorBuilder;
@@ -47,7 +47,7 @@ class Core
4747

4848
protected ?JwsVerifierDecoratorFactory $jwsVerifierDecoratorFactory = null;
4949

50-
protected ?JwksFactory $jwksFactory = null;
50+
protected ?JwksDecoratorFactory $jwksDecoratorFactory = null;
5151

5252
protected ?DateIntervalDecoratorFactory $dateIntervalDecoratorFactory = null;
5353

@@ -74,7 +74,7 @@ public function requestObjectFactory(): RequestObjectFactory
7474
return $this->requestObjectFactory ??= new RequestObjectFactory(
7575
$this->jwsDecoratorBuilder(),
7676
$this->jwsVerifierDecorator(),
77-
$this->jwksFactory(),
77+
$this->jwksDecoratorFactory(),
7878
$this->jwsSerializerManagerDecorator(),
7979
$this->timestampValidationLeewayDecorator,
8080
$this->helpers(),
@@ -87,7 +87,7 @@ public function clientAssertionFactory(): ClientAssertionFactory
8787
return $this->clientAssertionFactory ??= new ClientAssertionFactory(
8888
$this->jwsDecoratorBuilder(),
8989
$this->jwsVerifierDecorator(),
90-
$this->jwksFactory(),
90+
$this->jwksDecoratorFactory(),
9191
$this->jwsSerializerManagerDecorator(),
9292
$this->timestampValidationLeewayDecorator,
9393
$this->helpers(),
@@ -142,9 +142,9 @@ public function jwsVerifierDecoratorFactory(): JwsVerifierDecoratorFactory
142142
return $this->jwsVerifierDecoratorFactory;
143143
}
144144

145-
public function jwksFactory(): JwksFactory
145+
public function jwksDecoratorFactory(): JwksDecoratorFactory
146146
{
147-
return $this->jwksFactory ??= new JwksFactory();
147+
return $this->jwksDecoratorFactory ??= new JwksDecoratorFactory();
148148
}
149149

150150
public function dateIntervalDecoratorFactory(): DateIntervalDecoratorFactory

‎src/Core/Factories/ClientAssertionFactory.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public function fromToken(string $token): ClientAssertion
1414
return new ClientAssertion(
1515
$this->jwsDecoratorBuilder->fromToken($token),
1616
$this->jwsVerifierDecorator,
17-
$this->jwksFactory,
17+
$this->jwksDecoratorFactory,
1818
$this->jwsSerializerManagerDecorator,
1919
$this->timestampValidationLeeway,
2020
$this->helpers,

‎src/Core/Factories/RequestObjectFactory.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public function fromToken(string $token): RequestObject
1414
return new RequestObject(
1515
$this->jwsDecoratorBuilder->fromToken($token),
1616
$this->jwsVerifierDecorator,
17-
$this->jwksFactory,
17+
$this->jwksDecoratorFactory,
1818
$this->jwsSerializerManagerDecorator,
1919
$this->timestampValidationLeeway,
2020
$this->helpers,

‎src/Federation.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
use SimpleSAML\OpenID\Federation\TrustChainResolver;
3131
use SimpleSAML\OpenID\Federation\TrustMarkFetcher;
3232
use SimpleSAML\OpenID\Federation\TrustMarkValidator;
33-
use SimpleSAML\OpenID\Jwks\Factories\JwksFactory;
33+
use SimpleSAML\OpenID\Jwks\Factories\JwksDecoratorFactory;
3434
use SimpleSAML\OpenID\Jws\Factories\JwsDecoratorBuilderFactory;
3535
use SimpleSAML\OpenID\Jws\Factories\JwsVerifierDecoratorFactory;
3636
use SimpleSAML\OpenID\Jws\JwsDecoratorBuilder;
@@ -82,7 +82,7 @@ class Federation
8282

8383
protected ?JwsVerifierDecoratorFactory $jwsVerifierDecoratorFactory = null;
8484

85-
protected ?JwksFactory $jwksFactory = null;
85+
protected ?JwksDecoratorFactory $jwksDecoratorFactory = null;
8686

8787
protected ?DateIntervalDecoratorFactory $dateIntervalDecoratorFactory = null;
8888

@@ -193,7 +193,7 @@ public function entityStatementFactory(): EntityStatementFactory
193193
return $this->entityStatementFactory ??= new EntityStatementFactory(
194194
$this->jwsDecoratorBuilder(),
195195
$this->jwsVerifierDecorator(),
196-
$this->jwksFactory(),
196+
$this->jwksDecoratorFactory(),
197197
$this->jwsSerializerManagerDecorator(),
198198
$this->timestampValidationLeewayDecorator,
199199
$this->helpers(),
@@ -206,7 +206,7 @@ public function requestObjectFactory(): RequestObjectFactory
206206
return $this->requestObjectFactory ??= new RequestObjectFactory(
207207
$this->jwsDecoratorBuilder(),
208208
$this->jwsVerifierDecorator(),
209-
$this->jwksFactory(),
209+
$this->jwksDecoratorFactory(),
210210
$this->jwsSerializerManagerDecorator(),
211211
$this->timestampValidationLeewayDecorator,
212212
$this->helpers(),
@@ -219,7 +219,7 @@ public function trustMarkFactory(): TrustMarkFactory
219219
return $this->trustMarkFactory ??= new TrustMarkFactory(
220220
$this->jwsDecoratorBuilder(),
221221
$this->jwsVerifierDecorator(),
222-
$this->jwksFactory(),
222+
$this->jwksDecoratorFactory(),
223223
$this->jwsSerializerManagerDecorator(),
224224
$this->timestampValidationLeewayDecorator,
225225
$this->helpers(),
@@ -232,7 +232,7 @@ public function trustMarkDelegationFactory(): TrustMarkDelegationFactory
232232
return $this->trustMarkDelegationFactory ?? new TrustMarkDelegationFactory(
233233
$this->jwsDecoratorBuilder(),
234234
$this->jwsVerifierDecorator(),
235-
$this->jwksFactory(),
235+
$this->jwksDecoratorFactory(),
236236
$this->jwsSerializerManagerDecorator(),
237237
$this->timestampValidationLeewayDecorator,
238238
$this->helpers(),
@@ -294,9 +294,9 @@ public function jwsVerifierDecoratorFactory(): JwsVerifierDecoratorFactory
294294
return $this->jwsVerifierDecoratorFactory ??= new JwsVerifierDecoratorFactory();
295295
}
296296

297-
public function jwksFactory(): JwksFactory
297+
public function jwksDecoratorFactory(): JwksDecoratorFactory
298298
{
299-
return $this->jwksFactory ??= new JwksFactory();
299+
return $this->jwksDecoratorFactory ??= new JwksDecoratorFactory();
300300
}
301301

302302
public function dateIntervalDecoratorFactory(): DateIntervalDecoratorFactory

‎src/Federation/Factories/EntityStatementFactory.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public function fromToken(string $token): EntityStatement
1818
return new EntityStatement(
1919
$this->jwsDecoratorBuilder->fromToken($token),
2020
$this->jwsVerifierDecorator,
21-
$this->jwksFactory,
21+
$this->jwksDecoratorFactory,
2222
$this->jwsSerializerManagerDecorator,
2323
$this->timestampValidationLeeway,
2424
$this->helpers,

‎src/Federation/Factories/RequestObjectFactory.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public function fromToken(string $token): RequestObject
1818
return new RequestObject(
1919
$this->jwsDecoratorBuilder->fromToken($token),
2020
$this->jwsVerifierDecorator,
21-
$this->jwksFactory,
21+
$this->jwksDecoratorFactory,
2222
$this->jwsSerializerManagerDecorator,
2323
$this->timestampValidationLeeway,
2424
$this->helpers,

‎src/Federation/Factories/TrustMarkDelegationFactory.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public function fromToken(string $token): TrustMarkDelegation
1414
return new TrustMarkDelegation(
1515
$this->jwsDecoratorBuilder->fromToken($token),
1616
$this->jwsVerifierDecorator,
17-
$this->jwksFactory,
17+
$this->jwksDecoratorFactory,
1818
$this->jwsSerializerManagerDecorator,
1919
$this->timestampValidationLeeway,
2020
$this->helpers,

‎src/Federation/Factories/TrustMarkFactory.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public function fromToken(
1717
return new TrustMark(
1818
$this->jwsDecoratorBuilder->fromToken($token),
1919
$this->jwsVerifierDecorator,
20-
$this->jwksFactory,
20+
$this->jwksDecoratorFactory,
2121
$this->jwsSerializerManagerDecorator,
2222
$this->timestampValidationLeeway,
2323
$this->helpers,

‎src/Federation/TrustMark.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
use SimpleSAML\OpenID\Exceptions\TrustMarkException;
1111
use SimpleSAML\OpenID\Factories\ClaimFactory;
1212
use SimpleSAML\OpenID\Helpers;
13-
use SimpleSAML\OpenID\Jwks\Factories\JwksFactory;
13+
use SimpleSAML\OpenID\Jwks\Factories\JwksDecoratorFactory;
1414
use SimpleSAML\OpenID\Jws\JwsDecorator;
1515
use SimpleSAML\OpenID\Jws\JwsVerifierDecorator;
1616
use SimpleSAML\OpenID\Jws\ParsedJws;
@@ -21,7 +21,7 @@ class TrustMark extends ParsedJws
2121
public function __construct(
2222
JwsDecorator $jwsDecorator,
2323
JwsVerifierDecorator $jwsVerifierDecorator,
24-
JwksFactory $jwksFactory,
24+
JwksDecoratorFactory $jwksDecoratorFactory,
2525
JwsSerializerManagerDecorator $jwsSerializerManagerDecorator,
2626
DateIntervalDecorator $timestampValidationLeeway,
2727
Helpers $helpers,
@@ -31,7 +31,7 @@ public function __construct(
3131
parent::__construct(
3232
$jwsDecorator,
3333
$jwsVerifierDecorator,
34-
$jwksFactory,
34+
$jwksDecoratorFactory,
3535
$jwsSerializerManagerDecorator,
3636
$timestampValidationLeeway,
3737
$helpers,

‎src/Jwks.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
use SimpleSAML\OpenID\Factories\DateIntervalDecoratorFactory;
1919
use SimpleSAML\OpenID\Factories\HttpClientDecoratorFactory;
2020
use SimpleSAML\OpenID\Factories\JwsSerializerManagerDecoratorFactory;
21-
use SimpleSAML\OpenID\Jwks\Factories\JwksFactory;
21+
use SimpleSAML\OpenID\Jwks\Factories\JwksDecoratorFactory;
2222
use SimpleSAML\OpenID\Jwks\Factories\SignedJwksFactory;
2323
use SimpleSAML\OpenID\Jwks\JwksFetcher;
2424
use SimpleSAML\OpenID\Jws\Factories\JwsDecoratorBuilderFactory;
@@ -45,7 +45,7 @@ class Jwks
4545

4646
protected ?JwsVerifierDecorator $jwsVerifierDecorator = null;
4747

48-
protected ?JwksFactory $jwksFactory = null;
48+
protected ?JwksDecoratorFactory $jwksDecoratorFactory = null;
4949

5050
protected ?SignedJwksFactory $signedJwksFactory = null;
5151

@@ -84,17 +84,17 @@ public function __construct(
8484
$this->httpClientDecorator = $this->httpClientDecoratorFactory()->build($httpClient);
8585
}
8686

87-
public function jwksFactory(): JwksFactory
87+
public function jwksDecoratorFactory(): JwksDecoratorFactory
8888
{
89-
return $this->jwksFactory ??= new JwksFactory();
89+
return $this->jwksDecoratorFactory ??= new JwksDecoratorFactory();
9090
}
9191

9292
public function signedJwksFactory(): SignedJwksFactory
9393
{
9494
return $this->signedJwksFactory ??= new SignedJwksFactory(
9595
$this->jwsDecoratorBuilder(),
9696
$this->jwsVerifierDecorator(),
97-
$this->jwksFactory(),
97+
$this->jwksDecoratorFactory(),
9898
$this->jwsSerializerManagerDecorator(),
9999
$this->timestampValidationLeewayDecorator,
100100
$this->helpers(),
@@ -106,7 +106,7 @@ public function jwksFetcher(): JwksFetcher
106106
{
107107
return $this->jwksFetcher ??= new JwksFetcher(
108108
$this->httpClientDecorator,
109-
$this->jwksFactory(),
109+
$this->jwksDecoratorFactory(),
110110
$this->signedJwksFactory(),
111111
$this->maxCacheDurationDecorator,
112112
$this->helpers(),

0 commit comments

Comments
 (0)