Merge 7c9e84e into adfcfc9

src/Parser/Parse.php

@@ -83,7 +83,7 @@ public function load(string $quill_json): Parse
     {
         $this->quill_json = json_decode($quill_json, true);
 
-        if (is_array($this->quill_json) === true && count($this->quill_json) > 0) {
+        if ($this->isValidDeltaJson($this->quill_json)) {
             $this->valid = true;
             $this->deltas = [];
             return $this;
@@ -109,7 +109,7 @@ public function loadMultiple(array $quill_json): Parse
         foreach ($quill_json as $index => $json) {
             $json_stack_value = json_decode($json, true);
 
-            if (is_array($json_stack_value) === true && count($json_stack_value) > 0) {
+            if ($this->isValidDeltaJson($json_stack_value)) {
                 $this->quill_json_stack[$index] = $json_stack_value;
             }
         }
@@ -232,10 +232,7 @@ public function splitOnSingleNewlineOccurrences(string $insert, bool $newlines =
      */
     public function parse(): bool
     {
-        if (
-            $this->valid === true &&
-            array_key_exists('ops', $this->quill_json) === true
-        ) {
+        if ($this->valid === true) {
             /**
              * Before processing through the deltas, generate new deltas by splliting
              * on all new lines, will make it much simpler to work out which
@@ -495,4 +492,26 @@ public function video(array $quill)
     {
         $this->deltas[] = new $this->class_delta_video($quill['insert']['video']);
     }
+
+    /**
+     * Checks the delta json is valid and can be decoded
+     *
+     * @param $quill_json Quill json string
+     *
+     * @return boolean
+     */
+    private function isValidDeltaJson($quill_json): bool
+    {
+        if (is_array($quill_json) === false) {
+            return false;
+        }
+        if (count($quill_json) === 0) {
+            return false;
+        }
+        if (array_key_exists('ops', $quill_json) === false) {
+            return false;
+        }
+
+        return true;
+    }
 }