Un-nest CanonicalizableElementTrait from Signed/SignableElementTrait

Author: tvdijen

src/XML/SignableElementTrait.php

@@ -39,9 +39,6 @@
  */
 trait SignableElementTrait
 {
-    use CanonicalizableElementTrait;
-
-
     /** @var \SimpleSAML\XMLSecurity\XML\ds\Signature|null */
     protected ?Signature $signature = null;
 

src/XML/SignedElementTrait.php

@@ -42,9 +42,6 @@
  */
 trait SignedElementTrait
 {
-    use CanonicalizableElementTrait;
-
-
     /**
      * The signature of this element.
      *

tests/XML/CustomSignable.php

@@ -11,6 +11,8 @@
 use SimpleSAML\XMLSchema\Exception\TooManyElementsException;
 use SimpleSAML\XMLSchema\Type\IDValue;
 use SimpleSAML\XMLSecurity\Backend\EncryptionBackend;
+use SimpleSAML\XMLSecurity\XML\CanonicalizableElementInterface;
+use SimpleSAML\XMLSecurity\XML\CanonicalizableElementTrait;
 use SimpleSAML\XMLSecurity\XML\ds\Signature;
 use SimpleSAML\XMLSecurity\XML\EncryptableElementInterface;
 use SimpleSAML\XMLSecurity\XML\EncryptableElementTrait;
@@ -25,10 +27,12 @@
  * @package simplesamlphp/xml-security
  */
 class CustomSignable extends AbstractElement implements
+    CanonicalizableElementInterface,
     SignableElementInterface,
     SignedElementInterface,
     EncryptableElementInterface
 {
+    use CanonicalizableElementTrait;
     use SignableElementTrait;
     use SignedElementTrait;
     use EncryptableElementTrait;