EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
Ref, use data cache access
Yurii247a715477d0
diff --git a/application/Espo/Core/Utils/Address/CountryDataProvider.php b/application/Espo/Core/Utils/Address/CountryDataProvider.phpindex 28eda25154..201ad00eaa 100644--- a/application/Espo/Core/Utils/Address/CountryDataProvider.php+++ b/application/Espo/Core/Utils/Address/CountryDataProvider.php@@ -30,27 +30,29 @@namespace Espo\Core\Utils\Address;use Espo\Core\Name\Field;-use Espo\Core\Utils\Config;-use Espo\Core\Utils\DataCache;+use Espo\Core\Utils\Cache\DataCacheAccess;use Espo\Entities\AddressCountry;use Espo\ORM\EntityManager;use Espo\ORM\Query\Part\Order;class CountryDataProvider{- /** @var ?array{list: string[], preferredList: string[]} */- private ?array $data = null;- private bool $useCache;-- private const CACHE_KEY = 'addressCountryData';- private const LIMIT = 500;+ private const string CACHE_KEY = 'addressCountryData';+ private const int LIMIT = 500;+ /**+ * @param DataCacheAccess<array{list: string[], preferredList: string[]}> $dataCacheAccess+ */public function __construct(- private DataCache $dataCache,private EntityManager $entityManager,- Config\SystemConfig $systemConfig,+ private DataCacheAccess $dataCacheAccess,) {- $this->useCache = $systemConfig->useCache();+ $dataCacheAccess->init(+ key: self::CACHE_KEY,+ loader: function () {+ return $this->load();+ },+ );}/**@@ -58,11 +60,7 @@ class CountryDataProvider*/public function get(): array{- if ($this->data === null) {- $this->data = $this->load();- }-- return $this->data;+ return $this->dataCacheAccess->get();}/**@@ -70,19 +68,6 @@ class CountryDataProvider*/private function load(): array{- if ($this->useCache && $this->dataCache->has(self::CACHE_KEY)) {- $list = $this->dataCache->get(self::CACHE_KEY);-- if (- is_array($list) &&- is_array($list['list'] ?? null) &&- is_array($list['preferredList'] ?? null)- ) {- /** @var array{list: string[], preferredList: string[]} */- return $list;- }- }-$list = [];$preferredList = [];@@ -103,13 +88,6 @@ class CountryDataProvider}}- if ($this->useCache) {- $this->dataCache->store(self::CACHE_KEY, [- 'list' => $list,- 'preferredList' => $preferredList,- ]);- }-return ['list' => $list,'preferredList' => $preferredList,