Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Giehl <stefan@piwik.org>2017-02-21 16:36:39 +0300
committerMatthieu Aubry <mattab@users.noreply.github.com>2017-02-21 16:36:39 +0300
commitcda790ba6c5ca76378cf20f69d0bc53d488b6cda (patch)
treec39fbd6de120acef3090b3f2397b0f81f6d7ca7c /tests/PHPUnit/Framework/TestRequest
parenta6b8594917420809533303f58bd162359e6c838a (diff)
Adds API method to provide country code to name mapping (#11376)
* adds simple API to provide CountryCode to name mapping * New API method in API listing * Updates changelog
Diffstat (limited to 'tests/PHPUnit/Framework/TestRequest')
-rw-r--r--tests/PHPUnit/Framework/TestRequest/Collection.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/PHPUnit/Framework/TestRequest/Collection.php b/tests/PHPUnit/Framework/TestRequest/Collection.php
index a2038fd873..287b4563a7 100644
--- a/tests/PHPUnit/Framework/TestRequest/Collection.php
+++ b/tests/PHPUnit/Framework/TestRequest/Collection.php
@@ -42,6 +42,7 @@ class Collection
'Annotations',
'SegmentEditor',
'UserCountry.getLocationFromIP',
+ 'UserCountry.getCountryCodeMapping',
'Dashboard',
'ExamplePluginTemplate',
'CustomAlerts',
@@ -332,9 +333,11 @@ class Collection
$this->apiToCall = $apiToCall;
- if (!in_array('UserCountry.getLocationFromIP', $apiToCall)) {
+ if (!in_array('UserCountry.getLocationFromIP', $apiToCall) &&
+ !in_array('UserCountry.getCountryCodeMapping', $apiToCall)) {
$this->apiNotToCall = array('API.getPiwikVersion',
- 'UserCountry.getLocationFromIP');
+ 'UserCountry.getLocationFromIP',
+ 'UserCountry.getCountryCodeMapping');
} else {
$this->apiNotToCall = array();
}