From 2941282c92bc03ab9a09c3b8a11d1e697409e544 Mon Sep 17 00:00:00 2001
From: Kevin Purahoo <kevin@swoo.ca>
Date: Tue, 25 Feb 2025 10:41:58 -0500
Subject: [PATCH 1/5] Work in progress

---
 .idea/php.xml       | 27 +++++++++++++
 .idea/workspace.xml | 93 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 120 insertions(+)
 create mode 100644 .idea/php.xml
 create mode 100644 .idea/workspace.xml

diff --git a/.idea/php.xml b/.idea/php.xml
new file mode 100644
index 0000000..d0af434
--- /dev/null
+++ b/.idea/php.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PhpIncludePathManager">
+    <include_path>
+      <path value="$PROJECT_DIR$/vendor/nesbot/carbon" />
+      <path value="$PROJECT_DIR$/vendor/illuminate/collections" />
+      <path value="$PROJECT_DIR$/vendor/illuminate/macroable" />
+      <path value="$PROJECT_DIR$/vendor/illuminate/conditionable" />
+      <path value="$PROJECT_DIR$/vendor/symfony/clock" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-mbstring" />
+      <path value="$PROJECT_DIR$/vendor/symfony/deprecation-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/translation" />
+      <path value="$PROJECT_DIR$/vendor/symfony/translation-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php83" />
+      <path value="$PROJECT_DIR$/vendor/carbonphp/carbon-doctrine-types" />
+      <path value="$PROJECT_DIR$/vendor/composer" />
+      <path value="$PROJECT_DIR$/vendor/voku/portable-ascii" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/inflector" />
+      <path value="$PROJECT_DIR$/vendor/psr/simple-cache" />
+      <path value="$PROJECT_DIR$/vendor/psr/clock" />
+      <path value="$PROJECT_DIR$/vendor/psr/container" />
+      <path value="$PROJECT_DIR$/vendor/illuminate/support" />
+      <path value="$PROJECT_DIR$/vendor/illuminate/contracts" />
+    </include_path>
+  </component>
+  <component name="PhpProjectSharedConfiguration" php_language_level="8.2" />
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..f1cac2c
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="78f91c63-3d41-4112-a86e-70184536b1ea" name="Changes" comment="" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="ComposerSettings" synchronizationState="SYNCHRONIZE">
+    <pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath>
+    <execution>
+      <executable path="composer" />
+    </execution>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="PhpWorkspaceProjectConfiguration" interpreter_name="PHP 8.2">
+    <include_path>
+      <path value="$PROJECT_DIR$/vendor/nesbot/carbon" />
+      <path value="$PROJECT_DIR$/vendor/illuminate/collections" />
+      <path value="$PROJECT_DIR$/vendor/illuminate/macroable" />
+      <path value="$PROJECT_DIR$/vendor/illuminate/conditionable" />
+      <path value="$PROJECT_DIR$/vendor/symfony/clock" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-mbstring" />
+      <path value="$PROJECT_DIR$/vendor/symfony/deprecation-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/translation" />
+      <path value="$PROJECT_DIR$/vendor/symfony/translation-contracts" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php83" />
+      <path value="$PROJECT_DIR$/vendor/carbonphp/carbon-doctrine-types" />
+      <path value="$PROJECT_DIR$/vendor/composer" />
+      <path value="$PROJECT_DIR$/vendor/voku/portable-ascii" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/inflector" />
+      <path value="$PROJECT_DIR$/vendor/psr/simple-cache" />
+      <path value="$PROJECT_DIR$/vendor/psr/clock" />
+      <path value="$PROJECT_DIR$/vendor/psr/container" />
+      <path value="$PROJECT_DIR$/vendor/illuminate/support" />
+      <path value="$PROJECT_DIR$/vendor/illuminate/contracts" />
+    </include_path>
+  </component>
+  <component name="ProjectColorInfo">{
+  &quot;associatedIndex&quot;: 3
+}</component>
+  <component name="ProjectId" id="2szVee24p8FpRPTzgBk597BszJB" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.git.unshallow": "true",
+    "git-widget-placeholder": "main",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "settings.editor.selected.configurable": "reference.webide.settings.project.settings.php",
+    "vue.rearranger.settings.migration": "true"
+  }
+}]]></component>
+  <component name="SharedIndexes">
+    <attachedChunks>
+      <set>
+        <option value="bundled-js-predefined-d6986cc7102b-76f8388c3a79-JavaScript-PS-243.24978.50" />
+        <option value="bundled-php-predefined-a98d8de5180a-fbeb0b58ac0f-com.jetbrains.php.sharedIndexes-PS-243.24978.50" />
+      </set>
+    </attachedChunks>
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="78f91c63-3d41-4112-a86e-70184536b1ea" name="Changes" comment="" />
+      <created>1739458486787</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1739458486787</updated>
+      <workItem from="1739458491014" duration="2934000" />
+      <workItem from="1739971093434" duration="1399000" />
+      <workItem from="1740419822359" duration="680000" />
+      <workItem from="1740494062433" duration="1940000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+  </component>
+</project>
\ No newline at end of file

From 9dd89f80b88ed47a279e578a803b6f0be09511a5 Mon Sep 17 00:00:00 2001
From: Kevin Purahoo <kevin@swoo.ca>
Date: Tue, 25 Feb 2025 13:13:59 -0500
Subject: [PATCH 2/5] Update the states constant for the states to be available
 per country

---
 .gitignore                   |  1 +
 .idea/workspace.xml          | 18 ++++++++++++--
 lang/en/australia-states.php | 14 +++++++++++
 lang/en/canada-states.php    | 19 +++++++++++++++
 lang/en/states.php           | 21 ----------------
 src/AustraliaState.php       | 37 ++++++++++++++++++++++++++++
 src/CanadaState.php          | 47 ++++++++++++++++++++++++++++++++++++
 src/State.php                | 42 +++-----------------------------
 8 files changed, 138 insertions(+), 61 deletions(-)
 create mode 100644 lang/en/australia-states.php
 create mode 100644 lang/en/canada-states.php
 delete mode 100644 lang/en/states.php
 create mode 100644 src/AustraliaState.php
 create mode 100644 src/CanadaState.php

diff --git a/.gitignore b/.gitignore
index 987e2a2..bf12543 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 composer.lock
 vendor
+.idea
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f1cac2c..9ec02d9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,15 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="78f91c63-3d41-4112-a86e-70184536b1ea" name="Changes" comment="" />
+    <list default="true" id="78f91c63-3d41-4112-a86e-70184536b1ea" name="Changes" comment="">
+      <change afterPath="$PROJECT_DIR$/lang/en/canada-states.php" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/AustraliaState.php" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/CanadaState.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lang/en/states.php" beforeDir="false" afterPath="$PROJECT_DIR$/lang/en/australia-states.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/State.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/State.php" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -54,7 +62,8 @@
   "keyToString": {
     "RunOnceActivity.ShowReadmeOnStart": "true",
     "RunOnceActivity.git.unshallow": "true",
-    "git-widget-placeholder": "main",
+    "git-widget-placeholder": "feature/country-states",
+    "last_opened_file_path": "/Users/swoo/Projects/constants/lang/en",
     "node.js.detected.package.eslint": "true",
     "node.js.detected.package.tslint": "true",
     "node.js.selected.package.eslint": "(autodetect)",
@@ -64,6 +73,11 @@
     "vue.rearranger.settings.migration": "true"
   }
 }]]></component>
+  <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/lang/en" />
+    </key>
+  </component>
   <component name="SharedIndexes">
     <attachedChunks>
       <set>
diff --git a/lang/en/australia-states.php b/lang/en/australia-states.php
new file mode 100644
index 0000000..1c22ef1
--- /dev/null
+++ b/lang/en/australia-states.php
@@ -0,0 +1,14 @@
+<?php
+
+use AllDressed\Constants\AustraliaState;
+
+return [
+    AustraliaState::AUSTRALIAN_CAPITAL_TERRITORY->value => 'Australian Capital Territory',
+    AustraliaState::NEW_SOUTH_WALES->value => 'New South Wales',
+    AustraliaState::NORTHERN_TERRITORY->value => 'Northern Territory',
+    AustraliaState::QUEENSLAND->value => 'Queensland',
+    AustraliaState::SOUTH_AUSTRALIA->value => 'South Australia',
+    AustraliaState::TASMANIA->value => 'Tasmania',
+    AustraliaState::VICTORIA->value => 'Victoria',
+    AustraliaState::WESTERN_AUSTRALIA->value => 'Western Australia',
+];
\ No newline at end of file
diff --git a/lang/en/canada-states.php b/lang/en/canada-states.php
new file mode 100644
index 0000000..e68c172
--- /dev/null
+++ b/lang/en/canada-states.php
@@ -0,0 +1,19 @@
+states.php<?php
+
+use AllDressed\Constants\CanadaState;
+
+return [
+    CanadaState::ALBERTA->value => 'Alberta',
+    CanadaState::BRITISH_COLUMBIA->value => 'British Columbia',
+    CanadaState::MANITOBA->value => 'Manitoba',
+    CanadaState::NEW_BRUNSWICK->value => 'New Brunswick',
+    CanadaState::NEWFOUNDLAND_AND_LABRADOR->value => 'Newfoundland and Labrador',
+    CanadaState::NOVA_SCOTIA->value => 'Nova Scotia',
+    CanadaState::NORTHWEST_TERRITORIES->value => 'Northwest Territories',
+    CanadaState::NUNAVUT->value => 'Nunavut',
+    CanadaState::ONTARIO->value => 'Ontario',
+    CanadaState::PRINCE_EDWARD_ISLAND->value => 'Prince Edward Island',
+    CanadaState::QUEBEC->value => 'Quebec',
+    CanadaState::SASKATCHEWAN->value => 'Saskatchewan',
+    CanadaState::YUKON->value => 'Yukon',
+];
\ No newline at end of file
diff --git a/lang/en/states.php b/lang/en/states.php
deleted file mode 100644
index 298b51e..0000000
--- a/lang/en/states.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-use AllDressed\Constants\Country;
-use AllDressed\Constants\State;
-
-return [
-    Country::AUSTRALIA->value => [
-        State::AUSTRALIAN_CAPITAL_TERRITORY->value => 'Australian Capital Territory',
-        State::NEW_SOUTH_WALES->value => 'New South Wales',
-        State::NORTHERN_TERRITORY->value => 'Northern Territory',
-        State::QUEENSLAND->value => 'Queensland',
-        State::SOUTH_AUSTRALIA->value => 'South Australia',
-        State::TASMANIA->value => 'Tasmania',
-        State::VICTORIA->value => 'Victoria',
-        State::WESTERN_AUSTRALIA->value => 'Western Australia',
-    ],
-
-    Country::CANADA->value => [
-        State::QUEBEC->value => 'Quebec',
-    ],
-];
diff --git a/src/AustraliaState.php b/src/AustraliaState.php
new file mode 100644
index 0000000..bebd956
--- /dev/null
+++ b/src/AustraliaState.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace AllDressed\Constants;
+
+use AllDressed\Constants\Concerns\AvailableAsCollection;
+use AllDressed\Constants\Concerns\AvailableAsOptions;
+use AllDressed\Constants\Concerns\CanBeRandomized;
+
+enum AustraliaState: string
+{
+    use AvailableAsCollection, AvailableAsOptions, CanBeRandomized;
+
+    case AUSTRALIAN_CAPITAL_TERRITORY = 'ACT';
+    case NEW_SOUTH_WALES = 'NSW';
+    case NORTHERN_TERRITORY = 'NT';
+    case QUEENSLAND = 'QLD';
+    case SOUTH_AUSTRALIA = 'SA';
+    case TASMANIA = 'TAS';
+    case VICTORIA = 'VIC';
+    case WESTERN_AUSTRALIA = 'WA';
+
+    /**
+     * Retrieve the country of the state.
+     */
+    public function getCountry(): string
+    {
+        return 'AU';
+    }
+
+    /**
+     * Retrieve the abbreviation of the state.
+     */
+    public function getStateValue(): string
+    {
+        return $this->value;
+    }
+}
\ No newline at end of file
diff --git a/src/CanadaState.php b/src/CanadaState.php
new file mode 100644
index 0000000..12040ae
--- /dev/null
+++ b/src/CanadaState.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace AllDressed\Constants;
+
+use AllDressed\Constants\Concerns\AvailableAsCollection;
+use AllDressed\Constants\Concerns\AvailableAsOptions;
+use AllDressed\Constants\Concerns\CanBeRandomized;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Lang;
+
+enum CanadaState: string
+{
+    use AvailableAsCollection, AvailableAsOptions, CanBeRandomized;
+
+    case ALBERTA = 'AL';
+    case BRITISH_COLUMBIA = 'BC';
+    case MANITOBA = 'MB';
+    case NEW_BRUNSWICK = 'NB';
+    case NEWFOUNDLAND_AND_LABRADOR = 'NL';
+    case NOVA_SCOTIA = 'NS';
+    case NORTHWEST_TERRITORIES = 'NT';
+    case NUNAVUT = 'NU';
+    case ONTARIO = 'ON';
+    case PRINCE_EDWARD_ISLAND = 'PE';
+    case QUEBEC = 'QC';
+    case SASKATCHEWAN = 'SK';
+    case YUKON = 'YK';
+
+
+    /**
+     * Retrieve the country of the state.
+     */
+    public function getCountry(): string
+    {
+        return 'CA';
+    }
+
+    /**
+     * Retrieve the abbreviation of the state.
+     */
+    public function getStateValue(): string
+    {
+        return $this->value;
+    }
+}
\ No newline at end of file
diff --git a/src/State.php b/src/State.php
index d467933..7e011fe 100644
--- a/src/State.php
+++ b/src/State.php
@@ -7,51 +7,17 @@
 use AllDressed\Constants\Concerns\CanBeRandomized;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\App;
-use Illuminate\Support\Facades\Lang;
 
 enum State: string
 {
     use AvailableAsCollection, AvailableAsOptions, CanBeRandomized;
 
-    case AUSTRALIAN_CAPITAL_TERRITORY = 'ACT';
-    case NEW_SOUTH_WALES = 'NSW';
-    case NORTHERN_TERRITORY = 'NT';
-    case QUEBEC = 'QC';
-    case QUEENSLAND = 'QLD';
-    case SOUTH_AUSTRALIA = 'SA';
-    case TASMANIA = 'TAS';
-    case VICTORIA = 'VIC';
-    case WESTERN_AUSTRALIA = 'WA';
-
-    /**
-     * Retrieve the country of the state.
-     */
-    public function getCountry(): Country
-    {
-        $key = "alldressed-{$this->value}-country";
-
-        if (! App::has($key)) {
-            App::singleton($key, function () {
-                $country = collect(Lang::get('constants::states'))->search(
-                    function ($states) {
-                        return collect($states)->has($this->value);
-                    }
-                );
-
-                return Country::from($country);
-            });
-        }
-
-        return App::get($key);
-    }
-
     /**
-     * Preprend the country for the translation key.
+     * Get all states from all enums.
      */
-    public function getTranslationKey(): string
+    public static function all(): Collection
     {
-        return "states.{$this->getCountry()->value}.{$this->value}";
+        return collect([...AustraliaState::cases(), ...CanadaState::cases()]);
     }
 
     /**
@@ -68,4 +34,4 @@ public static function toCountrySelectorOptions(): Collection
             ->groupBy('country')
             ->map(static fn ($option) => Arr::except($option, 'country'));
     }
-}
+}
\ No newline at end of file

From d71f8499b62efa2e9e78fb3e4e911d437d20e62b Mon Sep 17 00:00:00 2001
From: Kevin Purahoo <kevin@swoo.ca>
Date: Tue, 25 Feb 2025 13:16:29 -0500
Subject: [PATCH 3/5] Update the states constant for the states to be available
 per country

---
 .idea/workspace.xml       | 7 +------
 lang/en/canada-states.php | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9ec02d9..4efbaf3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,13 +5,8 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="78f91c63-3d41-4112-a86e-70184536b1ea" name="Changes" comment="">
-      <change afterPath="$PROJECT_DIR$/lang/en/canada-states.php" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/AustraliaState.php" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/CanadaState.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lang/en/states.php" beforeDir="false" afterPath="$PROJECT_DIR$/lang/en/australia-states.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/State.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/State.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lang/en/canada-states.php" beforeDir="false" afterPath="$PROJECT_DIR$/lang/en/canada-states.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/lang/en/canada-states.php b/lang/en/canada-states.php
index e68c172..6f51d23 100644
--- a/lang/en/canada-states.php
+++ b/lang/en/canada-states.php
@@ -1,4 +1,4 @@
-states.php<?php
+<?php
 
 use AllDressed\Constants\CanadaState;
 

From 70749f2996f299f941b8fd7076ae85ea332eb8cd Mon Sep 17 00:00:00 2001
From: Kevin Purahoo <kevin@swoo.ca>
Date: Thu, 27 Feb 2025 16:29:40 -0500
Subject: [PATCH 4/5] Issue with getCountry in State enum

---
 .gitignore          |   2 +-
 .idea/php.xml       |  27 ------------
 .idea/workspace.xml | 102 --------------------------------------------
 src/State.php       |   2 +-
 4 files changed, 2 insertions(+), 131 deletions(-)
 delete mode 100644 .idea/php.xml
 delete mode 100644 .idea/workspace.xml

diff --git a/.gitignore b/.gitignore
index bf12543..7e43310 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 composer.lock
 vendor
-.idea
\ No newline at end of file
+.idea/
\ No newline at end of file
diff --git a/.idea/php.xml b/.idea/php.xml
deleted file mode 100644
index d0af434..0000000
--- a/.idea/php.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PhpIncludePathManager">
-    <include_path>
-      <path value="$PROJECT_DIR$/vendor/nesbot/carbon" />
-      <path value="$PROJECT_DIR$/vendor/illuminate/collections" />
-      <path value="$PROJECT_DIR$/vendor/illuminate/macroable" />
-      <path value="$PROJECT_DIR$/vendor/illuminate/conditionable" />
-      <path value="$PROJECT_DIR$/vendor/symfony/clock" />
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-mbstring" />
-      <path value="$PROJECT_DIR$/vendor/symfony/deprecation-contracts" />
-      <path value="$PROJECT_DIR$/vendor/symfony/translation" />
-      <path value="$PROJECT_DIR$/vendor/symfony/translation-contracts" />
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php83" />
-      <path value="$PROJECT_DIR$/vendor/carbonphp/carbon-doctrine-types" />
-      <path value="$PROJECT_DIR$/vendor/composer" />
-      <path value="$PROJECT_DIR$/vendor/voku/portable-ascii" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/inflector" />
-      <path value="$PROJECT_DIR$/vendor/psr/simple-cache" />
-      <path value="$PROJECT_DIR$/vendor/psr/clock" />
-      <path value="$PROJECT_DIR$/vendor/psr/container" />
-      <path value="$PROJECT_DIR$/vendor/illuminate/support" />
-      <path value="$PROJECT_DIR$/vendor/illuminate/contracts" />
-    </include_path>
-  </component>
-  <component name="PhpProjectSharedConfiguration" php_language_level="8.2" />
-</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index 4efbaf3..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AutoImportSettings">
-    <option name="autoReloadType" value="SELECTIVE" />
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="78f91c63-3d41-4112-a86e-70184536b1ea" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lang/en/canada-states.php" beforeDir="false" afterPath="$PROJECT_DIR$/lang/en/canada-states.php" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="ComposerSettings" synchronizationState="SYNCHRONIZE">
-    <pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath>
-    <execution>
-      <executable path="composer" />
-    </execution>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="PhpWorkspaceProjectConfiguration" interpreter_name="PHP 8.2">
-    <include_path>
-      <path value="$PROJECT_DIR$/vendor/nesbot/carbon" />
-      <path value="$PROJECT_DIR$/vendor/illuminate/collections" />
-      <path value="$PROJECT_DIR$/vendor/illuminate/macroable" />
-      <path value="$PROJECT_DIR$/vendor/illuminate/conditionable" />
-      <path value="$PROJECT_DIR$/vendor/symfony/clock" />
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-mbstring" />
-      <path value="$PROJECT_DIR$/vendor/symfony/deprecation-contracts" />
-      <path value="$PROJECT_DIR$/vendor/symfony/translation" />
-      <path value="$PROJECT_DIR$/vendor/symfony/translation-contracts" />
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php83" />
-      <path value="$PROJECT_DIR$/vendor/carbonphp/carbon-doctrine-types" />
-      <path value="$PROJECT_DIR$/vendor/composer" />
-      <path value="$PROJECT_DIR$/vendor/voku/portable-ascii" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/inflector" />
-      <path value="$PROJECT_DIR$/vendor/psr/simple-cache" />
-      <path value="$PROJECT_DIR$/vendor/psr/clock" />
-      <path value="$PROJECT_DIR$/vendor/psr/container" />
-      <path value="$PROJECT_DIR$/vendor/illuminate/support" />
-      <path value="$PROJECT_DIR$/vendor/illuminate/contracts" />
-    </include_path>
-  </component>
-  <component name="ProjectColorInfo">{
-  &quot;associatedIndex&quot;: 3
-}</component>
-  <component name="ProjectId" id="2szVee24p8FpRPTzgBk597BszJB" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "RunOnceActivity.git.unshallow": "true",
-    "git-widget-placeholder": "feature/country-states",
-    "last_opened_file_path": "/Users/swoo/Projects/constants/lang/en",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm",
-    "settings.editor.selected.configurable": "reference.webide.settings.project.settings.php",
-    "vue.rearranger.settings.migration": "true"
-  }
-}]]></component>
-  <component name="RecentsManager">
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/lang/en" />
-    </key>
-  </component>
-  <component name="SharedIndexes">
-    <attachedChunks>
-      <set>
-        <option value="bundled-js-predefined-d6986cc7102b-76f8388c3a79-JavaScript-PS-243.24978.50" />
-        <option value="bundled-php-predefined-a98d8de5180a-fbeb0b58ac0f-com.jetbrains.php.sharedIndexes-PS-243.24978.50" />
-      </set>
-    </attachedChunks>
-  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="78f91c63-3d41-4112-a86e-70184536b1ea" name="Changes" comment="" />
-      <created>1739458486787</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1739458486787</updated>
-      <workItem from="1739458491014" duration="2934000" />
-      <workItem from="1739971093434" duration="1399000" />
-      <workItem from="1740419822359" duration="680000" />
-      <workItem from="1740494062433" duration="1940000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/State.php b/src/State.php
index 7e011fe..85a7ce1 100644
--- a/src/State.php
+++ b/src/State.php
@@ -27,7 +27,7 @@ public static function toCountrySelectorOptions(): Collection
     {
         return static::all()
             ->map(static fn ($state) => [
-                'country' => $state->getCountry()->value,
+                'country' => $state->getCountry(),
                 'label' => $state->getLabel(),
                 'value' => $state->value,
             ])

From 976bed8119cb48eab61d8f7e935105fa102bbe54 Mon Sep 17 00:00:00 2001
From: Kevin Purahoo <kevin@swoo.ca>
Date: Mon, 3 Mar 2025 09:05:40 -0500
Subject: [PATCH 5/5] Refactor code for returning the states

---
 src/State.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/State.php b/src/State.php
index 85a7ce1..b564e75 100644
--- a/src/State.php
+++ b/src/State.php
@@ -26,12 +26,10 @@ public static function all(): Collection
     public static function toCountrySelectorOptions(): Collection
     {
         return static::all()
-            ->map(static fn ($state) => [
-                'country' => $state->getCountry(),
+            ->groupBy(static fn ($states) => $states->getCountry())
+            ->map(static fn ($states) => $states->map(static fn ($state) => [
                 'label' => $state->getLabel(),
                 'value' => $state->value,
-            ])
-            ->groupBy('country')
-            ->map(static fn ($option) => Arr::except($option, 'country'));
+            ]));
     }
 }
\ No newline at end of file