summaryrefslogtreecommitdiffstats
path: root/lib/SimpleSAML/Auth
diff options
context:
space:
mode:
Diffstat (limited to 'lib/SimpleSAML/Auth')
-rw-r--r--lib/SimpleSAML/Auth/Default.php6
-rw-r--r--lib/SimpleSAML/Auth/Source.php2
-rw-r--r--lib/SimpleSAML/Auth/State.php4
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/SimpleSAML/Auth/Default.php b/lib/SimpleSAML/Auth/Default.php
index d5553aa..4541f02 100644
--- a/lib/SimpleSAML/Auth/Default.php
+++ b/lib/SimpleSAML/Auth/Default.php
@@ -27,11 +27,11 @@ class SimpleSAML_Auth_Default {
/**
* @deprecated This method will be removed in SSP 2.0. Please use
- * SimpleSAML_Auth_State::extractPersistentAuthState() instead.
+ * SimpleSAML_Auth_State::getPersistentAuthData() instead.
*/
public static function extractPersistentAuthState(array &$state) {
- return SimpleSAML_Auth_State::extractPersistentAuthState($state);
+ return SimpleSAML_Auth_State::getPersistentAuthData($state);
}
@@ -50,7 +50,7 @@ class SimpleSAML_Auth_Default {
/* Save session state. */
$session = SimpleSAML_Session::getSessionFromRequest();
$authId = $state['SimpleSAML_Auth_Default.id'];
- $session->doLogin($authId, SimpleSAML_Auth_State::extractPersistentAuthState($state));
+ $session->doLogin($authId, SimpleSAML_Auth_State::getPersistentAuthData($state));
if (is_string($return)) {
/* Redirect... */
diff --git a/lib/SimpleSAML/Auth/Source.php b/lib/SimpleSAML/Auth/Source.php
index 70b8cf7..4637f8b 100644
--- a/lib/SimpleSAML/Auth/Source.php
+++ b/lib/SimpleSAML/Auth/Source.php
@@ -216,7 +216,7 @@ abstract class SimpleSAML_Auth_Source
// save session state
$session = SimpleSAML_Session::getSessionFromRequest();
$authId = $state['SimpleSAML_Auth_Default.id'];
- $session->doLogin($authId, SimpleSAML_Auth_State::extractPersistentAuthState($state));
+ $session->doLogin($authId, SimpleSAML_Auth_State::getPersistentAuthData($state));
if (is_string($return)) { // redirect...
\SimpleSAML\Utils\HTTP::redirectTrustedURL($return);
diff --git a/lib/SimpleSAML/Auth/State.php b/lib/SimpleSAML/Auth/State.php
index 5d6ebc6..a756535 100644
--- a/lib/SimpleSAML/Auth/State.php
+++ b/lib/SimpleSAML/Auth/State.php
@@ -92,12 +92,12 @@ class SimpleSAML_Auth_State {
/**
- * Extract the persistent authentication state from the state array.
+ * Get the persistent authentication state from the state array.
*
* @param array $state The state array to analyze.
* @return array The persistent authentication state.
*/
- public static function extractPersistentAuthState(array $state)
+ public static function getPersistentAuthData(array $state)
{
// save persistent authentication data
$persistent = array();