remove empty strings

mledoze · Sep 13, 2023 · a3afb25 · a3afb25
1 parent e0de4dc
commit a3afb25
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 56 deletions.
diff --git a/countries.json b/countries.json
@@ -1720,9 +1720,7 @@
             "root": "",
             "suffixes": []
         },
-        "capital": [
-            ""
-        ],
+        "capital": [],
         "altSpellings": [
             "AQ"
         ],
@@ -5791,9 +5789,7 @@
                 "7"
             ]
         },
-        "capital": [
-            ""
-        ],
+        "capital": [],
         "altSpellings": [
             "BV",
             "Bouvet\u00f8ya",
@@ -15346,13 +15342,9 @@
         "currencies": {},
         "idd": {
             "root": "",
-            "suffixes": [
-                ""
-            ]
+            "suffixes": []
         },
-        "capital": [
-            ""
-        ],
+        "capital": [],
         "altSpellings": [
             "HM",
             "Heard Island and McDonald Islands"
@@ -15380,7 +15372,7 @@
                 "common": "Heard ja McDonaldinsaaret"
             },
             "fra": {
-                "official": "Des \u00eeles Heard et McDonald",
+                "official": "\u00celes Heard-et-MacDonald",
                 "common": "\u00celes Heard-et-MacDonald"
             },
             "hrv": {
@@ -21371,9 +21363,7 @@
                 "53"
             ]
         },
-        "capital": [
-            ""
-        ],
+        "capital": [],
         "altSpellings": [
             "MO",
             "\u6fb3\u95e8",
@@ -30139,7 +30129,7 @@
         "currencies": {
             "SDG": {
                 "name": "Sudanese pound",
-                "symbol": ""
+                "symbol": "PT"
             }
         },
         "idd": {
@@ -36135,9 +36125,7 @@
                 "68"
             ]
         },
-        "capital": [
-            ""
-        ],
+        "capital": [],
         "altSpellings": [
             "UM"
         ],

diff --git a/dist/countries-unescaped.json b/dist/countries-unescaped.json
diff --git a/dist/countries.csv b/dist/countries.csv
diff --git a/dist/countries.json b/dist/countries.json
diff --git a/dist/countries.xml b/dist/countries.xml
diff --git a/dist/countries.yml b/dist/countries.yml
diff --git a/src/MLD/Console/Command/ExportCommand.php b/src/MLD/Console/Command/ExportCommand.php
@@ -25,6 +25,8 @@
 class ExportCommand extends Command
 {
     private const BASE_OUTPUT_FILENAME = 'countries';
+    private const EXIT_FAILURE = 1;
+    private const EXIT_SUCCESS = 0;
 
     private string $inputFile;
 
@@ -97,18 +99,17 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $countries = $this->decodeInputFile();
         } catch (JsonException $exception) {
             $output->writeln(sprintf('Failed to decode input countries file: %s', $exception->getMessage()));
-            return 1;
+            return self::EXIT_FAILURE;
         }
 
-        $countries = $this->generateFields($countries);
+        $countries = $this->generateCallingCodes($countries);
 
         $outputFields = $this->getOutputFields($input, $countries);
         if ($output->isVerbose()) {
             $output->writeln(sprintf('Output fields: %s', implode(',', $outputFields)));
         }
 
         $countries = $this->filterFields($countries, $outputFields);
-
         $formats = $this->getFormats($input);
         foreach ($formats as $format) {
             if ($output->isVerbose()) {
@@ -129,7 +130,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         }
 
         $this->printResult($output, $countries, $formats);
-        return 0;
+        return self::EXIT_SUCCESS;
     }
 
     /**
@@ -273,11 +274,10 @@ private function setOutputDirectory(InputInterface $input): void
     }
 
     /**
-     * Generate fields that exist only at build time
+     * Generate calling codes from the "idd" property
      */
-    private function generateFields(array $countries): array
+    private function generateCallingCodes(array $countries): array
     {
-        // generate calling codes from the "idd" property
         $generateCallingCodes = static function ($country) {
             $country[Fields::CALLING_CODES->value] = array_map(
                 static fn($suffix): string => $country[Fields::IDD->value][Fields::IDD_ROOT->value] . $suffix,