From a90dbdbc48306dc267d848bb0b7381cbee7ffbdc Mon Sep 17 00:00:00 2001
From: Stephen Wolff <stephen@maxgatedigital.com>
Date: Tue, 14 May 2019 16:48:26 +0100
Subject: [PATCH 1/3] Fix issue with checkbox, where 0 coerced to nothing
 causing index to fail

---
 Fields/MulticheckboxField.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Fields/MulticheckboxField.php b/Fields/MulticheckboxField.php
index e8f26a5..9050f52 100644
--- a/Fields/MulticheckboxField.php
+++ b/Fields/MulticheckboxField.php
@@ -135,11 +135,12 @@ public function getHtml()
         $html = '';
 
         if ($this->checkboxes) {
-            foreach ($this->checkboxes as $checkbox) {
+
+            foreach ($this->checkboxes as $checkboxIndex=>$checkbox) {
                 $html.= '<div class="'.$this->getAttribute('class').'">';
                 $html.= '<label>';
                 $html.= $checkbox->getHtml();
-                $html.= $this->labels[$checkbox->getName()];
+                $html.= $this->labels[$this->nameFor($checkboxIndex)];
                 $html.= '</label>';
                 $html.= '</div>';
             }

From be3037aa111d195f355fe3d54ab4f2beed98b236 Mon Sep 17 00:00:00 2001
From: Stephen Wolff <stephen@maxgatedigital.com>
Date: Wed, 15 May 2019 09:49:23 +0100
Subject: [PATCH 2/3] Create source entry in parent parser source array, to
 enable sources in multiple subforms

---
 Factory.php |  4 ++--
 Parser.php  | 28 +++++++++++++++++++++++++---
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/Factory.php b/Factory.php
index c0133ab..ebf16bf 100644
--- a/Factory.php
+++ b/Factory.php
@@ -75,11 +75,11 @@ protected function inject($object)
     /**
      * Get a parser
      */
-    public function getParser($content, $offset = 0)
+    public function getParser($content, $offset = 0, $parser_parent = null)
     {
         $parserClass = $this->parserClass;
 
-        return $this->inject(new $parserClass($content, $this, $offset));
+        return $this->inject(new $parserClass($content, $this, $offset, $parser_parent));
     }
 
     /**
diff --git a/Parser.php b/Parser.php
index c8dbefe..3647566 100644
--- a/Parser.php
+++ b/Parser.php
@@ -34,7 +34,20 @@ class Parser extends ParserData
      */
     private $offset = 0;
 
-    public function __construct($content, $factory = null, $offset = 0)
+    /**
+     * Parent parser (for back references from multiples parsers)
+     */
+    private $parser_parent;
+
+    /**
+     * Parser constructor.
+     * @param $content
+     * @param null $factory
+     * @param int $offset
+     * @param null $parent
+     */
+
+    public function __construct($content, $factory = null, $offset = 0, $parser_parent = null)
     {
         if (null === $factory) {
             $this->factory = new Factory;
@@ -42,6 +55,7 @@ public function __construct($content, $factory = null, $offset = 0)
             $this->factory = $factory;
         }
 
+        $this->parser_parent = $parser_parent;
         $this->offset = $offset;
         $this->parse($content);
     }
@@ -135,7 +149,13 @@ private function parse($content)
                             if (!$this->data[$idx-1] instanceof Fields\Select) {
                                 throw new ParserException('<option> should always be in a <select>');
                             }
-                            $this->sources[$newNode->getSource()] = $newNode;
+
+                            // target the parent sources area to create an index
+                            if ($this->parser_parent == null) {
+                                $this->sources[$newNode->getSource()] = $newNode;
+                            } else {
+                                $this->parser_parent->sources[$newNode->getSource()] = $newNode;
+                            }
                             $newNode->setParent($this->data[$idx-1]);
                         } else {
                             if ($newNode instanceof Fields\Option) {
@@ -158,7 +178,9 @@ private function parse($content)
                                 $this->push($newNode);
 
                                 if ($newNode instanceof Fields\Multiple) {
-                                    $parser = $this->factory->getParser($content, $this->offset+1);
+                                    // pass in $this for $parser_parent - to make sources available to multiple selects
+                                    $parser = $this->factory->getParser($content, $this->offset+1, $this);
+
                                     $newNode->setParserData($parser);
                                     $this->offset = $parser->getOffset();
                                 }

From 92db129eddf622bac1e41edc20d500092872263d Mon Sep 17 00:00:00 2001
From: Stephen Wolff <stephen@maxgatedigital.com>
Date: Sun, 19 May 2019 08:20:52 +0100
Subject: [PATCH 3/3] Ensure multiple setValues is passed an array, not a
 boolean true

---
 Fields/Multiple.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Fields/Multiple.php b/Fields/Multiple.php
index 21873b9..8d42356 100644
--- a/Fields/Multiple.php
+++ b/Fields/Multiple.php
@@ -68,7 +68,7 @@ public function setValues($values, array $files)
         $this->forms = array();
 
         $indexes = array();
-        if ($values) {
+        if ($values && is_array($values)) {
             $indexes = array_keys($values);
         } else if ($files) {
             $indexes = array_keys($files);