Enable sources in multiple subform selects

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));
     }
 
     /**

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>';
             }

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);

Parser.php

@@ -34,14 +34,28 @@ 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;
         } else {
             $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();
                                 }