Merge remote-tracking branch 'upstream/production/cafevdb/stable33'

This restores the behaviour of the app before I moved it to the
IBoostrap stuff.

Signed-off-by: Claus-Justus Heine <himself@claus-justus-heine.de>

appinfo/info.xml

@@ -21,8 +21,8 @@
     </types>
     <category>auth</category>
     <dependencies>
-        <php min-version="8.0"/>
-        <nextcloud min-version="31" max-version="31"/>
+        <php min-version="8.4"/>
+        <nextcloud min-version="31" max-version="33"/>
     </dependencies>
     <settings>
         <admin>\OCA\UserSQL\Settings\Admin</admin>

appinfo/routes.php

@@ -2,8 +2,9 @@
 /**
  * Nextcloud - user_sql
  *
- * @copyright 2012-2015 Andreas Böhler <dev (at) aboehler (dot) at>
+ * @copyright 2025 Claus-Justus Heine <himself@claus-justus-heine.de>
  * @copyright 2018 Marcin Łojewski <dev@mlojewski.me>
+ * @copyright 2012-2015 Andreas Böhler <dev (at) aboehler (dot) at>
  * @author    Marcin Łojewski <dev@mlojewski.me>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,10 +23,8 @@
 
 use OCA\UserSQL\AppInfo\Application;
 
-$application = new Application();
-$application->registerRoutes(
-    $this, [
-        "routes" => [
+$routes = [
+	'routes' => [
 		[
 			"name" => "settings#verifyDbConnection",
 			"url" => "/settings/db/verify",
@@ -66,6 +65,7 @@ $application->registerRoutes(
 			"url" => "/settings/crypto/params",
 			"verb" => "GET"
 		],
-        ]
-    ]
-);
+	],
+];
+
+return $routes;

lib/AppInfo/Application.php

@@ -2,10 +2,10 @@
 /**
  * Nextcloud - user_sql
  *
- * @copyright 2018 Marcin Łojewski <dev@mlojewski.me>
- * @author    Marcin Łojewski <dev@mlojewski.me>
  * @copyright 2025 Claus-Justus Heine <himself@claus-justus-heine.de>
  * @author    Claus-Justus Heine <himself@claus-justus-heine.de>
+ * @copyright 2018 Marcin Łojewski <dev@mlojewski.me>
+ * @author    Marcin Łojewski <dev@mlojewski.me>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -63,8 +63,12 @@ class Application extends App implements IBootstrap
 			IGroupManager $groupManager,
 			Backend\GroupBackend $groupBackend,
 		) {
+			if ($userBackend->isConfigured()) {
 				$userManager->registerBackend($userBackend);
+			}
+			if ($groupBackend->isConfigured()) {
 				$groupManager->addBackend($groupBackend);
+			}
 		});
 	}
 }

lib/Backend/UserBackend.php

@@ -264,7 +264,7 @@ final class UserBackend extends ABackend implements
             // avoid recursion as the action may very well call into the UserManager again ...
             $actions = $this->actions;
             $this->actions = [];
-            foreach ($this->actions as $action) {
+            foreach ($actions as $action) {
                 $action->doAction($user);
             }
             $this->actions = $actions;

lib/Query/DataQuery.php

@@ -4,6 +4,8 @@
  *
  * @copyright 2021 Marcin Łojewski <dev@mlojewski.me>
  * @author    Marcin Łojewski <dev@mlojewski.me>
+ * @copyright 2025 Claus-Justus Heine
+ * @author    Claus-Justus Heine <himself@claus-justus-heine.de>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -21,6 +23,8 @@
 
 namespace OCA\UserSQL\Query;
 
+use UnexpectedValueException;
+
 use Doctrine\DBAL\Driver\Statement;
 use Doctrine\DBAL\Exception as DBALException;
 use OC\DB\Connection;
@@ -151,6 +155,10 @@ class DataQuery
             "driverOptions" => array()
         );
 
+        if (empty($this->properties[DB::DRIVER])) {
+          throw new UnexpectedValueException('Attempt to connect without configuration.');
+        }
+
         if ($this->properties[DB::DRIVER] == 'mysql') {
             if ($this->properties[DB::SSL_CA]) {
                 $parameters["driverOptions"][\PDO::MYSQL_ATTR_SSL_CA] = \OC::$SERVERROOT . '/' . $this->properties[DB::SSL_CA];