Merge branch '5.x-dev' into dev-19555

Author: michalkleiner

.github/workflows/matomo-tests.yml

@@ -61,7 +61,7 @@ jobs:
             adapter: 'PDO_MYSQL'
             mysql-engine: 'Mariadb'
             mysql-version: '11.4'
-          - php: '8.4'
+          - php: '8.5'
             adapter: 'MYSQLI'
             mysql-engine: 'Mysql'
             mysql-version: '8.0'

core/Http.php

@@ -624,9 +624,17 @@ public static function sendHttpRequestBy(
                     fwrite($file, $response);
                 }
                 fclose($handle);
+
+                if (function_exists('http_get_last_response_headers')) {
+                    $http_response_header = http_get_last_response_headers();
+                }
             } else {
                 $response = @file_get_contents($aUrl, 0, $ctx);
 
+                if (function_exists('http_get_last_response_headers')) {
+                    $http_response_header = http_get_last_response_headers();
+                }
+
                 // try to get http status code from response headers
                 if (!empty($http_response_header) && preg_match('~^HTTP/(\d\.\d)\s+(\d+)(\s*.*)?~', implode("\n", $http_response_header), $m)) {
                     $status = (int)$m[2];

core/Plugin/API.php

@@ -129,7 +129,7 @@ protected function confirmCurrentUserPassword(
         }
 
         if (empty($passwordConfirmation)) {
-            throw new Exception(Piwik::translate('UsersManager_ConfirmWithPassword'));
+            throw new Exception(Piwik::translate('UsersManager_ConfirmWithReAuthentication'));
         }
 
         try {

plugins/CorePluginsAdmin/CorePluginsAdmin.php

@@ -170,6 +170,7 @@ public function getClientSideTranslationKeys(&$translations)
         $translations[] = 'General_Cancel';
         $translations[] = 'UsersManager_ConfirmThisChange';
         $translations[] = 'UsersManager_ConfirmWithPassword';
+        $translations[] = 'UsersManager_ConfirmWithReAuthentication';
         $translations[] = 'UsersManager_YourCurrentPassword';
         $translations[] = 'PrivacyManager_PolicyControlledSetting';
         $translations[] = 'PrivacyManager_ViewPrivacyComplianceOverview';

plugins/CorePluginsAdmin/tests/Integration/ApiTest.php

@@ -63,7 +63,7 @@ public function setUp(): void
     public function testSetSystemSettingsThrowsIfNoPasswordConfirmation()
     {
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('UsersManager_ConfirmWithPassword');
+        $this->expectExceptionMessage('UsersManager_ConfirmWithReAuthentication');
 
         $settingValues = $this->testSystemSettingsPayload;
         \Piwik\Plugins\CorePluginsAdmin\API::getInstance()->setSystemSettings($settingValues);