diff options
| author | Côme Chilliet <91878298+come-nc@users.noreply.github.com> | 2024-02-08 11:52:40 +0100 |
|---|---|---|
| committer | Louis Chemineau <louis@chmn.me> | 2024-02-08 18:27:44 +0100 |
| commit | 303e2febc717065581a3e3bdc92e1672bb8253dc (patch) | |
| tree | c8f88c01fa1e7f93958a6b48bee3aa4bf5525dfb /apps/user_ldap/lib | |
| parent | f6ed1effbf4bb040ab35c625159ad80caff5e687 (diff) | |
| download | nextcloud-server-303e2febc717065581a3e3bdc92e1672bb8253dc.tar.gz nextcloud-server-303e2febc717065581a3e3bdc92e1672bb8253dc.zip | |
Merge pull request #43387 from nextcloud/fix/migrate-away-from-ilogger-in-jobs
Diffstat (limited to 'apps/user_ldap/lib')
| -rw-r--r-- | apps/user_ldap/lib/Migration/UUIDFix.php | 9 | ||||
| -rw-r--r-- | apps/user_ldap/lib/Migration/UUIDFixGroup.php | 4 | ||||
| -rw-r--r-- | apps/user_ldap/lib/Migration/UUIDFixUser.php | 4 |
3 files changed, 9 insertions, 8 deletions
diff --git a/apps/user_ldap/lib/Migration/UUIDFix.php b/apps/user_ldap/lib/Migration/UUIDFix.php index 74ab65d347c..e36ddd1140f 100644 --- a/apps/user_ldap/lib/Migration/UUIDFix.php +++ b/apps/user_ldap/lib/Migration/UUIDFix.php @@ -23,17 +23,14 @@ */ namespace OCA\User_LDAP\Migration; -use OC\BackgroundJob\QueuedJob; use OCA\User_LDAP\Mapping\AbstractMapping; use OCA\User_LDAP\Proxy; use OCA\User_LDAP\User_Proxy; +use OCP\BackgroundJob\QueuedJob; abstract class UUIDFix extends QueuedJob { - /** @var AbstractMapping */ - protected $mapper; - - /** @var Proxy */ - protected $proxy; + protected AbstractMapping $mapper; + protected Proxy $proxy; public function run($argument) { $isUser = $this->proxy instanceof User_Proxy; diff --git a/apps/user_ldap/lib/Migration/UUIDFixGroup.php b/apps/user_ldap/lib/Migration/UUIDFixGroup.php index a90dcb5a938..c0ed3f9d48d 100644 --- a/apps/user_ldap/lib/Migration/UUIDFixGroup.php +++ b/apps/user_ldap/lib/Migration/UUIDFixGroup.php @@ -24,9 +24,11 @@ namespace OCA\User_LDAP\Migration; use OCA\User_LDAP\Group_Proxy; use OCA\User_LDAP\Mapping\GroupMapping; +use OCP\AppFramework\Utility\ITimeFactory; class UUIDFixGroup extends UUIDFix { - public function __construct(GroupMapping $mapper, Group_Proxy $proxy) { + public function __construct(ITimeFactory $time, GroupMapping $mapper, Group_Proxy $proxy) { + parent::__construct($time); $this->mapper = $mapper; $this->proxy = $proxy; } diff --git a/apps/user_ldap/lib/Migration/UUIDFixUser.php b/apps/user_ldap/lib/Migration/UUIDFixUser.php index bd6aed44a0a..3f811e434ad 100644 --- a/apps/user_ldap/lib/Migration/UUIDFixUser.php +++ b/apps/user_ldap/lib/Migration/UUIDFixUser.php @@ -24,9 +24,11 @@ namespace OCA\User_LDAP\Migration; use OCA\User_LDAP\Mapping\UserMapping; use OCA\User_LDAP\User_Proxy; +use OCP\AppFramework\Utility\ITimeFactory; class UUIDFixUser extends UUIDFix { - public function __construct(UserMapping $mapper, User_Proxy $proxy) { + public function __construct(ITimeFactory $time, UserMapping $mapper, User_Proxy $proxy) { + parent::__construct($time); $this->mapper = $mapper; $this->proxy = $proxy; } |