Merge pull request #4360 from dokuwiki/php84

PHP 8.4 fixes

3 files changed, 9 insertions, 8 deletions

diff --git a/lib/plugins/config/_test/WriterTest.php b/lib/plugins/config/_test/WriterTest.php
index 391cbbdbf..973bd5e52 100644
--- a/lib/plugins/config/_test/WriterTest.php
+++ b/lib/plugins/config/_test/WriterTest.php
@@ -25,7 +25,7 @@ class WriterTest extends \DokuWikiTest {
 
         // before running, no backup should exist
         $this->assertFileExists($config);
-        $this->assertFileNotExists("$config.bak.php");
+        $this->assertFileDoesNotExist("$config.bak.php");
         $old = filesize($config);
 
         /** @noinspection PhpUnhandledExceptionInspection */
@@ -64,7 +64,7 @@ class WriterTest extends \DokuWikiTest {
     public function testEmpty() {
         $writer = new Writer();
         $this->expectException(\Exception::class);
-        $this->expectErrorMessage('empty config');
+        $this->expectExceptionMessage('empty config');
         $writer->save([]);
     }
 }
diff --git a/lib/plugins/styling/_test/general.test.php b/lib/plugins/styling/_test/general.test.php
index 1337f6f75..0b09b5fcf 100644
--- a/lib/plugins/styling/_test/general.test.php
+++ b/lib/plugins/styling/_test/general.test.php
@@ -25,9 +25,9 @@ class general_plugin_styling_test extends DokuWikiTest {
         $this->assertArrayHasKey('url', $info);
 
         $this->assertEquals('styling', $info['base']);
-        $this->assertRegExp('/^https?:\/\//', $info['url']);
+        $this->assertMatchesRegularExpression('/^https?:\/\//', $info['url']);
         $this->assertTrue(mail_isvalid($info['email']));
-        $this->assertRegExp('/^\d\d\d\d-\d\d-\d\d$/', $info['date']);
+        $this->assertMatchesRegularExpression('/^\d\d\d\d-\d\d-\d\d$/', $info['date']);
         $this->assertTrue(false !== strtotime($info['date']));
     }
 }
diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index 2314a70a9..16cf96198 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -3,6 +3,7 @@
 use dokuwiki\Extension\AdminPlugin;
 use dokuwiki\Extension\AuthPlugin;
 use dokuwiki\Utf8\Clean;
+use dokuwiki\Utf8\Conversion;
 
 /*
  *  User Manager
@@ -1035,10 +1036,10 @@ class admin_plugin_usermanager extends AdminPlugin
 
         // output the csv
         $fd = fopen('php://output', 'w');
-        fputcsv($fd, $column_headings);
+        fputcsv($fd, $column_headings, ',', '"', "\\");
         foreach ($user_list as $user => $info) {
             $line = [$user, $info['name'], $info['mail'], implode(',', $info['grps'])];
-            fputcsv($fd, $line);
+            fputcsv($fd, $line, ',', '"', "\\");
         }
         fclose($fd);
         if (defined('DOKU_UNITTEST')) {
@@ -1078,9 +1079,9 @@ class admin_plugin_usermanager extends AdminPlugin
         if ($fd) {
             while ($csv = fgets($fd)) {
                 if (!Clean::isUtf8($csv)) {
-                    $csv = utf8_encode($csv);
+                    $csv = Conversion::fromLatin1($csv);
                 }
-                $raw = str_getcsv($csv);
+                $raw = str_getcsv($csv, ',', '"', "\\");
                 $error = '';                        // clean out any errors from the previous line
                 // data checks...
                 if (1 == ++$line) {