In Module::resolveClass throw a different error for class not found (#2185)

monkeyiq · monkeyiq · commit 8c53ebb7fc89 · 2024-07-29T09:25:53.000+10:00
* In Module::resolveClass throw a different error for class not found

This might help to debug when a class is renamed or moved to a new
module.

* move the class-exists check up a level

* move that up a level for general use

* less diff

* phpcbf and accept the diff
diff --git a/src/SimpleSAML/Module.php b/src/SimpleSAML/Module.php
@@ -449,6 +449,17 @@ public static function resolveClass(string $id, string $type, ?string $subclass
             $className = 'SimpleSAML\\Module\\' . $tmp[0] . $type . $tmp[1];
         }
 
+        // Check if the class exists to give a more informative error
+        // for cases where modules might have been moved or renamed.
+        // Otherwise a not subclass of error would be thrown for a class
+        // that does not exist.
+        if (!class_exists($className, true)) {
+            throw new Exception(
+                'Could not resolve \'' . $id . '\': The class \'' . $className
+                . '\' does not exist.',
+            );
+        }
+
         if ($subclass !== null && !is_subclass_of($className, $subclass)) {
             throw new Exception(
                 'Could not resolve \'' . $id . '\': The class \'' . $className
