aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorprovokateurin <kate@provokateurin.de>2025-05-27 15:28:37 +0200
committerprovokateurin <kate@provokateurin.de>2025-05-27 15:52:48 +0200
commit055167581d9d1bf8c1faa16807c3f3ee2ceb8c93 (patch)
tree05e15f5fbcfbba4c6c3fef2c3cabecdf78cd9da9
parent7d339518f397d304a861b2ae0f2444cf82707086 (diff)
downloadnextcloud-server-perf/files/setup-fs-basic-auth-request.tar.gz
nextcloud-server-perf/files/setup-fs-basic-auth-request.zip
chore: Remove unused \OC\Cache\CappedMemoryCacheperf/files/setup-fs-basic-auth-request
Signed-off-by: provokateurin <kate@provokateurin.de>
-rw-r--r--build/psalm-baseline.xml11
-rw-r--r--lib/composer/composer/autoload_classmap.php1
-rw-r--r--lib/composer/composer/autoload_static.php1
-rw-r--r--lib/private/Cache/CappedMemoryCache.php109
-rw-r--r--tests/lib/Cache/CappedMemoryCacheTest.php62
5 files changed, 0 insertions, 184 deletions
diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index ad2ccce5641..0e998e7d456 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -3555,17 +3555,6 @@
<code><![CDATA[$this->providers]]></code>
</UndefinedInterfaceMethod>
</file>
- <file src="lib/private/Cache/CappedMemoryCache.php">
- <MissingTemplateParam>
- <code><![CDATA[\ArrayAccess]]></code>
- </MissingTemplateParam>
- </file>
- <file src="lib/private/Cache/File.php">
- <LessSpecificImplementedReturnType>
- <code><![CDATA[bool|mixed]]></code>
- <code><![CDATA[bool|mixed]]></code>
- </LessSpecificImplementedReturnType>
- </file>
<file src="lib/private/Calendar/Manager.php">
<LessSpecificReturnStatement>
<code><![CDATA[array_merge(
diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php
index 696e044d86c..ca0599a63d2 100644
--- a/lib/composer/composer/autoload_classmap.php
+++ b/lib/composer/composer/autoload_classmap.php
@@ -1147,7 +1147,6 @@ return array(
'OC\\BinaryFinder' => $baseDir . '/lib/private/BinaryFinder.php',
'OC\\Blurhash\\Listener\\GenerateBlurhashMetadata' => $baseDir . '/lib/private/Blurhash/Listener/GenerateBlurhashMetadata.php',
'OC\\Broadcast\\Events\\BroadcastEvent' => $baseDir . '/lib/private/Broadcast/Events/BroadcastEvent.php',
- 'OC\\Cache\\CappedMemoryCache' => $baseDir . '/lib/private/Cache/CappedMemoryCache.php',
'OC\\Calendar\\AvailabilityResult' => $baseDir . '/lib/private/Calendar/AvailabilityResult.php',
'OC\\Calendar\\CalendarEventBuilder' => $baseDir . '/lib/private/Calendar/CalendarEventBuilder.php',
'OC\\Calendar\\CalendarQuery' => $baseDir . '/lib/private/Calendar/CalendarQuery.php',
diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php
index f75c15501e8..69c0f0c742c 100644
--- a/lib/composer/composer/autoload_static.php
+++ b/lib/composer/composer/autoload_static.php
@@ -1188,7 +1188,6 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
'OC\\BinaryFinder' => __DIR__ . '/../../..' . '/lib/private/BinaryFinder.php',
'OC\\Blurhash\\Listener\\GenerateBlurhashMetadata' => __DIR__ . '/../../..' . '/lib/private/Blurhash/Listener/GenerateBlurhashMetadata.php',
'OC\\Broadcast\\Events\\BroadcastEvent' => __DIR__ . '/../../..' . '/lib/private/Broadcast/Events/BroadcastEvent.php',
- 'OC\\Cache\\CappedMemoryCache' => __DIR__ . '/../../..' . '/lib/private/Cache/CappedMemoryCache.php',
'OC\\Calendar\\AvailabilityResult' => __DIR__ . '/../../..' . '/lib/private/Calendar/AvailabilityResult.php',
'OC\\Calendar\\CalendarEventBuilder' => __DIR__ . '/../../..' . '/lib/private/Calendar/CalendarEventBuilder.php',
'OC\\Calendar\\CalendarQuery' => __DIR__ . '/../../..' . '/lib/private/Calendar/CalendarQuery.php',
diff --git a/lib/private/Cache/CappedMemoryCache.php b/lib/private/Cache/CappedMemoryCache.php
deleted file mode 100644
index 999ed8a7a74..00000000000
--- a/lib/private/Cache/CappedMemoryCache.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-
-/**
- * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
- * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-namespace OC\Cache;
-
-use OCP\ICache;
-
-/**
- * In-memory cache with a capacity limit to keep memory usage in check
- *
- * Uses a simple FIFO expiry mechanism
- * @template T
- * @deprecated 25.0.0 use OCP\Cache\CappedMemoryCache instead
- */
-class CappedMemoryCache implements ICache, \ArrayAccess {
- private $capacity;
- /** @var T[] */
- private $cache = [];
-
- public function __construct($capacity = 512) {
- $this->capacity = $capacity;
- }
-
- public function hasKey($key): bool {
- return isset($this->cache[$key]);
- }
-
- /**
- * @return ?T
- */
- public function get($key) {
- return $this->cache[$key] ?? null;
- }
-
- /**
- * @param string $key
- * @param T $value
- * @param int $ttl
- * @return bool
- */
- public function set($key, $value, $ttl = 0): bool {
- if (is_null($key)) {
- $this->cache[] = $value;
- } else {
- $this->cache[$key] = $value;
- }
- $this->garbageCollect();
- return true;
- }
-
- public function remove($key) {
- unset($this->cache[$key]);
- return true;
- }
-
- public function clear($prefix = '') {
- $this->cache = [];
- return true;
- }
-
- public function offsetExists($offset): bool {
- return $this->hasKey($offset);
- }
-
- /**
- * @return T
- */
- #[\ReturnTypeWillChange]
- public function &offsetGet($offset) {
- return $this->cache[$offset];
- }
-
- /**
- * @param string $offset
- * @param T $value
- * @return void
- */
- public function offsetSet($offset, $value): void {
- $this->set($offset, $value);
- }
-
- public function offsetUnset($offset): void {
- $this->remove($offset);
- }
-
- /**
- * @return T[]
- */
- public function getData() {
- return $this->cache;
- }
-
-
- private function garbageCollect() {
- while (count($this->cache) > $this->capacity) {
- reset($this->cache);
- $key = key($this->cache);
- $this->remove($key);
- }
- }
-
- public static function isAvailable(): bool {
- return true;
- }
-}
diff --git a/tests/lib/Cache/CappedMemoryCacheTest.php b/tests/lib/Cache/CappedMemoryCacheTest.php
deleted file mode 100644
index f2ed1a5ee0d..00000000000
--- a/tests/lib/Cache/CappedMemoryCacheTest.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
- * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
- * SPDX-License-Identifier: AGPL-3.0-or-later
- */
-
-namespace Test\Cache;
-
-/**
- * Class CappedMemoryCacheTest
- *
- * @package Test\Cache
- */
-class CappedMemoryCacheTest extends TestCache {
- protected function setUp(): void {
- parent::setUp();
- $this->instance = new \OCP\Cache\CappedMemoryCache();
- }
-
- public function testSetOverCap(): void {
- $instance = new \OCP\Cache\CappedMemoryCache(3);
-
- $instance->set('1', 'a');
- $instance->set('2', 'b');
- $instance->set('3', 'c');
- $instance->set('4', 'd');
- $instance->set('5', 'e');
-
- $this->assertFalse($instance->hasKey('1'));
- $this->assertFalse($instance->hasKey('2'));
- $this->assertTrue($instance->hasKey('3'));
- $this->assertTrue($instance->hasKey('4'));
- $this->assertTrue($instance->hasKey('5'));
- }
-
- public function testClear(): void {
- $value = 'ipsum lorum';
- $this->instance->set('1_value1', $value);
- $this->instance->set('1_value2', $value);
- $this->instance->set('2_value1', $value);
- $this->instance->set('3_value1', $value);
-
- $this->assertTrue($this->instance->clear());
- $this->assertFalse($this->instance->hasKey('1_value1'));
- $this->assertFalse($this->instance->hasKey('1_value2'));
- $this->assertFalse($this->instance->hasKey('2_value1'));
- $this->assertFalse($this->instance->hasKey('3_value1'));
- }
-
- public function testIndirectSet(): void {
- $this->instance->set('array', []);
-
- $this->instance['array'][] = 'foo';
-
- $this->assertEquals(['foo'], $this->instance->get('array'));
-
- $this->instance['array']['bar'] = 'qwerty';
-
- $this->assertEquals(['foo', 'bar' => 'qwerty'], $this->instance->get('array'));
- }
-}