diff --git a/.travis.yml b/.travis.yml
index d78e98f8b4c..adccfa91c9c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -63,10 +63,10 @@ matrix:
sudo: false
addons: false
# All tests after another
- - php: 7
+ - php: 7.3
env: TEST_SUITE=AllTests MYSQL_ADAPTER=MYSQLI ALLTEST_EXTRA_OPTIONS="--run-first-half-only"
sudo: required
- - php: 7
+ - php: 7.3
env: TEST_SUITE=AllTests MYSQL_ADAPTER=MYSQLI ALLTEST_EXTRA_OPTIONS="--run-second-half-only"
sudo: required
# UITests use a specific version because the default 5.5 (== 5.5.38) is missing FreeType support
diff --git a/plugins/API/tests/Unit/HtmlRendererTest.php b/plugins/API/tests/Unit/HtmlRendererTest.php
index d1370432ffb..098f9395cc0 100644
--- a/plugins/API/tests/Unit/HtmlRendererTest.php
+++ b/plugins/API/tests/Unit/HtmlRendererTest.php
@@ -275,6 +275,10 @@ public function test_renderDataTable_shouldRenderDataTableWithComplexMetadata()
$response = $this->builder->renderDataTable($dataTable);
+ $stdClass = version_compare(PHP_VERSION, 7.3, '>=') ?
+ "(object) array(\n )," :
+ "stdClass::__set_state(array(\n )),";
+
$this->assertEquals('
@@ -292,8 +296,7 @@ public function test_renderDataTable_shouldRenderDataTableWithComplexMetadata()
Piwik\Plugins\CoreHome\Columns\Metrics\AverageTimeOnSite::__set_state(array(
)),
1 =>
- stdClass::__set_state(array(
- )),
+ ' . $stdClass . '
2 =>
Piwik\Date::__set_state(array(
\'timestamp\' => 1451606400,
diff --git a/tests/PHPUnit/Integration/EmailValidatorTest.php b/tests/PHPUnit/Integration/EmailValidatorTest.php
index 8cb0c198c07..4a4665f2d6a 100644
--- a/tests/PHPUnit/Integration/EmailValidatorTest.php
+++ b/tests/PHPUnit/Integration/EmailValidatorTest.php
@@ -60,7 +60,7 @@ public function test_allCurrentTlds()
if (strpos(mb_strtolower($tld), 'xn--') !== 0) {
$tld = mb_strtolower($tld);
}
- $domainNameExtension = idn_to_utf8($tld);
+ $domainNameExtension = idn_to_utf8($tld, 0, INTL_IDNA_VARIANT_UTS46);
$email = 'test@example.' . $domainNameExtension;
if(!$this->isValid($email)) {
@@ -101,7 +101,7 @@ public function test_invalidTld()
$tld = mb_strtolower($tld);
}
$this->assertFalse(
- $this->isValid('test@example.' . idn_to_utf8($tld))
+ $this->isValid('test@example.' . idn_to_utf8($tld, 0, INTL_IDNA_VARIANT_UTS46))
);
}
}