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

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"/>
+        <php min-version="8.4"/>
-        <nextcloud min-version="31" max-version="31"/>
+        <nextcloud min-version="35" max-version="35"/>
     </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,50 +23,49 @@
 
 use OCA\UserSQL\AppInfo\Application;
 
-$application = new Application();
+$routes = [
-$application->registerRoutes(
+	'routes' => [
-    $this, [
+		[
-        "routes" => [
+			"name" => "settings#verifyDbConnection",
-            [
+			"url" => "/settings/db/verify",
-                "name" => "settings#verifyDbConnection",
+			"verb" => "POST"
-                "url" => "/settings/db/verify",
+		],
-                "verb" => "POST"
+		[
-            ],
+			"name" => "settings#saveProperties",
-            [
+			"url" => "/settings/properties",
-                "name" => "settings#saveProperties",
+			"verb" => "POST"
-                "url" => "/settings/properties",
+		],
-                "verb" => "POST"
+		[
-            ],
+			"name" => "settings#clearCache",
-            [
+			"url" => "/settings/cache/clear",
-                "name" => "settings#clearCache",
+			"verb" => "POST"
-                "url" => "/settings/cache/clear",
+		],
-                "verb" => "POST"
+		[
-            ],
+			"name" => "settings#tableAutocomplete",
-            [
+			"url" => "/settings/autocomplete/table",
-                "name" => "settings#tableAutocomplete",
+			"verb" => "POST"
-                "url" => "/settings/autocomplete/table",
+		],
-                "verb" => "POST"
+		[
-            ],
+			"name" => "settings#userTableAutocomplete",
-            [
+			"url" => "/settings/autocomplete/table/user",
-                "name" => "settings#userTableAutocomplete",
+			"verb" => "POST"
-                "url" => "/settings/autocomplete/table/user",
+		],
-                "verb" => "POST"
+		[
-            ],
+			"name" => "settings#userGroupTableAutocomplete",
-            [
+			"url" => "/settings/autocomplete/table/user_group",
-                "name" => "settings#userGroupTableAutocomplete",
+			"verb" => "POST"
-                "url" => "/settings/autocomplete/table/user_group",
+		],
-                "verb" => "POST"
+		[
-            ],
+			"name" => "settings#groupTableAutocomplete",
-            [
+			"url" => "/settings/autocomplete/table/group",
-                "name" => "settings#groupTableAutocomplete",
+			"verb" => "POST"
-                "url" => "/settings/autocomplete/table/group",
+		],
-                "verb" => "POST"
+		[
-            ],
+			"name" => "settings#cryptoParams",
-            [
+			"url" => "/settings/crypto/params",
-                "name" => "settings#cryptoParams",
+			"verb" => "GET"
-                "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,
 		) {
-			$userManager->registerBackend($userBackend);
+			if ($userBackend->isConfigured()) {
-			$groupManager->addBackend($groupBackend);
+				$userManager->registerBackend($userBackend);
+			}
+			if ($groupBackend->isConfigured()) {
+				$groupManager->addBackend($groupBackend);
+			}
 		});
 	}
 }

lib/Backend/UserBackend.php

@@ -261,13 +261,13 @@ final class UserBackend extends ABackend implements
         if ($user instanceof User) {
             $this->cache->set($cacheKey, $user);
 
-			// avoid recursion as the action may very well call into the UserManager again ...
+            // avoid recursion as the action may very well call into the UserManager again ...
-			$actions = $this->actions;
+            $actions = $this->actions;
-			$this->actions = [];
+            $this->actions = [];
-            foreach ($this->actions as $action) {
+            foreach ($actions as $action) {
                 $action->doAction($user);
             }
-			$this->actions = $actions;
+            $this->actions = $actions;
         }
 
         return $user;

lib/Cache.php

@@ -53,7 +53,7 @@ class Cache
      */
     public function __construct($AppName, IConfig $config, LoggerInterface $logger)
     {
-        $factory = \OC::$server->getMemCacheFactory();
+        $factory = \OC::$server->get(\OC\Memcache\Factory::class);
         $useCache = $config->getAppValue(
             $AppName, Opt::USE_CACHE, App::FALSE_VALUE
         );

lib/Controller/SettingsController.php

@@ -2,7 +2,7 @@
 /**
  * Nextcloud - user_sql
  *
- * @copyright 2021 Marcin Łojewski <dev@mlojewski.me>
+ * @copyright 2021, 2026 Marcin Łojewski <dev@mlojewski.me>
  * @author    Marcin Łojewski <dev@mlojewski.me>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -157,7 +157,7 @@ class SettingsController extends Controller
         }
 
         $connectionFactory = new ConnectionFactory(
-            \OC::$server->getSystemConfig()
+            \OC::$server->get(\OC\SystemConfig::class),
         );
 
         $parameters = [

lib/Query/DataQuery.php

@@ -2,8 +2,10 @@
 /**
  * Nextcloud - user_sql
  *
- * @copyright 2021 Marcin Łojewski <dev@mlojewski.me>
+ * @copyright 2021, 2026 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;
@@ -139,7 +143,7 @@ class DataQuery
     private function connectToDatabase()
     {
         $connectionFactory = new ConnectionFactory(
-            \OC::$server->getSystemConfig()
+            \OC::$server->get(\OC\SystemConfig::class),
         );
 
         $parameters = array(
@@ -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];