Apply codestyles regarding imports

Prior to this change, consistent import style was not enforced.

This change applies the phpcs rules for clean imports (no fqn, sorted, no unused).

Author: johanib

ci/qa/phpcbf

@@ -3,4 +3,4 @@
 cd $(dirname $0)/../../
 
 # https://github.com/squizlabs/PHP_CodeSniffer/wiki/Fixing-Errors-Automatically
-./vendor/bin/phpcbf --standard=ci/qa/phpcs.xml ./src $1
+./vendor/bin/phpcbf --standard=ci/qa/phpcs.xml ./src ./tests $1

ci/qa/phpcs

@@ -3,4 +3,4 @@
 cd $(dirname $0)/../../
 
 # https://github.com/squizlabs/PHP_CodeSniffer/wiki/Usage
-./vendor/bin/phpcs --standard=./ci/qa/phpcs.xml --report=full --warning-severity=0 ./src
+./vendor/bin/phpcs --standard=./ci/qa/phpcs.xml --report=full --warning-severity=0 ./src ./tests

ci/qa/phpcs.xml

@@ -5,9 +5,6 @@
         By default it is less stringent about long lines than other coding standards
     </description>
 
-    <exclude-pattern>src/*/*Bundle/Resources</exclude-pattern>
-    <exclude-pattern>src/*/Bundle/*Bundle/Resources</exclude-pattern>
-
     <!-- This is the rule we inherit from. If you want to exclude some specific rules, see the docs on how to do that -->
     <rule ref="PSR2"/>
 
@@ -19,5 +16,13 @@
         </properties>
     </rule>
 
+    <rule ref="SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly"/>
+    <rule ref="SlevomatCodingStandard.Namespaces.UnusedUses">
+        <properties>
+            <property name="searchAnnotations" type="bool" value="true"/>
+        </properties>
+    </rule>
+    <rule ref="SlevomatCodingStandard.Namespaces.AlphabeticallySortedUses"/>
+
     <rule ref="vendor/slevomat/coding-standard/SlevomatCodingStandard/Sniffs/TypeHints/DeclareStrictTypesSniff.php" />
 </ruleset>

config/reference.php

@@ -1279,18 +1279,6 @@
  *         surfnet_gssp?: SurfnetGsspConfig,
  *         webpack_encore?: WebpackEncoreConfig,
  *     },
- *     "when@smoketest"?: array{
- *         imports?: ImportsConfig,
- *         parameters?: ParametersConfig,
- *         services?: ServicesConfig,
- *         framework?: FrameworkConfig,
- *         monolog?: MonologConfig,
- *         twig?: TwigConfig,
- *         security?: SecurityConfig,
- *         surfnet_saml?: SurfnetSamlConfig,
- *         surfnet_gssp?: SurfnetGsspConfig,
- *         webpack_encore?: WebpackEncoreConfig,
- *     },
  *     "when@test"?: array{
  *         imports?: ImportsConfig,
  *         parameters?: ParametersConfig,
@@ -1385,7 +1373,6 @@ public static function config(array $config): array
  * @psalm-type RoutesConfig = array{
  *     "when@dev"?: array<string, RouteConfig|ImportConfig|AliasConfig>,
  *     "when@prod"?: array<string, RouteConfig|ImportConfig|AliasConfig>,
- *     "when@smoketest"?: array<string, RouteConfig|ImportConfig|AliasConfig>,
  *     "when@test"?: array<string, RouteConfig|ImportConfig|AliasConfig>,
  *     ...<string, RouteConfig|ImportConfig|AliasConfig>
  * }

tests/Functional/Features/Context/ErrorReportContext.php

@@ -26,6 +26,8 @@
 use Behat\Behat\Hook\Scope\StepScope;
 use Behat\Gherkin\Node\NodeInterface;
 use Behat\Gherkin\Node\ScenarioInterface;
+use Behat\Hook\AfterStep;
+use Behat\Hook\BeforeScenario;
 use Behat\Mink\Driver\Selenium2Driver;
 use Behat\Mink\Exception\DriverException;
 use Behat\MinkExtension\Context\MinkContext;
@@ -38,14 +40,14 @@ final class ErrorReportContext implements Context
 {
     private MinkContext $minkContext;
 
-    #[\Behat\Hook\BeforeScenario]
+    #[BeforeScenario]
     public function gatherContexts(BeforeScenarioScope $scope): void
     {
         $environment = $scope->getEnvironment();
         $this->minkContext = $environment->getContext(MinkContext::class);
     }
 
-    #[\Behat\Hook\AfterStep]
+    #[AfterStep]
     public function dumpInfoAfterFailedStep(AfterStepScope $scope): void
     {
         if ($this->stepIsSuccessful($scope)) {

tests/Functional/Features/Context/WebContext.php

@@ -20,10 +20,10 @@
 
 namespace Surfnet\Gssp\Test\Features\Context;
 
+use Behat\Behat\Context\Context;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Behat\Hook\BeforeScenario;
 use Behat\MinkExtension\Context\MinkContext;
-use Behat\Behat\Context\Context;
 use Behat\Step\Given;
 use Behat\Step\When;
 use Exception;
@@ -36,6 +36,7 @@
 use Surfnet\SamlBundle\Entity\IdentityProvider;
 use Surfnet\SamlBundle\Entity\ServiceProvider;
 use Surfnet\SamlBundle\Exception\NotFound;
+use Surfnet\SamlBundle\SAML2\AuthnRequest as SamlBundleAuthnRequest;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpKernel\KernelInterface;
@@ -116,7 +117,7 @@ public function aNormalSAMLAuthnRequestFormAUnknownServiceProvider(): void
             self::loadPrivateKey($this->getIdentityProvider()->getPrivateKey(PrivateKey::NAME_DEFAULT))
         );
 
-        $request = \Surfnet\SamlBundle\SAML2\AuthnRequest::createNew($authnRequest);
+        $request = SamlBundleAuthnRequest::createNew($authnRequest);
         $query = $request->buildRequestQuery();
         $this->minkContext->visitPath('/saml/sso?' . $query);
     }