From 470c69ac0980c01d3e52d75aaf59adf25f569b2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaime=20Pe=CC=81rez=20Crespo?= <jaime.perez@uninett.no>
Date: Thu, 7 Sep 2017 16:22:08 +0200
Subject: [PATCH] Migrate all calls of SimpleSAML_Auth_Simple to
\SimpleSAML\Auth\Simple.
Fix build as a side effect. When vimeo/psalm tries to resolve dependencies, it now fails with this.
---
lib/SimpleSAML/IdP.php | 4 ++--
lib/SimpleSAML/Utils/Auth.php | 2 +-
modules/casserver/www/login.php | 2 +-
modules/consentAdmin/www/consentAdmin.php | 2 +-
modules/core/www/as_login.php | 2 +-
modules/core/www/as_logout.php | 2 +-
modules/core/www/authenticate.php | 2 +-
modules/statistics/lib/AccessCheck.php | 2 +-
www/authmemcookie.php | 2 +-
9 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/lib/SimpleSAML/IdP.php b/lib/SimpleSAML/IdP.php
index d0b322257..7fa5fed3f 100644
--- a/lib/SimpleSAML/IdP.php
+++ b/lib/SimpleSAML/IdP.php
@@ -49,7 +49,7 @@ class SimpleSAML_IdP
/**
* Our authsource.
*
- * @var SimpleSAML_Auth_Simple
+ * @var \SimpleSAML\Auth\Simple
*/
private $authSource;
@@ -103,7 +103,7 @@ class SimpleSAML_IdP
$auth = $this->config->getString('auth');
if (SimpleSAML_Auth_Source::getById($auth) !== null) {
- $this->authSource = new SimpleSAML_Auth_Simple($auth);
+ $this->authSource = new \SimpleSAML\Auth\Simple($auth);
} else {
throw new SimpleSAML_Error_Exception('No such "'.$auth.'" auth source found.');
}
diff --git a/lib/SimpleSAML/Utils/Auth.php b/lib/SimpleSAML/Utils/Auth.php
index 68a721295..5360f74da 100644
--- a/lib/SimpleSAML/Utils/Auth.php
+++ b/lib/SimpleSAML/Utils/Auth.php
@@ -65,7 +65,7 @@ class Auth
// not authenticated as admin user, start authentication
if (\SimpleSAML_Auth_Source::getById('admin') !== null) {
- $as = new \SimpleSAML_Auth_Simple('admin');
+ $as = new \SimpleSAML\Auth\Simple('admin');
$as->login();
} else {
throw new \SimpleSAML_Error_Exception(
diff --git a/modules/casserver/www/login.php b/modules/casserver/www/login.php
index 008018b92..f7ab7de8b 100644
--- a/modules/casserver/www/login.php
+++ b/modules/casserver/www/login.php
@@ -28,7 +28,7 @@ $auth = $casconfig->getValue('auth', 'saml2');
if (!in_array($auth, array('saml2', 'shib13')))
throw new Exception('CAS Service configured to use [auth] = ' . $auth . ' only [saml2,shib13] is legal.');
-$as = new SimpleSAML_Auth_Simple($auth);
+$as = new \SimpleSAML\Auth\Simple($auth);
if (!$as->isAuthenticated()) {
$params = array(
'ForceAuthn' => $forceAuthn,
diff --git a/modules/consentAdmin/www/consentAdmin.php b/modules/consentAdmin/www/consentAdmin.php
index f41733de3..f3760a648 100644
--- a/modules/consentAdmin/www/consentAdmin.php
+++ b/modules/consentAdmin/www/consentAdmin.php
@@ -70,7 +70,7 @@ $config = SimpleSAML_Configuration::getInstance();
$cA_config = SimpleSAML_Configuration::getConfig('module_consentAdmin.php');
$authority = $cA_config->getValue('authority');
-$as = new SimpleSAML_Auth_Simple($authority);
+$as = new \SimpleSAML\Auth\Simple($authority);
// If request is a logout request
if (array_key_exists('logout', $_REQUEST)) {
diff --git a/modules/core/www/as_login.php b/modules/core/www/as_login.php
index 189e05408..e43a77898 100644
--- a/modules/core/www/as_login.php
+++ b/modules/core/www/as_login.php
@@ -29,7 +29,7 @@ if (!empty($_REQUEST['saml:idp'])) {
$options['saml:idp'] = $_REQUEST['saml:idp'];
}
-$as = new SimpleSAML_Auth_Simple($_REQUEST['AuthId']);
+$as = new \SimpleSAML\Auth\Simple($_REQUEST['AuthId']);
$as->requireAuth($options);
\SimpleSAML\Utils\HTTP::redirectTrustedURL($options['ReturnTo']);
diff --git a/modules/core/www/as_logout.php b/modules/core/www/as_logout.php
index f3bbf5535..bfd923415 100644
--- a/modules/core/www/as_logout.php
+++ b/modules/core/www/as_logout.php
@@ -14,5 +14,5 @@ if (!isset($_REQUEST['AuthId']) || !is_string($_REQUEST['AuthId'])) {
throw new SimpleSAML_Error_BadRequest('Missing AuthId parameter.');
}
-$as = new SimpleSAML_Auth_Simple($_REQUEST['AuthId']);
+$as = new \SimpleSAML\Auth\Simple($_REQUEST['AuthId']);
$as->logout(\SimpleSAML\Utils\HTTP::checkURLAllowed($_REQUEST['ReturnTo']));
diff --git a/modules/core/www/authenticate.php b/modules/core/www/authenticate.php
index d71082580..c6932313b 100644
--- a/modules/core/www/authenticate.php
+++ b/modules/core/www/authenticate.php
@@ -11,7 +11,7 @@ if (!array_key_exists('as', $_REQUEST)) {
}
$asId = (string) $_REQUEST['as'];
-$as = new SimpleSAML_Auth_Simple($asId);
+$as = new \SimpleSAML\Auth\Simple($asId);
if (array_key_exists('logout', $_REQUEST)) {
$as->logout($config->getBasePath().'logout.php');
diff --git a/modules/statistics/lib/AccessCheck.php b/modules/statistics/lib/AccessCheck.php
index a400f3377..9cbed6f13 100644
--- a/modules/statistics/lib/AccessCheck.php
+++ b/modules/statistics/lib/AccessCheck.php
@@ -41,7 +41,7 @@ class sspmod_statistics_AccessCheck
// We are using an authsource for login.
- $as = new SimpleSAML_Auth_Simple($authsource);
+ $as = new \SimpleSAML\Auth\Simple($authsource);
$as->requireAuth();
// User logged in with auth source.
diff --git a/www/authmemcookie.php b/www/authmemcookie.php
index 914959135..d403aee13 100644
--- a/www/authmemcookie.php
+++ b/www/authmemcookie.php
@@ -27,7 +27,7 @@ try {
$amc = SimpleSAML_AuthMemCookie::getInstance();
$sourceId = $amc->getAuthSource();
- $s = new SimpleSAML_Auth_Simple($sourceId);
+ $s = new \SimpleSAML\Auth\Simple($sourceId);
// check if the user is authorized. We attempt to authenticate the user if not
$s->requireAuth();
--
GitLab