Skip to content
Snippets Groups Projects
Commit 02af510b authored by Tim van Dijen's avatar Tim van Dijen
Browse files

Fix wrong error being caught

\SimpleSAML\Error\NoPassive is deprecated and all modules now raise \SimpleSAML\Module\saml\Error\NoPassive.
During this period of deprecation, we need to catch both flavours.

This fixes NoPassive-errors when using consentAdmin
parent dc251702
No related branches found
No related tags found
No related merge requests found
......@@ -270,7 +270,7 @@ class ProcessingChain
/**
* Process the given state passivly.
*
* Modules with user interaction are expected to throw an \SimpleSAML\Error\NoPassive exception
* Modules with user interaction are expected to throw an \SimpleSAML\Module\saml\Error\NoPassive exception
* which are silently ignored. Exceptions of other types are passed further up the call stack.
*
* This function will only return if processing completes.
......@@ -299,7 +299,10 @@ class ProcessingChain
try {
$filter->process($state);
} catch (\SimpleSAML\Error\NoPassive $e) {
// @deprecated will be removed in 2.0
// Ignore \SimpleSAML\Error\NoPassive exceptions
} catch (\SimpleSAML\Module\saml\Error\NoPassive $e) {
// Ignore \SimpleSAML\Module\saml\Error\NoPassive exceptions
}
}
}
......
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