From 05fec2d2814877d55b14f6322b4b377776db861d Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 5 Jul 2019 14:42:11 +0200
Subject: [PATCH] #2868

---
 composer.json                |  5 +++--
 src/Country.php              | 10 +++++++++
 src/CubistLocaleProvider.php | 39 ------------------------------------
 src/List.php                 | 25 +++++++++++++++++++++++
 src/Locale.php               |  8 ++++++++
 5 files changed, 46 insertions(+), 41 deletions(-)
 create mode 100644 src/Country.php
 delete mode 100644 src/CubistLocaleProvider.php
 create mode 100644 src/List.php
 create mode 100644 src/Locale.php

diff --git a/composer.json b/composer.json
index 3aff7e4..cf1222e 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,8 @@
     "require": {
         "php": ">=7.1.3",
         "umpirsky/locale-list": "^1.0",
-        "umpirsky/country-list": "^2.0"
+        "umpirsky/country-list": "^2.0",
+        "laravel/framework": "^5.8"
     },
     "require-dev": {
     },
@@ -32,7 +33,7 @@
         },
         "laravel": {
             "providers": [
-                "Cubist\\Locale\\CubistLocaleServiceProvider"
+
             ],
             "aliases": {
 
diff --git a/src/Country.php b/src/Country.php
new file mode 100644
index 0000000..9bd337d
--- /dev/null
+++ b/src/Country.php
@@ -0,0 +1,10 @@
+<?php
+
+
+namespace Cubist\Locale;
+
+
+class Locale extends LocalizedList
+{
+    protected static $_listPath = '/vendor/umpirsky/country-list/data/$locale/country.php';
+}
diff --git a/src/CubistLocaleProvider.php b/src/CubistLocaleProvider.php
deleted file mode 100644
index f7dfad8..0000000
--- a/src/CubistLocaleProvider.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace Cubist\Locale;
-
-use Illuminate\Support\ServiceProvider;
-
-class CubistBackpackServiceProvider extends ServiceProvider
-{
-    /**
-     * Indicates if loading of the provider is deferred.
-     *
-     * @var bool
-     */
-    protected $defer = false;
-
-    const NAMESPACE = 'cubist_locale';
-
-
-    /**
-     * Perform post-registration booting of services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-
-    }
-
-
-    /**
-     * Register any package services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-
-    }
-}
diff --git a/src/List.php b/src/List.php
new file mode 100644
index 0000000..4bc03d9
--- /dev/null
+++ b/src/List.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Cubist\Locale;
+class LocalizedList
+{
+    protected static $_rawList = [];
+    protected static $_listPath='';
+
+    public static function getList($locale)
+    {
+        if (!isset(self::$_rawList[$locale])) {
+            self::$_rawList[$locale] = static::_getList($locale);
+        }
+        return self::$_rawList[$locale];
+    }
+
+    /**
+     * @param string $locale
+     * @return array
+     */
+    protected static function _getList($locale)
+    {
+       include base_path(str_replace('$locale',$locale,self::$_listPath));
+    }
+}
diff --git a/src/Locale.php b/src/Locale.php
new file mode 100644
index 0000000..2a854fa
--- /dev/null
+++ b/src/Locale.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Cubist\Locale;
+
+class Locale extends LocalizedList
+{
+    protected static $_listPath = '/vendor/umpirsky/locale-list/data/$locale/locales.php';
+}
-- 
2.39.5