Add Choice field type - closes #574

formers · Jan 30, 2019 · d8cf68f · d8cf68f
2 parents c60a32e + 3f3f03d
commit d8cf68f
Show file tree

Hide file tree

Showing 8 changed files with 1,951 additions and 16 deletions.
diff --git a/src/Former/Form/Fields/Choice.php b/src/Former/Form/Fields/Choice.php
diff --git a/src/Former/Former.php b/src/Former/Former.php
@@ -146,17 +146,14 @@ public function __call($method, $parameters)
 		}
 
 		// Checking for any supplementary classes
-		$classes = explode('_', $method);
-		$method  = array_pop($classes);
-
+		$modifiers = explode('_', $method);
+		$method  = array_pop($modifiers);
+		
 		// Dispatch to the different Form\Fields
-		$framework = isset($this->app['former.form.framework']) ? $this->app['former.form.framework'] : $this->app['former.framework'];
 		$field     = $this->dispatch->toFields($method, $parameters);
-
-		if ($field instanceof Field) {
-			$field = $framework->getFieldClasses($field, $classes);
-		}
-
+		$field->setModifiers($modifiers);
+		$field->addClass('');
+
 		// Else bind field
 		$this->app->instance('former.field', $field);
 

diff --git a/src/Former/Traits/Checkable.php b/src/Former/Traits/Checkable.php
@@ -121,6 +121,8 @@ public function render()
 	{
 		$html = null;
 
+		$this->setFieldClasses();
+
 		// Multiple items
 		if ($this->items) {
 			unset($this->app['former']->labels[array_search($this->name, $this->app['former']->labels)]);
@@ -166,29 +168,29 @@ public function on($on)
 	/**
 	 * Set the checkables as inline
 	 */
-	public function inline()
+	public function inline($isInline = true)
 	{
-		$this->inline = true;
+		$this->inline = $isInline;
 
 		return $this;
 	}
 
 	/**
 	 * Set the checkables as stacked
 	 */
-	public function stacked()
+	public function stacked($isStacked = true)
 	{
-		$this->inline = false;
+		$this->inline = !$isStacked;
 
 		return $this;
 	}
 
 	/**
 	 * Set the checkables as grouped
 	 */
-	public function grouped()
+	public function grouped($isGrouped = true)
 	{
-		$this->grouped = true;
+		$this->grouped = $isGrouped;
 
 		return $this;
 	}

diff --git a/src/Former/Traits/FormerObject.php b/src/Former/Traits/FormerObject.php
@@ -31,6 +31,13 @@ abstract class FormerObject extends Element
 	 */
 	protected $injectedProperties = array('name');
 
+	/**
+	 * The field's modifiers from method call
+	 *
+	 * @var string
+	 */
+	protected $modifiers;
+
 	////////////////////////////////////////////////////////////////////
 	/////////////////////////// ID AND LABELS //////////////////////////
 	////////////////////////////////////////////////////////////////////
@@ -83,6 +90,19 @@ protected function getUniqueId($name)
 		return $name;
 	}
 
+	/**
+	 * Runs the frameworks getFieldClasses method on this
+	 *
+	 * @return $this
+	 */
+	protected function setFieldClasses()
+	{
+		$framework = isset($this->app['former.form.framework']) ? $this->app['former.form.framework'] : $this->app['former.framework'];
+		$framework->getFieldClasses($this, $this->modifiers);
+
+		return $this;
+	}
+
 	/**
 	 * Render the FormerObject and set its id
 	 *
@@ -93,6 +113,10 @@ public function render()
 		// Set the proper ID according to the label
 		$this->setId();
 
+		if($this instanceof Field) {
+			$this->setFieldClasses();
+		}
+
 		// Encode HTML value
 		$isButton = ($this instanceof Field) ? $this->isButton() : false;
 		if (!$isButton and is_string($this->value)) {
@@ -153,4 +177,25 @@ public function isOfType()
 
 		return in_array($this->type, $types);
 	}
+
+	/**
+	 * Set the modifiers from initial method call
+	 *
+	 * @return $this
+	 */
+	public function getModifiers()
+	{
+		return $this->modifiers;
+	}
+
+	/**
+	 * Set the modifiers from initial method call
+	 *
+	 * @return $this
+	 */
+	public function setModifiers($modifiers)
+	{
+		$this->modifiers = $modifiers;
+		return $this;
+	}
 }