Move initial data validation out of generator parser

amphp · Dec 18, 2017 · 67b8213 · 67b8213
1 parent 82e439c
commit 67b8213
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/lib/Internal/ArrayParser.php b/lib/Internal/ArrayParser.php
@@ -15,6 +15,12 @@ class ArrayParser {
      * @throws \Amp\Postgres\ParseException
      */
     public function parse(string $data, callable $cast = null, string $delimiter = ','): array {
+        $data = \trim($data);
+
+        if ($data[0] !== '{' || \substr($data, -1) !== '}') {
+            throw new ParseException("Missing opening or closing brackets");
+        }
+
         $parser = $this->parser($data, $cast, $delimiter);
         $data = \iterator_to_array($parser);
 
@@ -26,12 +32,6 @@ public function parse(string $data, callable $cast = null, string $delimiter = '
     }
 
     private function parser(string $data, callable $cast = null, string $delimiter = ','): \Generator {
-        $data = \trim($data);
-
-        if ($data[0] !== '{' || \substr($data, -1) !== '}') {
-            throw new ParseException("Missing opening or closing brackets");
-        }
-
         $data = \ltrim(\substr($data, 1));
 
         do {