Use custom message if any was supplied; otherwise use the message raised

Author: tvdijen

src/Assert/DateTimeTrait.php

@@ -4,6 +4,7 @@
 
 namespace SimpleSAML\WebServices\Security\Assert;
 
+use SimpleSAML\Assert\AssertionFailedException;
 use SimpleSAML\WebServices\Security\Exception\ProtocolViolationException;
 
 /**
@@ -17,12 +18,15 @@ trait DateTimeTrait
      */
     protected static function validDateTime(string $value, string $message = ''): void
     {
-        parent::validDateTime($value);
-        parent::endsWith(
-            $value,
-            'Z',
-            '%s is not a DateTime expressed in the UTC timezone using the \'Z\' timezone identifier.',
-            ProtocolViolationException::class,
-        );
+        try {
+            parent::validDateTime($value);
+            parent::endsWith(
+                $value,
+                'Z',
+                '%s is not a DateTime expressed in the UTC timezone using the \'Z\' timezone identifier.',
+            );
+        } catch (AssertionFailedException $e) {
+            throw new ProtocolViolationException($message ?: $e->getMessage());
+        }
     }
 }