Merge pull request #59002 from nextcloud/fix/remove-static-vars

Remove usage of static vars or properties

Author: Altahrim

apps/encryption/lib/Crypto/Encryption.php

@@ -56,7 +56,10 @@ class Encryption implements IEncryptionModule {
 	/** @var int Current version of the file */
 	private int $version = 0;
 
-	/** @var array remember encryption signature version */
+	/**
+	 * @var array remember encryption signature version
+	 * @psalm-suppress ImpureStaticProperty
+	 */
 	private static $rememberVersion = [];
 
 	public function __construct(

apps/files_external/lib/Service/BackendService.php

@@ -62,6 +62,7 @@ class BackendService {
 
 	/** @var IConfigHandler[] */
 	private array $configHandlers = [];
+	private bool $eventSent = false;
 
 	public function __construct(
 		protected readonly IAppConfig $appConfig,
@@ -79,14 +80,14 @@ public function registerBackendProvider(IBackendProvider $provider) {
 		$this->backendProviders[] = $provider;
 	}
 
-	private function callForRegistrations() {
-		static $eventSent = false;
-		if (!$eventSent) {
+	private function callForRegistrations(): void {
+		$instance = Server::get(self::class);
+		if (!$instance->eventSent) {
 			Server::get(IEventDispatcher::class)->dispatch(
 				'OCA\\Files_External::loadAdditionalBackends',
 				new GenericEvent()
 			);
-			$eventSent = true;
+			$instance->eventSent = true;
 		}
 	}
 

apps/files_sharing/lib/SharedStorage.php

@@ -89,6 +89,9 @@ class SharedStorage extends Jail implements LegacyISharedStorage, ISharedStorage
 	private IAppConfig $appConfig;
 	private IShareManager $shareManager;
 
+	/**
+	 * @psalm-suppress ImpureStaticProperty
+	 */
 	private static int $initDepth = 0;
 
 	public function __construct(array $parameters) {

apps/files_trashbin/lib/Command/RestoreAllFiles.php

@@ -30,7 +30,7 @@ class RestoreAllFiles extends Base {
 	private const SCOPE_USER = 1;
 	private const SCOPE_GROUPFOLDERS = 2;
 
-	private static array $SCOPE_MAP = [
+	private const SCOPE_MAP = [
 		'user' => self::SCOPE_USER,
 		'groupfolders' => self::SCOPE_GROUPFOLDERS,
 		'all' => self::SCOPE_ALL
@@ -221,8 +221,8 @@ protected function parseArgs(InputInterface $input): array {
 	}
 
 	protected function parseScope(string $scope): int {
-		if (isset(self::$SCOPE_MAP[$scope])) {
-			return self::$SCOPE_MAP[$scope];
+		if (isset(self::SCOPE_MAP[$scope])) {
+			return self::SCOPE_MAP[$scope];
 		}
 
 		throw new InvalidOptionException("Invalid scope '$scope'");

apps/files_versions/lib/BlockVersioningOperation.php

@@ -6,6 +6,7 @@
  * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
+
 namespace OCA\Files_Versions;
 
 use OCA\Files_Versions\Events\CreateVersionEvent;

apps/files_versions/lib/Listener/CreateVersionListenerForWorkflow.php

@@ -6,6 +6,7 @@
  * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
+
 namespace OCA\Files_Versions\Listener;
 
 use OCA\Files_Versions\BlockVersioningOperation;

apps/files_versions/lib/Listener/RegisterWorkflowIntegrationListener.php

@@ -6,6 +6,7 @@
  * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
+
 namespace OCA\Files_Versions\Listener;
 
 use OCA\Files_Versions\BlockVersioningOperation;

apps/files_versions/lib/Storage.php

@@ -56,11 +56,17 @@ class Storage {
 	public const DELETE_TRIGGER_QUOTA_EXCEEDED = 2;
 
 	// files for which we can remove the versions after the delete operation was successful
-	private static $deletedFiles = [];
+	/**
+	 * @psalm-suppress ImpureStaticProperty
+	 */
+	private static array $deletedFiles = [];
 
-	private static $sourcePathAndUser = [];
+	/**
+	 * @psalm-suppress ImpureStaticProperty
+	 */
+	private static array $sourcePathAndUser = [];
 
-	private static $max_versions_per_interval = [
+	private const MAX_VERSIONS_PER_INTERVAL = [
 		//first 10sec, one version every 2sec
 		1 => ['intervalEndsAfter' => 10,      'step' => 2],
 		//next minute, one version every 10sec
@@ -763,12 +769,8 @@ protected static function getAutoExpireList($time, $versions) {
 		$toDelete = [];  // versions we want to delete
 
 		$interval = 1;
-		$step = Storage::$max_versions_per_interval[$interval]['step'];
-		if (Storage::$max_versions_per_interval[$interval]['intervalEndsAfter'] === -1) {
-			$nextInterval = -1;
-		} else {
-			$nextInterval = $time - Storage::$max_versions_per_interval[$interval]['intervalEndsAfter'];
-		}
+		$step = Storage::MAX_VERSIONS_PER_INTERVAL[$interval]['step'];
+		$nextInterval = $time - Storage::MAX_VERSIONS_PER_INTERVAL[$interval]['intervalEndsAfter'];
 
 		$firstVersion = reset($versions);
 
@@ -797,12 +799,16 @@ protected static function getAutoExpireList($time, $versions) {
 					$newInterval = false; // version checked so we can move to the next one
 				} else { // time to move on to the next interval
 					$interval++;
-					$step = Storage::$max_versions_per_interval[$interval]['step'];
+					if ($interval > count(Storage::MAX_VERSIONS_PER_INTERVAL)) {
+						/* Should never happen, as last interval has -1 as nextInterval */
+						throw new \Exception('MAX_VERSIONS_PER_INTERVAL is malformed or there is a logic issue');
+					}
+					$step = Storage::MAX_VERSIONS_PER_INTERVAL[$interval]['step'];
 					$nextVersion = $prevTimestamp - $step;
-					if (Storage::$max_versions_per_interval[$interval]['intervalEndsAfter'] === -1) {
+					if (Storage::MAX_VERSIONS_PER_INTERVAL[$interval]['intervalEndsAfter'] === -1) {
 						$nextInterval = -1;
 					} else {
-						$nextInterval = $time - Storage::$max_versions_per_interval[$interval]['intervalEndsAfter'];
+						$nextInterval = $time - Storage::MAX_VERSIONS_PER_INTERVAL[$interval]['intervalEndsAfter'];
 					}
 					$newInterval = true; // we changed the interval -> check same version with new interval
 				}

apps/user_ldap/lib/Access.php

@@ -16,6 +16,7 @@
 use OCA\User_LDAP\Mapping\AbstractMapping;
 use OCA\User_LDAP\User\Manager;
 use OCA\User_LDAP\User\OfflineUser;
+use OCP\Cache\CappedMemoryCache;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\HintException;
 use OCP\IAppConfig;
@@ -49,6 +50,7 @@ class Access extends LDAPUtility {
 	protected $groupMapper;
 
 	private string $lastCookie = '';
+	private CappedMemoryCache $intermediates;
 
 	public function __construct(
 		ILDAPWrapper $ldap,
@@ -62,6 +64,7 @@ public function __construct(
 	) {
 		parent::__construct($ldap);
 		$this->userManager->setLdapAccess($this);
+		$this->intermediates = new CappedMemoryCache();
 	}
 
 	/**
@@ -484,8 +487,7 @@ public function dn2username($fdn) {
 	 * @throws \Exception
 	 */
 	public function dn2ocname($fdn, $ldapName = null, $isUser = true, &$newlyMapped = null, ?array $record = null, bool $autoMapping = true) {
-		static $intermediates = [];
-		if (isset($intermediates[($isUser ? 'user-' : 'group-') . $fdn])) {
+		if (isset($this->intermediates[($isUser ? 'user-' : 'group-') . $fdn])) {
 			return false; // is a known intermediate
 		}
 
@@ -532,7 +534,7 @@ public function dn2ocname($fdn, $ldapName = null, $isUser = true, &$newlyMapped
 			$record = $this->readAttributes($fdn, $attributesToRead, $filter);
 			if ($record === false) {
 				$this->logger->debug('Cannot read attributes for ' . $fdn . '. Skipping.', ['filter' => $filter]);
-				$intermediates[($isUser ? 'user-' : 'group-') . $fdn] = true;
+				$this->intermediates[($isUser ? 'user-' : 'group-') . $fdn] = true;
 				return false;
 			}
 		}
@@ -579,7 +581,7 @@ public function dn2ocname($fdn, $ldapName = null, $isUser = true, &$newlyMapped
 				$ldapName = $record[$nameAttribute];
 				if (!isset($ldapName[0]) || empty($ldapName[0])) {
 					$this->logger->debug('No or empty name for ' . $fdn . ' with filter ' . $filter . '.', ['app' => 'user_ldap']);
-					$intermediates['group-' . $fdn] = true;
+					$this->intermediates['group-' . $fdn] = true;
 					return false;
 				}
 				$ldapName = $ldapName[0];

apps/user_ldap/lib/AccessFactory.php

@@ -1,12 +1,16 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
 namespace OCA\User_LDAP;
 
+use OCA\User_LDAP\Mapping\GroupMapping;
+use OCA\User_LDAP\Mapping\UserMapping;
 use OCA\User_LDAP\User\Manager;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IAppConfig;
@@ -15,6 +19,8 @@
 use Psr\Log\LoggerInterface;
 
 class AccessFactory {
+	/** @var array<string,Access> */
+	private array $accesses = [];
 
 	public function __construct(
 		private ILDAPWrapper $ldap,
@@ -23,6 +29,8 @@ public function __construct(
 		private IUserManager $ncUserManager,
 		private LoggerInterface $logger,
 		private IEventDispatcher $dispatcher,
+		private UserMapping $userMapping,
+		private GroupMapping $groupMapping,
 	) {
 	}
 
@@ -39,4 +47,19 @@ public function get(Connection $connection): Access {
 			$this->dispatcher,
 		);
 	}
+
+	public function getAccessForPrefix(string $configPrefix): Access {
+		if (!isset(self::$accesses[$configPrefix])) {
+			$this->addAccess($configPrefix);
+		}
+		return $this->accesses[$configPrefix];
+	}
+
+	private function addAccess(string $configPrefix): void {
+		$connector = new Connection($this->ldap, $configPrefix);
+		$access = $this->get($connector);
+		$access->setUserMapper($this->userMapping);
+		$access->setGroupMapper($this->groupMapping);
+		$this->accesses[$configPrefix] = $access;
+	}
 }