Switch form hierarchy

Author: joshbmarshall

src/Form.php

@@ -2,17 +2,26 @@
 
 namespace Granada\Form;
 
+/**
+ * @property \Granada\Form\FormField $field
+ * @property \Granada\Builder\ExtendedModel $model
+ */
 class Form {
 
-    /**
-     * @var \Granada\Builder\ExtendedModel
-     */
+    protected $fieldname;
     protected $model;
 
-    public function __construct($model = null) {
+    public function __construct($fieldname, $model = null) {
+        $this->fieldname = $fieldname;
         $this->model = $model;
     }
 
+    public function field() {
+        $class = $this->fieldname;
+        $field = new $class($this);
+        return $field->setItem($this->model);
+    }
+
     public function getFields($field_names = null) {
         if (is_null($field_names)) {
             $field_names = $this->model->formFields();
@@ -32,7 +41,7 @@ public function getFields($field_names = null) {
      */
     public function build($field_name = null, $name_override = null) {
         if (!$field_name) {
-            return new FormField(get_class($this));
+            return $this->field();
         }
         $options = [];
         if ($this->model->fieldType($field_name) == 'reference') {
@@ -43,7 +52,12 @@ public function build($field_name = null, $name_override = null) {
         if ($this->model->fieldType($field_name) == 'enum') {
             $options = $this->model->enum_options($field_name);
         }
-        return (new FormField(get_class($this)))
+        if ($this->model->fieldType($field_name) == 'booltristate') {
+            $options[''] = 'Neither';
+            $options['1'] = 'Yes';
+            $options['0'] = 'No';
+        }
+        return $this->field()
             ->setItem($this->model)
             ->setType($this->model->fieldType($field_name))
             ->setName($name_override ?: $field_name)
@@ -57,63 +71,30 @@ public function build($field_name = null, $name_override = null) {
     }
 
     /**
-     * @param string $type The tag type, e.g input or a
-     * @param array $htmlOptions list of pairs of values
-     * @param string $close 'short', 'long' or 'none' for closing type
-     * @param string $contents What to put between open and close tags if it is a long close type
+     * Render a form field
+     * @param string $field
+     * @param string|null $name_override
      * @return string
      */
-    public function tag($type, $htmlOptions, $close = 'short', $contents = '') {
-        ob_start();
-        echo '<';
-        echo $type;
-        foreach ($htmlOptions as $name => $value) {
-            if ($value === '') {
-                if ($name != 'value') {
-                    continue;
-                }
-            }
-            echo ' ';
-            if ($name == 'custom') {
-                echo $value;
-            } else {
-                echo $name;
-                echo '="';
-                if ($name == 'id') {
-                    echo $this->slug($value);
-                } else {
-                    echo htmlentities($value);
-                }
-                echo '"';
-            }
-        }
-        if ($close == 'short') {
-            echo ' /';
-        }
-        if ($close == 'long') {
-            echo '>';
-            echo $contents;
-            echo '</';
-            echo $type;
-        }
-        echo '>';
-        return ob_get_clean();
+    public function renderField($field, $name_override = null) {
+        return $this->build($field, $name_override)
+            ->render();
     }
 
     /**
-     * Get a slug for a string
-     *
-     * @param string $string
+     * Render a number of fields at once
+     * @param string[] $fields
      * @return string
      */
-    public function slug($string) {
-        // Trim and to lower
-        $slug = strtolower(trim($string));
-        // Remove non-chars
-        $slug = preg_replace("/[^a-zA-Z0-9\/_|+ -]/", '', $slug);
-        // Replace separators with dash
-        $slug = preg_replace("/[\/_|+ -]+/", '-', $slug);
-        return $slug;
+    public function renderFields($fields = array()) {
+        $response = '';
+        if (!$fields) {
+            $fields = $this->model->formFields();
+        }
+        foreach ($fields as $field) {
+            $response .= $this->renderField($field);
+        }
+        return $response;
     }
 
     /**
@@ -122,15 +103,10 @@ public function slug($string) {
      * @param string $action
      * @param string $method
      * @param array $htmlOptions
-     * @param boolean $fileupload Include the enctype for forms that have a basic file upload field
      * @return string
      */
-    public function beginForm($action = '', $method = 'post', $htmlOptions = array(), $fileupload = false) {
-        return $this->tag('form', array_merge(array(
-            'action' => $action,
-            'method' => $method,
-            'enctype' => $fileupload ? 'multipart/form-data' : '',
-        ), $htmlOptions), 'none');
+    public function beginForm($action = '', $method = 'post', $htmlOptions = array()) {
+        return $this->field()->beginForm($action, $method, $htmlOptions);
     }
 
     /**
@@ -139,62 +115,23 @@ public function beginForm($action = '', $method = 'post', $htmlOptions = array()
      * @return string
      */
     public function endForm() {
-        return '</form>';
-    }
-
-    /**
-     * Get the form template for this field in twig format
-     * @param string $type
-     * @param integer $length
-     * @param string[] $tags
-     * @param \Granada\Granada|null $item
-     * @param string $fieldname
-     * @return string
-     */
-    public function fieldTemplate($type, $length, $tags, $item, $fieldname) {
-        return '<label for={{ label_for }}>{{ label }}{% if help %}
-        <i class="fas fa-question-circle" title="{{ help }}"></i>
-        {% endif %}</label><input type="text" name="{{ name }}" value="{{ value }}" />';
-    }
-
-    /**
-     * Render a form field
-     * @param string $field
-     * @param string|null $name_override
-     * @return string
-     */
-    public function renderField($field, $name_override = null) {
-        return $this->build($field, $name_override)
-            ->render();
-    }
-
-    /**
-     * Render a number of fields at once
-     * @param string[] $fields
-     * @return string
-     */
-    public function renderFields($fields = array()) {
-        $response = '';
-        if (!$fields) {
-            $fields = $this->model->formFields();
-        }
-        foreach ($fields as $field) {
-            $response .= $this->renderField($field);
-        }
-        return $response;
+        return $this->field()->endForm();
     }
 
     /**
      * Insert a hidden input field
      *
      * @param string $name
      * @param string $value
+     * @param array $htmlOptions
      * @return string
      */
-    public function hiddenField($name, $value = '') {
-        return $this->tag('input', array(
-            'type' => 'hidden',
-            'name' => $name,
-        ));
+    public function hiddenField($name, $value = '', $htmlOptions = array()) {
+        echo $this->field()
+            ->setType('hidden')
+            ->setName($name)
+            ->setValue($value)
+            ->setHtmlOptions($htmlOptions)
+            ->render();
     }
 }