Skip to content
Snippets Groups Projects
Commit 26fd93f6 authored by Jaime Pérez's avatar Jaime Pérez
Browse files

Deprecate the old SimpleSAML_Error_NoPassive and SimpleSAML_Error_ProxyCountExceeded exceptions.

parent 3f9313c4
No related branches found
No related tags found
No related merge requests found
<?php <?php
/**
* Class SimpleSAML_Error_NoPassive
*
* @deprecated This class has been deprecated and will be removed in SimpleSAMLphp 2.0. Please use
* SimpleSAML\Module\saml\Error\NoPassive instead.
*
* @see \SimpleSAML\Module\saml\Error\NoPassive
*/
class SimpleSAML_Error_NoPassive extends SimpleSAML_Error_Exception { class SimpleSAML_Error_NoPassive extends SimpleSAML_Error_Exception {
} }
<?php <?php
/**
* Class SimpleSAML_Error_ProxyCountExceeded
*
* @deprecated This class has been deprecated and will be removed in SimpleSAMLphp 2.0. Please use
* SimpleSAML\Module\saml\Error\ProxyCountExceeded instead.
*
* @see \SimpleSAML\Module\saml\Error\ProxyCountExceeded
*/
class SimpleSAML_Error_ProxyCountExceeded extends SimpleSAML_Error_Exception { class SimpleSAML_Error_ProxyCountExceeded extends SimpleSAML_Error_Exception {
} }
...@@ -104,6 +104,7 @@ class sspmod_saml_Error extends SimpleSAML_Error_Exception { ...@@ -104,6 +104,7 @@ class sspmod_saml_Error extends SimpleSAML_Error_Exception {
// Return the original exception unchanged // Return the original exception unchanged
return $exception; return $exception;
// TODO: remove this branch in 2.0
} elseif ($exception instanceof SimpleSAML_Error_NoPassive) { } elseif ($exception instanceof SimpleSAML_Error_NoPassive) {
$e = new self( $e = new self(
\SAML2\Constants::STATUS_RESPONDER, \SAML2\Constants::STATUS_RESPONDER,
...@@ -111,6 +112,7 @@ class sspmod_saml_Error extends SimpleSAML_Error_Exception { ...@@ -111,6 +112,7 @@ class sspmod_saml_Error extends SimpleSAML_Error_Exception {
$exception->getMessage(), $exception->getMessage(),
$exception $exception
); );
// TODO: remove this branch in 2.0
} elseif ($exception instanceof SimpleSAML_Error_ProxyCountExceeded) { } elseif ($exception instanceof SimpleSAML_Error_ProxyCountExceeded) {
$e = new self( $e = new self(
\SAML2\Constants::STATUS_RESPONDER, \SAML2\Constants::STATUS_RESPONDER,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment