Skip to content

fix: Remove all uses of legacy class OC_Defaults #55384

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

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

fix: Remove all uses of legacy class OC_Defaults #55384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e7d43b
fix: Remove all uses of legacy class OC_Defaults
come-nc Sep 28, 2025
838dd55
WIP - tests
come-nc Sep 28, 2025
47f4b85
fix: add missing file
come-nc Sep 28, 2025
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
9 changes: 2 additions & 7 deletions apps/dav/lib/Provisioning/Apple/AppleProvisioningPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
use OCP\IRequest;
use OCP\IURLGenerator;
use OCP\IUserSession;
use OCP\Theming\IDefaults;
use Sabre\DAV\Server;
use Sabre\DAV\ServerPlugin;
use Sabre\HTTP\RequestInterface;
Expand All @@ -22,23 +23,17 @@ class AppleProvisioningPlugin extends ServerPlugin {
*/
protected $server;

/**
* @var \OC_Defaults
*/
protected $themingDefaults;

/**
* AppleProvisioningPlugin constructor.
*/
public function __construct(
protected IUserSession $userSession,
protected IURLGenerator $urlGenerator,
\OC_Defaults $themingDefaults,
protected IDefaults $themingDefaults,
protected IRequest $request,
protected IL10N $l10n,
protected \Closure $uuidClosure,
) {
$this->themingDefaults = $themingDefaults;
}

/**
Expand Down
3 changes: 2 additions & 1 deletion apps/files_sharing/tests/CapabilitiesTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
use OCP\Security\IHasher;
use OCP\Security\ISecureRandom;
use OCP\Share\IProviderFactory;
use OCP\Theming\IDefaults;
use Psr\Log\LoggerInterface;

/**
Expand Down Expand Up @@ -93,7 +94,7 @@ private function getResults(array $map, array $typedMap = [], bool $federationEn
$this->createMock(IRootFolder::class),
$this->createMock(IMailer::class),
$this->createMock(IURLGenerator::class),
$this->createMock(\OC_Defaults::class),
$this->createMock(IDefaults::class),
$this->createMock(IEventDispatcher::class),
$this->createMock(IUserSession::class),
$this->createMock(KnownUserService::class),
Expand Down
Loading
Loading