Use JSON_THROW_ON_ERROR

Enalean · Sep 13, 2019 · 70a6135 · 70a6135
1 parent 886cd58
commit 70a6135
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 26 deletions.
diff --git a/src/Storage/APCUStore.php b/src/Storage/APCUStore.php
@@ -26,7 +26,6 @@
 use function implode;
 use function json_decode;
 use function json_encode;
-use function json_last_error_msg;
 use function pack;
 use function sort;
 use function strcmp;
@@ -371,15 +370,10 @@ private static function sortSamples(array &$samples) : void
 
     /**
      * @param string[] $values
-     *
-     * @throws RuntimeException
      */
     private function encodeLabelValues(array $values) : string
     {
-        $json = json_encode($values);
+        $json = json_encode($values, JSON_THROW_ON_ERROR);
-        if ($json === false) {
-            throw new RuntimeException(json_last_error_msg());
-        }
 
         return base64_encode($json);
     }
@@ -395,11 +389,6 @@ private function decodeLabelValues(string $values) : array
         if ($json === false) {
             throw new RuntimeException('Cannot base64 decode label values');
         }
-        $decodedValues = json_decode($json, true);
+        return json_decode($json, true, JSON_THROW_ON_ERROR);
-        if ($decodedValues === false) {
-            throw new RuntimeException(json_last_error_msg());
-        }
-
-        return $decodedValues;
     }
 }
diff --git a/src/Storage/InMemoryStore.php b/src/Storage/InMemoryStore.php
@@ -20,7 +20,6 @@
 use function implode;
 use function json_decode;
 use function json_encode;
-use function json_last_error_msg;
 use function sort;
 use function strcmp;
 use function usort;
@@ -321,15 +320,10 @@ private function metaData(MetricName $name, string $help, LabelNames $labelNames
 
     /**
      * @param string[] $values
-     *
-     * @throws RuntimeException
      */
     private function encodeLabelValues(array $values) : string
     {
-        $json = json_encode($values);
+        $json = json_encode($values, JSON_THROW_ON_ERROR);
-        if ($json === false) {
-            throw new RuntimeException(json_last_error_msg());
-        }
 
         return base64_encode($json);
     }
@@ -345,11 +339,6 @@ private function decodeLabelValues(string $values) : array
         if ($json === false) {
             throw new RuntimeException('Cannot base64 decode label values');
         }
-        $decodedValues = json_decode($json, true);
+        return json_decode($json, true, 512, JSON_THROW_ON_ERROR);
-        if ($decodedValues === false) {
-            throw new RuntimeException(json_last_error_msg());
-        }
-
-        return $decodedValues;
     }
 }