Merge pull request #40125 from summersab/refactor/OC-Server-getThemingDefaults

Author: skjnldsv

lib/private/AppFramework/DependencyInjection/DIContainer.php

@@ -173,7 +173,7 @@ public function __construct(string $appName, array $urlParams = [], ServerContai
 		});
 
 		$this->registerService('OC_Defaults', function (ContainerInterface $c) {
-			return $c->get(IServerContainer::class)->getThemingDefaults();
+			return $c->get(IServerContainer::class)->get('ThemingDefaults');
 		});
 
 		$this->registerService('Protocol', function (ContainerInterface $c) {

lib/private/Console/Application.php

@@ -59,7 +59,7 @@ public function __construct(IConfig $config,
 		IRequest $request,
 		LoggerInterface $logger,
 		MemoryInfo $memoryInfo) {
-		$defaults = \OC::$server->getThemingDefaults();
+		$defaults = \OC::$server->get('ThemingDefaults');
 		$this->config = $config;
 		$this->application = new SymfonyApplication($defaults->getName(), \OC_Util::getVersionString());
 		$this->dispatcher = $dispatcher;

lib/private/Server.php

@@ -1348,7 +1348,7 @@ public function __construct($webRoot, \OC\Config $config) {
 
 		$this->registerService(Defaults::class, function (Server $c) {
 			return new Defaults(
-				$c->getThemingDefaults()
+				$c->get('ThemingDefaults')
 			);
 		});
 		/** @deprecated 19.0.0 */

lib/private/URLGenerator.php

@@ -226,7 +226,7 @@ public function imagePath(string $appName, string $file): string {
 		$themingEnabled = $this->config->getSystemValueBool('installed', false) && $this->getAppManager()->isEnabledForUser('theming');
 		$themingImagePath = false;
 		if ($themingEnabled) {
-			$themingDefaults = \OC::$server->getThemingDefaults();
+			$themingDefaults = \OC::$server->get('ThemingDefaults');
 			if ($themingDefaults instanceof ThemingDefaults) {
 				$themingImagePath = $themingDefaults->replaceImagePath($appName, $file);
 			}
@@ -299,7 +299,7 @@ public function getAbsoluteURL(string $url): string {
 	 * @return string url to the online documentation
 	 */
 	public function linkToDocs(string $key): string {
-		$theme = \OC::$server->getThemingDefaults();
+		$theme = \OC::$server->get('ThemingDefaults');
 		return $theme->buildDocLinkToKey($key);
 	}
 

lib/public/Defaults.php

@@ -52,7 +52,7 @@ class Defaults {
 	 */
 	public function __construct(\OC_Defaults $defaults = null) {
 		if ($defaults === null) {
-			$defaults = \OC::$server->getThemingDefaults();
+			$defaults = \OC::$server->get('ThemingDefaults');
 		}
 		$this->defaults = $defaults;
 	}