Newest style fixes

cicnavi · cicnavi · commit 71970aeebd6c · 2025-01-14T14:51:46.000+01:00
diff --git a/src/Federation/EntityStatementFetcher.php b/src/Federation/EntityStatementFetcher.php
@@ -7,12 +7,10 @@
 use Psr\Log\LoggerInterface;
 use SimpleSAML\OpenID\Codebooks\ClaimsEnum;
 use SimpleSAML\OpenID\Codebooks\ContentTypesEnum;
-use SimpleSAML\OpenID\Codebooks\EntityTypesEnum;
 use SimpleSAML\OpenID\Codebooks\WellKnownEnum;
 use SimpleSAML\OpenID\Decorators\DateIntervalDecorator;
 use SimpleSAML\OpenID\Exceptions\EntityStatementException;
 use SimpleSAML\OpenID\Exceptions\FetchException;
-use SimpleSAML\OpenID\Exceptions\JwsException;
 use SimpleSAML\OpenID\Federation\Factories\EntityStatementFactory;
 use SimpleSAML\OpenID\Helpers;
 use SimpleSAML\OpenID\Jws\JwsFetcher;
diff --git a/src/Federation/TrustChain.php b/src/Federation/TrustChain.php
@@ -10,7 +10,6 @@
 use SimpleSAML\OpenID\Decorators\DateIntervalDecorator;
 use SimpleSAML\OpenID\Exceptions\EntityStatementException;
 use SimpleSAML\OpenID\Exceptions\TrustChainException;
-use SimpleSAML\OpenID\Helpers;
 
 class TrustChain implements JsonSerializable
 {
diff --git a/src/Jws/AbstractJwsFetcher.php b/src/Jws/AbstractJwsFetcher.php
@@ -7,7 +7,6 @@
 use Psr\Log\LoggerInterface;
 use SimpleSAML\OpenID\Decorators\DateIntervalDecorator;
 use SimpleSAML\OpenID\Helpers;
-use SimpleSAML\OpenID\Jws\Factories\ParsedJwsFactory;
 use SimpleSAML\OpenID\Utils\ArtifactFetcher;
 
 abstract class AbstractJwsFetcher
diff --git a/tests/src/Federation/EntityStatementFetcherTest.php b/tests/src/Federation/EntityStatementFetcherTest.php
@@ -14,7 +14,6 @@
 use SimpleSAML\OpenID\Codebooks\WellKnownEnum;
 use SimpleSAML\OpenID\Decorators\DateIntervalDecorator;
 use SimpleSAML\OpenID\Exceptions\EntityStatementException;
-use SimpleSAML\OpenID\Exceptions\FetchException;
 use SimpleSAML\OpenID\Federation\EntityStatement;
 use SimpleSAML\OpenID\Federation\EntityStatementFetcher;
 use SimpleSAML\OpenID\Federation\Factories\EntityStatementFactory;
diff --git a/tests/src/Federation/EntityStatementTest.php b/tests/src/Federation/EntityStatementTest.php
@@ -11,7 +11,6 @@
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\OpenID\Decorators\DateIntervalDecorator;
-use SimpleSAML\OpenID\Exceptions\EntityStatementException;
 use SimpleSAML\OpenID\Exceptions\JwsException;
 use SimpleSAML\OpenID\Federation\EntityStatement;
 use SimpleSAML\OpenID\Federation\EntityStatement\Factories\TrustMarkClaimBagFactory;
diff --git a/tests/src/Federation/Factories/TrustChainFactoryTest.php b/tests/src/Federation/Factories/TrustChainFactoryTest.php
@@ -16,7 +16,6 @@
 use SimpleSAML\OpenID\Federation\MetadataPolicyApplicator;
 use SimpleSAML\OpenID\Federation\MetadataPolicyResolver;
 use SimpleSAML\OpenID\Federation\TrustChain;
-use SimpleSAML\OpenID\Helpers;
 
 #[CoversClass(TrustChainFactory::class)]
 #[UsesClass(TrustChain::class)]
diff --git a/tests/src/Federation/MetadataPolicyResolverTest.php b/tests/src/Federation/MetadataPolicyResolverTest.php
@@ -7,11 +7,11 @@
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\UsesClass;
 use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 use SimpleSAML\OpenID\Codebooks\EntityTypesEnum;
 use SimpleSAML\OpenID\Codebooks\MetadataPolicyOperatorsEnum;
 use SimpleSAML\OpenID\Exceptions\MetadataPolicyException;
 use SimpleSAML\OpenID\Federation\MetadataPolicyResolver;
-use PHPUnit\Framework\TestCase;
 use SimpleSAML\OpenID\Helpers;
 
 #[CoversClass(MetadataPolicyResolver::class)]
@@ -84,7 +84,7 @@ public function testForHappyFlow(): void
             EntityTypesEnum::OpenIdRelyingParty,
             [
                 $this->trustAnchorMetadataPolicySample,
-                $this->intermediateMetadataPolicySample
+                $this->intermediateMetadataPolicySample,
             ],
         );
 
@@ -98,9 +98,9 @@ public function testReturnsEmptyArrayIfEntityTypeNotPresent(): void
                 EntityTypesEnum::FederationEntity,
                 [
                     $this->trustAnchorMetadataPolicySample,
-                    $this->intermediateMetadataPolicySample
+                    $this->intermediateMetadataPolicySample,
                 ],
-            )
+            ),
         );
     }
 
diff --git a/tests/src/Federation/TrustChainResolverTest.php b/tests/src/Federation/TrustChainResolverTest.php
@@ -99,7 +99,7 @@ public function testCanGetConfigurationChains(): void
             ->method('fromCacheOrWellKnownEndpoint')
             ->willReturnCallback(
                 fn(string $entityId) =>
-                    $this->configChainSample[$entityId] ?? throw new \Exception('No entity.')
+                    $this->configChainSample[$entityId] ?? throw new \Exception('No entity.'),
             );
 
         $this->leafEntityConfigurationMock
diff --git a/tests/src/Federation/TrustChainTest.php b/tests/src/Federation/TrustChainTest.php
@@ -6,7 +6,7 @@
 
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\MockObject\MockObject;
-use SimpleSAML\OpenID\Codebooks\ClaimsEnum;
+use PHPUnit\Framework\TestCase;
 use SimpleSAML\OpenID\Codebooks\EntityTypesEnum;
 use SimpleSAML\OpenID\Decorators\DateIntervalDecorator;
 use SimpleSAML\OpenID\Exceptions\EntityStatementException;
@@ -15,7 +15,6 @@
 use SimpleSAML\OpenID\Federation\MetadataPolicyApplicator;
 use SimpleSAML\OpenID\Federation\MetadataPolicyResolver;
 use SimpleSAML\OpenID\Federation\TrustChain;
-use PHPUnit\Framework\TestCase;
 
 #[CoversClass(TrustChain::class)]
 class TrustChainTest extends TestCase
@@ -54,7 +53,7 @@ protected function setUp(): void
     protected function sut(
         ?DateIntervalDecorator $timestampValidationLeewayDecorator = null,
         ?MetadataPolicyResolver $metadataPolicyResolver = null,
-        ?MetadataPolicyApplicator $metadataPolicyApplicator = null
+        ?MetadataPolicyApplicator $metadataPolicyApplicator = null,
     ): TrustChain {
         $timestampValidationLeewayDecorator ??= $this->timestampValidationLeewayDecoratorMock;
         $metadataPolicyResolver ??= $this->metadataPolicyResolverMock;
@@ -203,7 +202,7 @@ public function testCanGetResolvedMetadata(): void
                         'helpdesk@leaf.org',
                     ],
                     'some_claim' => 'something',
-                ]
+                ],
             );
 
         $this->assertIsArray($sut->getResolvedMetadata(EntityTypesEnum::OpenIdRelyingParty));
diff --git a/tests/src/Jwks/Factories/JwksFactoryTest.php b/tests/src/Jwks/Factories/JwksFactoryTest.php
@@ -6,9 +6,9 @@
 
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\UsesClass;
+use PHPUnit\Framework\TestCase;
 use SimpleSAML\OpenID\Jwks;
 use SimpleSAML\OpenID\Jwks\Factories\JwksFactory;
-use PHPUnit\Framework\TestCase;
 use SimpleSAML\OpenID\Jwks\JwksDecorator;
 
 #[CoversClass(JwksFactory::class)]
diff --git a/tests/src/Jwks/Factories/SignedJwksFactoryTest.php b/tests/src/Jwks/Factories/SignedJwksFactoryTest.php
@@ -9,11 +9,11 @@
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\UsesClass;
 use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 use SimpleSAML\OpenID\Decorators\DateIntervalDecorator;
 use SimpleSAML\OpenID\Helpers;
 use SimpleSAML\OpenID\Jwks\Factories\JwksFactory;
 use SimpleSAML\OpenID\Jwks\Factories\SignedJwksFactory;
-use PHPUnit\Framework\TestCase;
 use SimpleSAML\OpenID\Jwks\SignedJwks;
 use SimpleSAML\OpenID\Jws\Factories\ParsedJwsFactory;
 use SimpleSAML\OpenID\Jws\JwsDecorator;
diff --git a/tests/src/Jwks/JwksDecoratorTest.php b/tests/src/Jwks/JwksDecoratorTest.php
@@ -8,9 +8,8 @@
 use Jose\Component\Core\JWKSet;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\MockObject\MockObject;
-use SimpleSAML\OpenID\Jwks;
-use SimpleSAML\OpenID\Jwks\JwksDecorator;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\OpenID\Jwks\JwksDecorator;
 
 #[CoversClass(JwksDecorator::class)]
 class JwksDecoratorTest extends TestCase
diff --git a/tests/src/Jwks/JwksFetcherTest.php b/tests/src/Jwks/JwksFetcherTest.php
@@ -4,10 +4,10 @@
 
 namespace SimpleSAML\Test\OpenID\Jwks;
 
-use HttpRequest;
 use JsonException;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\StreamInterface;
 use Psr\Log\LoggerInterface;
@@ -16,13 +16,11 @@
 use SimpleSAML\OpenID\Decorators\DateIntervalDecorator;
 use SimpleSAML\OpenID\Decorators\HttpClientDecorator;
 use SimpleSAML\OpenID\Exceptions\HttpException;
-use SimpleSAML\OpenID\Exceptions\JwksException;
 use SimpleSAML\OpenID\Helpers;
 use SimpleSAML\OpenID\Jwks\Factories\JwksFactory;
 use SimpleSAML\OpenID\Jwks\Factories\SignedJwksFactory;
 use SimpleSAML\OpenID\Jwks\JwksDecorator;
 use SimpleSAML\OpenID\Jwks\JwksFetcher;
-use PHPUnit\Framework\TestCase;
 use SimpleSAML\OpenID\Jwks\SignedJwks;
 
 #[CoversClass(JwksFetcher::class)]
diff --git a/tests/src/JwksTest.php b/tests/src/JwksTest.php
@@ -20,7 +20,6 @@
 use SimpleSAML\OpenID\Factories\DateIntervalDecoratorFactory;
 use SimpleSAML\OpenID\Factories\HttpClientDecoratorFactory;
 use SimpleSAML\OpenID\Factories\JwsSerializerManagerFactory;
-use SimpleSAML\OpenID\Helpers;
 use SimpleSAML\OpenID\Jwks;
 use SimpleSAML\OpenID\Jwks\Factories\JwksFactory;
 use SimpleSAML\OpenID\Jwks\Factories\SignedJwksFactory;
diff --git a/tests/src/Jws/JwsDecoratorTest.php b/tests/src/Jws/JwsDecoratorTest.php
@@ -6,8 +6,8 @@
 
 use Jose\Component\Signature\JWS;
 use PHPUnit\Framework\Attributes\CoversClass;
-use SimpleSAML\OpenID\Jws\JwsDecorator;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\OpenID\Jws\JwsDecorator;
 
 #[CoversClass(JwsDecorator::class)]
 class JwsDecoratorTest extends TestCase
diff --git a/tests/src/Jws/JwsFetcherTest.php b/tests/src/Jws/JwsFetcherTest.php
@@ -6,16 +6,15 @@
 
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\StreamInterface;
 use Psr\Log\LoggerInterface;
-use SimpleSAML\OpenID\Codebooks\HttpMethodsEnum;
 use SimpleSAML\OpenID\Decorators\DateIntervalDecorator;
 use SimpleSAML\OpenID\Exceptions\FetchException;
 use SimpleSAML\OpenID\Helpers;
 use SimpleSAML\OpenID\Jws\AbstractJwsFetcher;
 use SimpleSAML\OpenID\Jws\Factories\ParsedJwsFactory;
-use PHPUnit\Framework\TestCase;
 use SimpleSAML\OpenID\Jws\JwsFetcher;
 use SimpleSAML\OpenID\Jws\ParsedJws;
 use SimpleSAML\OpenID\Utils\ArtifactFetcher;
diff --git a/tests/src/Jws/JwsParserTest.php b/tests/src/Jws/JwsParserTest.php
@@ -8,10 +8,10 @@
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\UsesClass;
 use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 use SimpleSAML\OpenID\Exceptions\JwsException;
 use SimpleSAML\OpenID\Jws\JwsDecorator;
 use SimpleSAML\OpenID\Jws\JwsParser;
-use PHPUnit\Framework\TestCase;
 use SimpleSAML\OpenID\Serializers\JwsSerializerManager;
 
 #[CoversClass(JwsParser::class)]
diff --git a/tests/src/Jws/ParsedJwsTest.php b/tests/src/Jws/ParsedJwsTest.php
@@ -4,19 +4,18 @@
 
 namespace SimpleSAML\Test\OpenID\Jws;
 
-use DateInterval;
 use Jose\Component\Signature\JWS;
 use Jose\Component\Signature\Signature;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 use SimpleSAML\OpenID\Decorators\DateIntervalDecorator;
 use SimpleSAML\OpenID\Exceptions\JwsException;
 use SimpleSAML\OpenID\Helpers;
 use SimpleSAML\OpenID\Jwks\Factories\JwksFactory;
 use SimpleSAML\OpenID\Jws\JwsDecorator;
 use SimpleSAML\OpenID\Jws\JwsVerifier;
 use SimpleSAML\OpenID\Jws\ParsedJws;
-use PHPUnit\Framework\TestCase;
 use SimpleSAML\OpenID\Serializers\JwsSerializerManager;
 
 #[CoversClass(ParsedJws::class)]
diff --git a/tests/src/Utils/ArtifactFetcherTest.php b/tests/src/Utils/ArtifactFetcherTest.php
@@ -6,6 +6,7 @@
 
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\StreamInterface;
 use Psr\Log\LoggerInterface;
@@ -14,7 +15,6 @@
 use SimpleSAML\OpenID\Decorators\HttpClientDecorator;
 use SimpleSAML\OpenID\Exceptions\FetchException;
 use SimpleSAML\OpenID\Utils\ArtifactFetcher;
-use PHPUnit\Framework\TestCase;
 
 #[CoversClass(ArtifactFetcher::class)]
 class ArtifactFetcherTest extends TestCase

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@`
`10`	`10`	`use SimpleSAML\OpenID\Decorators\DateIntervalDecorator;`
`11`	`11`	`use SimpleSAML\OpenID\Exceptions\EntityStatementException;`
`12`	`12`	`use SimpleSAML\OpenID\Exceptions\TrustChainException;`
`13`		`-use SimpleSAML\OpenID\Helpers;`
`14`	`13`
`15`	`14`	`class TrustChain implements JsonSerializable`
`16`	`15`	`{`