Cleanup unnecessary try-catch statements

tvdijen · tvdijen · commit a3fda0421295 · 2025-12-18T22:19:14.000+01:00
diff --git a/src/Assert/CIDRTrait.php b/src/Assert/CIDRTrait.php
@@ -4,7 +4,6 @@
 
 namespace SimpleSAML\SAML2\Assert;
 
-use SimpleSAML\Assert\AssertionFailedException;
 use SimpleSAML\SAML2\Exception\ProtocolViolationException;
 
 /**
@@ -42,19 +41,14 @@ trait CIDRTrait
 
 
     /**
-     * @param string $value
-     * @param string $message
      */
     protected static function validCIDR(string $value, string $message = ''): void
     {
-        try {
-            parent::regex(
-                $value,
-                self::$cidr_regex,
-                $message ?: '%s is not a valid RFC4632 CIDR-block',
-            );
-        } catch (AssertionFailedException $e) {
-            throw new ProtocolViolationException($e->getMessage());
-        }
+        parent::regex(
+            $value,
+            self::$cidr_regex,
+            $message ?: '%s is not a valid RFC4632 CIDR-block',
+            ProtocolViolationException::class,
+        );
     }
 }
diff --git a/src/Assert/DomainTrait.php b/src/Assert/DomainTrait.php
@@ -4,7 +4,6 @@
 
 namespace SimpleSAML\SAML2\Assert;
 
-use SimpleSAML\Assert\AssertionFailedException;
 use SimpleSAML\SAML2\Exception\ProtocolViolationException;
 
 /**
@@ -20,19 +19,14 @@ trait DomainTrait
 
 
     /**
-     * @param string $value
-     * @param string $message
      */
     protected static function validDomain(string $value, string $message = ''): void
     {
-        try {
-            parent::regex(
-                $value,
-                self::$domain_regex,
-                $message ?: '%s is not a valid domain name',
-            );
-        } catch (AssertionFailedException $e) {
-            throw new ProtocolViolationException($e->getMessage());
-        }
+        parent::regex(
+            $value,
+            self::$domain_regex,
+            $message ?: '%s is not a valid domain name',
+            ProtocolViolationException::class,
+        );
     }
 }
diff --git a/src/Assert/EntityIDTrait.php b/src/Assert/EntityIDTrait.php
@@ -4,7 +4,6 @@
 
 namespace SimpleSAML\SAML2\Assert;
 
-use SimpleSAML\Assert\AssertionFailedException;
 use SimpleSAML\SAML2\Constants as C;
 use SimpleSAML\SAML2\Exception\ProtocolViolationException;
 
@@ -16,22 +15,17 @@
 trait EntityIDTrait
 {
     /**
-     * @param string $value
-     * @param string $message
      */
     protected static function validEntityID(string $value, string $message = ''): void
     {
         static::validSAMLAnyURI($value);
 
-        try {
-            parent::notWhitespaceOnly($value);
-            parent::maxLength(
-                $value,
-                C::ENTITYID_MAX_LENGTH,
-                sprintf('An entityID cannot be longer than %d characters.', C::ENTITYID_MAX_LENGTH),
-            );
-        } catch (AssertionFailedException $e) {
-            throw new ProtocolViolationException($e->getMessage());
-        }
+        parent::notWhitespaceOnly($value, ProtocolViolationException::class);
+        parent::maxLength(
+            $value,
+            C::ENTITYID_MAX_LENGTH,
+            sprintf('An entityID cannot be longer than %d characters.', C::ENTITYID_MAX_LENGTH),
+            ProtocolViolationException::class,
+        );
     }
 }
diff --git a/src/Assert/GeolocationTrait.php b/src/Assert/GeolocationTrait.php
@@ -4,7 +4,6 @@
 
 namespace SimpleSAML\SAML2\Assert;
 
-use SimpleSAML\Assert\AssertionFailedException;
 use SimpleSAML\SAML2\Exception\ProtocolViolationException;
 
 /**
@@ -16,8 +15,6 @@ trait GeolocationTrait
     //private static string $geolocation_regex = '/^geo:([-+]?\d+(?:\.\d+)?),([-+]?\d+(?:\.\d+)?)(?:\?z=(\d{1,2}))?$/';
 
     /**
-     * @param string $value
-     * @param string $message
      */
     protected static function validGeolocation(string $value, string $message = ''): void
     {
@@ -28,10 +25,6 @@ protected static function validGeolocation(string $value, string $message = ''):
         // );
         // The regex above is incomplete, so for now we only test for a valid URI
 
-        try {
-            static::validAnyURI($value);
-        } catch (AssertionFailedException $e) {
-            throw new ProtocolViolationException($e->getMessage());
-        }
+        static::validAnyURI($value, ProtocolViolationException::class);
     }
 }
diff --git a/src/Assert/RelayStateTrait.php b/src/Assert/RelayStateTrait.php
@@ -4,7 +4,6 @@
 
 namespace SimpleSAML\SAML2\Assert;
 
-use SimpleSAML\Assert\AssertionFailedException;
 use SimpleSAML\SAML2\Constants as C;
 use SimpleSAML\SAML2\Exception\ProtocolViolationException;
 
@@ -14,25 +13,21 @@
 trait RelayStateTrait
 {
     /**
-     * @param string $value
-     * @param string $message
      */
     protected static function validRelayState(string $value, string $message = ''): void
     {
         parent::notWhitespaceOnly($value, $message); // Not protocol-defined, but makes zero sense
-        try {
-            /**
-             * 3.4.3 RelayState
-             *
-             * The value MUST NOT exceed 80 bytes in length [..]
-             */
-            parent::maxLength(
-                $value,
-                C::MAX_RELAY_STATE_LENGTH,
-                $message ?: '%s is not a SAML2.0-compliant RelayState',
-            );
-        } catch (AssertionFailedException $e) {
-            throw new ProtocolViolationException($e->getMessage());
-        }
+
+        /**
+         * 3.4.3 RelayState
+         *
+         * The value MUST NOT exceed 80 bytes in length [..]
+         */
+        parent::maxLength(
+            $value,
+            C::MAX_RELAY_STATE_LENGTH,
+            $message ?: '%s is not a SAML2.0-compliant RelayState',
+            ProtocolViolationException::class,
+        );
     }
 }
diff --git a/src/Assert/SAMLAnyURITrait.php b/src/Assert/SAMLAnyURITrait.php
@@ -4,7 +4,6 @@
 
 namespace SimpleSAML\SAML2\Assert;
 
-use SimpleSAML\Assert\AssertionFailedException;
 use SimpleSAML\SAML2\Exception\ProtocolViolationException;
 
 /**
@@ -16,18 +15,17 @@ trait SAMLAnyURITrait
 
 
     /**
-     * @param string $value
-     * @param string $message
      */
     protected static function validSAMLAnyURI(string $value, string $message = ''): void
     {
         parent::validAnyURI($value);
 
-        try {
-            // If it doesn't have a scheme, it's not an absolute URI
-            parent::regex($value, self::$scheme_regex, $message ?: '%s is not a SAML2-compliant URI');
-        } catch (AssertionFailedException $e) {
-            throw new ProtocolViolationException($e->getMessage());
-        }
+        // If it doesn't have a scheme, it's not an absolute URI
+        parent::regex(
+            $value,
+            self::$scheme_regex,
+            $message ?: '%s is not a SAML2-compliant URI',
+            ProtocolViolationException::class,
+        );
     }
 }
diff --git a/src/Assert/SAMLDateTimeTrait.php b/src/Assert/SAMLDateTimeTrait.php
@@ -4,7 +4,6 @@
 
 namespace SimpleSAML\SAML2\Assert;
 
-use SimpleSAML\Assert\AssertionFailedException;
 use SimpleSAML\SAML2\Exception\ProtocolViolationException;
 
 /**
@@ -13,21 +12,16 @@
 trait SAMLDateTimeTrait
 {
     /**
-     * @param string $value
-     * @param string $message
      */
     protected static function validSAMLDateTime(string $value, string $message = ''): void
     {
         parent::validDateTime($value);
 
-        try {
-            parent::endsWith(
-                $value,
-                'Z',
-                '%s is not a DateTime expressed in the UTC timezone using the \'Z\' timezone identifier.',
-            );
-        } catch (AssertionFailedException $e) {
-            throw new ProtocolViolationException($e->getMessage());
-        }
+        parent::endsWith(
+            $value,
+            'Z',
+            '%s is not a DateTime expressed in the UTC timezone using the \'Z\' timezone identifier.',
+            ProtocolViolationException::class,
+        );
     }
 }
diff --git a/src/Assert/SAMLStringTrait.php b/src/Assert/SAMLStringTrait.php
@@ -4,7 +4,6 @@
 
 namespace SimpleSAML\SAML2\Assert;
 
-use SimpleSAML\Assert\AssertionFailedException;
 use SimpleSAML\SAML2\Exception\ProtocolViolationException;
 use SimpleSAML\XMLSchema\Exception\SchemaViolationException;
 
@@ -14,22 +13,21 @@
 trait SAMLStringTrait
 {
     /**
-     * @param string $value
-     * @param string $message
      */
     protected static function validSAMLString(string $value, string $message = ''): void
     {
         parent::validString($value, $message, SchemaViolationException::class);
-        try {
-            /**
-             * 1.3.1 String Values
-             *
-             * Unless otherwise noted in this specification or particular profiles, all strings in
-             * SAML messages MUST consist of at least one non-whitespace character
-             */
-            parent::notWhitespaceOnly($value, $message ?: '%s is not a SAML2.0-compliant string');
-        } catch (AssertionFailedException $e) {
-            throw new ProtocolViolationException($e->getMessage());
-        }
+
+        /**
+         * 1.3.1 String Values
+         *
+         * Unless otherwise noted in this specification or particular profiles, all strings in
+         * SAML messages MUST consist of at least one non-whitespace character
+         */
+        parent::notWhitespaceOnly(
+            $value,
+            $message ?: '%s is not a SAML2.0-compliant string',
+            ProtocolViolationException::class,
+        );
     }
 }
