Run tests on PHP 8.5

.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];

plugins/Marketplace/tests/Unit/PluginsTest.php

@@ -28,7 +28,10 @@ public function testPrettifyNumberOfDownloads($numDownloads, $expectedPrettyDown
 
         $pluginsReflection = new ReflectionClass($pluginsClass);
         $method = $pluginsReflection->getMethod('prettifyNumberOfDownloads');
-        $method->setAccessible(true);
+
+        if (PHP_VERSION_ID < 80100) {
+            $method->setAccessible(true);
+        }
 
         $plugin = ['numDownloads' => $numDownloads];
         $method->invokeArgs($pluginsClass, [&$plugin]);

plugins/ScheduledReports/tests/Integration/ApiTest.php

@@ -396,7 +396,10 @@ public function testGetReportSubjectAndReportTitle($expectedReportSubject, $expe
             '\\Piwik\\Plugins\\ScheduledReports\\API',
             'getReportSubjectAndReportTitle'
         );
-        $getReportSubjectAndReportTitle->setAccessible(true);
+
+        if (PHP_VERSION_ID < 80100) {
+            $getReportSubjectAndReportTitle->setAccessible(true);
+        }
 
         [$reportSubject, $reportTitle] = $getReportSubjectAndReportTitle->invoke(APIScheduledReports::getInstance(), $websiteName, $reports);
         $this->assertEquals($expectedReportSubject, $reportSubject);

plugins/UsersManager/tests/Integration/UserAccessFilterTest.php

@@ -68,7 +68,11 @@ public function setUp(): void
 
         $this->filter = new UserAccessFilter($this->model, $this->access);
         $method = new \ReflectionMethod($this->filter, 'isNonSuperUserAllowedToSeeThisLogin');
-        $method->setAccessible(true);
+
+        if (PHP_VERSION_ID < 80100) {
+            $method->setAccessible(true);
+        }
+
         $this->isNonSuperUserAllowedToSeeThisLogin = $method;
     }
 

tests/PHPUnit/Integration/API/RequestTest.php

@@ -314,7 +314,10 @@ private function createAccessMock($auth)
             // some tests require it)
             $reflection = new ReflectionClass(Access::class);
             $reflectionProperty = $reflection->getProperty('idsitesByAccess');
-            $reflectionProperty->setAccessible(true);
+
+            if (PHP_VERSION_ID < 80100) {
+                $reflectionProperty->setAccessible(true);
+            }
 
             $reflectionProperty->setValue($mock, $this->idSitesAccess);
         });

tests/PHPUnit/Integration/CliMulti/ProcessTest.php

@@ -143,7 +143,11 @@ public function testGetSecondsSinceCreation()
     {
         // This is not proper, but it avoids using sleep and stopping the tests for several seconds
         $r = new ReflectionProperty($this->process, 'timeCreation');
-        $r->setAccessible(true);
+
+        if (PHP_VERSION_ID < 80100) {
+            $r->setAccessible(true);
+        }
+
         $r->setValue($this->process, time() - 2);
 
         $seconds = $this->process->getSecondsSinceCreation();

tests/PHPUnit/Integration/CronArchiveTest.php

@@ -850,7 +850,10 @@ public function testCanWeSkipInvalidatingBecauseThereIsAUsablePeriodReturnsExpec
 
         $class = new \ReflectionClass(CronArchive::class);
         $method = $class->getMethod('canWeSkipInvalidatingBecauseThereIsAUsablePeriod');
-        $method->setAccessible(true);
+
+        if (PHP_VERSION_ID < 80100) {
+            $method->setAccessible(true);
+        }
 
         $actual = $method->invoke($archiver, $params, $dayToArchive === 'yesterday');
         $this->assertSame($expected, $actual);

tests/PHPUnit/Integration/DataAccess/LogAggregatorTest.php

@@ -75,7 +75,11 @@ public function testGetSelectDimensions($dimensions, $tableName, $expectedResult
     {
         $class = new \ReflectionClass(LogAggregator::class);
         $method = $class->getMethod('getSelectDimensions');
-        $method->setAccessible(true);
+
+        if (PHP_VERSION_ID < 80100) {
+            $method->setAccessible(true);
+        }
+
         $output = $method->invoke($this->logAggregator, $dimensions, $tableName);
         $this->assertEquals($expectedResult, $output);
     }
@@ -127,7 +131,11 @@ public function testGetGroupByDimensions($dimensions, $tableName, $expectedResul
     {
         $class = new \ReflectionClass(LogAggregator::class);
         $method = $class->getMethod('getGroupByDimensions');
-        $method->setAccessible(true);
+
+        if (PHP_VERSION_ID < 80100) {
+            $method->setAccessible(true);
+        }
+
         $output = $method->invoke($this->logAggregator, $dimensions, $tableName);
         $this->assertEquals($expectedResult, $output);
     }

tests/PHPUnit/System/ArchiveInvalidationTest.php

@@ -326,7 +326,10 @@ public function testDatesCorrectlyParsed($dates, $period, $expected)
         $api        = CoreAdminHomeApi::getInstance();
         $reflection = new \ReflectionClass(CoreAdminHomeApi::class);
         $method     = $reflection->getMethod('getDatesToInvalidateFromString');
-        $method->setAccessible(true);
+
+        if (PHP_VERSION_ID < 80100) {
+            $method->setAccessible(true);
+        }
 
         $parameters = [$dates, $period];
 

tests/PHPUnit/Unit/DbHelperTest.php

@@ -28,9 +28,11 @@ public function testExtractOrderByFromQuery(string $sql, ?string $expectedOrderB
     {
         $extractedOrderBy = DbHelper::extractOrderByFromQuery($sql);
 
-        // compare with collapsed whitespace
-        $expectedOrderBy = trim(preg_replace('/\s+/', ' ', $expectedOrderBy));
-        $extractedOrderBy = trim(preg_replace('/\s+/', ' ', $extractedOrderBy));
+        if (null !== $expectedOrderBy) {
+            // compare with collapsed whitespace
+            $expectedOrderBy  = trim(preg_replace('/\s+/', ' ', $expectedOrderBy));
+            $extractedOrderBy = trim(preg_replace('/\s+/', ' ', $extractedOrderBy));
+        }
 
         $this->assertSame($expectedOrderBy, $extractedOrderBy);
     }

tests/PHPUnit/Unit/HttpTest.php

@@ -24,7 +24,10 @@ class HttpTest extends \PHPUnit\Framework\TestCase
     public function testgetProxyConfiguration($url, $proxyConfiguration, $expected)
     {
         $getProxyConfiguration = new ReflectionMethod('\\Piwik\\Http', 'getProxyConfiguration');
-        $getProxyConfiguration->setAccessible(true);
+
+        if (PHP_VERSION_ID < 80100) {
+            $getProxyConfiguration->setAccessible(true);
+        }
 
         Config::getInstance()->proxy['host'] = $proxyConfiguration[0];
         Config::getInstance()->proxy['port'] = $proxyConfiguration[1];

tests/PHPUnit/Unit/SettingsServerTest.php

@@ -40,7 +40,11 @@ public function testGetMegaBytesFromShorthandByte($data, $expected)
     {
         $class = new \ReflectionClass(SettingsServer::class);
         $method = $class->getMethod('getMegaBytesFromShorthandByte');
-        $method->setAccessible(true);
+
+        if (PHP_VERSION_ID < 80100) {
+            $method->setAccessible(true);
+        }
+
         $output = $method->invoke($class, $data);
 
         $this->assertEquals($expected, $output);