petru/nextcloud-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Remove static vars usage in user_ldap

Browse Source 
There are still some left, harder to remove.

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
This commit is contained in:
Côme Chilliet
2026-03-17 16:34:07 +01:00
parent 9b84a0ec19
commit c88a1d3961
3 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/user_ldap/lib/Configuration.php
+1 -5
View File
@@ -444,13 +444,9 @@ class Configuration {
}
protected function getValue(string $varName): string {
static $defaults;
if (is_null($defaults)) {
$defaults = $this->getDefaults();
}
return Server::get(IConfig::class)->getAppValue('user_ldap',
$this->configPrefix . $varName,
$defaults[$varName]);
$this->getDefaults()[$varName]);
}
/**
apps/user_ldap/lib/Mapping/UserMapping.php
+5 -8
View File
@@ -1,10 +1,13 @@
<?php
declare(strict_types=1);
/**
* SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH and Nextcloud contributors
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.
* SPDX-License-Identifier: AGPL-3.0-only
*/
namespace OCA\User_LDAP\Mapping;
use OCP\HintException;
@@ -12,7 +15,6 @@ use OCP\IAppConfig;
use OCP\ICacheFactory;
use OCP\IDBConnection;
use OCP\IRequest;
use OCP\Server;
use OCP\Support\Subscription\IAssertion;
/**
@@ -30,6 +32,7 @@ class UserMapping extends AbstractMapping {
IAppConfig $config,
bool $isCLI,
private IAssertion $assertion,
private IRequest $request,
) {
parent::__construct($dbc, $cacheFactory, $config, $isCLI);
}
@@ -41,13 +44,7 @@ class UserMapping extends AbstractMapping {
try {
$this->assertion->createUserIsLegit();
} catch (HintException $e) {
static $isProvisioningApi = null;
if ($isProvisioningApi === null) {
$request = Server::get(IRequest::class);
$isProvisioningApi = \preg_match(self::PROV_API_REGEX, $request->getRequestUri()) === 1;
}
if ($isProvisioningApi) {
if (\preg_match(self::PROV_API_REGEX, $this->request->getRequestUri()) === 1) {
// only throw when prov API is being used, since functionality
// should not break for end users (e.g. when sharing).
// On direct API usage, e.g. on users page, this is desired.
apps/user_ldap/tests/Mapping/UserMappingTest.php
+2 -1
View File
@@ -12,6 +12,7 @@ use OCA\User_LDAP\Mapping\UserMapping;
use OCP\IAppConfig;
use OCP\ICacheFactory;
use OCP\IDBConnection;
use OCP\IRequest;
use OCP\Support\Subscription\IAssertion;
/**
@@ -23,6 +24,6 @@ use OCP\Support\Subscription\IAssertion;
#[\PHPUnit\Framework\Attributes\Group(name: 'DB')]
class UserMappingTest extends AbstractMappingTestCase {
public function getMapper(IDBConnection $dbMock, ICacheFactory $cacheFactory, IAppConfig $appConfig): UserMapping {
return new UserMapping($dbMock, $cacheFactory, $appConfig, true, $this->createMock(IAssertion::class));
return new UserMapping($dbMock, $cacheFactory, $appConfig, true, $this->createMock(IAssertion::class), $this->createMock(IRequest::class));
}
}