Skip to content
Snippets Groups Projects
Unverified Commit a8da0f00 authored by Jaime Pérez Crespo's avatar Jaime Pérez Crespo Committed by GitHub
Browse files

Merge pull request #1013 from simplesamlphp/fix-namespace

namespaces:  Fix resolveClass for sspmod_ style classes
parents 1f0a1f22 5af5f995
No related branches found
No related tags found
No related merge requests found
...@@ -392,20 +392,18 @@ class Module ...@@ -392,20 +392,18 @@ class Module
} else { } else {
// should be a module // should be a module
// make sure empty types are handled correctly // make sure empty types are handled correctly
$type = (empty($type)) ? '_' : '_'.$type.'_'; $type = (empty($type)) ? '\\' : '\\'.$type.'\\';
// check for the old-style class names
$className = 'sspmod_'.$tmp[0].$type.$tmp[1];
$className = 'SimpleSAML\\Module\\'.$tmp[0].$type.$tmp[1];
if (!class_exists($className)) { if (!class_exists($className)) {
// check for the new-style class names, using namespaces // check for the old-style class names
$type = str_replace('_', '\\', $type); $type = str_replace('\\', '_', $type);
$newClassName = 'SimpleSAML\\Module\\'.$tmp[0].$type.$tmp[1]; $oldClassName = 'sspmod_'.$tmp[0].$type.$tmp[1];
if (!class_exists($newClassName)) { if (!class_exists($oldClassName)) {
throw new \Exception("Could not resolve '$id': no class named '$className' or '$newClassName'."); throw new \Exception("Could not resolve '$id': no class named '$className' or '$oldClassName'.");
} }
$className = $newClassName; $className = $oldClassName;
} }
} }
......
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