Adopt SSP coding-style

Author: tvdijen

src/Auth/Source/Negotiate.php

@@ -8,9 +8,16 @@
 use GSSAPIChannelBinding;
 use KRB5NegotiateAuth;
 use SimpleSAML\Assert\Assert;
-use SimpleSAML\{Auth, Configuration, Error, Logger, Module, Session, Utils};
+use SimpleSAML\Auth;
+use SimpleSAML\Configuration;
+use SimpleSAML\Error;
+use SimpleSAML\Logger;
+use SimpleSAML\Module;
+use SimpleSAML\Session;
+use SimpleSAML\Utils;
 use SimpleSAML\XHTML\Template;
-use Symfony\Component\HttpFoundation\{IpUtils, Request};
+use Symfony\Component\HttpFoundation\IpUtils;
+use Symfony\Component\HttpFoundation\Request;
 
 use function array_key_exists;
 use function extension_loaded;
@@ -38,6 +45,7 @@ class Negotiate extends Auth\Source
 
     public const AUTHID = '\SimpleSAML\Module\negotiate\Auth\Source\Negotiate.AuthId';
 
+
     /** @var string|null */
     protected ?string $backend = null;
 
@@ -155,10 +163,12 @@ public function authenticate(array &$state): void
 
                 try {
                     if (version_compare(phpversion('krb5'), '1.1.6', '<')) {
-                        Logger::debug('Negotiate - authenticate(): Trying to authenticate (channel binding not available).');
+                        Logger::debug(
+                            'Negotiate - authenticate(): Trying to authenticate (channel binding not available).',
+                        );
                         $auth = new KRB5NegotiateAuth($this->keytab, $this->spn);
                         $reply = $this->doAuthentication($auth);
-                    } else if (empty($this->allowedCertificateHashes) && $this->enforceChannelBinding === false) {
+                    } elseif (empty($this->allowedCertificateHashes) && $this->enforceChannelBinding === false) {
                         Logger::debug('Negotiate - authenticate(): Trying to authenticate without channel binding.');
                         $auth = new KRB5NegotiateAuth($this->keytab, $this->spn);
                         $reply = $this->doAuthentication($auth);

src/Controller/NegotiateController.php

@@ -116,7 +116,7 @@ public function setLogger(Logger $logger): void
     /**
      * Get the metadata storage handler instance.
      *
-     * @return MetaDataStorageHandler
+     * @return \SimpleSAML\Metadata\MetaDataStorageHandler
      */
     protected function getMetadataStorageHandler(): MetaDataStorageHandler
     {
@@ -151,7 +151,7 @@ public function setModule(Module $module): void
      *
      * @param \Symfony\Component\HttpFoundation\Request $request
      * @return \SimpleSAML\XHTML\Template
-     * @throws Exception
+     * @throws \Exception
      */
     public function enable(Request $request): Template
     {
@@ -180,7 +180,7 @@ public function enable(Request $request): Template
      *
      * @param \Symfony\Component\HttpFoundation\Request $request
      * @return \SimpleSAML\XHTML\Template
-     * @throws Exception
+     * @throws \Exception
      */
     public function disable(Request $request): Template
     {
@@ -207,7 +207,7 @@ public function disable(Request $request): Template
     /**
      * Show retry
      *
-     * @param Request $request The request that lead to this retry operation.
+     * @param \Symfony\Component\HttpFoundation\Request $request The request that lead to this retry operation.
      * @return \SimpleSAML\HTTP\RunnableResponse
      * @throws \Exception
      * @throws \SimpleSAML\Error\BadRequest
@@ -244,7 +244,7 @@ public function retry(Request $request): RunnableResponse
     /**
      * Show fallback
      *
-     * @param Request $request The request that lead to this retry operation.
+     * @param \Symfony\Component\HttpFoundation\Request $request The request that lead to this retry operation.
      *
      * @return \SimpleSAML\HTTP\RunnableResponse
      * @throws \SimpleSAML\Error\BadRequest

tests/src/Controller/NegotiateControllerTest.php

@@ -26,8 +26,11 @@
 final class NegotiateControllerTest extends TestCase
 {
     protected Configuration $config;
+
     protected Logger $logger;
+
     protected Module $module;
+
     protected Session $session;
 
 
@@ -177,13 +180,12 @@ final public function __construct()
 
 
             /** @param array<mixed> $state */
-            public function authenticate(array &$state): void
             {
                 // stub
             }
 
 
-            public static function getById(string $authId, ?string $type = null): ?Source
+            public static function getById(string $authId, ?string $type = null): Source
             {
                 return new static();
             }
@@ -279,7 +281,8 @@ public function authenticate(array &$state): void
                 // stub
             }
 
-            public static function getById(string $authId, ?string $type = null): ?Source
+
+            public static function getById(string $authId, ?string $type = null): null
             {
                 return null;
             }
@@ -316,8 +319,8 @@ public function testRetryMissingState(): void
 
     /**
      * Test that a valid requests results in a RunnableResponse
-     * @throws Error\BadRequest
-     * @throws Error\NoState
+     * @throws \SimpleSAML\Error\BadRequest
+     * @throws \SimpleSAML\Error\NoState
      */
     public function testBackend(): void
     {
@@ -349,8 +352,8 @@ public static function loadState(string $id, string $stage, bool $allowMissing =
 
     /**
      * Test that a missing AuthState results in a BadRequest-error
-     * @throws Error\BadRequest
-     * @throws Error\NoState
+     * @throws \SimpleSAML\Error\BadRequest
+     * @throws \SimpleSAML\Error\NoState
      */
     public function testBackendMissingState(): void
     {