Merge branch 'master' into fqcn

roundcube · Nov 4, 2024 · e13e395 · e13e395
2 parents ebe0838 + 749eb38
commit e13e395
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
@@ -148,7 +148,9 @@ protected function startup()
         }
 
         // load oauth manager
-        $this->oauth = \rcmail_oauth::get_instance();
+        if (\PHP_SAPI != 'cli') {
+                $this->oauth = \rcmail_oauth::get_instance();
+        }
 
         // run init method on all the plugins
         $this->plugins->init($this, $this->task);

diff --git a/program/lib/Roundcube/rcube_csv2vcard.php b/program/lib/Roundcube/rcube_csv2vcard.php
@@ -521,7 +521,7 @@ protected function parse_line($line)
             return [];
         }
 
-        $fields = str_getcsv($line);
+        $fields = str_getcsv($line, ',', '"', '\\');
 
         return $fields;
     }

diff --git a/tests/Actions/Login/OauthTest.php b/tests/Actions/Login/OauthTest.php
@@ -16,6 +16,8 @@ class OauthTest extends ActionTestCase
      */
     public function test_run_login_redirect()
     {
+        \rcmail::get_instance()->oauth = \rcmail_oauth::get_instance();
+
         $action = new \rcmail_action_login_oauth();
         $output = $this->initOutput(\rcmail_action::MODE_HTTP, 'login', '');
 

diff --git a/tests/Framework/RcubeTest.php b/tests/Framework/RcubeTest.php
@@ -78,7 +78,7 @@ public function test_exec()
             return;
         }
 
-        $this->assertSame('', \rcube::exec('which unknown-command-123'));
+        $this->assertSame('', \rcube::exec('which unknown-command-123 2> /dev/null'));
         $this->assertSame("2038\n", \rcube::exec('date --date={date} +%Y', ['date' => '@2147483647']));
         // TODO: More cases
     }