Skip to content

Refactor OC\Server::getAvatarManager in user_ldap app #40206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skjnldsv merged 1 commit into from
May 30, 2024
Merged

Refactor OC\Server::getAvatarManager in user_ldap app #40206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/user_ldap/lib/Jobs/Sync.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ public function setArgument($argument) {
if (isset($argument['avatarManager'])) {
$this->avatarManager = $argument['avatarManager'];
} else {
$this->avatarManager = \OC::$server->getAvatarManager();
$this->avatarManager = \OC::$server->get(IAvatarManager::class);
}

if (isset($argument['dbc'])) {
Expand Down
3 changes: 2 additions & 1 deletion apps/user_ldap/tests/Integration/AbstractIntegrationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
use OCA\User_LDAP\LDAP;
use OCA\User_LDAP\User\Manager;
use OCA\User_LDAP\UserPluginManager;
use OCP\IAvatarManager;
use OCP\Share\IManager;
use Psr\Log\LoggerInterface;

Expand Down Expand Up @@ -124,7 +125,7 @@ protected function initUserManager() {
\OC::$server->getConfig(),
new FilesystemHelper(),
\OC::$server->get(LoggerInterface::class),
\OC::$server->getAvatarManager(),
\OC::$server->get(IAvatarManager::class),
new \OCP\Image(),
\OC::$server->getUserManager(),
\OC::$server->getNotificationManager(),
Expand Down
11 changes: 6 additions & 5 deletions apps/user_ldap/tests/Integration/Lib/User/IntegrationTestUserAvatar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
use OCA\User_LDAP\User\User;
use OCA\User_LDAP\User_LDAP;
use OCA\User_LDAP\UserPluginManager;
use OCP\IAvatarManager;
use OCP\Image;
use Psr\Log\LoggerInterface;

Expand Down Expand Up @@ -78,8 +79,8 @@ private function execFetchTest($dn, $username, $image) {
\OC_Util::setupFS($username);
\OC::$server->getUserFolder($username);
\OC::$server->getConfig()->deleteUserValue($username, 'user_ldap', User::USER_PREFKEY_LASTREFRESH);
if (\OC::$server->getAvatarManager()->getAvatar($username)->exists()) {
\OC::$server->getAvatarManager()->getAvatar($username)->remove();
if (\OC::$server->get(IAvatarManager::class)->getAvatar($username)->exists()) {
\OC::$server->get(IAvatarManager::class)->getAvatar($username)->remove();
}

// finally attempt to get the avatar set
Expand All @@ -99,7 +100,7 @@ protected function case1() {

$this->execFetchTest($dn, $username, $image);

return \OC::$server->getAvatarManager()->getAvatar($username)->exists();
return \OC::$server->get(IAvatarManager::class)->getAvatar($username)->exists();
}

/**
Expand All @@ -116,7 +117,7 @@ protected function case2() {

$this->execFetchTest($dn, $username, $image);

return !\OC::$server->getAvatarManager()->getAvatar($username)->exists();
return !\OC::$server->get(IAvatarManager::class)->getAvatar($username)->exists();
}

/**
Expand All @@ -136,7 +137,7 @@ protected function initUserManager() {
\OC::$server->getConfig(),
new FilesystemHelper(),
\OC::$server->get(LoggerInterface::class),
\OC::$server->getAvatarManager(),
\OC::$server->get(IAvatarManager::class),
new Image(),
\OC::$server->getDatabaseConnection(),
\OC::$server->getUserManager(),
Expand Down