diff --git a/core/command/encryption/decryptall.php b/core/command/encryption/decryptall.php index 374f635725..696570b7ae 100644 --- a/core/command/encryption/decryptall.php +++ b/core/command/encryption/decryptall.php @@ -77,13 +77,13 @@ class DecryptAll extends Command { $this->questionHelper = $questionHelper; $this->wasTrashbinEnabled = $this->appManager->isEnabledForUser('files_trashbin'); - $this->wasSingleUserModeEnabled = $this->config->getSystemValue('singleUser', false); - $this->config->setSystemValue('singleUser', true); + $this->wasSingleUserModeEnabled = $this->config->getSystemValue('singleuser', false); + $this->config->setSystemValue('singleuser', true); $this->appManager->disableApp('files_trashbin'); } public function __destruct() { - $this->config->setSystemValue('singleUser', $this->wasSingleUserModeEnabled); + $this->config->setSystemValue('singleuser', $this->wasSingleUserModeEnabled); if ($this->wasTrashbinEnabled) { $this->appManager->enableApp('files_trashbin'); } diff --git a/core/command/encryption/encryptall.php b/core/command/encryption/encryptall.php index 7f33e18ecb..950ce5166d 100644 --- a/core/command/encryption/encryptall.php +++ b/core/command/encryption/encryptall.php @@ -68,13 +68,13 @@ class EncryptAll extends Command { $this->config = $config; $this->questionHelper = $questionHelper; $this->wasTrashbinEnabled = $this->appManager->isEnabledForUser('files_trashbin'); - $this->wasSingleUserModeEnabled = $this->config->getSystemValue('singleUser', false); - $this->config->setSystemValue('singleUser', true); + $this->wasSingleUserModeEnabled = $this->config->getSystemValue('singleuser', false); + $this->config->setSystemValue('singleuser', true); $this->appManager->disableApp('files_trashbin'); } public function __destruct() { - $this->config->setSystemValue('singleUser', $this->wasSingleUserModeEnabled); + $this->config->setSystemValue('singleuser', $this->wasSingleUserModeEnabled); if ($this->wasTrashbinEnabled) { $this->appManager->enableApp('files_trashbin'); } diff --git a/tests/core/command/encryption/decryptalltest.php b/tests/core/command/encryption/decryptalltest.php index b7fd630e9b..ef36d6d282 100644 --- a/tests/core/command/encryption/decryptalltest.php +++ b/tests/core/command/encryption/decryptalltest.php @@ -71,7 +71,7 @@ class DecryptAllTest extends TestCase { $this->config->expects($this->any()) ->method('getSystemValue') - ->with('singleUser', false) + ->with('singleuser', false) ->willReturn(false); $this->appManager->expects($this->any()) ->method('isEnabledForUser') @@ -83,7 +83,7 @@ class DecryptAllTest extends TestCase { // on construct we enable single-user-mode and disable the trash bin $this->config->expects($this->at(1)) ->method('setSystemValue') - ->with('singleUser', true); + ->with('singleuser', true); $this->appManager->expects($this->once()) ->method('disableApp') ->with('files_trashbin'); @@ -91,7 +91,7 @@ class DecryptAllTest extends TestCase { // on destruct wi disable single-user-mode again and enable the trash bin $this->config->expects($this->at(2)) ->method('setSystemValue') - ->with('singleUser', false); + ->with('singleuser', false); $this->appManager->expects($this->once()) ->method('enableApp') ->with('files_trashbin'); diff --git a/tests/core/command/encryption/encryptalltest.php b/tests/core/command/encryption/encryptalltest.php index 41edee6987..9f7f737504 100644 --- a/tests/core/command/encryption/encryptalltest.php +++ b/tests/core/command/encryption/encryptalltest.php @@ -81,9 +81,9 @@ class EncryptAllTest extends TestCase { $this->appManager->expects($this->once())->method('disableApp')->with('files_trashbin'); // enable single user mode to avoid that other user login during encryption // destructor should disable the single user mode again - $this->config->expects($this->once())->method('getSystemValue')->with('singleUser', false)->willReturn(false); - $this->config->expects($this->at(1))->method('setSystemValue')->with('singleUser', true); - $this->config->expects($this->at(2))->method('setSystemValue')->with('singleUser', false); + $this->config->expects($this->once())->method('getSystemValue')->with('singleuser', false)->willReturn(false); + $this->config->expects($this->at(1))->method('setSystemValue')->with('singleuser', true); + $this->config->expects($this->at(2))->method('setSystemValue')->with('singleuser', false); new EncryptAll($this->encryptionManager, $this->appManager, $this->config, $this->questionHelper); }