Fix Psalm-issues

Author: tvdijen

psalm-dev.xml

@@ -21,6 +21,7 @@
         <UnresolvableInclude>
             <errorLevel type="suppress">
                 <file name="tests/bootstrap.php" />
+                <file name="tests/routers/configLoader.php" />
             </errorLevel>
         </UnresolvableInclude>
     </issueHandlers>

psalm.xml

@@ -6,9 +6,9 @@
     reportMixedIssues="false"
 >
     <projectFiles>
-        <directory name="config-templates" />
+        <directory name="config" />
+        <directory name="public" />
         <directory name="src" />
-        <directory name="www" />
     </projectFiles>
 
     <issueHandlers>

src/Cas/Protocol/SamlValidateResponder.php

@@ -64,7 +64,7 @@ public function convertToSaml(array $ticket): Chunk
 
     /**
      * @param \SimpleSAML\XML\SerializableElementInterface $samlResponse
-     * @return \SimpleSAML\XML\SOAP11\XML\env\Envelope
+     * @return \SimpleSAML\SOAP11\XML\env\Envelope
      */
     public function wrapInSoap(SerializableElementInterface $samlResponse): Envelope
     {

tests/public/LoginIntegrationTest.php

@@ -4,6 +4,7 @@
 
 namespace SimpleSAML\Casserver;
 
+use CurlHandle;
 use DOMDocument;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Configuration;
@@ -452,10 +453,10 @@ private function authenticate(): void
 
     /**
      * TODO: migrate into BuiltInServer
-     * @param resource $ch
+     * @param \CurlHandle $ch
      * @return array
      */
-    private function execAndHandleCurlResponse($ch): array
+    private function execAndHandleCurlResponse(CurlHandle $ch): array
     {
         $resp = curl_exec($ch);
         if ($resp === false) {

tests/src/Cas/Protocol/SamlValidateTest.php

@@ -47,7 +47,7 @@ public function testSamlValidatXmlGeneration(): void
 
         $asSoap = $samlValidate->wrapInSoap($xmlString);
 
-        $this->assertInstanceOf($asSoap, Envelope::class);
+        $this->assertInstanceOf(Envelope::class, $asSoap);
         $this->assertNull($asSoap->getHeader());
         $this->assertNotEmpty($asSoap->getBody());
     }