Skip to content
Extraits de code Groupes Projets
Valider 6539a73a rédigé par Matthieu Napoli's avatar Matthieu Napoli
Parcourir les fichiers

Removed calls to deprecated Piwik\Common::getLanguagesList()

parent e9197cbd
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -752,7 +752,7 @@ class Common ...@@ -752,7 +752,7 @@ class Common
* *
* @see core/DataFiles/Countries.php * @see core/DataFiles/Countries.php
* *
* @return array Array of 3 letter continent codes * @return array Array of 3 letter continent codes
* *
* @deprecated Use Piwik\Intl\Data\Provider\RegionDataProvider instead. * @deprecated Use Piwik\Intl\Data\Provider\RegionDataProvider instead.
* @see \Piwik\Intl\Data\Provider\RegionDataProvider::getContinentList() * @see \Piwik\Intl\Data\Provider\RegionDataProvider::getContinentList()
...@@ -770,7 +770,7 @@ class Common ...@@ -770,7 +770,7 @@ class Common
* @see core/DataFiles/Countries.php * @see core/DataFiles/Countries.php
* *
* @param bool $includeInternalCodes * @param bool $includeInternalCodes
* @return array Array of (2 letter ISO codes => 3 letter continent code) * @return array Array of (2 letter ISO codes => 3 letter continent code)
* *
* @deprecated Use Piwik\Intl\Data\Provider\RegionDataProvider instead. * @deprecated Use Piwik\Intl\Data\Provider\RegionDataProvider instead.
* @see \Piwik\Intl\Data\Provider\RegionDataProvider::getCountryList() * @see \Piwik\Intl\Data\Provider\RegionDataProvider::getCountryList()
...@@ -1275,8 +1275,11 @@ class Common ...@@ -1275,8 +1275,11 @@ class Common
*/ */
protected static function checkValidLanguagesIsSet($validLanguages) protected static function checkValidLanguagesIsSet($validLanguages)
{ {
/** @var LanguageDataProvider $dataProvider */
$dataProvider = StaticContainer::get('Piwik\Intl\Data\Provider\LanguageDataProvider');
if (empty($validLanguages)) { if (empty($validLanguages)) {
$validLanguages = array_keys(Common::getLanguagesList()); $validLanguages = array_keys($dataProvider->getLanguageList());
return $validLanguages; return $validLanguages;
} }
return $validLanguages; return $validLanguages;
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
namespace Piwik\Plugins\LanguagesManager\Test\Integration; namespace Piwik\Plugins\LanguagesManager\Test\Integration;
use Piwik\Common;
use Piwik\Container\StaticContainer; use Piwik\Container\StaticContainer;
use Piwik\Intl\Data\Provider\LanguageDataProvider; use Piwik\Intl\Data\Provider\LanguageDataProvider;
use Piwik\Plugins\LanguagesManager\API; use Piwik\Plugins\LanguagesManager\API;
...@@ -173,9 +172,12 @@ class LanguagesManagerTest extends \PHPUnit_Framework_TestCase ...@@ -173,9 +172,12 @@ class LanguagesManagerTest extends \PHPUnit_Framework_TestCase
* *
* @group Plugins * @group Plugins
*/ */
function testGetLanguagesList() public function testGetLanguagesList()
{ {
$languages = Common::getLanguagesList(); /** @var LanguageDataProvider $languageDataProvider */
$languageDataProvider = StaticContainer::get('Piwik\Intl\Data\Provider\LanguageDataProvider');
$languages = $languageDataProvider->getLanguageList();
$this->assertTrue(count($languages) > 0); $this->assertTrue(count($languages) > 0);
foreach ($languages as $langCode => $langs) { foreach ($languages as $langCode => $langs) {
$this->assertTrue(strlen($langCode) == 2, "$langCode length = 2"); $this->assertTrue(strlen($langCode) == 2, "$langCode length = 2");
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
namespace Piwik\Plugins\LanguagesManager\TranslationWriter\Validate; namespace Piwik\Plugins\LanguagesManager\TranslationWriter\Validate;
use Piwik\Common;
use Piwik\Container\StaticContainer; use Piwik\Container\StaticContainer;
use Piwik\Intl\Data\Provider\LanguageDataProvider;
use Piwik\Intl\Data\Provider\RegionDataProvider; use Piwik\Intl\Data\Provider\RegionDataProvider;
class CoreTranslations extends ValidateAbstract class CoreTranslations extends ValidateAbstract
...@@ -75,10 +75,12 @@ class CoreTranslations extends ValidateAbstract ...@@ -75,10 +75,12 @@ class CoreTranslations extends ValidateAbstract
return false; return false;
} }
/** @var LanguageDataProvider $languageDataProvider */
$languageDataProvider = StaticContainer::get('Piwik\Intl\Data\Provider\LanguageDataProvider');
/** @var RegionDataProvider $regionDataProvider */ /** @var RegionDataProvider $regionDataProvider */
$regionDataProvider = StaticContainer::get('Piwik\Intl\Data\Provider\RegionDataProvider'); $regionDataProvider = StaticContainer::get('Piwik\Intl\Data\Provider\RegionDataProvider');
$allLanguages = Common::getLanguagesList(); $allLanguages = $languageDataProvider->getLanguageList();
$allCountries = $regionDataProvider->getCountryList(); $allCountries = $regionDataProvider->getCountryList();
if (!preg_match('/^([a-z]{2})_([A-Z]{2})\.UTF-8$/', $translations['General']['Locale'], $matches)) { if (!preg_match('/^([a-z]{2})_([A-Z]{2})\.UTF-8$/', $translations['General']['Locale'], $matches)) {
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter