Fix phpstan issues

Author: johanib

ci/qa/phpstan-baseline.neon

@@ -8,9 +8,8 @@
     ->withPaths([
          __DIR__ . '/../../src',
     ])
-    ->withPhpSets()
     ->withAttributesSets(all: true)
     ->withComposerBased(phpunit: true, symfony: true)
-    ->withTypeCoverageLevel(0)
+    ->withTypeCoverageLevel(10)
     ->withDeadCodeLevel(0)
     ->withCodeQualityLevel(0);

ci/qa/rector.php

@@ -158,9 +158,7 @@ private function parseRemoteConfiguration(array $remoteConfiguration, ContainerB
         if (!empty($remoteConfiguration['identity_provider']['enabled'])) {
             $definition = $this->parseRemoteIdentityProviderConfiguration($remoteConfiguration['identity_provider']);
 
-            if ($definition !== null) {
-                $container->setDefinition('surfnet_saml.remote.idp', $definition);
-            }
+            $container->setDefinition('surfnet_saml.remote.idp', $definition);
         }
     }
 

src/DependencyInjection/SurfnetSamlExtension.php

@@ -42,7 +42,7 @@
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 
 /**
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings("PHPMD.CouplingBetweenObjects")
  */
 class PostBinding implements HttpBinding
 {

src/Http/PostBinding.php

@@ -28,12 +28,15 @@ final class ReceivedAuthnRequestPost implements SignatureVerifiable
     public const PARAMETER_REQUEST = 'SAMLRequest';
     public const PARAMETER_RELAY_STATE = 'RelayState';
 
-    private ?string $relayState;
+    private ?string $relayState = null;
 
     private ?ReceivedAuthnRequest $receivedRequest = null;
 
-    private function __construct(private readonly string $samlRequest)
+    private readonly string $samlRequest;
+
+    private function __construct(string $samlRequest)
     {
+        $this->samlRequest = $samlRequest;
     }
 
     public static function parse(array $parameters): self
@@ -62,7 +65,7 @@ public function hasRelayState(): bool
         return $this->relayState !== null;
     }
 
-    public function getDecodedSamlRequest(): string|bool
+    public function getDecodedSamlRequest(): string
     {
         return base64_decode($this->samlRequest);
     }

src/Http/ReceivedAuthnRequestPost.php

@@ -49,8 +49,8 @@ private function __construct(private readonly string $samlRequest)
     }
 
     /**
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity) Extensive validation
-     * @SuppressWarnings(PHPMD.NPathComplexity) Extensive validation
+     * @SuppressWarnings("PHPMD.CyclomaticComplexity") Extensive validation
+     * @SuppressWarnings("PHPMD.NPathComplexity") Extensive validation
      */
     public static function parse(string $query): ReceivedAuthnRequestQueryString
     {
@@ -211,7 +211,7 @@ public function getSamlRequest(): string
         return $this->samlRequest;
     }
 
-    public function getSignatureAlgorithm(): ?string
+    public function getSignatureAlgorithm(): string
     {
         return urldecode($this->signatureAlgorithm);
     }

src/Http/ReceivedAuthnRequestQueryString.php

@@ -32,7 +32,7 @@
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 
 /**
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects) - not much we can do about it
+ * @SuppressWarnings("PHPMD.CouplingBetweenObjects") - not much we can do about it
  * @see https://www.pivotaltracker.com/story/show/83028366
  */
 class RedirectBinding implements HttpBinding
@@ -71,7 +71,7 @@ public function receiveUnsignedAuthnRequestFrom(Request $request): ReceivedAuthn
     }
 
     /**
-     * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @SuppressWarnings("PHPMD.NPathComplexity")
      */
     public function receiveSignedAuthnRequestFrom(Request $request): ReceivedAuthnRequest
     {

src/Http/RedirectBinding.php

@@ -72,10 +72,7 @@ private function buildMetadata(): Metadata
             $metadata->hasSpMetadata = true;
             $metadata->assertionConsumerUrl = $this->getUrl($metadataConfiguration->assertionConsumerRoute);
 
-            if ($metadataConfiguration->spCertificate &&
-                $metadataConfiguration->spCertificate !== '' &&
-                $metadataConfiguration->spCertificate !== '0'
-            ) {
+            if ($metadataConfiguration->spCertificate) {
                 $metadata->spCertificate = $this->getCertificateData($metadataConfiguration->spCertificate);
             }
         }
@@ -84,10 +81,7 @@ private function buildMetadata(): Metadata
             $metadata->hasIdPMetadata = true;
             $metadata->ssoUrl = $this->getUrl($metadataConfiguration->ssoRoute);
 
-            if ($metadataConfiguration->idpCertificate &&
-                $metadataConfiguration->idpCertificate !== '' &&
-                $metadataConfiguration->idpCertificate !== '0'
-            ) {
+            if ($metadataConfiguration->idpCertificate) {
                 $certificate = $this->getCertificateData($metadataConfiguration->idpCertificate);
             } else {
                 $certificate = $this->getCertificateData($metadataConfiguration->publicKey);

src/Metadata/MetadataFactory.php

@@ -25,7 +25,7 @@
 /**
  * Decorates a PSR logger and adds information pertaining to a SAML request procedure to each message's context.
  *
- * @SuppressWarnings(PHPMD.TooManyPublicMethods)
+ * @SuppressWarnings("PHPMD.TooManyPublicMethods")
  */
 final class SamlAuthenticationLogger implements LoggerInterface
 {

src/Monolog/SamlAuthenticationLogger.php

@@ -107,7 +107,7 @@ public function getAttributeDefinition(string $attributeName): AttributeDefiniti
 
     public function findAttributeDefinitionByUrn(string $urn): ?AttributeDefinition
     {
-        if (!is_string($urn) || $urn === '') {
+        if ($urn === '') {
             throw InvalidArgumentException::invalidType('non-empty string', $urn, 'urn');
         }