Improve error messages

Author: tvdijen

src/XML/SignableElementTrait.php

@@ -85,7 +85,7 @@ public function sign(
                 C::C14N_EXCLUSIVE_WITH_COMMENTS,
                 C::C14N_EXCLUSIVE_WITHOUT_COMMENTS,
             ],
-            'Unsupported canonicalization algorithm',
+            'Unsupported canonicalization algorithm: %s',
             UnsupportedAlgorithmException::class,
         );
         $this->c14nAlg = $canonicalizationAlg;

src/XML/ds/CanonicalizationMethod.php

@@ -64,7 +64,7 @@ private function setAlgorithm(string $algorithm): void
                 C::C14N_INCLUSIVE_WITH_COMMENTS,
                 C::C14N_INCLUSIVE_WITHOUT_COMMENTS,
             ],
-            'Invalid canonicalization method',
+            'Invalid canonicalization method: %s',
             InvalidArgumentException::class,
         );
 

src/XML/ds/DigestMethod.php

@@ -67,7 +67,7 @@ private function setAlgorithm(string $algorithm): void
         Assert::oneOf(
             $algorithm,
             array_keys(C::$DIGEST_ALGORITHMS),
-            'Invalid digest method',
+            'Invalid digest method: %s',
             InvalidArgumentException::class,
         );
 

src/XML/ds/SignatureMethod.php

@@ -62,7 +62,7 @@ private function setAlgorithm(string $algorithm): void
                 array_keys(C::$RSA_DIGESTS),
                 array_keys(C::$HMAC_DIGESTS),
             ),
-            'Invalid signature method',
+            'Invalid signature method: %s',
             InvalidArgumentException::class,
         );
 

src/XML/ds/Transform.php

@@ -109,7 +109,7 @@ private function setXPath(?XPath $xpath): void
         Assert::nullOrEq(
             $this->algorithm,
             C::XPATH_URI,
-            'Transform algorithm "' . C::XPATH_URI . '" required if XPath provided.',
+            sprintf('Transform algorithm "%s" required if XPath provided.', C::XPATH_URI),
         );
         $this->xpath = $xpath;
     }
@@ -143,8 +143,11 @@ private function setInclusiveNamespaces(?InclusiveNamespaces $inclusiveNamespace
                 C::C14N_INCLUSIVE_WITH_COMMENTS,
                 C::C14N_EXCLUSIVE_WITHOUT_COMMENTS,
             ],
-            'Transform algorithm "' . C::C14N_EXCLUSIVE_WITH_COMMENTS . '" or "' .
-            C::C14N_EXCLUSIVE_WITHOUT_COMMENTS . '" required if InclusiveNamespaces provided.',
+            sprintf(
+                'Transform algorithm "%s" or "%s" required if InclusiveNamespaces provided.',
+                C::C14N_EXCLUSIVE_WITH_COMMENTS,
+                C::C14N_EXCLUSIVE_WITHOUT_COMMENTS
+            ),
         );
 
         $this->inclusiveNamespaces = $inclusiveNamespaces;

src/XML/dsig11/X509Digest.php

@@ -65,7 +65,7 @@ private function setAlgorithm(string $algorithm): void
         Assert::oneOf(
             $algorithm,
             array_keys(C::$DIGEST_ALGORITHMS),
-            'Invalid digest method',
+            'Invalid digest method: %s',
             InvalidArgumentException::class,
         );
 

src/XML/xenc/CipherData.php

@@ -105,15 +105,15 @@ public static function fromXML(DOMElement $xml): static
         Assert::maxCount(
             $cv,
             1,
-            'More than one CipherValue element in <xenc:CipherData',
+            'More than one CipherValue element in <xenc:CipherData>',
             TooManyElementsException::class
         );
 
         $cr = CipherReference::getChildrenOfClass($xml);
         Assert::maxCount(
             $cr,
             1,
-            'More than one CipherReference element in <xenc:CipherData',
+            'More than one CipherReference element in <xenc:CipherData>',
             TooManyElementsException::class
         );