Fix unit tests

Author: tvdijen

src/Cas/Protocol/Cas20.php

@@ -117,9 +117,9 @@ public function getProxyGrantingTicketIOU(): ?string
 
     /**
      * @param string $username
-     * @return \SimpleSAML\CAS\XML\cas\AuthenticationSuccess
+     * @return \SimpleSAML\CAS\XML\cas\ServiceResponse
      */
-    public function getValidateSuccessResponse(string $username): AuthenticationSuccess
+    public function getValidateSuccessResponse(string $username): ServiceResponse
     {
         $user = new User($username);
 
@@ -157,9 +157,10 @@ public function getValidateSuccessResponse(string $username): AuthenticationSucc
             $attr,
         );
 
-        $authenticationSucces = new AuthenticationSuccess($user, $attributes, $proxyGrantingTicket);
+        $authenticationSuccess = new AuthenticationSuccess($user, $attributes, $proxyGrantingTicket);
+        $serviceResponse = new ServiceResponse($authenticationSuccess);
 
-        return $authenticationSucces;
+        return $serviceResponse;
     }
 
 
@@ -217,8 +218,7 @@ private function generateCas20Attribute(
         $xmlDocument = DOMDocumentFactory::create();
 
         $attributeValue = $this->base64EncodeAttributes ? base64_encode($attributeValue) : $attributeValue;
-        $attributeElement = $xmlDocument->createElement('cas:' . $attributeName);
-        $attributeElement->appendChild($attributeValueNode);
+        $attributeElement = $xmlDocument->createElementNS(Attributes::NS, 'cas:' . $attributeName, $attributeValue);
 
         return new Chunk($attributeElement);
     }
@@ -242,6 +242,6 @@ private function isValidXmlName(string $name): bool
             $name,
             FILTER_VALIDATE_REGEXP,
             ['options' => ['regexp' => '/^[a-zA-Z_][\w.-]*$/']],
-        ) === true;
+        ) !== false;
     }
 }

tests/bootstrap.php

@@ -16,6 +16,13 @@
 /** @psalm-suppress UnresolvableInclude */
 require_once($projectRootDirectory . '/vendor/autoload.php');
 
+// Symlink module into ssp vendor lib so that templates and urls can resolve correctly
+$linkPath = $projectRootDirectory . '/vendor/simplesamlphp/simplesamlphp/modules/casserver';
+if (file_exists($linkPath) === false) {
+    echo "Linking '$linkPath' to '$projectRootDirectory'\n";
+    symlink($projectRootDirectory, $linkPath);
+}
+
 /**
  * Sets a link in the simplesamlphp vendor directory
  * @param string $target

tests/resources/xml/testAttributeToXmlConversion.xml

@@ -2,6 +2,9 @@
   <cas:authenticationSuccess>
     <cas:user>myUser</cas:user>
     <cas:attributes>
+      <cas:authenticationDate>2024-07-16T22:31:00Z</cas:authenticationDate>
+      <cas:longTermAuthenticationRequestTokenUsed>true</cas:longTermAuthenticationRequestTokenUsed>
+      <cas:isFromNewLogin>true</cas:isFromNewLogin>
       <cas:lastName>lasty</cas:lastName>
       <cas:valuesAreEscaped>&gt;abc&lt;blah&gt;</cas:valuesAreEscaped>
       <cas:urn_oid_0.9.2342.19200300.100.1.1>someValue</cas:urn_oid_0.9.2342.19200300.100.1.1>

tests/src/Cas/Protocol/Cas20Test.php

@@ -54,6 +54,6 @@ public function testAttributeToXmlConversion(): void
 
         $xml = $casProtocol->getValidateSuccessResponse('myUser');
 
-        $this->assertEquals($this->document->saveXML(), $xml);
+        $this->assertEquals($this->document->saveXML($this->document->documentElement), strval($xml));
     }
 }

tests/src/Ticket/DelegatingTicketStoreTest.php

@@ -35,7 +35,7 @@ class DelegatingTicketStoreTest extends TestCase
 
     /**
      */
-    public function setup(): void
+    public function setUp(): void
     {
         parent::setUp();