diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml index f9285e948..47f025720 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress.yml @@ -25,7 +25,7 @@ jobs: matrix: node-version: [ 16 ] databases: [ 'mysql' ] - server-versions: [ 'stable25', 'stable27', 'master' ] + server-versions: [ 'stable26', 'stable27', 'master' ] include: - php-versions: 8.1 diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index e3d2aed10..96f081c60 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -26,7 +26,7 @@ jobs: strategy: fail-fast: false matrix: - server-versions: ['stable25', 'stable27', 'master'] + server-versions: ['stable26', 'stable27', 'master'] php-versions: ['8.1'] databases: ['mysql'] include: diff --git a/appinfo/info.xml b/appinfo/info.xml index e3070c31d..a37735e09 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -44,7 +44,7 @@ Have a good time and manage whatever you want. pgsql mysql sqlite - + diff --git a/lib/Service/TableTemplateService.php b/lib/Service/TableTemplateService.php index e867707d2..d26d2eb37 100644 --- a/lib/Service/TableTemplateService.php +++ b/lib/Service/TableTemplateService.php @@ -10,7 +10,6 @@ use OCP\AppFramework\Db\DoesNotExistException; use OCP\AppFramework\Db\MultipleObjectsReturnedException; use OCP\DB\Exception; -use OCP\IConfig; use OCP\IL10N; use Psr\Log\LoggerInterface; @@ -27,24 +26,15 @@ class TableTemplateService { private ?string $userId; - private IConfig $config; - private string $textRichColumnTypeName = 'rich'; - public function __construct(LoggerInterface $logger, IL10N $l, ColumnService $columnService, ?string $userId, RowService $rowService, ViewService $viewService, IConfig $config) { + public function __construct(LoggerInterface $logger, IL10N $l, ColumnService $columnService, ?string $userId, RowService $rowService, ViewService $viewService) { $this->logger = $logger; $this->l = $l; $this->columnService = $columnService; $this->rowService = $rowService; $this->viewService = $viewService; $this->userId = $userId; - $this->config = $config; - - // if we are on NC25, wie have to use the old text-long column type - // this is because NC25 does not serve the text editor globally - if (version_compare($this->config->getSystemValueString('version', '0.0.0'), '26.0.0', '<')) { - $this->textRichColumnTypeName = 'long'; - } } /**