Skip to content

Commit

Permalink
fix(meta): drop 25 support
Browse files Browse the repository at this point in the history
for dependencies already PHP 8.x is required, contradicting NC 25
compatibility. Also, 25 is EOL.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
  • Loading branch information
blizzz committed Feb 29, 2024
1 parent a11cfa0 commit ee3177e
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Have a good time and manage whatever you want.
<database>pgsql</database>
<database>mysql</database>
<database>sqlite</database>
<nextcloud min-version="25" max-version="29"/>
<nextcloud min-version="26" max-version="29"/>
</dependencies>
<repair-steps>
<post-migration>
Expand Down
12 changes: 1 addition & 11 deletions lib/Service/TableTemplateService.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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';
}
}

/**
Expand Down

0 comments on commit ee3177e

Please sign in to comment.