Attempt to fix formCollection truncated content (issue #24)

neilime · Nov 8, 2019 · a84f359 · a84f359
1 parent 29cb1b5
commit a84f359
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/TwbsHelper/Form/View/Helper/FormCollection.php b/src/TwbsHelper/Form/View/Helper/FormCollection.php
@@ -9,6 +9,9 @@ class FormCollection extends \Zend\Form\View\Helper\FormCollection
 {
     use \TwbsHelper\View\Helper\HtmlTrait;
 
+    protected static $fieldsetRegex = '/(<fieldset[^>]*>)([\s\S]*)(<\/fieldset[^>]*>)$/imU';
+    protected static $legendRegex = '/<legend[^>]*>([\s\S]*)<\/legend[^>]*>/imU';
+
     /**
      * This is the default wrapper that the collection is wrapped into
      *
@@ -36,7 +39,7 @@ public function render(\Zend\Form\ElementInterface $oElement): string
             return $sMarkup;
         }
 
-        if (!preg_match('/(<fieldset[^>]*>)([\s\S]*)(<\/fieldset[^>]*>)/imU', $sMarkup, $aMatches)) {
+        if (!preg_match(self::$fieldsetRegex, $sMarkup, $aMatches)) {
             return $sMarkup;
         }
 
@@ -54,7 +57,7 @@ public function render(\Zend\Form\ElementInterface $oElement): string
 
         // Extract legend
         $sLegendContent = '';
-        if (preg_match('/<legend[^>]*>([\s\S]*)<\/legend[^>]*>/imU', $sMarkup, $aLegendMatches)) {
+        if (preg_match(self::$legendRegex, $sMarkup, $aLegendMatches)) {
             $sLegendContent = sprintf(
                 '<legend%s>%s</legend>',
                 $this->attributesToString($this->setClassesToAttributes(