Coding standards: Add AlphabeticallySortedUses

johanib · johanib · commit ccbd8eccfd8a · 2025-11-11T15:37:09.000+01:00
diff --git a/ci/qa/phpcs.xml b/ci/qa/phpcs.xml
@@ -24,4 +24,5 @@
 
   <rule ref="SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly"/>
   <rule ref="SlevomatCodingStandard.Namespaces.UnusedUses"/>
+  <rule ref="SlevomatCodingStandard.Namespaces.AlphabeticallySortedUses"/>
 </ruleset>
diff --git a/src/DependencyInjection/SurfnetSamlExtension.php b/src/DependencyInjection/SurfnetSamlExtension.php
@@ -24,11 +24,11 @@
 use Surfnet\SamlBundle\Entity\StaticServiceProviderRepository;
 use Surfnet\SamlBundle\Exception\SamlInvalidConfigurationException;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Component\DependencyInjection\Loader;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use function array_key_exists;
 
 class SurfnetSamlExtension extends Extension
diff --git a/src/Metadata/MetadataFactory.php b/src/Metadata/MetadataFactory.php
@@ -21,11 +21,11 @@
 use SAML2\DOMDocumentFactory;
 use SAML2\Utilities\Certificate;
 use SAML2\Utilities\File;
+use Surfnet\SamlBundle\Exception\RuntimeException;
 use Surfnet\SamlBundle\Service\SigningService;
 use Surfnet\SamlBundle\Signing\KeyPair;
 use Symfony\Component\Routing\RouterInterface;
 use Twig\Environment;
-use Surfnet\SamlBundle\Exception\RuntimeException;
 
 class MetadataFactory
 {
diff --git a/src/Tests/Bootstrap.php b/src/Tests/Bootstrap.php
@@ -17,8 +17,8 @@
  */
 
 use Psr\Log\NullLogger;
-use Surfnet\SamlBundle\Tests\TestSaml2Container;
 use SAML2\Compat\ContainerSingleton;
+use Surfnet\SamlBundle\Tests\TestSaml2Container;
 
 require_once __DIR__ . '/../../vendor/autoload.php';
 
diff --git a/src/Tests/Component/Metadata/MetadataFactoryTest.php b/src/Tests/Component/Metadata/MetadataFactoryTest.php
@@ -18,6 +18,7 @@
 
 namespace Surfnet\SamlBundle\Tests\Component\Metadata;
 
+use DOMDocument;
 use Mockery as m;
 use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 use PHPUnit\Framework\TestCase;
@@ -28,10 +29,9 @@
 use Surfnet\SamlBundle\Service\SigningService;
 use Surfnet\SamlBundle\Signing\Signable;
 use Symfony\Component\Routing\RouterInterface;
-use Twig\Loader\ArrayLoader;
 use Twig\Environment;
+use Twig\Loader\ArrayLoader;
 use function dirname;
-use DOMDocument;
 
 class MetadataFactoryTest extends TestCase
 {
diff --git a/src/Tests/Component/Signing/AuthnRequestSigningTest.php b/src/Tests/Component/Signing/AuthnRequestSigningTest.php
@@ -18,6 +18,8 @@
 
 namespace Surfnet\SamlBundle\Tests\Component\Signing;
 
+use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\NullLogger;
 use RobRichards\XMLSecLibs\XMLSecurityKey;
@@ -28,8 +30,6 @@
 use Surfnet\SamlBundle\Http\ReceivedAuthnRequestQueryString;
 use Surfnet\SamlBundle\SAML2\AuthnRequest;
 use Surfnet\SamlBundle\Signing\SignatureVerifier;
-use PHPUnit\Framework\Attributes\Test;
-use PHPUnit\Framework\Attributes\Group;
 
 class AuthnRequestSigningTest extends TestCase
 {
diff --git a/src/Tests/TestSaml2Container.php b/src/Tests/TestSaml2Container.php
@@ -19,8 +19,8 @@
 namespace Surfnet\SamlBundle\Tests;
 
 use BadMethodCallException;
-use SAML2\Compat\AbstractContainer;
 use Psr\Log\LoggerInterface;
+use SAML2\Compat\AbstractContainer;
 
 class TestSaml2Container extends AbstractContainer
 {
diff --git a/src/Tests/Unit/Http/HttpBindingFactoryTest.php b/src/Tests/Unit/Http/HttpBindingFactoryTest.php
@@ -20,14 +20,14 @@
 
 use Mockery;
 use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
+use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Surfnet\SamlBundle\Exception\InvalidArgumentException;
 use Surfnet\SamlBundle\Http\HttpBindingFactory;
 use Surfnet\SamlBundle\Http\PostBinding;
 use Surfnet\SamlBundle\Http\RedirectBinding;
 use Symfony\Component\HttpFoundation\Request;
-use PHPUnit\Framework\Attributes\Test;
-use PHPUnit\Framework\Attributes\Group;
 
 class HttpBindingFactoryTest extends TestCase
 {
diff --git a/src/Tests/Unit/Http/RedirectBindingTest.php b/src/Tests/Unit/Http/RedirectBindingTest.php
@@ -20,6 +20,9 @@
 
 use Mockery as m;
 use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use SAML2\Compat\ContainerSingleton;
 use SAML2\Compat\MockContainer;
@@ -34,9 +37,6 @@
 use Surfnet\SamlBundle\Signing\SignatureVerifier;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
-use PHPUnit\Framework\Attributes\Test;
-use PHPUnit\Framework\Attributes\DataProvider;
-use PHPUnit\Framework\Attributes\Group;
 
 class RedirectBindingTest extends TestCase
 {
diff --git a/src/Tests/Unit/Metadata/MetadataFactoryTest.php b/src/Tests/Unit/Metadata/MetadataFactoryTest.php
@@ -20,8 +20,8 @@
 
 use PHPUnit\Framework\TestCase;
 use ReflectionMethod;
-use Surfnet\SamlBundle\Metadata\MetadataFactory;
 use RuntimeException;
+use Surfnet\SamlBundle\Metadata\MetadataFactory;
 
 class MetadataFactoryTest extends TestCase
 {
diff --git a/src/Tests/Unit/Monolog/SamlAuthenticationLoggerTest.php b/src/Tests/Unit/Monolog/SamlAuthenticationLoggerTest.php
@@ -20,10 +20,10 @@
 
 use Mockery as m;
 use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
 use Surfnet\SamlBundle\Monolog\SamlAuthenticationLogger;
-use PHPUnit\Framework\Attributes\Test;
 
 final class SamlAuthenticationLoggerTest extends TestCase
 {
diff --git a/src/Tests/Unit/SAML2/Attribute/AttributeDictionaryTest.php b/src/Tests/Unit/SAML2/Attribute/AttributeDictionaryTest.php
@@ -18,12 +18,12 @@
 
 namespace Surfnet\SamlBundle\Tests\Unit\SAML2\Attribute;
 
+use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Surfnet\SamlBundle\Exception\UnknownUrnException;
 use Surfnet\SamlBundle\SAML2\Attribute\AttributeDefinition;
 use Surfnet\SamlBundle\SAML2\Attribute\AttributeDictionary;
-use PHPUnit\Framework\Attributes\Test;
-use PHPUnit\Framework\Attributes\Group;
 
 class AttributeDictionaryTest extends TestCase
 {
diff --git a/src/Tests/Unit/SAML2/Attribute/ConfigurableAttributeSetFactoryTest.php b/src/Tests/Unit/SAML2/Attribute/ConfigurableAttributeSetFactoryTest.php
@@ -18,6 +18,9 @@
 
 namespace Surfnet\SamlBundle\Tests\Unit\SAML2\Attribute;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use SAML2\Assertion;
 use SAML2\Compat\ContainerSingleton;
@@ -27,9 +30,6 @@
 use Surfnet\SamlBundle\SAML2\Attribute\AttributeDictionary;
 use Surfnet\SamlBundle\SAML2\Attribute\AttributeSet;
 use Surfnet\SamlBundle\SAML2\Attribute\ConfigurableAttributeSetFactory;
-use PHPUnit\Framework\Attributes\Test;
-use PHPUnit\Framework\Attributes\Group;
-use PHPUnit\Framework\Attributes\DataProvider;
 
 class ConfigurableAttributeSetFactoryTest extends TestCase
 {
diff --git a/src/Tests/Unit/SAML2/AuthnRequestFactoryTest.php b/src/Tests/Unit/SAML2/AuthnRequestFactoryTest.php
@@ -20,6 +20,8 @@
 
 use Mockery as m;
 use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
+use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use SAML2\Configuration\PrivateKey;
 use Surfnet\SamlBundle\Entity\IdentityProvider;
@@ -28,8 +30,6 @@
 use Surfnet\SamlBundle\SAML2\AuthnRequest;
 use Surfnet\SamlBundle\SAML2\AuthnRequestFactory;
 use Symfony\Component\HttpFoundation\Request;
-use PHPUnit\Framework\Attributes\Test;
-use PHPUnit\Framework\Attributes\Group;
 
 class AuthnRequestFactoryTest extends TestCase
 {
diff --git a/src/Tests/Unit/SAML2/AuthnRequestTest.php b/src/Tests/Unit/SAML2/AuthnRequestTest.php
@@ -18,14 +18,14 @@
 
 namespace Surfnet\SamlBundle\Tests\Unit\SAML2;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use SAML2\AuthnRequest as SAML2AuthnRequest;
 use SAML2\DOMDocumentFactory;
 use SAML2\XML\saml\NameID;
 use Surfnet\SamlBundle\SAML2\AuthnRequest;
-use PHPUnit\Framework\Attributes\Test;
-use PHPUnit\Framework\Attributes\DataProvider;
-use PHPUnit\Framework\Attributes\Group;
 
 class AuthnRequestTest extends TestCase
 {
diff --git a/src/Tests/Unit/SAML2/ReceivedAuthnRequestPostTest.php b/src/Tests/Unit/SAML2/ReceivedAuthnRequestPostTest.php
@@ -18,10 +18,10 @@
 
 namespace Tests\Unit\SAML2;
 
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use Surfnet\SamlBundle\Http\Exception\InvalidRequestException;
 use Surfnet\SamlBundle\Http\ReceivedAuthnRequestPost;
-use PHPUnit\Framework\Attributes\Test;
 
 class ReceivedAuthnRequestPostTest extends TestCase
 {
diff --git a/src/Tests/Unit/SAML2/ReceivedAuthnRequestQueryStringTest.php b/src/Tests/Unit/SAML2/ReceivedAuthnRequestQueryStringTest.php
@@ -18,16 +18,16 @@
 
 namespace Tests\Unit\SAML2;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use SAML2\AuthnRequest as SAML2AuthnRequest;
 use SAML2\DOMDocumentFactory;
 use stdClass;
 use Surfnet\SamlBundle\Http\Exception\InvalidReceivedAuthnRequestQueryStringException;
 use Surfnet\SamlBundle\Http\Exception\InvalidRequestException;
 use Surfnet\SamlBundle\Http\ReceivedAuthnRequestQueryString;
-use PHPUnit\Framework\Attributes\Test;
-use PHPUnit\Framework\Attributes\DataProvider;
-use PHPUnit\Framework\Attributes\Group;
 
 class ReceivedAuthnRequestQueryStringTest extends TestCase
 {
diff --git a/src/Tests/Unit/SAML2/Response/Assertion/AssertionAdapterTest.php b/src/Tests/Unit/SAML2/Response/Assertion/AssertionAdapterTest.php
@@ -20,15 +20,15 @@
 
 use Mockery as m;
 use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
+use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use SAML2\Assertion;
 use Surfnet\SamlBundle\Exception\UnknownUrnException;
 use Surfnet\SamlBundle\SAML2\Attribute\Attribute;
 use Surfnet\SamlBundle\SAML2\Attribute\AttributeDefinition;
 use Surfnet\SamlBundle\SAML2\Attribute\AttributeDictionary;
 use Surfnet\SamlBundle\SAML2\Response\AssertionAdapter;
-use PHPUnit\Framework\Attributes\Test;
-use PHPUnit\Framework\Attributes\Group;
 
 class AssertionAdapterTest extends TestCase
 {
diff --git a/src/Tests/Unit/SAML2/Response/Assertion/InResponseToTest.php b/src/Tests/Unit/SAML2/Response/Assertion/InResponseToTest.php
@@ -18,16 +18,16 @@
 
 namespace Surfnet\SamlBundle\Tests\Unit\SAML2\Response\Assertion;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use SAML2\Assertion;
 use SAML2\Compat\ContainerSingleton;
 use SAML2\Compat\MockContainer;
 use SAML2\XML\saml\SubjectConfirmation;
 use SAML2\XML\saml\SubjectConfirmationData;
 use Surfnet\SamlBundle\SAML2\Response\Assertion\InResponseTo;
-use PHPUnit\Framework\Attributes\Test;
-use PHPUnit\Framework\Attributes\DataProvider;
-use PHPUnit\Framework\Attributes\Group;
 
 class InResponseToTest extends TestCase
 {
diff --git a/src/Tests/Unit/Security/SamlAuthenticatorTest.php b/src/Tests/Unit/Security/SamlAuthenticatorTest.php
@@ -21,20 +21,21 @@
 use Generator;
 use Mockery;
 use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
 use SAML2\Assertion;
 use SAML2\Configuration\PrivateKey;
-use Surfnet\SamlBundle\Security\Authentication\Handler\FailureHandler;
-use Surfnet\SamlBundle\Security\Authentication\Handler\SuccessHandler;
-use Surfnet\SamlBundle\Security\Authentication\Passport\Badge\SamlAttributesBadge;
-use Surfnet\SamlBundle\Security\Authentication\SamlAuthenticationStateHandler;
-use Surfnet\SamlBundle\Security\Authentication\SamlAuthenticator;
-use Psr\Log\LoggerInterface;
 use Surfnet\SamlBundle\Entity\IdentityProvider;
 use Surfnet\SamlBundle\Entity\ServiceProvider;
 use Surfnet\SamlBundle\Http\RedirectBinding;
+use Surfnet\SamlBundle\Security\Authentication\Handler\FailureHandler;
 use Surfnet\SamlBundle\Security\Authentication\Handler\ProcessSamlAuthenticationHandler;
+use Surfnet\SamlBundle\Security\Authentication\Handler\SuccessHandler;
+use Surfnet\SamlBundle\Security\Authentication\Passport\Badge\SamlAttributesBadge;
 use Surfnet\SamlBundle\Security\Authentication\Provider\SamlProviderInterface;
+use Surfnet\SamlBundle\Security\Authentication\SamlAuthenticationStateHandler;
+use Surfnet\SamlBundle\Security\Authentication\SamlAuthenticator;
 use Surfnet\SamlBundle\Security\Authentication\Token\SamlToken;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
@@ -48,7 +49,6 @@
 use Symfony\Component\Security\Http\Authenticator\Passport\Badge\BadgeInterface;
 use Symfony\Component\Security\Http\Authenticator\Passport\Badge\UserBadge;
 use Symfony\Component\Security\Http\Authenticator\Passport\SelfValidatingPassport;
-use PHPUnit\Framework\Attributes\DataProvider;
 
 class SamlAuthenticatorTest extends TestCase
 {

Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@`
`19`	`19`	`namespace Surfnet\SamlBundle\Tests;`
`20`	`20`
`21`	`21`	`use BadMethodCallException;`
`22`		`-use SAML2\Compat\AbstractContainer;`
`23`	`22`	`use Psr\Log\LoggerInterface;`
	`23`	`+use SAML2\Compat\AbstractContainer;`
`24`	`24`
`25`	`25`	`class TestSaml2Container extends AbstractContainer`
`26`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,8 @@`
`20`	`20`
`21`	`21`	`use PHPUnit\Framework\TestCase;`
`22`	`22`	`use ReflectionMethod;`
`23`		`-use Surfnet\SamlBundle\Metadata\MetadataFactory;`
`24`	`23`	`use RuntimeException;`
	`24`	`+use Surfnet\SamlBundle\Metadata\MetadataFactory;`
`25`	`25`
`26`	`26`	`class MetadataFactoryTest extends TestCase`
`27`	`27`	`{`