Use the proper default values

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

diff --git a/settings/Controller/CheckSetupController.php b/settings/Controller/CheckSetupController.php
index 57766f26724963c3fba6b63c6c905b249143f281..224c0cb30d3abc3fe74530c3c78ccabaf78135e9 100644 (file)
--- a/settings/Controller/CheckSetupController.php
+++ b/settings/Controller/CheckSetupController.php
@@ -529,7 +529,7 @@ Raw output
        }
 
        protected function isPhpMailerUsed(): bool {
-               return $this->config->getSystemValue('mail_smtpmode') === 'php';
+               return $this->config->getSystemValue('mail_smtpmode', 'smtp') === 'php';
        }
 
        protected function hasOpcacheLoaded(): bool {

diff --git a/tests/Settings/Controller/CheckSetupControllerTest.php b/tests/Settings/Controller/CheckSetupControllerTest.php
index 8da90b91bfd24cc54a9a523c983b344fcedfd4c2..20184251d206d607a8658261bfd2a6b81edc5ad2 100644 (file)
--- a/tests/Settings/Controller/CheckSetupControllerTest.php
+++ b/tests/Settings/Controller/CheckSetupControllerTest.php
@@ -533,11 +533,11 @@ class CheckSetupControllerTest extends TestCase {
 
                $this->config->expects($this->at(0))
                        ->method('getSystemValue')
-                       ->with('mail_smtpmode', null)
+                       ->with('mail_smtpmode', 'smtp')
                        ->will($this->returnValue('php'));
                $this->config->expects($this->at(1))
                        ->method('getSystemValue')
-                       ->with('mail_smtpmode', null)
+                       ->with('mail_smtpmode', 'smtp')
                        ->will($this->returnValue('not-php'));
 
                $this->assertTrue($this->invokePrivate($checkSetupController, 'isPhpMailerUsed'));