From 93f9ece519db25e9755b4e8a555e8dfb5a39af3c Mon Sep 17 00:00:00 2001
From: Jonas Raoni Soares da Silva <github@raoni.org>
Date: Sat, 15 Apr 2023 21:53:45 +0300
Subject: [PATCH] #229 Replaced IsoCodesFactory by Locale method

---
 OrcidProfilePlugin.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/OrcidProfilePlugin.php b/OrcidProfilePlugin.php
index 901e94b7..b906be22 100755
--- a/OrcidProfilePlugin.php
+++ b/OrcidProfilePlugin.php
@@ -59,6 +59,7 @@
 use PKP\core\JSONMessage;
 use PKP\core\PKPApplication;
 use PKP\db\DAORegistry;
+use PKP\facades\Locale;
 use PKP\form\Form;
 use PKP\install\Installer;
 use PKP\linkAction\LinkAction;
@@ -70,7 +71,7 @@
 use PKP\submission\PKPSubmission;
 use PKP\submission\reviewAssignment\ReviewAssignment;
 use PKP\submission\reviewAssignment\ReviewAssignmentDAO;
-use Sokil\IsoCodes\IsoCodesFactory;
+use Sokil\IsoCodes\Database\Countries\Country;
 
 class OrcidProfilePlugin extends GenericPlugin
 {
@@ -1099,12 +1100,11 @@ public function manage($args, $request)
                     ORCID_API_URL_MEMBER_SANDBOX => 'plugins.generic.orcidProfile.manager.settings.orcidProfileAPIPath.memberSandbox'
                 ]);
 
-                $isoCodes = new IsoCodesFactory();
-                $countries = [];
-                foreach ($isoCodes->getCountries() as $country) {
-                    $countries[$country->getAlpha2()] = $country->getLocalName();
-                }
-                asort($countries);
+                $countries = collect(Locale::getCountries())
+                    ->mapWithKeys(fn (Country $country) => [$country->getAlpha2() => $country->getLocalName()])
+                    ->sort(fn (string $a, string $b) => strcoll($a, $b))
+                    ->toArray();
+
                 $templateMgr->assign('countries', $countries);
                 $templateMgr->assign('logLevelOptions', [
                     'ERROR' => 'plugins.generic.orcidProfile.manager.settings.logLevel.error',