better error handling when decoding JSON dataset

mledoze · Sep 11, 2023 · f41cbf2 · f41cbf2
1 parent 3939c68
commit f41cbf2
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 15 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/MLD/Console/Command/ExportCommand.php b/src/MLD/Console/Command/ExportCommand.php
@@ -4,6 +4,7 @@
 
 namespace MLD\Console\Command;
 
+use JsonException;
 use MLD\Converter\Factory;
 use MLD\Enum\ExportCommandOptions;
 use MLD\Enum\Formats;
@@ -90,7 +91,12 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $this->setOutputDirectory($input);
         $this->createOutputDirectory($output);
 
-        $countries = $this->decodeInputFile();
+        try {
+            $countries = $this->decodeInputFile();
+        } catch (JsonException $exception) {
+            $output->writeln(sprintf('Failed to decode input countries file: %s', $exception->getMessage()));
+            return 1;
+        }
 
         $outputFields = $this->getOutputFields($input, $countries);
         if ($output->isVerbose()) {
@@ -194,10 +200,11 @@ private function getOutputFields(InputInterface $input, array $countries): array
 
     /**
      * @return array
+     * @throws JsonException
      */
     private function decodeInputFile(): array
     {
-        return json_decode(file_get_contents($this->inputFile), true);
+        return json_decode(file_get_contents($this->inputFile), true, 512, JSON_THROW_ON_ERROR);
     }
 
     /**

diff --git a/src/MLD/Converter/AbstractJsonConverter.php b/src/MLD/Converter/AbstractJsonConverter.php
@@ -37,7 +37,7 @@ abstract protected function jsonEncode(array $countries): string;
     protected function processEmptyArrays(array $countries): array
     {
         return array_map(
-            function ($country) {
+            static function ($country) {
                 if (isset($country[Fields::LANGUAGES]) && empty($country[Fields::LANGUAGES])) {
                     $country[Fields::LANGUAGES] = new stdClass();
                 }

diff --git a/src/MLD/Converter/JsonConverter.php b/src/MLD/Converter/JsonConverter.php
@@ -4,16 +4,19 @@
 
 namespace MLD\Converter;
 
+use JsonException;
+
 /**
  * Convert countries data to JSON format
  */
 class JsonConverter extends AbstractJsonConverter
 {
     /**
      * @inheritDoc
+     * @throws JsonException
      */
     protected function jsonEncode(array $countries): string
     {
-        return json_encode($countries);
+        return json_encode($countries, JSON_THROW_ON_ERROR);
     }
 }
diff --git a/src/MLD/Converter/JsonConverterUnicode.php b/src/MLD/Converter/JsonConverterUnicode.php
@@ -4,16 +4,19 @@
 
 namespace MLD\Converter;
 
+use JsonException;
+
 /**
  * Convert countries data to JSON format with unescaped characters
  */
 class JsonConverterUnicode extends AbstractJsonConverter
 {
     /**
      * @inheritdoc
+     * @throws JsonException
      */
     protected function jsonEncode(array $countries): string
     {
-        return json_encode($countries, JSON_UNESCAPED_UNICODE);
+        return json_encode($countries, JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE);
     }
 }
diff --git a/src/MLD/Converter/XmlConverter.php b/src/MLD/Converter/XmlConverter.php
@@ -51,7 +51,7 @@ private function processCountry(array $country): void
     {
         $countryNode = $this->domDocument->createElement('country');
         $country = $this->flatten($country);
-        array_walk($country, function ($value, $key) use ($countryNode) {
+        array_walk($country, static function ($value, $key) use ($countryNode) {
             $countryNode->setAttribute($key, (string) $value);
         });
         $this->domDocument->documentElement->appendChild($countryNode);

diff --git a/src/MLD/Converter/YamlConverter.php b/src/MLD/Converter/YamlConverter.php
@@ -18,8 +18,6 @@ class YamlConverter extends AbstractConverter
      */
     public function convert(array $countries): string
     {
-        $dumper = new Dumper();
-
-        return $dumper->dump($countries, self::INLINE_LEVEL);
+        return (new Dumper())->dump($countries, self::INLINE_LEVEL);
     }
 }