diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php index 4cbade8e68e..e7251e78f81 100644 --- a/lib/composer/composer/autoload_classmap.php +++ b/lib/composer/composer/autoload_classmap.php @@ -1762,7 +1762,6 @@ return array( 'OC\\Files\\Template\\TemplateManager' => $baseDir . '/lib/private/Files/Template/TemplateManager.php', 'OC\\Files\\Type\\Detection' => $baseDir . '/lib/private/Files/Type/Detection.php', 'OC\\Files\\Type\\Loader' => $baseDir . '/lib/private/Files/Type/Loader.php', - 'OC\\Files\\Type\\TemplateManager' => $baseDir . '/lib/private/Files/Type/TemplateManager.php', 'OC\\Files\\Utils\\PathHelper' => $baseDir . '/lib/private/Files/Utils/PathHelper.php', 'OC\\Files\\Utils\\Scanner' => $baseDir . '/lib/private/Files/Utils/Scanner.php', 'OC\\Files\\View' => $baseDir . '/lib/private/Files/View.php', diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php index 79f4c88358f..45c9221f8f4 100644 --- a/lib/composer/composer/autoload_static.php +++ b/lib/composer/composer/autoload_static.php @@ -1803,7 +1803,6 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OC\\Files\\Template\\TemplateManager' => __DIR__ . '/../../..' . '/lib/private/Files/Template/TemplateManager.php', 'OC\\Files\\Type\\Detection' => __DIR__ . '/../../..' . '/lib/private/Files/Type/Detection.php', 'OC\\Files\\Type\\Loader' => __DIR__ . '/../../..' . '/lib/private/Files/Type/Loader.php', - 'OC\\Files\\Type\\TemplateManager' => __DIR__ . '/../../..' . '/lib/private/Files/Type/TemplateManager.php', 'OC\\Files\\Utils\\PathHelper' => __DIR__ . '/../../..' . '/lib/private/Files/Utils/PathHelper.php', 'OC\\Files\\Utils\\Scanner' => __DIR__ . '/../../..' . '/lib/private/Files/Utils/Scanner.php', 'OC\\Files\\View' => __DIR__ . '/../../..' . '/lib/private/Files/View.php', diff --git a/lib/private/Files/Type/TemplateManager.php b/lib/private/Files/Type/TemplateManager.php deleted file mode 100644 index a0c0e9fac9f..00000000000 --- a/lib/private/Files/Type/TemplateManager.php +++ /dev/null @@ -1,50 +0,0 @@ -templates[$mimetype] = $path; - } - - /** - * get the path of the template for a mimetype - * - * @deprecated 18.0.0 - * @param string $mimetype - * @return string|null - */ - public function getTemplatePath($mimetype) { - if (isset($this->templates[$mimetype])) { - return $this->templates[$mimetype]; - } else { - return null; - } - } - - /** - * get the template content for a mimetype - * - * @deprecated 18.0.0 - * @param string $mimetype - * @return string - */ - public function getTemplate($mimetype) { - $path = $this->getTemplatePath($mimetype); - if ($path) { - return file_get_contents($path); - } else { - return ''; - } - } -} diff --git a/lib/private/legacy/OC_Helper.php b/lib/private/legacy/OC_Helper.php index 7417ebf227b..47d2d88e7ea 100644 --- a/lib/private/legacy/OC_Helper.php +++ b/lib/private/legacy/OC_Helper.php @@ -32,7 +32,6 @@ use Psr\Log\LoggerInterface; * } */ class OC_Helper { - private static $templateManager; private static ?ICacheFactory $cacheFactory = null; private static ?bool $quotaIncludeExternalStorage = null; @@ -66,17 +65,6 @@ class OC_Helper { } } - /** - * @deprecated 18.0.0 - * @return \OC\Files\Type\TemplateManager - */ - public static function getFileTemplateManager() { - if (!self::$templateManager) { - self::$templateManager = new \OC\Files\Type\TemplateManager(); - } - return self::$templateManager; - } - /** * detect if a given program is found in the search PATH *