Merge pull request #205 from matomo-org/php8build

Added additional build for php8

.travis.yml

@@ -47,6 +47,16 @@ matrix:
     # execute UI tests only w/ PHP 5.6
     - php: 7.4
       env: TEST_SUITE=UITests MYSQL_ADAPTER=PDO_MYSQL TEST_AGAINST_PIWIK_BRANCH=$PIWIK_TEST_TARGET
+  include:
+    - php: 8.0
+      env: TEST_SUITE=PluginTests MYSQL_ADAPTER=PDO_MYSQL TEST_AGAINST_PIWIK_BRANCH=$PIWIK_TEST_TARGET SKIP_COMPOSER_INSTALL=1
+      script:
+        - cd $PIWIK_ROOT_DIR
+        - composer install --ignore-platform-reqs
+        - composer remove --dev phpunit/phpunit
+        - composer require --dev phpunit/phpunit ~9.3 --ignore-platform-reqs
+        - cd tests/PHPUnit
+        - $PIWIK_ROOT_DIR/tests/travis/travis.sh
 
 dist: bionic
 

ImportStatus.php

@@ -213,7 +213,7 @@ public function getAllImportStatuses($checkKilledStatus = false)
             $result[] = $status;
         }
 
-        usort($result, function (&$lhs, $rhs) {
+        usort($result, function ($lhs, $rhs) {
             $lhsIdSite = (int)($lhs['idSite'] ?? 0);
             $rhsIdSite = (int)($rhs['idSite'] ?? 0);
 

TESTING.md

@@ -11,6 +11,7 @@ Before running, the following environment variables must be set:
 ```
 $ export PIWIK_TEST_GA_VIEW_ID=2352671
 $ export GA_PROPERTY_ID=UA-95026-4
+$ export MATOMO_USE_MOCK_RESPONSE=1
 ```
 
 You must also provide credentials to the test GA site in some way. There are two ways to do this:

tests/Fixtures/ImportedFromGoogle.php

@@ -68,7 +68,7 @@ public function setUp(): void
         $this->scheduleReimport($idSite = 1, '2019-06-27', '2019-06-27');
 
         $output = $this->runGoogleImporter($this->importedDateRange2, $idSite = 1);
-        $this->assertContains('Importing reports for date range 2019-06-27 - 2019-06-27 from GA view', $output);
+        $this->assertStringContainsString('Importing reports for date range 2019-06-27 - 2019-06-27 from GA view', $output);
 
         $this->runGoogleImporter($this->campaignDataDateRange);