Fix exception

tvdijen · tvdijen · commit 1d42cc8273b9 · 2024-08-27T17:58:53.000+02:00
diff --git a/modules/core/src/Controller/Login.php b/modules/core/src/Controller/Login.php
@@ -4,7 +4,6 @@
 
 namespace SimpleSAML\Module\core\Controller;
 
-use Exception as BuiltinException;
 use SimpleSAML\{Auth, Configuration, Error, Module, Utils};
 use SimpleSAML\Module\core\Auth\{UserPassBase, UserPassOrgBase};
 use SimpleSAML\XHTML\Template;
@@ -113,7 +112,7 @@ public function loginuserpass(Request $request): Response
         /** @var \SimpleSAML\Module\core\Auth\UserPassBase|null $source */
         $source = $this->authSource::getById($state[UserPassBase::AUTHID]);
         if ($source === null) {
-            throw new BuiltinException(
+            throw new Error\Exception(
                 'Could not find authentication source with id ' . $state[UserPassBase::AUTHID],
             );
         }
@@ -324,11 +323,11 @@ private function handleLogin(Request $request, UserPassBase|UserPassOrgBase $sou
         if ($className) {
             if (in_array($className, self::$registeredErrorCodeClasses)) {
                 if (!class_exists($className)) {
-                    throw new Exception("Could not resolve error class. no class named '$className'.");
+                    throw new Error\Exception("Could not resolve error class. no class named '$className'.");
                 }
 
                 if (!is_subclass_of($className, ErrorCodes::class)) {
-                    throw new Exception(
+                    throw new Error\Exception(
                         'Could not resolve error class: The class \'' . $className
                         . '\' isn\'t a subclass of \'' . ErrorCodes::class . '\'.',
                     );
@@ -338,7 +337,7 @@ private function handleLogin(Request $request, UserPassBase|UserPassOrgBase $sou
                 $t->data['errorcodes'] = $obj->getAllMessages();
             } else {
                 if ($className != ErrorCodes::class) {
-                    throw new BuiltinException(
+                    throw new Error\Exception(
                         'The desired error code class is not found or of the wrong type ' . $className,
                     );
                 }
@@ -377,7 +376,7 @@ public function loginuserpassorg(Request $request): Response
         /** @var \SimpleSAML\Module\core\Auth\UserPassOrgBase $source */
         $source = $this->authSource::getById($state[UserPassOrgBase::AUTHID]);
         if ($source === null) {
-            throw new BuiltinException(
+            throw new Error\Exception(
                 'Could not find authentication source with id ' . $state[UserPassOrgBase::AUTHID],
             );
         }
