From 9c3d26ab5932ba05248ea095268ed5eefd979cb8 Mon Sep 17 00:00:00 2001
From: Jaime Perez Crespo <jaime.perez@uninett.no>
Date: Thu, 3 Mar 2016 16:21:44 +0100
Subject: [PATCH] Some more fixes for the new SimpleSAML\Module and
SimpleSAML\Logger.
---
lib/SimpleSAML/Utils/Auth.php | 6 ++++--
lib/SimpleSAML/Utils/XML.php | 14 +++++++-------
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/lib/SimpleSAML/Utils/Auth.php b/lib/SimpleSAML/Utils/Auth.php
index 089f94ea6..84508206e 100644
--- a/lib/SimpleSAML/Utils/Auth.php
+++ b/lib/SimpleSAML/Utils/Auth.php
@@ -1,6 +1,8 @@
<?php
namespace SimpleSAML\Utils;
+use SimpleSAML\Module;
+
/**
* Auth-related utility methods.
*
@@ -24,10 +26,10 @@ class Auth
}
if ($returnTo === null) {
- $returnTo = \SimpleSAML\Utils\HTTP::getSelfURL();
+ $returnTo = HTTP::getSelfURL();
}
- return \SimpleSAML_Module::getModuleURL('core/login-admin.php', array('ReturnTo' => $returnTo));
+ return Module::getModuleURL('core/login-admin.php', array('ReturnTo' => $returnTo));
}
/**
diff --git a/lib/SimpleSAML/Utils/XML.php b/lib/SimpleSAML/Utils/XML.php
index 938ce6fd7..13b5123b5 100644
--- a/lib/SimpleSAML/Utils/XML.php
+++ b/lib/SimpleSAML/Utils/XML.php
@@ -7,7 +7,7 @@
namespace SimpleSAML\Utils;
-
+use SimpleSAML\Logger;
use Symfony\Component\Config\Definition\Exception\Exception;
class XML
@@ -59,7 +59,7 @@ class XML
$result = self::isValid($message, 'saml-schema-metadata-2.0.xsd');
}
if ($result !== true) {
- \SimpleSAML_Logger::warning($result);
+ Logger::warning($result);
}
}
@@ -97,16 +97,16 @@ class XML
switch ($type) {
case 'in':
- \SimpleSAML_Logger::debug('Received message:');
+ Logger::debug('Received message:');
break;
case 'out':
- \SimpleSAML_Logger::debug('Sending message:');
+ Logger::debug('Sending message:');
break;
case 'decrypt':
- \SimpleSAML_Logger::debug('Decrypted message:');
+ Logger::debug('Decrypted message:');
break;
case 'encrypt':
- \SimpleSAML_Logger::debug('Encrypted message:');
+ Logger::debug('Encrypted message:');
break;
default:
assert(false);
@@ -114,7 +114,7 @@ class XML
$str = self::formatXMLString($message);
foreach (explode("\n", $str) as $line) {
- \SimpleSAML_Logger::debug($line);
+ Logger::debug($line);
}
}
--
GitLab