Removed calls to deprecated Piwik\Common::getCountriesList

2 files changed, 12 insertions, 2 deletions

diff --git a/plugins/UserCountry/Columns/Country.php b/plugins/UserCountry/Columns/Country.php
index 31e2839a54..db8026ba6b 100644
--- a/plugins/UserCountry/Columns/Country.php
+++ b/plugins/UserCountry/Columns/Country.php
@@ -10,6 +10,8 @@ namespace Piwik\Plugins\UserCountry\Columns;
 
 use Piwik\Common;
 use Piwik\Config;
+use Piwik\Container\StaticContainer;
+use Piwik\Intl\Data\Provider\RegionDataProvider;
 use Piwik\IP;
 use Piwik\Piwik;
 use Piwik\Plugin\Manager;
@@ -92,7 +94,10 @@ class Country extends Base
             $hostnameDomain = 'gb';
         }
 
-        if (array_key_exists($hostnameDomain, Common::getCountriesList())) {
+        /** @var RegionDataProvider $regionDataProvider */
+        $regionDataProvider = StaticContainer::get('Piwik\Intl\Data\Provider\RegionDataProvider');
+
+        if (array_key_exists($hostnameDomain, $regionDataProvider->getCountryList())) {
             return $hostnameDomain;
         }
 
diff --git a/plugins/UserCountry/UserCountry.php b/plugins/UserCountry/UserCountry.php
index 960e966093..d28e6ce601 100644
--- a/plugins/UserCountry/UserCountry.php
+++ b/plugins/UserCountry/UserCountry.php
@@ -11,6 +11,8 @@ namespace Piwik\Plugins\UserCountry;
 use Piwik\ArchiveProcessor;
 use Piwik\Common;
 use Piwik\Config;
+use Piwik\Container\StaticContainer;
+use Piwik\Intl\Data\Provider\RegionDataProvider;
 use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
 use Piwik\Plugins\UserCountry\LocationProvider;
 use Piwik\Url;
@@ -85,9 +87,12 @@ class UserCountry extends \Piwik\Plugin
      */
     public static function getCountriesForContinent($continent)
     {
+        /** @var RegionDataProvider $regionDataProvider */
+        $regionDataProvider = StaticContainer::get('Piwik\Intl\Data\Provider\RegionDataProvider');
+
         $result = array();
         $continent = strtolower($continent);
-        foreach (Common::getCountriesList() as $countryCode => $continentCode) {
+        foreach ($regionDataProvider->getCountryList() as $countryCode => $continentCode) {
             if ($continent == $continentCode) {
                 $result[] = $countryCode;
             }