diff options
| author | Thomas Steur <tsteur@users.noreply.github.com> | 2020-11-11 01:12:59 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-11 01:12:59 +0300 |
| commit | 1f91b320ec00049ac106f5db1854d22ac2e39b1b (patch) | |
| tree | a3537913012003ab196957bcc88eacbaf7a54f69 | |
| parent | b984ce602987468004cf75579055c7dcb350a1a0 (diff) | |
Fix build (#16698)
| -rw-r--r-- | core/Version.php | 2 | ||||
| m--------- | plugins/LoginLdap | 0 | ||||
| -rw-r--r-- | tests/PHPUnit/Integration/HttpTest.php | 2 | ||||
| -rw-r--r-- | tests/UI/expected-screenshots/UIIntegrationTest_email_reports_download.png | 4 |
4 files changed, 4 insertions, 4 deletions
diff --git a/core/Version.php b/core/Version.php index 4f8084ef58..9e4e5cbe2c 100644 --- a/core/Version.php +++ b/core/Version.php @@ -20,7 +20,7 @@ final class Version * The current Matomo version. * @var string */ - const VERSION = '4.0.0-rc1'; + const VERSION = '4.0.0-rc2'; const MAJOR_VERSION = 4; public function isStableVersion($version) diff --git a/plugins/LoginLdap b/plugins/LoginLdap -Subproject e9cffd2a996ad001c6998d9ff00bfd99379d8a1 +Subproject eae0cb494dc424fb2d710db7c5170822cad32bf diff --git a/tests/PHPUnit/Integration/HttpTest.php b/tests/PHPUnit/Integration/HttpTest.php index ce132e6075..e3209c8ae1 100644 --- a/tests/PHPUnit/Integration/HttpTest.php +++ b/tests/PHPUnit/Integration/HttpTest.php @@ -371,7 +371,7 @@ class HttpTest extends \PHPUnit\Framework\TestCase $this->assertEquals(array($url, array( 'httpMethod' => 'POST', 'body' => array('adf2' => '44','afc23' => 'ab12'), - 'userAgent' => 'Piwik/' . Version::VERSION, + 'userAgent' => 'Matomo/' . Version::VERSION, 'timeout' => 30, 'headers' => array( 'Range: bytes=10-20', diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_email_reports_download.png b/tests/UI/expected-screenshots/UIIntegrationTest_email_reports_download.png index d12de6a4f5..7a76ea821b 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_email_reports_download.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_email_reports_download.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a1863444f361ce1013c81c6b49541ad115b372faea03b890501831b3a30c903e -size 99867 +oid sha256:a03136463f1fae0961ed154f73a5cca02ef73bdf5f990991a4b29ab95843c2d7 +size 99988 |
