From 50c720688badc7185c6a71fd185bab0db8e7179d Mon Sep 17 00:00:00 2001 From: Philipp Date: Mon, 21 Apr 2025 20:49:41 +0200 Subject: [PATCH] Make PHPCS happy --- src/Core/Cache/Type/APCuCache.php | 11 +++++------ src/Core/Cache/Type/ArrayCache.php | 3 +-- src/Core/Cache/Type/MemcacheCache.php | 17 ++++++++--------- src/Core/Cache/Type/MemcachedCache.php | 17 ++++++++--------- src/Core/Lock/Type/CacheLock.php | 1 - src/Module/StatsCaching.php | 12 ++++++------ 6 files changed, 28 insertions(+), 33 deletions(-) diff --git a/src/Core/Cache/Type/APCuCache.php b/src/Core/Cache/Type/APCuCache.php index 3c72e76c98..b269b5aa9d 100644 --- a/src/Core/Cache/Type/APCuCache.php +++ b/src/Core/Cache/Type/APCuCache.php @@ -16,10 +16,9 @@ use Friendica\Core\Cache\Exception\InvalidCacheDriverException; */ class APCuCache extends AbstractCache implements ICanCacheInMemory { - const NAME = 'apcu'; - use CompareSetTrait; use CompareDeleteTrait; + const NAME = 'apcu'; /** * @throws InvalidCacheDriverException @@ -156,10 +155,10 @@ class APCuCache extends AbstractCache implements ICanCacheInMemory return [ 'entries' => $apcu['num_entries'] ?? null, - 'used_memory' => $apcu['mem_size'] ?? null, - 'hits' => $apcu['num_hits'] ?? null, - 'misses' => $apcu['num_misses'] ?? null, - 'avail_mem' => $sma['avail_mem'] ?? null, + 'used_memory' => $apcu['mem_size'] ?? null, + 'hits' => $apcu['num_hits'] ?? null, + 'misses' => $apcu['num_misses'] ?? null, + 'avail_mem' => $sma['avail_mem'] ?? null, ]; } } diff --git a/src/Core/Cache/Type/ArrayCache.php b/src/Core/Cache/Type/ArrayCache.php index c6a20d627b..148210b4e8 100644 --- a/src/Core/Cache/Type/ArrayCache.php +++ b/src/Core/Cache/Type/ArrayCache.php @@ -15,9 +15,8 @@ use Friendica\Core\Cache\Enum; */ class ArrayCache extends AbstractCache implements ICanCacheInMemory { - const NAME = 'array'; - use CompareDeleteTrait; + const NAME = 'array'; /** @var array Array with the cached data */ protected $cachedData = []; diff --git a/src/Core/Cache/Type/MemcacheCache.php b/src/Core/Cache/Type/MemcacheCache.php index b2142ffd36..b3a6588841 100644 --- a/src/Core/Cache/Type/MemcacheCache.php +++ b/src/Core/Cache/Type/MemcacheCache.php @@ -19,11 +19,10 @@ use Memcache; */ class MemcacheCache extends AbstractCache implements ICanCacheInMemory { - const NAME = 'memcache'; - use CompareSetTrait; use CompareDeleteTrait; use MemcacheCommandTrait; + const NAME = 'memcache'; /** * @var Memcache @@ -163,14 +162,14 @@ class MemcacheCache extends AbstractCache implements ICanCacheInMemory $stats = $this->memcache->getStats(); return [ - 'version' => $stats['version'] ?? null, - 'entries' => $stats['curr_items'] ?? null, - 'used_memory' => $stats['bytes'] ?? null, - 'uptime' => $stats['uptime'] ?? null, + 'version' => $stats['version'] ?? null, + 'entries' => $stats['curr_items'] ?? null, + 'used_memory' => $stats['bytes'] ?? null, + 'uptime' => $stats['uptime'] ?? null, 'connected_clients' => $stats['curr_connections'] ?? null, - 'hits' => $stats['get_hits'] ?? null, - 'misses' => $stats['get_misses'] ?? null, - 'evictions' => $stats['evictions'] ?? null, + 'hits' => $stats['get_hits'] ?? null, + 'misses' => $stats['get_misses'] ?? null, + 'evictions' => $stats['evictions'] ?? null, ]; } } diff --git a/src/Core/Cache/Type/MemcachedCache.php b/src/Core/Cache/Type/MemcachedCache.php index 53f959fd2b..03ad7d8322 100644 --- a/src/Core/Cache/Type/MemcachedCache.php +++ b/src/Core/Cache/Type/MemcachedCache.php @@ -20,11 +20,10 @@ use Psr\Log\LoggerInterface; */ class MemcachedCache extends AbstractCache implements ICanCacheInMemory { - const NAME = 'memcached'; - use CompareSetTrait; use CompareDeleteTrait; use MemcacheCommandTrait; + const NAME = 'memcached'; /** * @var \Memcached @@ -185,14 +184,14 @@ class MemcachedCache extends AbstractCache implements ICanCacheInMemory } return [ - 'version' => $stats['version'] ?? null, - 'entries' => $stats['curr_items'] ?? null, - 'used_memory' => $stats['bytes'] ?? null, - 'uptime' => $stats['uptime'] ?? null, + 'version' => $stats['version'] ?? null, + 'entries' => $stats['curr_items'] ?? null, + 'used_memory' => $stats['bytes'] ?? null, + 'uptime' => $stats['uptime'] ?? null, 'connected_clients' => $stats['curr_connections'] ?? null, - 'hits' => $stats['get_hits'] ?? null, - 'misses' => $stats['get_misses'] ?? null, - 'evictions' => $stats['evictions'] ?? null, + 'hits' => $stats['get_hits'] ?? null, + 'misses' => $stats['get_misses'] ?? null, + 'evictions' => $stats['evictions'] ?? null, ]; } } diff --git a/src/Core/Lock/Type/CacheLock.php b/src/Core/Lock/Type/CacheLock.php index 9fc9fad8f8..c7fa75e021 100644 --- a/src/Core/Lock/Type/CacheLock.php +++ b/src/Core/Lock/Type/CacheLock.php @@ -7,7 +7,6 @@ namespace Friendica\Core\Lock\Type; -use Friendica\Core\Cache\Capability\ICanCache; use Friendica\Core\Cache\Capability\ICanCacheInMemory; use Friendica\Core\Cache\Enum\Duration; use Friendica\Core\Cache\Exception\CachePersistenceException; diff --git a/src/Module/StatsCaching.php b/src/Module/StatsCaching.php index 72ba61c67a..b8d0cd1829 100644 --- a/src/Module/StatsCaching.php +++ b/src/Module/StatsCaching.php @@ -59,10 +59,10 @@ class StatsCaching extends BaseModule if (function_exists('opcache_get_status')) { $status = opcache_get_status(false); $data['opcache'] = [ - 'enabled' => $status['opcache_enabled'] ?? false, - 'hit_rate' => $status['opcache_statistics']['opcache_hit_rate'] ?? null, - 'used_memory' => $status['memory_usage']['used_memory'] ?? null, - 'free_memory' => $status['memory_usage']['free_memory'] ?? null, + 'enabled' => $status['opcache_enabled'] ?? false, + 'hit_rate' => $status['opcache_statistics']['opcache_hit_rate'] ?? null, + 'used_memory' => $status['memory_usage']['used_memory'] ?? null, + 'free_memory' => $status['memory_usage']['free_memory'] ?? null, 'num_cached_scripts' => $status['opcache_statistics']['num_cached_scripts'] ?? null, ]; } else { @@ -73,7 +73,7 @@ class StatsCaching extends BaseModule if ($this->cache instanceof ICanCacheInMemory) { $data['cache'] = [ - 'type' => $this->cache->getName(), + 'type' => $this->cache->getName(), 'stats' => $this->cache->getStats(), ]; } else { @@ -84,7 +84,7 @@ class StatsCaching extends BaseModule if ($this->lock instanceof CacheLock) { $data['lock'] = [ - 'type' => $this->lock->getName(), + 'type' => $this->lock->getName(), 'stats' => $this->lock->getCacheStats(), ]; } else {