diff options
10 files changed, 33 insertions, 17 deletions
diff --git a/composer.lock b/composer.lock index c27ab8d884..a3ae0b855e 100644 --- a/composer.lock +++ b/composer.lock @@ -548,12 +548,12 @@ "source": { "type": "git", "url": "https://github.com/matomo-org/matomo-php-tracker.git", - "reference": "69e876faf4f981bafa3f65c8dd78a1d131badc1c" + "reference": "3d2faa5ce463e70e38d344c9d18c34cec58fc5a6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/matomo-org/matomo-php-tracker/zipball/69e876faf4f981bafa3f65c8dd78a1d131badc1c", - "reference": "69e876faf4f981bafa3f65c8dd78a1d131badc1c", + "url": "https://api.github.com/repos/matomo-org/matomo-php-tracker/zipball/3d2faa5ce463e70e38d344c9d18c34cec58fc5a6", + "reference": "3d2faa5ce463e70e38d344c9d18c34cec58fc5a6", "shasum": "" }, "require": { @@ -588,7 +588,7 @@ "piwik", "tracker" ], - "time": "2020-05-27T06:53:04+00:00" + "time": "2020-06-09T08:59:01+00:00" }, { "name": "matomo/network", diff --git a/plugins/CustomDimensions b/plugins/CustomDimensions -Subproject 4f12c89fd19eb726d04781c38c5a14032197483 +Subproject 3cc1af5efe68ac93afadd2ef8be9a198d052340 diff --git a/plugins/Ecommerce/Columns/ProductViewCategory.php b/plugins/Ecommerce/Columns/ProductViewCategory.php index b047fe3c7c..a59cd39b2a 100644 --- a/plugins/Ecommerce/Columns/ProductViewCategory.php +++ b/plugins/Ecommerce/Columns/ProductViewCategory.php @@ -117,7 +117,7 @@ class ProductViewCategory extends ActionDimension protected function handleCategoryParam($categories) { if (0 === strpos($categories, '["')) { - $categories = array_values(array_filter(@\json_decode($categories, true))); + $categories = array_values(array_filter((array) @\json_decode($categories, true))); } else { $categories = [$categories]; } diff --git a/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_cities.png b/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_cities.png index 82b59c80a5..b6bd0e6187 100644 --- a/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_cities.png +++ b/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_cities.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8fa287087f6e90df90f91566013e868fb4fb8ed7e1a95d474fbae6efcc09552 -size 114508 +oid sha256:1e6eab272abfcfe11e07d8418a4ae36b6be24940c7e24b14bd66daca7e039971 +size 116131 diff --git a/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_regions.png b/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_regions.png index 5159225887..8e2afb3e08 100644 --- a/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_regions.png +++ b/plugins/UserCountryMap/tests/UI/expected-screenshots/VisitorMap_regions.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c1bb4c48dabc5e484d7e3d93db825f25590805c582016112178af4355fada02c -size 113953 +oid sha256:60331f813404c415e2fd3262c24844cfa2de8fce0a9fc980c8051493737c26ec +size 115647 diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml index 4a2ecee69a..58511d3684 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml @@ -122,6 +122,15 @@ <avg_time_on_load>Average time (in seconds) how long it takes the browser to execute Javascript code waiting for the window.load event. This event is triggered once the DOM was completely rendered.</avg_time_on_load> <avg_page_load_time>Average time (in seconds) how long it takes from requesting a page until the page is fully rendered within the browser</avg_page_load_time> </metricsDocumentation> + <processedMetrics> + <avg_time_network>Avg. network time</avg_time_network> + <avg_time_server>Avg. server time</avg_time_server> + <avg_time_transfer>Avg. transfer time</avg_time_transfer> + <avg_time_dom_processing>Avg. DOM processing time</avg_time_dom_processing> + <avg_time_dom_completion>Avg. DOM completion time</avg_time_dom_completion> + <avg_time_on_load>Avg. on load time</avg_time_on_load> + <avg_page_load_time>Avg. page load time</avg_page_load_time> + </processedMetrics> <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=PagePerformance&apiAction=get&period=day&date=2008-12-06,2009-01-04</imageGraphUrl> <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=PagePerformance&apiAction=get&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> <uniqueId>PagePerformance_get</uniqueId> @@ -2703,6 +2712,13 @@ <avg_time_on_site_new>Avg. Duration of a New Visit (in sec)</avg_time_on_site_new> <nb_actions_per_visit_new>Avg. Actions per New Visit</nb_actions_per_visit_new> <bounce_rate_new>Bounce Rate for New Visits</bounce_rate_new> + <avg_time_network>Avg. network time</avg_time_network> + <avg_time_server>Avg. server time</avg_time_server> + <avg_time_transfer>Avg. transfer time</avg_time_transfer> + <avg_time_dom_processing>Avg. DOM processing time</avg_time_dom_processing> + <avg_time_dom_completion>Avg. DOM completion time</avg_time_dom_completion> + <avg_time_on_load>Avg. on load time</avg_time_on_load> + <avg_page_load_time>Avg. page load time</avg_page_load_time> </processedMetrics> <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=API&apiAction=get&period=day&date=2008-12-06,2009-01-04</imageGraphUrl> <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=API&apiAction=get&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> diff --git a/tests/UI/expected-screenshots/Comparison_visitors_overview.png b/tests/UI/expected-screenshots/Comparison_visitors_overview.png index a91b2358a8..ddbb3803df 100644 --- a/tests/UI/expected-screenshots/Comparison_visitors_overview.png +++ b/tests/UI/expected-screenshots/Comparison_visitors_overview.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:246bedd8f63199764171070c43f229b1ef23769b4338e716337bf3fa084c503d -size 500082 +oid sha256:bb135e54799c2eeb629f37ae6b8ed7d816b895e49449dbfa4f14a0198ab061df +size 503405 diff --git a/tests/UI/expected-screenshots/Comparison_visitors_overview_segment_removed.png b/tests/UI/expected-screenshots/Comparison_visitors_overview_segment_removed.png index 47b87a5ea5..f49661f52c 100644 --- a/tests/UI/expected-screenshots/Comparison_visitors_overview_segment_removed.png +++ b/tests/UI/expected-screenshots/Comparison_visitors_overview_segment_removed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:845048ef59eda1f8ba3adabf8cc35e558c7983af5c8d50eae768e217e51e38da -size 271865 +oid sha256:506d4500fd48dff2a5677e01ed1ffad948cc3bf95d330f158add2c7cd226089a +size 273098 diff --git a/tests/UI/expected-screenshots/Comparison_visitors_overview_switched.png b/tests/UI/expected-screenshots/Comparison_visitors_overview_switched.png index 485ebe78af..0e9e93aafb 100644 --- a/tests/UI/expected-screenshots/Comparison_visitors_overview_switched.png +++ b/tests/UI/expected-screenshots/Comparison_visitors_overview_switched.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2fa7284468a12b1b5c48605014a9edbb43538f55af879127c5e29d54bd3a7f89 -size 521432 +oid sha256:3eafe4cde2dd1efaee37dcf2bd8e7bd75ef2d285698d1899583990c31b26aa7a +size 524665 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png index e039ad8fbf..e8f56c171c 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:42076506aa268d1a6c28ad333112316f113ad28f4047a39d1bcbaa51b69a6396 -size 4238648 +oid sha256:ad8cb62dc3bfff725a67754a901093b299285d97ded6199e894f1cb3fed78f77 +size 4238777 |
