Merge "API: Fix 'user_id' field of ApiCSPReport"

diff --git a/includes/api/ApiCSPReport.php b/includes/api/ApiCSPReport.php
index f53d2b9..be2da34 100644 (file)
--- a/includes/api/ApiCSPReport.php
+++ b/includes/api/ApiCSPReport.php
@@ -54,7 +54,7 @@ class ApiCSPReport extends ApiBase {
                        // XXX Is it ok to put untrusted data into log??
                        'csp-report' => $report,
                        'method' => __METHOD__,
-                       'user_id' => $this->getUser()->getId() || 'logged-out',
+                       'user_id' => $this->getUser()->getId() ?: 'logged-out',
                        'user-agent' => $userAgent,
                        'source' => $this->getParameter( 'source' ),
                ] );

diff --git a/tests/phpunit/includes/api/ApiCSPReportTest.php b/tests/phpunit/includes/api/ApiCSPReportTest.php
index dab9d3f..b3e0543 100644 (file)
--- a/tests/phpunit/includes/api/ApiCSPReportTest.php
+++ b/tests/phpunit/includes/api/ApiCSPReportTest.php
@@ -39,8 +39,7 @@ class ApiCSPReportTest extends MediaWikiIntegrationTestCase {
                                                '<https://blocked.test> blocked from being loaded on <https://doc.test/path>:4',
                                        [
                                                'method' => 'ApiCSPReport::execute',
-                                               // FIXME
-                                               'user_id' => true,
+                                               'user_id' => 'logged-out',
                                                'user-agent' => 'Test/0.0',
                                                'source' => 'internal'
                                        ]