From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Mon, 8 Jul 2019 10:17:19 +0000 (+0200)
Subject: #2868
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=97ef080f15e5489f0b454f3c41c11975657c0e55;p=cubist_locale.git

#2868
---

diff --git a/src/Country.php b/src/Country.php
index d2ca904..cd7ec94 100644
--- a/src/Country.php
+++ b/src/Country.php
@@ -1,12 +1,11 @@
 <?php
 
-
 namespace Cubist\Locale;
 
-
 class Country extends LocalizedList
 {
-    protected static function _getListPath(){
+    protected static function _getListPath()
+    {
         return 'vendor/umpirsky/country-list/data/$locale/country.php';
     }
 }
diff --git a/src/Locale.php b/src/Locale.php
index 700400e..81ab891 100644
--- a/src/Locale.php
+++ b/src/Locale.php
@@ -4,7 +4,6 @@ namespace Cubist\Locale;
 
 class Locale extends LocalizedList
 {
-
     protected static function _getListPath()
     {
         return 'vendor/umpirsky/locale-list/data/$locale/locales.php';
diff --git a/src/LocalizedList.php b/src/LocalizedList.php
index 8c6e464..c646725 100644
--- a/src/LocalizedList.php
+++ b/src/LocalizedList.php
@@ -8,10 +8,13 @@ class LocalizedList
 
     public static function getList($locale)
     {
-        if (!isset(static::$_rawList[$locale])) {
-            static::$_rawList[$locale] = static::_getList($locale);
+        if (!isset(self::$_rawList[static::class])) {
+            self::$_rawList[static::class] = [];
         }
-        return static::$_rawList[$locale];
+        if (!isset(static::$_rawList[static::class][$locale])) {
+            static::$_rawList[static::class][$locale] = static::_getList($locale);
+        }
+        return static::$_rawList[static::class][$locale];
     }
 
     protected static function _getListPath()
@@ -26,9 +29,12 @@ class LocalizedList
     protected static function _getList($locale)
     {
         $f = base_path(str_replace('$locale', $locale, static::_getListPath()));
+
         if (!file_exists($f) || !is_file($f)) {
             return [];
         }
-        include $f;
+
+        $res = include $f;
+        return $res;
     }
 }