Refactor saml:EncryptedElementType

Author: tvdijen

src/XML/saml/AbstractEncryptedElement.php

@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\SAML2\XML\saml;
+
+use SimpleSAML\SAML2\XML\EncryptedElementTrait;
+use SimpleSAML\XMLSecurity\XML\EncryptedElementInterface;
+
+/**
+ * Class representing an encrypted element.
+ *
+ * @package simplesamlphp/saml2
+ */
+abstract class AbstractEncryptedElement extends AbstractSamlElement implements EncryptedElementInterface
+{
+    use EncryptedElementTrait;
+}

src/XML/saml/EncryptedAssertion.php

@@ -4,23 +4,19 @@
 
 namespace SimpleSAML\SAML2\XML\saml;
 
-use SimpleSAML\SAML2\XML\EncryptedElementTrait;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\SchemaValidatableElementInterface;
 use SimpleSAML\XML\SchemaValidatableElementTrait;
 use SimpleSAML\XMLSecurity\Alg\Encryption\EncryptionAlgorithmInterface;
-use SimpleSAML\XMLSecurity\XML\EncryptedElementInterface;
 
 /**
  * Class handling encrypted assertions.
  *
  * @package simplesamlphp/saml2
  */
-final class EncryptedAssertion extends AbstractSamlElement implements
-    EncryptedElementInterface,
+final class EncryptedAssertion extends AbstractEncryptedElement implements
     SchemaValidatableElementInterface
 {
-    use EncryptedElementTrait;
     use SchemaValidatableElementTrait;
 
 

src/XML/saml/EncryptedAttribute.php

@@ -4,23 +4,19 @@
 
 namespace SimpleSAML\SAML2\XML\saml;
 
-use SimpleSAML\SAML2\XML\EncryptedElementTrait;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\SchemaValidatableElementInterface;
 use SimpleSAML\XML\SchemaValidatableElementTrait;
 use SimpleSAML\XMLSecurity\Alg\Encryption\EncryptionAlgorithmInterface;
-use SimpleSAML\XMLSecurity\XML\EncryptedElementInterface;
 
 /**
  * Class handling encrypted attributes.
  *
  * @package simplesamlphp/saml2
  */
-class EncryptedAttribute extends AbstractSamlElement implements
-    EncryptedElementInterface,
+final class EncryptedAttribute extends AbstractEncryptedElement implements
     SchemaValidatableElementInterface
 {
-    use EncryptedElementTrait;
     use SchemaValidatableElementTrait;
 
 

src/XML/saml/EncryptedID.php

@@ -5,13 +5,11 @@
 namespace SimpleSAML\SAML2\XML\saml;
 
 use InvalidArgumentException;
-use SimpleSAML\SAML2\XML\EncryptedElementTrait;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\SchemaValidatableElementInterface;
 use SimpleSAML\XML\SchemaValidatableElementTrait;
 use SimpleSAML\XML\SerializableElementInterface;
 use SimpleSAML\XMLSecurity\Alg\Encryption\EncryptionAlgorithmInterface;
-use SimpleSAML\XMLSecurity\XML\EncryptedElementInterface;
 
 use function implode;
 
@@ -20,12 +18,10 @@
  *
  * @package simplesamlphp/saml2
  */
-class EncryptedID extends AbstractSamlElement implements
-    EncryptedElementInterface,
+final class EncryptedID extends AbstractEncryptedElement implements
     IdentifierInterface,
     SchemaValidatableElementInterface
 {
-    use EncryptedElementTrait;
     use SchemaValidatableElementTrait;