Merge pull request #62266 from nextcloud/backport/62195/stable34

[stable34] chore: undeprecate the redis cache backend

Author: AndyScherzinger

apps/settings/composer/composer/autoload_classmap.php

@@ -110,7 +110,6 @@
     'OCA\\Settings\\SetupChecks\\LoggingLevel' => $baseDir . '/../lib/SetupChecks/LoggingLevel.php',
     'OCA\\Settings\\SetupChecks\\MaintenanceWindowStart' => $baseDir . '/../lib/SetupChecks/MaintenanceWindowStart.php',
     'OCA\\Settings\\SetupChecks\\MemcacheConfigured' => $baseDir . '/../lib/SetupChecks/MemcacheConfigured.php',
-    'OCA\\Settings\\SetupChecks\\MemcacheLegacy' => $baseDir . '/../lib/SetupChecks/MemcacheLegacy.php',
     'OCA\\Settings\\SetupChecks\\MimeTypeMigrationAvailable' => $baseDir . '/../lib/SetupChecks/MimeTypeMigrationAvailable.php',
     'OCA\\Settings\\SetupChecks\\MysqlRowFormat' => $baseDir . '/../lib/SetupChecks/MysqlRowFormat.php',
     'OCA\\Settings\\SetupChecks\\MysqlUnicodeSupport' => $baseDir . '/../lib/SetupChecks/MysqlUnicodeSupport.php',

apps/settings/composer/composer/autoload_static.php

@@ -125,7 +125,6 @@ class ComposerStaticInitSettings
         'OCA\\Settings\\SetupChecks\\LoggingLevel' => __DIR__ . '/..' . '/../lib/SetupChecks/LoggingLevel.php',
         'OCA\\Settings\\SetupChecks\\MaintenanceWindowStart' => __DIR__ . '/..' . '/../lib/SetupChecks/MaintenanceWindowStart.php',
         'OCA\\Settings\\SetupChecks\\MemcacheConfigured' => __DIR__ . '/..' . '/../lib/SetupChecks/MemcacheConfigured.php',
-        'OCA\\Settings\\SetupChecks\\MemcacheLegacy' => __DIR__ . '/..' . '/../lib/SetupChecks/MemcacheLegacy.php',
         'OCA\\Settings\\SetupChecks\\MimeTypeMigrationAvailable' => __DIR__ . '/..' . '/../lib/SetupChecks/MimeTypeMigrationAvailable.php',
         'OCA\\Settings\\SetupChecks\\MysqlRowFormat' => __DIR__ . '/..' . '/../lib/SetupChecks/MysqlRowFormat.php',
         'OCA\\Settings\\SetupChecks\\MysqlUnicodeSupport' => __DIR__ . '/..' . '/../lib/SetupChecks/MysqlUnicodeSupport.php',

apps/settings/lib/AppInfo/Application.php

@@ -48,7 +48,6 @@
 use OCA\Settings\SetupChecks\LegacySSEKeyFormat;
 use OCA\Settings\SetupChecks\MaintenanceWindowStart;
 use OCA\Settings\SetupChecks\MemcacheConfigured;
-use OCA\Settings\SetupChecks\MemcacheLegacy;
 use OCA\Settings\SetupChecks\MimeTypeMigrationAvailable;
 use OCA\Settings\SetupChecks\MysqlRowFormat;
 use OCA\Settings\SetupChecks\MysqlUnicodeSupport;
@@ -190,7 +189,6 @@ public function register(IRegistrationContext $context): void {
 		$context->registerSetupCheck(LegacySSEKeyFormat::class);
 		$context->registerSetupCheck(MaintenanceWindowStart::class);
 		$context->registerSetupCheck(MemcacheConfigured::class);
-		$context->registerSetupCheck(MemcacheLegacy::class);
 		$context->registerSetupCheck(MimeTypeMigrationAvailable::class);
 		$context->registerSetupCheck(MysqlRowFormat::class);
 		$context->registerSetupCheck(MysqlUnicodeSupport::class);

apps/settings/lib/SetupChecks/MemcacheLegacy.php

@@ -3024,11 +3024,6 @@
       <code><![CDATA[$this->timeFactory->getTime()]]></code>
     </InvalidScalarArgument>
   </file>
-  <file src="core/Command/Memcache/RedisCommand.php">
-    <DeprecatedClass>
-      <code><![CDATA[protected]]></code>
-    </DeprecatedClass>
-  </file>
   <file src="core/Command/Security/BruteforceAttempts.php">
     <DeprecatedMethod>
       <code><![CDATA[getAttempts]]></code>

build/psalm-baseline.xml

@@ -1787,9 +1787,16 @@
 	 * Connection details for the Key-Value store used for in-memory caching,
 	 * for example when using Valkey or Redis.
 	 *
-	 * This is the brand-independent successor of the ``redis`` and
-	 * ``redis.cluster`` options below and supports the latest Valkey and Redis
-	 * releases. Three topologies are supported:
+	 * This is the brand-independent version of the ``redis`` and
+	 * ``redis.cluster`` options below without depending on ``php-redis``
+	 * meaning no additional PHP extension needs to be installed.
+	 * Redis and Valkey 4.0 up to 8.0 are supported, for SSL support Redis v6 or higher is required,
+	 * Valkey 9 is supported but without support for numbered databased when using cluster mode.
+	 *
+	 * Warning: If the cache server is not hosted on the same machine as Nextcloud,
+	 * this can have a network overhead compared to the ``php-redis`` based backend below.
+	 *
+	 * Three topologies are supported:
 	 * a single server, a Sentinel managed replication set, and a
 	 * server cluster. Configure exactly one of ``server``, ``sentinel`` or
 	 * ``seeds``.
@@ -1873,8 +1880,6 @@
 	 *
 	 * We also support Redis SSL/TLS encryption as of version 6.
 	 * See https://redis.io/topics/encryption for more information.
-	 *
-	 * @deprecated 34.0.0 use `memcache.kvstore` instead which supports also Valkey.
 	 */
 	'redis' => [
 		'host' => 'localhost', // can also be a Unix domain socket: '/tmp/redis.sock'
@@ -1914,8 +1919,6 @@
 	 *
 	 * Authentication works with phpredis version 4.2.1+. See
 	 * https://github.com/phpredis/phpredis/commit/c5994f2a42b8a348af92d3acb4edff1328ad8ce1
-	 *
-	 * @deprecated 34.0.0 use `memcache.kvstore` instead which supports also Valkey.
 	 */
 	'redis.cluster' => [
 		'seeds' => [ // provide some or all of the cluster servers to bootstrap discovery, port required

config/config.sample.php

@@ -10,12 +10,6 @@
 use OCP\IMemcacheTTL;
 use OCP\Server;
 
-/**
- * @deprecated 34.0.2 Legacy phpredis based backend. Kept so existing `redis`
- *             and `redis.cluster` configurations keep working. New setups should
- *             use {@see KeyValueCache} with the `memcache.kvstore` configuration,
- *             which also supports Valkey.
- */
 class Redis extends Cache implements IMemcacheTTL {
 	/** name => [script, sha1] */
 	public const LUA_SCRIPTS = [

lib/private/Memcache/Redis.php

@@ -9,9 +9,6 @@
 
 use OCP\Diagnostics\IEventLogger;
 
-/**
- * @deprecated 34.0.2 - use {@see \OC\Memcache\KeyValueCacheFactory} instead
- */
 class RedisFactory {
 	public const REDIS_MINIMAL_VERSION = '4.0.0';
 	public const REDIS_EXTRA_PARAMETERS_MINIMAL_VERSION = '5.3.0';