Cleanup

simplesamlphp · Jul 23, 2024 · ec56649 · ec56649
1 parent d926eb0
commit ec56649
Show file tree

Hide file tree

Showing 25 changed files with 10 additions and 26 deletions.
diff --git a/src/SAML2/XML/alg/DigestMethod.php b/src/SAML2/XML/alg/DigestMethod.php
@@ -9,7 +9,6 @@
 use SimpleSAML\SAML2\Assert\Assert as SAMLAssert;
 use SimpleSAML\XML\Chunk;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
-use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\ExtendableElementTrait;
 use SimpleSAML\XML\XsNamespace as NS;
 

diff --git a/src/SAML2/XML/alg/SigningMethod.php b/src/SAML2/XML/alg/SigningMethod.php
@@ -9,7 +9,6 @@
 use SimpleSAML\SAML2\Assert\Assert as SAMLAssert;
 use SimpleSAML\XML\Chunk;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
-use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\ExtendableElementTrait;
 use SimpleSAML\XML\XsNamespace as NS;
 

diff --git a/src/SAML2/XML/ecp/Response.php b/src/SAML2/XML/ecp/Response.php
@@ -11,7 +11,6 @@
 use SimpleSAML\SOAP\Constants as C;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingAttributeException;
-use SimpleSAML\XML\Exception\SchemaViolationException;
 
 /**
  * Class representing the ECP Response element.

diff --git a/src/SAML2/XML/ecp/SubjectConfirmation.php b/src/SAML2/XML/ecp/SubjectConfirmation.php
@@ -12,7 +12,6 @@
 use SimpleSAML\SOAP\Constants as C;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingAttributeException;
-use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
 
 /**

diff --git a/src/SAML2/XML/md/AbstractEndpointType.php b/src/SAML2/XML/md/AbstractEndpointType.php
@@ -12,7 +12,6 @@
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XML\Chunk;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
-use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\ExtendableElementTrait;
 use SimpleSAML\XML\SerializableElementInterface;

diff --git a/src/SAML2/XML/md/AbstractLocalizedURI.php b/src/SAML2/XML/md/AbstractLocalizedURI.php
@@ -6,7 +6,6 @@
 
 use SimpleSAML\Assert\Assert;
 use SimpleSAML\SAML2\Assert\Assert as SAMLAssert;
-use SimpleSAML\XML\Exception\SchemaViolationException;
 
 /**
  * Abstract class implementing LocalizedURIType.

diff --git a/src/SAML2/XML/md/AffiliateMember.php b/src/SAML2/XML/md/AffiliateMember.php
@@ -8,7 +8,6 @@
 use SimpleSAML\SAML2\Assert\Assert as SAMLAssert;
 use SimpleSAML\SAML2\Constants as C;
 use SimpleSAML\SAML2\Exception\ProtocolViolationException;
-use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\StringElementTrait;
 
 /**

diff --git a/src/SAML2/XML/md/AffiliationDescriptor.php b/src/SAML2/XML/md/AffiliationDescriptor.php
@@ -11,7 +11,6 @@
 use SimpleSAML\SAML2\Constants as C;
 use SimpleSAML\SAML2\Exception\ProtocolViolationException;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
-use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\XsNamespace as NS;

diff --git a/src/SAML2/XML/md/AttributeProfile.php b/src/SAML2/XML/md/AttributeProfile.php
@@ -8,7 +8,6 @@
 use SimpleSAML\Assert\Assert;
 use SimpleSAML\SAML2\Assert\Assert as SAMLAssert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
-use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\StringElementTrait;
 
 /**

diff --git a/src/SAML2/XML/md/EntityDescriptor.php b/src/SAML2/XML/md/EntityDescriptor.php
@@ -11,7 +11,6 @@
 use SimpleSAML\SAML2\Constants as C;
 use SimpleSAML\SAML2\Exception\ProtocolViolationException;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
-use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
 use SimpleSAML\XML\ExtendableAttributesTrait;
 use SimpleSAML\XML\XsNamespace as NS;

diff --git a/src/SAML2/XML/md/NameIDFormat.php b/src/SAML2/XML/md/NameIDFormat.php
@@ -8,7 +8,6 @@
 use SimpleSAML\Assert\Assert;
 use SimpleSAML\SAML2\Assert\Assert as SAMLAssert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
-use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\StringElementTrait;
 
 use function trim;

diff --git a/src/SAML2/XML/saml/Action.php b/src/SAML2/XML/saml/Action.php
@@ -8,7 +8,6 @@
 use SimpleSAML\Assert\Assert;
 use SimpleSAML\SAML2\Assert\Assert as SAMLAssert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
-use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\StringElementTrait;
 
 /**

diff --git a/src/SAML2/XML/saml/AssertionURIRef.php b/src/SAML2/XML/saml/AssertionURIRef.php
@@ -8,7 +8,6 @@
 use SimpleSAML\Assert\Assert;
 use SimpleSAML\SAML2\Assert\Assert as SAMLAssert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
-use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\StringElementTrait;
 
 /**

diff --git a/src/SAML2/XML/saml/Attribute.php b/src/SAML2/XML/saml/Attribute.php
@@ -53,9 +53,15 @@ public function __construct(
         Assert::allIsInstanceOf($attributeValue, AttributeValue::class, 'Invalid AttributeValue.');
 
         if ($nameFormat === C::NAMEFORMAT_URI) {
-            SAMLAssert::validURI($name, sprintf("Attribute name `%s` does not match its declared format `%s`", $name, $nameFormat));
+            SAMLAssert::validURI(
+                $name,
+                sprintf("Attribute name `%s` does not match its declared format `%s`", $name, $nameFormat),
+            );
         } elseif ($nameFormat === C::NAMEFORMAT_BASIC) {
-            Assert::validNCName($name, sprintf("Attribute name `%s` does not match its declared format `%s`", $name, $nameFormat));
+            Assert::validNCName(
+                $name,
+                sprintf("Attribute name `%s` does not match its declared format `%s`", $name, $nameFormat),
+            );
         }
 
         $this->setAttributesNS($namespacedAttribute);

diff --git a/src/SAML2/XML/saml/Audience.php b/src/SAML2/XML/saml/Audience.php
@@ -8,7 +8,6 @@
 use SimpleSAML\Assert\Assert;
 use SimpleSAML\SAML2\Assert\Assert as SAMLAssert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
-use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\StringElementTrait;
 
 /**

diff --git a/src/SAML2/XML/saml/AuthenticatingAuthority.php b/src/SAML2/XML/saml/AuthenticatingAuthority.php
@@ -8,7 +8,6 @@
 use SimpleSAML\Assert\Assert;
 use SimpleSAML\SAML2\Assert\Assert as SAMLAssert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
-use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\StringElementTrait;
 
 /**

diff --git a/src/SAML2/XML/saml/AuthnContextClassRef.php b/src/SAML2/XML/saml/AuthnContextClassRef.php
@@ -5,7 +5,6 @@
 namespace SimpleSAML\SAML2\XML\saml;
 
 use SimpleSAML\SAML2\Assert\Assert as SAMLAssert;
-use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\StringElementTrait;
 
 /**

diff --git a/src/SAML2/XML/saml/AuthnContextDeclRef.php b/src/SAML2/XML/saml/AuthnContextDeclRef.php
@@ -5,7 +5,6 @@
 namespace SimpleSAML\SAML2\XML\saml;
 
 use SimpleSAML\SAML2\Assert\Assert as SAMLAssert;
-use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\StringElementTrait;
 
 /**

diff --git a/src/SAML2/XML/saml/SubjectConfirmation.php b/src/SAML2/XML/saml/SubjectConfirmation.php
@@ -9,7 +9,6 @@
 use SimpleSAML\SAML2\Assert\Assert as SAMLAssert;
 use SimpleSAML\SAML2\XML\IdentifierTrait;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
-use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
 
 use function array_pop;

diff --git a/src/SAML2/XML/samlp/GetComplete.php b/src/SAML2/XML/samlp/GetComplete.php
@@ -9,7 +9,6 @@
 use SimpleSAML\SAML2\Assert\Assert as SAMLAssert;
 use SimpleSAML\SAML2\Exception\ArrayValidationException;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
-use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\StringElementTrait;
 
 use function array_key_first;

diff --git a/src/SAML2/XML/samlp/IDPEntry.php b/src/SAML2/XML/samlp/IDPEntry.php
@@ -9,7 +9,6 @@
 use SimpleSAML\SAML2\Assert\Assert as SAMLAssert;
 use SimpleSAML\SAML2\Exception\ArrayValidationException;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
-use SimpleSAML\XML\Exception\SchemaViolationException;
 
 use function array_change_key_case;
 use function array_filter;

diff --git a/src/SAML2/XML/samlp/RequesterID.php b/src/SAML2/XML/samlp/RequesterID.php
@@ -9,7 +9,6 @@
 use SimpleSAML\SAML2\Assert\Assert as SAMLAssert;
 use SimpleSAML\SAML2\Exception\ArrayValidationException;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
-use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\StringElementTrait;
 
 use function array_key_first;

diff --git a/src/SAML2/XML/samlp/StatusCode.php b/src/SAML2/XML/samlp/StatusCode.php
@@ -9,7 +9,6 @@
 use SimpleSAML\SAML2\Assert\Assert as SAMLAssert;
 use SimpleSAML\SAML2\Constants as C;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
-use SimpleSAML\XML\Exception\SchemaViolationException;
 
 /**
  * SAML StatusCode data type.

diff --git a/tests/SAML2/Assert/DateTimeTest.php b/tests/SAML2/Assert/DateTimeTest.php
@@ -29,7 +29,7 @@ public function testValidDateTime(bool $shouldPass, string $timestamp): void
         try {
             SAML2Assert::validDateTime($timestamp);
             $this->assertTrue($shouldPass);
-        } catch (ProtocolViolationException|SchemaViolationException $e) {
+        } catch (ProtocolViolationException | SchemaViolationException $e) {
             $this->assertFalse($shouldPass);
         }
     }

diff --git a/tests/SAML2/Assert/URITest.php b/tests/SAML2/Assert/URITest.php
@@ -29,7 +29,7 @@ public function testValidURI(bool $shouldPass, string $uri): void
         try {
             SAML2Assert::validURI($uri);
             $this->assertTrue($shouldPass);
-        } catch (ProtocolViolationException|SchemaViolationException $e) {
+        } catch (ProtocolViolationException | SchemaViolationException $e) {
             $this->assertFalse($shouldPass);
         }
     }