Run Matomo in PHP 8.3 (matomo-org#21434)

caddoo · michalkleiner · web-flow · commit 738eb3c8128b · 2023-10-30T17:40:21.000+13:00
* Add extra test runner for PHP 8.3

* Fix serialised data for data table test

* Add support for '-dev' PHP versions in test

* Check if headers sent before setting them again

* Update plugins/Marketplace/tests/Integration/EnvironmentTest.php

Co-authored-by: Michal Kleiner &lt;michal@innocraft.com&gt;

* Run UI tests with 8.3

* Run UI tests with 8.2

* Run UI tests back with 7.2

* Add 8.3 to unit/integration tests

---------

Co-authored-by: Michal Kleiner &lt;michal@innocraft.com&gt;
diff --git a/.github/workflows/matomo-tests.yml b/.github/workflows/matomo-tests.yml
@@ -37,13 +37,15 @@ jobs:
       fail-fast: false
       matrix:
         type: [ 'UnitTests', 'SystemTestsPlugins', 'SystemTestsCore', 'IntegrationTestsCore', 'IntegrationTestsPlugins' ]
-        php: [ '7.2', '8.2' ]
+        php: [ '7.2', '8.2', '8.3' ]
         adapter: [ 'PDO_MYSQL', 'MYSQLI' ]
         exclude:
           - php: '7.2'
             adapter: 'MYSQLI'
           - php: '8.2'
             adapter: 'PDO_MYSQL'
+          - php: '8.3'
+            adapter: 'PDO_MYSQL'
     steps:
       - uses: actions/checkout@v3
         with:
diff --git a/plugins/Marketplace/tests/Integration/EnvironmentTest.php b/plugins/Marketplace/tests/Integration/EnvironmentTest.php
@@ -45,8 +45,8 @@ public function setUp(): void
 
     public function test_getPhpVersion()
     {
-        // this is because the php version contain uname
-        $this->assertTrue(version_compare(phpversion(), $this->environment->getPhpVersion(),'>='));
+        $phpVersion = explode('-', phpversion()); // cater for pre-release versions like 8.3.0-dev
+        $this->assertTrue(version_compare($phpVersion[0], $this->environment->getPhpVersion(),'>='));
     }
 
     public function test_getPiwikVersion()
diff --git a/plugins/TwoFactorAuth/TwoFactorAuth.php b/plugins/TwoFactorAuth/TwoFactorAuth.php
@@ -179,11 +179,15 @@ public function onCreateAppSpecificTokenAuth($returnedValue, $params)
                 // we only return an error when the login/password combo was correct. otherwise you could brute force
                 // auth tokens
                 if (!$authCode) {
-                    http_response_code(401);
+                    if (!headers_sent()) {
+                        http_response_code(401);
+                    }
                     throw new Exception(Piwik::translate('TwoFactorAuth_MissingAuthCodeAPI'));
                 }
                 if (!$twoFa->validateAuthCode($login, $authCode)) {
-                    http_response_code(401);
+                    if (!headers_sent()) {
+                        http_response_code(401);
+                    }
                     throw new Exception(Piwik::translate('TwoFactorAuth_InvalidAuthCode'));
                 }
             } else if ($twoFa->isUserRequiredToHaveTwoFactorEnabled()
diff --git a/tests/resources/DataTables-archived-different-formats.php b/tests/resources/DataTables-archived-different-formats.php

Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,8 @@ public function setUp(): void`
`45`	`45`
`46`	`46`	`public function test_getPhpVersion()`
`47`	`47`	`{`
`48`		`- // this is because the php version contain uname`
`49`		`- $this->assertTrue(version_compare(phpversion(), $this->environment->getPhpVersion(),'>='));`
	`48`	`+ $phpVersion = explode('-', phpversion()); // cater for pre-release versions like 8.3.0-dev`
	`49`	`+ $this->assertTrue(version_compare($phpVersion[0], $this->environment->getPhpVersion(),'>='));`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`public function test_getPiwikVersion()`