diff options
| author | Stefan Giehl <stefan@matomo.org> | 2019-03-11 07:47:27 +0300 |
|---|---|---|
| committer | diosmosis <diosmosis@users.noreply.github.com> | 2019-03-11 07:47:27 +0300 |
| commit | a345c2f22b8356dd3300d66f5ade3df24f69d900 (patch) | |
| tree | 436cc2e01ae503fd5fa8be6720f73f8260d09a83 /plugins/API | |
| parent | f7b442a9ca40466fe43e0312e013f51f2e5e5abd (diff) | |
Run AllTests against PHP 7.3 on travis (#14148)
* Run AllTests against PHP 7.3 on travis
* use INTL_IDNA_VARIANT_UTS46 for idn_to_utf8
PHP 7.2 deprecated INTL_IDNA_VARIANT_2003 but still uses it as default until 7.4
* Fix test as var_export signature for stdClasses changed in PHP 7.3
see https://github.com/php/php-src/commit/e4e9cd835550990a6b8df7c61d59b6cc0da9b5b2
Diffstat (limited to 'plugins/API')
| -rw-r--r-- | plugins/API/tests/Unit/HtmlRendererTest.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/plugins/API/tests/Unit/HtmlRendererTest.php b/plugins/API/tests/Unit/HtmlRendererTest.php index d1370432ff..098f9395cc 100644 --- a/plugins/API/tests/Unit/HtmlRendererTest.php +++ b/plugins/API/tests/Unit/HtmlRendererTest.php @@ -275,6 +275,10 @@ message', $response); $response = $this->builder->renderDataTable($dataTable); + $stdClass = version_compare(PHP_VERSION, 7.3, '>=') ? + "(object) array(\n )," : + "stdClass::__set_state(array(\n )),"; + $this->assertEquals('<table id="MultiSites_getAll" border="1"> <thead> <tr> @@ -292,8 +296,7 @@ message', $response); Piwik\Plugins\CoreHome\Columns\Metrics\AverageTimeOnSite::__set_state(array( )), 1 => - stdClass::__set_state(array( - )), + ' . $stdClass . ' 2 => Piwik\Date::__set_state(array( \'timestamp\' => 1451606400, |