Fix assertions; ID is required

tvdijen · tvdijen · commit bac9ee26a2d3 · 2023-03-07T00:21:26.000+01:00
diff --git a/src/SAML2/XML/saml/Assertion.php b/src/SAML2/XML/saml/Assertion.php
@@ -265,7 +265,7 @@ public static function fromXML(DOMElement $xml): static
         Assert::same(self::getAttribute($xml, 'Version'), '2.0', 'Unsupported version: %s');
 
         $id = self::getAttribute($xml, 'ID');
-        Assert::nullOrValidNCName($id); // Covers the empty string
+        Assert::validNCName($id); // Covers the empty string
 
         $issueInstant = self::getAttribute($xml, 'IssueInstant');
         // Strip sub-seconds - See paragraph 1.3.3 of SAML core specifications
diff --git a/src/SAML2/XML/samlp/ArtifactResolve.php b/src/SAML2/XML/samlp/ArtifactResolve.php
@@ -94,7 +94,7 @@ public static function fromXML(DOMElement $xml): static
         Assert::true(version_compare('2.0', $version, '>='), RequestVersionTooHighException::class);
 
         $id = self::getAttribute($xml, 'ID');
-        Assert::nullOrValidNCName($id); // Covers the empty string
+        Assert::validNCName($id); // Covers the empty string
 
         $issueInstant = self::getAttribute($xml, 'IssueInstant');
         // Strip sub-seconds - See paragraph 1.3.3 of SAML core specifications
diff --git a/src/SAML2/XML/samlp/ArtifactResponse.php b/src/SAML2/XML/samlp/ArtifactResponse.php
@@ -100,7 +100,7 @@ public static function fromXML(DOMElement $xml): static
         Assert::true(version_compare('2.0', $version, '>='), RequestVersionTooHighException::class);
 
         $id = self::getAttribute($xml, 'ID');
-        Assert::nullOrValidNCName($id); // Covers the empty string
+        Assert::validNCName($id); // Covers the empty string
 
         $inResponseTo = self::getAttribute($xml, 'InResponseTo', null);
         $destination = self::getAttribute($xml, 'Destination', null);
diff --git a/src/SAML2/XML/samlp/AssertionIDRequest.php b/src/SAML2/XML/samlp/AssertionIDRequest.php
@@ -104,7 +104,7 @@ public static function fromXML(DOMElement $xml): static
         Assert::true(version_compare('2.0', $version, '>='), RequestVersionTooHighException::class);
 
         $id = self::getAttribute($xml, 'ID');
-        Assert::nullOrValidNCName($id); // Covers the empty string
+        Assert::validNCName($id); // Covers the empty string
 
         /** @psalm-var string $issueInstant */
         $issueInstant = self::getAttribute($xml, 'IssueInstant');
diff --git a/src/SAML2/XML/samlp/AttributeQuery.php b/src/SAML2/XML/samlp/AttributeQuery.php
@@ -120,7 +120,7 @@ public static function fromXML(DOMElement $xml): static
         Assert::true(version_compare('2.0', $version, '>='), RequestVersionTooHighException::class);
 
         $id = self::getAttribute($xml, 'ID');
-        Assert::nullOrValidNCName($id); // Covers the empty string
+        Assert::validNCName($id); // Covers the empty string
 
         $destination = self::getAttribute($xml, 'Destination', null);
         $consent = self::getAttribute($xml, 'Consent', null);
diff --git a/src/SAML2/XML/samlp/AuthnQuery.php b/src/SAML2/XML/samlp/AuthnQuery.php
@@ -106,7 +106,7 @@ public static function fromXML(DOMElement $xml): static
         Assert::true(version_compare('2.0', $version, '>='), RequestVersionTooHighException::class);
 
         $id = self::getAttribute($xml, 'ID');
-        Assert::nullOrValidNCName($id); // Covers the empty string
+        Assert::validNCName($id); // Covers the empty string
 
         $destination = self::getAttribute($xml, 'Destination', null);
         $consent = self::getAttribute($xml, 'Consent', null);
diff --git a/src/SAML2/XML/samlp/AuthnRequest.php b/src/SAML2/XML/samlp/AuthnRequest.php
@@ -250,7 +250,7 @@ public static function fromXML(DOMElement $xml): static
         Assert::true(version_compare('2.0', $version, '>='), RequestVersionTooHighException::class);
 
         $id = self::getAttribute($xml, 'ID');
-        Assert::nullOrValidNCName($id); // Covers the empty string
+        Assert::validNCName($id); // Covers the empty string
 
         $issueInstant = self::getAttribute($xml, 'IssueInstant');
         // Strip sub-seconds - See paragraph 1.3.3 of SAML core specifications
diff --git a/src/SAML2/XML/samlp/LogoutRequest.php b/src/SAML2/XML/samlp/LogoutRequest.php
@@ -65,7 +65,6 @@ public function __construct(
         ?string $consent = null,
         ?Extensions $extensions = null,
     ) {
-        Assert::nullOrValidURI($reason, SchemaViolationException::class);
         Assert::allIsInstanceOf($sessionIndexes, SessionIndex::class);
 
         parent::__construct($issuer, $id, $version, $issueInstant, $destination, $consent, $extensions);
@@ -133,7 +132,7 @@ public static function fromXML(DOMElement $xml): static
         Assert::true(version_compare('2.0', $version, '>='), RequestVersionTooHighException::class);
 
         $id = self::getAttribute($xml, 'ID');
-        Assert::nullOrValidNCName($id); // Covers the empty string
+        Assert::validNCName($id); // Covers the empty string
 
         $issueInstant = self::getAttribute($xml, 'IssueInstant');
         // Strip sub-seconds - See paragraph 1.3.3 of SAML core specifications
diff --git a/src/SAML2/XML/samlp/LogoutResponse.php b/src/SAML2/XML/samlp/LogoutResponse.php
@@ -87,7 +87,7 @@ public static function fromXML(DOMElement $xml): static
         Assert::true(version_compare('2.0', $version, '>='), RequestVersionTooHighException::class);
 
         $id = self::getAttribute($xml, 'ID');
-        Assert::nullOrValidNCName($id); // Covers the empty string
+        Assert::validNCName($id); // Covers the empty string
 
         $issueInstant = self::getAttribute($xml, 'IssueInstant');
         // Strip sub-seconds - See paragraph 1.3.3 of SAML core specifications
diff --git a/src/SAML2/XML/samlp/Response.php b/src/SAML2/XML/samlp/Response.php
@@ -109,7 +109,7 @@ public static function fromXML(DOMElement $xml): static
         Assert::maxCount($signature, 1, 'Only one ds:Signature element is allowed.', TooManyElementsException::class);
 
         $id = self::getAttribute($xml, 'ID');
-        Assert::nullOrValidNCName($id); // Covers the empty string
+        Assert::validNCName($id); // Covers the empty string
 
         $inResponseTo = self::getAttribute($xml, 'InResponseTo', null);
         $destination = self::getAttribute($xml, 'Destination', null);
