From 39d64ee00245f67e36cdec059058b272d4045111 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Mon, 3 Dec 2018 19:23:25 +0100
Subject: [PATCH] Fix namespace deprecation warnings
---
lib/SimpleSAML/Auth/ProcessingChain.php | 2 +-
lib/SimpleSAML/Auth/Source.php | 4 ++--
lib/SimpleSAML/Stats.php | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/SimpleSAML/Auth/ProcessingChain.php b/lib/SimpleSAML/Auth/ProcessingChain.php
index 9f7daf3a3..a82d51334 100644
--- a/lib/SimpleSAML/Auth/ProcessingChain.php
+++ b/lib/SimpleSAML/Auth/ProcessingChain.php
@@ -153,7 +153,7 @@ class ProcessingChain
$className = \SimpleSAML\Module::resolveClass(
$config['class'],
- 'Auth_Process',
+ 'Auth\Process',
'\SimpleSAML\Auth\ProcessingFilter'
);
$config['%priority'] = $priority;
diff --git a/lib/SimpleSAML/Auth/Source.php b/lib/SimpleSAML/Auth/Source.php
index 9cd848641..d24f6e774 100644
--- a/lib/SimpleSAML/Auth/Source.php
+++ b/lib/SimpleSAML/Auth/Source.php
@@ -306,7 +306,7 @@ abstract class Source
// Check whether or not there's a factory responsible for instantiating our Auth Source instance
$factoryClass = \SimpleSAML\Module::resolveClass(
$id,
- 'Auth_Source_Factory',
+ 'Auth\Source\Factory',
'\SimpleSAML\Auth\SourceFactory'
);
@@ -315,7 +315,7 @@ abstract class Source
$authSource = $factory->create($info, $config);
} catch (\Exception $e) {
// If not, instantiate the Auth Source here
- $className = \SimpleSAML\Module::resolveClass($id, 'Auth_Source', '\SimpleSAML\Auth\Source');
+ $className = \SimpleSAML\Module::resolveClass($id, 'Auth\Source', '\SimpleSAML\Auth\Source');
$authSource = new $className($info, $config);
}
diff --git a/lib/SimpleSAML/Stats.php b/lib/SimpleSAML/Stats.php
index 8c2987c82..56d07c302 100644
--- a/lib/SimpleSAML/Stats.php
+++ b/lib/SimpleSAML/Stats.php
@@ -38,7 +38,7 @@ class Stats
private static function createOutput(\SimpleSAML\Configuration $config)
{
$cls = $config->getString('class');
- $cls = \SimpleSAML\Module::resolveClass($cls, 'Stats_Output', '\SimpleSAML\Stats\Output');
+ $cls = \SimpleSAML\Module::resolveClass($cls, 'Stats\Output', '\SimpleSAML\Stats\Output');
$output = new $cls($config);
return $output;
--
GitLab