summaryrefslogtreecommitdiffstats
path: root/lib/private/Repair
diff options
context:
space:
mode:
Diffstat (limited to 'lib/private/Repair')
-rw-r--r--lib/private/Repair/ClearGeneratedAvatarCache.php2
-rw-r--r--lib/private/Repair/Collation.php6
-rw-r--r--lib/private/Repair/MoveUpdaterStepFile.php4
-rw-r--r--lib/private/Repair/NC16/CleanupCardDAVPhotoCache.php2
-rw-r--r--lib/private/Repair/NC16/ClearCollectionsAccessCache.php2
-rw-r--r--lib/private/Repair/NC18/ResetGeneratedAvatarFlag.php2
-rw-r--r--lib/private/Repair/NC20/EncryptionLegacyCipher.php2
-rw-r--r--lib/private/Repair/NC20/EncryptionMigration.php2
-rw-r--r--lib/private/Repair/NC21/AddCheckForUserCertificatesJob.php2
-rw-r--r--lib/private/Repair/NC22/LookupServerSendCheck.php2
-rw-r--r--lib/private/Repair/NC25/AddMissingSecretJob.php8
-rw-r--r--lib/private/Repair/Owncloud/MoveAvatars.php2
-rw-r--r--lib/private/Repair/Owncloud/SaveAccountsTableData.php4
-rw-r--r--lib/private/Repair/Owncloud/UpdateLanguageCodes.php2
-rw-r--r--lib/private/Repair/RemoveLinkShares.php2
-rw-r--r--lib/private/Repair/RepairDavShares.php2
-rw-r--r--lib/private/Repair/RepairInvalidShares.php2
-rw-r--r--lib/private/Repair/RepairMimeTypes.php2
18 files changed, 25 insertions, 25 deletions
diff --git a/lib/private/Repair/ClearGeneratedAvatarCache.php b/lib/private/Repair/ClearGeneratedAvatarCache.php
index db86d92cd87..844bf6cf346 100644
--- a/lib/private/Repair/ClearGeneratedAvatarCache.php
+++ b/lib/private/Repair/ClearGeneratedAvatarCache.php
@@ -49,7 +49,7 @@ class ClearGeneratedAvatarCache implements IRepairStep {
* Check if this repair step should run
*/
private function shouldRun(): bool {
- $versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0.0');
+ $versionFromBeforeUpdate = $this->config->getSystemValueString('version', '0.0.0.0');
// was added to 25.0.0.10
return version_compare($versionFromBeforeUpdate, '25.0.0.10', '<=');
diff --git a/lib/private/Repair/Collation.php b/lib/private/Repair/Collation.php
index 25e85f00af8..6f7dde68865 100644
--- a/lib/private/Repair/Collation.php
+++ b/lib/private/Repair/Collation.php
@@ -74,7 +74,7 @@ class Collation implements IRepairStep {
return;
}
- $characterSet = $this->config->getSystemValue('mysql.utf8mb4', false) ? 'utf8mb4' : 'utf8';
+ $characterSet = $this->config->getSystemValueBool('mysql.utf8mb4', false) ? 'utf8mb4' : 'utf8';
$tables = $this->getAllNonUTF8BinTables($this->connection);
foreach ($tables as $table) {
@@ -112,8 +112,8 @@ class Collation implements IRepairStep {
* @return string[]
*/
protected function getAllNonUTF8BinTables(IDBConnection $connection) {
- $dbName = $this->config->getSystemValue("dbname");
- $characterSet = $this->config->getSystemValue('mysql.utf8mb4', false) ? 'utf8mb4' : 'utf8';
+ $dbName = $this->config->getSystemValueString("dbname");
+ $characterSet = $this->config->getSystemValueBool('mysql.utf8mb4', false) ? 'utf8mb4' : 'utf8';
// fetch tables by columns
$statement = $connection->executeQuery(
diff --git a/lib/private/Repair/MoveUpdaterStepFile.php b/lib/private/Repair/MoveUpdaterStepFile.php
index 905fc9451f5..fc3b9dce1f3 100644
--- a/lib/private/Repair/MoveUpdaterStepFile.php
+++ b/lib/private/Repair/MoveUpdaterStepFile.php
@@ -43,9 +43,9 @@ class MoveUpdaterStepFile implements IRepairStep {
public function run(IOutput $output) {
$updateDir = $this->config->getSystemValue('updatedirectory', null) ?? $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data');
- $instanceId = $this->config->getSystemValue('instanceid', null);
+ $instanceId = $this->config->getSystemValueString('instanceid');
- if (!is_string($instanceId) || empty($instanceId)) {
+ if (empty($instanceId)) {
return;
}
diff --git a/lib/private/Repair/NC16/CleanupCardDAVPhotoCache.php b/lib/private/Repair/NC16/CleanupCardDAVPhotoCache.php
index b12604cd132..394e47dfcda 100644
--- a/lib/private/Repair/NC16/CleanupCardDAVPhotoCache.php
+++ b/lib/private/Repair/NC16/CleanupCardDAVPhotoCache.php
@@ -96,7 +96,7 @@ class CleanupCardDAVPhotoCache implements IRepairStep {
private function shouldRun(): bool {
return version_compare(
- $this->config->getSystemValue('version', '0.0.0.0'),
+ $this->config->getSystemValueString('version', '0.0.0.0'),
'16.0.0.0',
'<='
);
diff --git a/lib/private/Repair/NC16/ClearCollectionsAccessCache.php b/lib/private/Repair/NC16/ClearCollectionsAccessCache.php
index 51a63406d22..076e27a6ceb 100644
--- a/lib/private/Repair/NC16/ClearCollectionsAccessCache.php
+++ b/lib/private/Repair/NC16/ClearCollectionsAccessCache.php
@@ -48,7 +48,7 @@ class ClearCollectionsAccessCache implements IRepairStep {
}
private function shouldRun(): bool {
- $versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0.0');
+ $versionFromBeforeUpdate = $this->config->getSystemValueString('version', '0.0.0.0');
return version_compare($versionFromBeforeUpdate, '17.0.0.3', '<=');
}
diff --git a/lib/private/Repair/NC18/ResetGeneratedAvatarFlag.php b/lib/private/Repair/NC18/ResetGeneratedAvatarFlag.php
index 3635c86e1b9..d5ae1d7ab63 100644
--- a/lib/private/Repair/NC18/ResetGeneratedAvatarFlag.php
+++ b/lib/private/Repair/NC18/ResetGeneratedAvatarFlag.php
@@ -47,7 +47,7 @@ class ResetGeneratedAvatarFlag implements IRepairStep {
}
private function shouldRun(): bool {
- $versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0.0');
+ $versionFromBeforeUpdate = $this->config->getSystemValueString('version', '0.0.0.0');
return version_compare($versionFromBeforeUpdate, '18.0.0.5', '<=');
}
diff --git a/lib/private/Repair/NC20/EncryptionLegacyCipher.php b/lib/private/Repair/NC20/EncryptionLegacyCipher.php
index 6e31423915f..a7d008e87be 100644
--- a/lib/private/Repair/NC20/EncryptionLegacyCipher.php
+++ b/lib/private/Repair/NC20/EncryptionLegacyCipher.php
@@ -48,7 +48,7 @@ class EncryptionLegacyCipher implements IRepairStep {
}
private function shouldRun(): bool {
- $versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0.0');
+ $versionFromBeforeUpdate = $this->config->getSystemValueString('version', '0.0.0.0');
return version_compare($versionFromBeforeUpdate, '20.0.0.0', '<=');
}
diff --git a/lib/private/Repair/NC20/EncryptionMigration.php b/lib/private/Repair/NC20/EncryptionMigration.php
index 6e209314462..239a62c2718 100644
--- a/lib/private/Repair/NC20/EncryptionMigration.php
+++ b/lib/private/Repair/NC20/EncryptionMigration.php
@@ -48,7 +48,7 @@ class EncryptionMigration implements IRepairStep {
}
private function shouldRun(): bool {
- $versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0.0');
+ $versionFromBeforeUpdate = $this->config->getSystemValueString('version', '0.0.0.0');
return version_compare($versionFromBeforeUpdate, '20.0.0.1', '<=');
}
diff --git a/lib/private/Repair/NC21/AddCheckForUserCertificatesJob.php b/lib/private/Repair/NC21/AddCheckForUserCertificatesJob.php
index e9b26947db6..ee413ce12ca 100644
--- a/lib/private/Repair/NC21/AddCheckForUserCertificatesJob.php
+++ b/lib/private/Repair/NC21/AddCheckForUserCertificatesJob.php
@@ -44,7 +44,7 @@ class AddCheckForUserCertificatesJob implements IRepairStep {
}
private function shouldRun() {
- $versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0.0');
+ $versionFromBeforeUpdate = $this->config->getSystemValueString('version', '0.0.0.0');
// was added to 21.0.0.2
return version_compare($versionFromBeforeUpdate, '21.0.0.2', '<');
diff --git a/lib/private/Repair/NC22/LookupServerSendCheck.php b/lib/private/Repair/NC22/LookupServerSendCheck.php
index 46029357dbe..93475d88a2d 100644
--- a/lib/private/Repair/NC22/LookupServerSendCheck.php
+++ b/lib/private/Repair/NC22/LookupServerSendCheck.php
@@ -46,7 +46,7 @@ class LookupServerSendCheck implements IRepairStep {
}
private function shouldRun(): bool {
- $versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0.0');
+ $versionFromBeforeUpdate = $this->config->getSystemValueString('version', '0.0.0.0');
// was added to 22.0.0.3
return (version_compare($versionFromBeforeUpdate, '22.0.0.3', '<') && version_compare($versionFromBeforeUpdate, '22.0.0.0', '>='))
diff --git a/lib/private/Repair/NC25/AddMissingSecretJob.php b/lib/private/Repair/NC25/AddMissingSecretJob.php
index 1194fe3f6ab..d3a438b89c1 100644
--- a/lib/private/Repair/NC25/AddMissingSecretJob.php
+++ b/lib/private/Repair/NC25/AddMissingSecretJob.php
@@ -42,8 +42,8 @@ class AddMissingSecretJob implements IRepairStep {
}
public function run(IOutput $output): void {
- $passwordSalt = $this->config->getSystemValue('passwordsalt', null);
- if ($passwordSalt === null || $passwordSalt === '') {
+ $passwordSalt = $this->config->getSystemValueString('passwordsalt', '');
+ if ($passwordSalt === '') {
try {
$this->config->setSystemValue('passwordsalt', $this->random->generate(30));
} catch (HintException $e) {
@@ -51,8 +51,8 @@ class AddMissingSecretJob implements IRepairStep {
}
}
- $secret = $this->config->getSystemValue('secret', null);
- if ($secret === null || $secret === '') {
+ $secret = $this->config->getSystemValueString('secret', '');
+ if ($secret === '') {
try {
$this->config->setSystemValue('secret', $this->random->generate(48));
} catch (HintException $e) {
diff --git a/lib/private/Repair/Owncloud/MoveAvatars.php b/lib/private/Repair/Owncloud/MoveAvatars.php
index fa3dd924648..44ba9b7643b 100644
--- a/lib/private/Repair/Owncloud/MoveAvatars.php
+++ b/lib/private/Repair/Owncloud/MoveAvatars.php
@@ -59,7 +59,7 @@ class MoveAvatars implements IRepairStep {
$output->info('Repair step already executed');
return;
}
- if ($this->config->getSystemValue('enable_avatars', true) === false) {
+ if (!$this->config->getSystemValueBool('enable_avatars', true)) {
$output->info('Avatars are disabled');
} else {
$output->info('Add background job');
diff --git a/lib/private/Repair/Owncloud/SaveAccountsTableData.php b/lib/private/Repair/Owncloud/SaveAccountsTableData.php
index 13677d80de0..94fd1554293 100644
--- a/lib/private/Repair/Owncloud/SaveAccountsTableData.php
+++ b/lib/private/Repair/Owncloud/SaveAccountsTableData.php
@@ -79,7 +79,7 @@ class SaveAccountsTableData implements IRepairStep {
}
// oc_persistent_locks will be removed later on anyways so we can just drop and ignore any foreign key constraints here
- $tableName = $this->config->getSystemValue('dbtableprefix', 'oc_') . 'persistent_locks';
+ $tableName = $this->config->getSystemValueString('dbtableprefix', 'oc_') . 'persistent_locks';
$schema = $this->db->createSchema();
$table = $schema->getTable($tableName);
foreach ($table->getForeignKeys() as $foreignKey) {
@@ -99,7 +99,7 @@ class SaveAccountsTableData implements IRepairStep {
*/
protected function shouldRun() {
$schema = $this->db->createSchema();
- $prefix = $this->config->getSystemValue('dbtableprefix', 'oc_');
+ $prefix = $this->config->getSystemValueString('dbtableprefix', 'oc_');
$tableName = $prefix . 'accounts';
if (!$schema->hasTable($tableName)) {
diff --git a/lib/private/Repair/Owncloud/UpdateLanguageCodes.php b/lib/private/Repair/Owncloud/UpdateLanguageCodes.php
index cb4525b6c1d..e08a0b55a9a 100644
--- a/lib/private/Repair/Owncloud/UpdateLanguageCodes.php
+++ b/lib/private/Repair/Owncloud/UpdateLanguageCodes.php
@@ -56,7 +56,7 @@ class UpdateLanguageCodes implements IRepairStep {
* {@inheritdoc}
*/
public function run(IOutput $output) {
- $versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
+ $versionFromBeforeUpdate = $this->config->getSystemValueString('version', '0.0.0');
if (version_compare($versionFromBeforeUpdate, '12.0.0.13', '>')) {
return;
diff --git a/lib/private/Repair/RemoveLinkShares.php b/lib/private/Repair/RemoveLinkShares.php
index 71eead1053b..b45a1d83a56 100644
--- a/lib/private/Repair/RemoveLinkShares.php
+++ b/lib/private/Repair/RemoveLinkShares.php
@@ -71,7 +71,7 @@ class RemoveLinkShares implements IRepairStep {
}
private function shouldRun(): bool {
- $versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
+ $versionFromBeforeUpdate = $this->config->getSystemValueString('version', '0.0.0');
if (version_compare($versionFromBeforeUpdate, '14.0.11', '<')) {
return true;
diff --git a/lib/private/Repair/RepairDavShares.php b/lib/private/Repair/RepairDavShares.php
index 9c0bce66ae8..467adc2b0d9 100644
--- a/lib/private/Repair/RepairDavShares.php
+++ b/lib/private/Repair/RepairDavShares.php
@@ -125,7 +125,7 @@ class RepairDavShares implements IRepairStep {
* @inheritDoc
*/
public function run(IOutput $output) {
- $versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
+ $versionFromBeforeUpdate = $this->config->getSystemValueString('version', '0.0.0');
if (version_compare($versionFromBeforeUpdate, '20.0.8', '<')
&& $this->repairUnencodedGroupShares()
) {
diff --git a/lib/private/Repair/RepairInvalidShares.php b/lib/private/Repair/RepairInvalidShares.php
index c34d5d9e005..9255034f6fe 100644
--- a/lib/private/Repair/RepairInvalidShares.php
+++ b/lib/private/Repair/RepairInvalidShares.php
@@ -110,7 +110,7 @@ class RepairInvalidShares implements IRepairStep {
}
public function run(IOutput $out) {
- $ocVersionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
+ $ocVersionFromBeforeUpdate = $this->config->getSystemValueString('version', '0.0.0');
if (version_compare($ocVersionFromBeforeUpdate, '12.0.0.11', '<')) {
$this->adjustFileSharePermissions($out);
}
diff --git a/lib/private/Repair/RepairMimeTypes.php b/lib/private/Repair/RepairMimeTypes.php
index 5f3531ea79c..ee5a84ad65c 100644
--- a/lib/private/Repair/RepairMimeTypes.php
+++ b/lib/private/Repair/RepairMimeTypes.php
@@ -234,7 +234,7 @@ class RepairMimeTypes implements IRepairStep {
* Fix mime types
*/
public function run(IOutput $out) {
- $ocVersionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
+ $ocVersionFromBeforeUpdate = $this->config->getSystemValueString('version', '0.0.0');
// NOTE TO DEVELOPERS: when adding new mime types, please make sure to
// add a version comparison to avoid doing it every time
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-09 15:18:00 +0000