formers / former

src/Former/Framework/ZurbFoundation.php

Indentation +270 added lines, -270 removed lines

@@ -13,274 +13,274 @@
  */
 class ZurbFoundation extends Framework implements FrameworkInterface
 {
-	/**
-	 * Form types that trigger special styling for this Framework
-	 *
-	 * @var array
-	 */
-	protected $availableTypes = array('horizontal', 'vertical');
-
-	/**
-	 * The field sizes available
-	 *
-	 * @var array
-	 */
-	private $fields = array(
-		1  => 'one',
-		2  => 'two',
-		3  => 'three',
-		4  => 'four',
-		5  => 'five',
-		6  => 'six',
-		7  => 'seven',
-		8  => 'eight',
-		9  => 'nine',
-		10 => 'ten',
-		11 => 'eleven',
-		12 => 'twelve',
-	);
-
-	/**
-	 * The field states available
-	 *
-	 * @var array
-	 */
-	protected $states = array(
-		'error',
-	);
-
-	/**
-	 * Create a new ZurbFoundation instance
-	 *
-	 * @param Container $app
-	 */
-	public function __construct(Container $app)
-	{
-		$this->app = $app;
-		$this->setFrameworkDefaults();
-	}
-
-	////////////////////////////////////////////////////////////////////
-	/////////////////////////// FILTER ARRAYS //////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	public function filterButtonClasses($classes)
-	{
-		return $classes;
-	}
-
-	public function filterFieldClasses($classes)
-	{
-		// Filter classes
-		$classes = array_intersect($classes, $this->fields);
-
-		return $classes;
-	}
-
-	////////////////////////////////////////////////////////////////////
-	///////////////////// EXPOSE FRAMEWORK SPECIFICS ///////////////////
-	////////////////////////////////////////////////////////////////////
-
-	protected function setFieldWidths($labelWidths)
-	{
-		$labelWidthClass = $fieldWidthClass = $fieldOffsetClass = '';
-
-		$viewports = $this->getFrameworkOption('viewports');
-
-		foreach ($labelWidths as $viewport => $columns) {
-			if ($viewport) {
-				$labelWidthClass .= $viewports[$viewport].$this->fields[$columns].' ';
-				$fieldWidthClass .= $viewports[$viewport].$this->fields[12 - $columns].' ';
-				$fieldOffsetClass .= $viewports[$viewport].'offset-by-'.$this->fields[$columns].' ';
-			}
-		}
-
-		$this->labelWidth  = $labelWidthClass.'columns';
-		$this->fieldWidth  = $fieldWidthClass.'columns';
-		$this->fieldOffset = $fieldOffsetClass.'columns';
-	}
-
-	////////////////////////////////////////////////////////////////////
-	///////////////////////////// ADD CLASSES //////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	public function getFieldClasses(Field $field, $classes = array())
-	{
-		$classes = $this->filterFieldClasses($classes);
-
-		return $this->addClassesToField($field, $classes);
-	}
-
-	public function getGroupClasses()
-	{
-		if ($this->app['former.form']->isOfType('horizontal')) {
-			return 'row';
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Add label classes
-	 *
-	 * @return string|null An array of attributes with the label class
-	 */
-	public function getLabelClasses()
-	{
-		if ($this->app['former.form']->isOfType('horizontal')) {
-			return $this->getFrameworkOption('wrappedLabelClasses');
-		} else {
-			return null;
-		}
-	}
-
-	public function getUneditableClasses()
-	{
-		return null;
-	}
-
-	public function getPlainTextClasses()
-	{
-		return null;
-	}
-
-	public function getFormClasses($type)
-	{
-		return null;
-	}
-
-	public function getActionClasses()
-	{
-		return null;
-	}
-
-	////////////////////////////////////////////////////////////////////
-	//////////////////////////// RENDER BLOCKS /////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	public function createHelp($text, $attributes = null)
-	{
-		if (is_null($attributes) or empty($attributes)) {
-			$attributes = $this->getFrameworkOption('error_classes');
-		}
-
-		return Element::create('span', $text, $attributes);
-	}
-
-	/**
-	 * Render a disabled field
-	 *
-	 * @param Field $field
-	 *
-	 * @return Input
-	 */
-	public function createDisabledField(Field $field)
-	{
-		$field->disabled();
-
-		return Input::create('text', $field->getName(), $field->getValue(), $field->getAttributes());
-	}
-
-	/**
-	 * Render a plain text field
-	 * Which fallback to a disabled field
-	 *
-	 * @param Field $field
-	 *
-	 * @return Element
-	 */
-	public function createPlainTextField(Field $field)
-	{
-		return $this->createDisabledField($field);
-	}
-
-	////////////////////////////////////////////////////////////////////
-	//////////////////////////// WRAP BLOCKS ///////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Wrap an item to be prepended or appended to the current field.
-	 * For Zurb we return the item and handle the wrapping in prependAppend
-	 * as wrapping is dependent on whether we're prepending or appending.
-	 *
-	 * @return string A wrapped item
-	 */
-	public function placeAround($item)
-	{
-		return $item;
-	}
-
-	/**
-	 * Wrap a field with prepended and appended items
-	 *
-	 * @param  Field $field
-	 * @param  array $prepend
-	 * @param  array $append
-	 *
-	 * @return string A field concatented with prepended and/or appended items
-	 */
-	public function prependAppend($field, $prepend, $append)
-	{
-		$return = '';
-
-		foreach ($prepend as $item) {
-			$return .= '<div class="two mobile-one columns"><span class="prefix">'.$item.'</span></div>';
-		}
-
-		$return .= '<div class="ten mobile-three columns">'.$field->render().'</div>';
-
-		foreach ($append as $item) {
-			$return .= '<div class="two mobile-one columns"><span class="postfix">'.$item.'</span></div>';
-		}
-
-		return $return;
-	}
-
-	/**
-	 * Wraps all label contents with potential additional tags.
-	 *
-	 * @param  string $label
-	 *
-	 * @return string A wrapped label
-	 */
-	public function wrapLabel($label)
-	{
-		if ($this->app['former.form']->isOfType('horizontal')) {
-			return Element::create('div', $label)->addClass($this->labelWidth);
-		} else {
-			return $label;
-		}
-	}
-
-	/**
-	 * Wraps all field contents with potential additional tags.
-	 *
-	 * @param  Field $field
-	 *
-	 * @return Element A wrapped field
-	 */
-	public function wrapField($field)
-	{
-		if ($this->app['former.form']->isOfType('horizontal')) {
-			return Element::create('div', $field)->addClass($this->fieldWidth);
-		} else {
-			return $field;
-		}
-	}
-
-	/**
-	 * Wrap actions block with potential additional tags
-	 *
-	 * @param  Actions $actions
-	 *
-	 * @return string A wrapped actions block
-	 */
-	public function wrapActions($actions)
-	{
-		if ($this->app['former.form']->isOfType('horizontal')) {
-			return Element::create('div', $actions)->addClass(array($this->fieldOffset, $this->fieldWidth));
-		} else {
-			return $actions;
-		}
-	}
+    /**
+     * Form types that trigger special styling for this Framework
+     *
+     * @var array
+     */
+    protected $availableTypes = array('horizontal', 'vertical');
+
+    /**
+     * The field sizes available
+     *
+     * @var array
+     */
+    private $fields = array(
+        1  => 'one',
+        2  => 'two',
+        3  => 'three',
+        4  => 'four',
+        5  => 'five',
+        6  => 'six',
+        7  => 'seven',
+        8  => 'eight',
+        9  => 'nine',
+        10 => 'ten',
+        11 => 'eleven',
+        12 => 'twelve',
+    );
+
+    /**
+     * The field states available
+     *
+     * @var array
+     */
+    protected $states = array(
+        'error',
+    );
+
+    /**
+     * Create a new ZurbFoundation instance
+     *
+     * @param Container $app
+     */
+    public function __construct(Container $app)
+    {
+        $this->app = $app;
+        $this->setFrameworkDefaults();
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    /////////////////////////// FILTER ARRAYS //////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    public function filterButtonClasses($classes)
+    {
+        return $classes;
+    }
+
+    public function filterFieldClasses($classes)
+    {
+        // Filter classes
+        $classes = array_intersect($classes, $this->fields);
+
+        return $classes;
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ///////////////////// EXPOSE FRAMEWORK SPECIFICS ///////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    protected function setFieldWidths($labelWidths)
+    {
+        $labelWidthClass = $fieldWidthClass = $fieldOffsetClass = '';
+
+        $viewports = $this->getFrameworkOption('viewports');
+
+        foreach ($labelWidths as $viewport => $columns) {
+            if ($viewport) {
+                $labelWidthClass .= $viewports[$viewport].$this->fields[$columns].' ';
+                $fieldWidthClass .= $viewports[$viewport].$this->fields[12 - $columns].' ';
+                $fieldOffsetClass .= $viewports[$viewport].'offset-by-'.$this->fields[$columns].' ';
+            }
+        }
+
+        $this->labelWidth  = $labelWidthClass.'columns';
+        $this->fieldWidth  = $fieldWidthClass.'columns';
+        $this->fieldOffset = $fieldOffsetClass.'columns';
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ///////////////////////////// ADD CLASSES //////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    public function getFieldClasses(Field $field, $classes = array())
+    {
+        $classes = $this->filterFieldClasses($classes);
+
+        return $this->addClassesToField($field, $classes);
+    }
+
+    public function getGroupClasses()
+    {
+        if ($this->app['former.form']->isOfType('horizontal')) {
+            return 'row';
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Add label classes
+     *
+     * @return string|null An array of attributes with the label class
+     */
+    public function getLabelClasses()
+    {
+        if ($this->app['former.form']->isOfType('horizontal')) {
+            return $this->getFrameworkOption('wrappedLabelClasses');
+        } else {
+            return null;
+        }
+    }
+
+    public function getUneditableClasses()
+    {
+        return null;
+    }
+
+    public function getPlainTextClasses()
+    {
+        return null;
+    }
+
+    public function getFormClasses($type)
+    {
+        return null;
+    }
+
+    public function getActionClasses()
+    {
+        return null;
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    //////////////////////////// RENDER BLOCKS /////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    public function createHelp($text, $attributes = null)
+    {
+        if (is_null($attributes) or empty($attributes)) {
+            $attributes = $this->getFrameworkOption('error_classes');
+        }
+
+        return Element::create('span', $text, $attributes);
+    }
+
+    /**
+     * Render a disabled field
+     *
+     * @param Field $field
+     *
+     * @return Input
+     */
+    public function createDisabledField(Field $field)
+    {
+        $field->disabled();
+
+        return Input::create('text', $field->getName(), $field->getValue(), $field->getAttributes());
+    }
+
+    /**
+     * Render a plain text field
+     * Which fallback to a disabled field
+     *
+     * @param Field $field
+     *
+     * @return Element
+     */
+    public function createPlainTextField(Field $field)
+    {
+        return $this->createDisabledField($field);
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    //////////////////////////// WRAP BLOCKS ///////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Wrap an item to be prepended or appended to the current field.
+     * For Zurb we return the item and handle the wrapping in prependAppend
+     * as wrapping is dependent on whether we're prepending or appending.
+     *
+     * @return string A wrapped item
+     */
+    public function placeAround($item)
+    {
+        return $item;
+    }
+
+    /**
+     * Wrap a field with prepended and appended items
+     *
+     * @param  Field $field
+     * @param  array $prepend
+     * @param  array $append
+     *
+     * @return string A field concatented with prepended and/or appended items
+     */
+    public function prependAppend($field, $prepend, $append)
+    {
+        $return = '';
+
+        foreach ($prepend as $item) {
+            $return .= '<div class="two mobile-one columns"><span class="prefix">'.$item.'</span></div>';
+        }
+
+        $return .= '<div class="ten mobile-three columns">'.$field->render().'</div>';
+
+        foreach ($append as $item) {
+            $return .= '<div class="two mobile-one columns"><span class="postfix">'.$item.'</span></div>';
+        }
+
+        return $return;
+    }
+
+    /**
+     * Wraps all label contents with potential additional tags.
+     *
+     * @param  string $label
+     *
+     * @return string A wrapped label
+     */
+    public function wrapLabel($label)
+    {
+        if ($this->app['former.form']->isOfType('horizontal')) {
+            return Element::create('div', $label)->addClass($this->labelWidth);
+        } else {
+            return $label;
+        }
+    }
+
+    /**
+     * Wraps all field contents with potential additional tags.
+     *
+     * @param  Field $field
+     *
+     * @return Element A wrapped field
+     */
+    public function wrapField($field)
+    {
+        if ($this->app['former.form']->isOfType('horizontal')) {
+            return Element::create('div', $field)->addClass($this->fieldWidth);
+        } else {
+            return $field;
+        }
+    }
+
+    /**
+     * Wrap actions block with potential additional tags
+     *
+     * @param  Actions $actions
+     *
+     * @return string A wrapped actions block
+     */
+    public function wrapActions($actions)
+    {
+        if ($this->app['former.form']->isOfType('horizontal')) {
+            return Element::create('div', $actions)->addClass(array($this->fieldOffset, $this->fieldWidth));
+        } else {
+            return $actions;
+        }
+    }
 }

src/Former/Framework/ZurbFoundation4.php

Indentation +277 added lines, -277 removed lines

@@ -13,281 +13,281 @@
  */
 class ZurbFoundation4 extends Framework implements FrameworkInterface
 {
-	/**
-	 * Form types that trigger special styling for this Framework
-	 *
-	 * @var array
-	 */
-	protected $availableTypes = array('horizontal', 'vertical');
-
-	/**
-	 * The button types available
-	 *
-	 * @var array
-	 */
-	private $buttons = array(
-		'tiny',
-		'small',
-		'medium',
-		'large',
-		'success',
-		'radius',
-		'round',
-		'disabled',
-		'prefix',
-		'postfix',
-	);
-
-	/**
-	 * The field sizes available
-	 * Zurb Foundation 4 does not apply sizes to the form element, but to the wrapper div
-	 *
-	 * @var array
-	 */
-	private $fields = array();
-
-	/**
-	 * The field states available
-	 *
-	 * @var array
-	 */
-	protected $states = array(
-		'error',
-	);
-
-	/**
-	 * Create a new ZurbFoundation instance
-	 *
-	 * @param \Illuminate\Container\Container $app
-	 */
-	public function __construct(Container $app)
-	{
-		$this->app = $app;
-		$this->setFrameworkDefaults();
-	}
-
-	////////////////////////////////////////////////////////////////////
-	/////////////////////////// FILTER ARRAYS //////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	public function filterButtonClasses($classes)
-	{
-		// Filter classes
-		$classes   = array_intersect($classes, $this->buttons);
-		$classes[] = 'button';
-
-		return $classes;
-	}
-
-	public function filterFieldClasses($classes)
-	{
-		return null;
-	}
-
-	////////////////////////////////////////////////////////////////////
-	///////////////////// EXPOSE FRAMEWORK SPECIFICS ///////////////////
-	////////////////////////////////////////////////////////////////////
-
-	protected function setFieldWidths($labelWidths)
-	{
-		$labelWidthClass = $fieldWidthClass = $fieldOffsetClass = '';
-
-		$viewports = $this->getFrameworkOption('viewports');
-
-		foreach ($labelWidths as $viewport => $columns) {
-			if ($viewport) {
-				$labelWidthClass .= $viewports[$viewport].'-'.$columns.' ';
-				$fieldWidthClass .= $viewports[$viewport].'-'.(12 - $columns).' ';
-				$fieldOffsetClass .= $viewports[$viewport].'-offset-'.$columns.' ';
-			}
-		}
-
-		$this->labelWidth  = $labelWidthClass.'columns';
-		$this->fieldWidth  = $fieldWidthClass.'columns';
-		$this->fieldOffset = $fieldOffsetClass.'columns';
-	}
-
-	////////////////////////////////////////////////////////////////////
-	///////////////////////////// ADD CLASSES //////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	public function getFieldClasses(Field $field, $classes = array())
-	{
-		if ($field->isButton()) {
-			$classes = $this->filterButtonClasses($classes);
-		} else {
-			$classes = $this->filterFieldClasses($classes);
-		}
-
-		return $this->addClassesToField($field, $classes);
-	}
-
-	public function getGroupClasses()
-	{
-		if ($this->app['former.form']->isOfType('horizontal')) {
-			return 'row';
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Add label classes
-	 *
-	 * @return string|null An array of attributes with the label class
-	 */
-	public function getLabelClasses()
-	{
-		if ($this->app['former.form']->isOfType('horizontal')) {
-			return $this->getFrameworkOption('wrappedLabelClasses');
-		} else {
-			return null;
-		}
-	}
-
-	public function getUneditableClasses()
-	{
-		return null;
-	}
-
-	public function getPlainTextClasses()
-	{
-		return null;
-	}
-
-	public function getFormClasses($type)
-	{
-		return null;
-	}
-
-	public function getActionClasses()
-	{
-		return null;
-	}
-
-	////////////////////////////////////////////////////////////////////
-	//////////////////////////// RENDER BLOCKS /////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	public function createHelp($text, $attributes = null)
-	{
-		if (is_null($attributes) or empty($attributes)) {
-			$attributes = $this->getFrameworkOption('error_classes');
-		}
-
-		return Element::create('span', $text, $attributes);
-	}
-
-	/**
-	 * Render a disabled field
-	 *
-	 * @param Field $field
-	 *
-	 * @return Input
-	 */
-	public function createDisabledField(Field $field)
-	{
-		$field->disabled();
-
-		return Input::create('text', $field->getName(), $field->getValue(), $field->getAttributes());
-	}
-
-	/**
-	 * Render a plain text field
-	 * Which fallback to a disabled field
-	 *
-	 * @param Field $field
-	 *
-	 * @return Element
-	 */
-	public function createPlainTextField(Field $field)
-	{
-		return $this->createDisabledField($field);
-	}
-
-	////////////////////////////////////////////////////////////////////
-	//////////////////////////// WRAP BLOCKS ///////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Wrap an item to be prepended or appended to the current field.
-	 * For Zurb we return the item and handle the wrapping in prependAppend
-	 * as wrapping is dependent on whether we're prepending or appending.
-	 *
-	 * @return string A wrapped item
-	 */
-	public function placeAround($item)
-	{
-		return $item;
-	}
-
-	/**
-	 * Wrap a field with prepended and appended items
-	 *
-	 * @param  Field $field
-	 * @param  array $prepend
-	 * @param  array $append
-	 *
-	 * @return string A field concatented with prepended and/or appended items
-	 */
-	public function prependAppend($field, $prepend, $append)
-	{
-		$return = '';
-
-		foreach ($prepend as $item) {
-			$return .= '<div class="large-2 small-3 columns"><span class="prefix">'.$item.'</span></div>';
-		}
-
-		$return .= '<div class="large-10 small-9 columns">'.$field->render().'</div>';
-
-		foreach ($append as $item) {
-			$return .= '<div class="large-2 small-3 columns"><span class="postfix">'.$item.'</span></div>';
-		}
-
-		return $return;
-	}
-
-	/**
-	 * Wraps all label contents with potential additional tags.
-	 *
-	 * @param  string $label
-	 *
-	 * @return string A wrapped label
-	 */
-	public function wrapLabel($label)
-	{
-		if ($this->app['former.form']->isOfType('horizontal')) {
-			return Element::create('div', $label)->addClass($this->labelWidth);
-		} else {
-			return $label;
-		}
-	}
-
-	/**
-	 * Wraps all field contents with potential additional tags.
-	 *
-	 * @param  Field $field
-	 *
-	 * @return Element A wrapped field
-	 */
-	public function wrapField($field)
-	{
-		if ($this->app['former.form']->isOfType('horizontal')) {
-			return Element::create('div', $field)->addClass($this->fieldWidth);
-		} else {
-			return $field;
-		}
-	}
-
-	/**
-	 * Wrap actions block with potential additional tags
-	 *
-	 * @param  Actions $actions
-	 *
-	 * @return string A wrapped actions block
-	 */
-	public function wrapActions($actions)
-	{
-		return $actions;
-	}
+    /**
+     * Form types that trigger special styling for this Framework
+     *
+     * @var array
+     */
+    protected $availableTypes = array('horizontal', 'vertical');
+
+    /**
+     * The button types available
+     *
+     * @var array
+     */
+    private $buttons = array(
+        'tiny',
+        'small',
+        'medium',
+        'large',
+        'success',
+        'radius',
+        'round',
+        'disabled',
+        'prefix',
+        'postfix',
+    );
+
+    /**
+     * The field sizes available
+     * Zurb Foundation 4 does not apply sizes to the form element, but to the wrapper div
+     *
+     * @var array
+     */
+    private $fields = array();
+
+    /**
+     * The field states available
+     *
+     * @var array
+     */
+    protected $states = array(
+        'error',
+    );
+
+    /**
+     * Create a new ZurbFoundation instance
+     *
+     * @param \Illuminate\Container\Container $app
+     */
+    public function __construct(Container $app)
+    {
+        $this->app = $app;
+        $this->setFrameworkDefaults();
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    /////////////////////////// FILTER ARRAYS //////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    public function filterButtonClasses($classes)
+    {
+        // Filter classes
+        $classes   = array_intersect($classes, $this->buttons);
+        $classes[] = 'button';
+
+        return $classes;
+    }
+
+    public function filterFieldClasses($classes)
+    {
+        return null;
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ///////////////////// EXPOSE FRAMEWORK SPECIFICS ///////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    protected function setFieldWidths($labelWidths)
+    {
+        $labelWidthClass = $fieldWidthClass = $fieldOffsetClass = '';
+
+        $viewports = $this->getFrameworkOption('viewports');
+
+        foreach ($labelWidths as $viewport => $columns) {
+            if ($viewport) {
+                $labelWidthClass .= $viewports[$viewport].'-'.$columns.' ';
+                $fieldWidthClass .= $viewports[$viewport].'-'.(12 - $columns).' ';
+                $fieldOffsetClass .= $viewports[$viewport].'-offset-'.$columns.' ';
+            }
+        }
+
+        $this->labelWidth  = $labelWidthClass.'columns';
+        $this->fieldWidth  = $fieldWidthClass.'columns';
+        $this->fieldOffset = $fieldOffsetClass.'columns';
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ///////////////////////////// ADD CLASSES //////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    public function getFieldClasses(Field $field, $classes = array())
+    {
+        if ($field->isButton()) {
+            $classes = $this->filterButtonClasses($classes);
+        } else {
+            $classes = $this->filterFieldClasses($classes);
+        }
+
+        return $this->addClassesToField($field, $classes);
+    }
+
+    public function getGroupClasses()
+    {
+        if ($this->app['former.form']->isOfType('horizontal')) {
+            return 'row';
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Add label classes
+     *
+     * @return string|null An array of attributes with the label class
+     */
+    public function getLabelClasses()
+    {
+        if ($this->app['former.form']->isOfType('horizontal')) {
+            return $this->getFrameworkOption('wrappedLabelClasses');
+        } else {
+            return null;
+        }
+    }
+
+    public function getUneditableClasses()
+    {
+        return null;
+    }
+
+    public function getPlainTextClasses()
+    {
+        return null;
+    }
+
+    public function getFormClasses($type)
+    {
+        return null;
+    }
+
+    public function getActionClasses()
+    {
+        return null;
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    //////////////////////////// RENDER BLOCKS /////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    public function createHelp($text, $attributes = null)
+    {
+        if (is_null($attributes) or empty($attributes)) {
+            $attributes = $this->getFrameworkOption('error_classes');
+        }
+
+        return Element::create('span', $text, $attributes);
+    }
+
+    /**
+     * Render a disabled field
+     *
+     * @param Field $field
+     *
+     * @return Input
+     */
+    public function createDisabledField(Field $field)
+    {
+        $field->disabled();
+
+        return Input::create('text', $field->getName(), $field->getValue(), $field->getAttributes());
+    }
+
+    /**
+     * Render a plain text field
+     * Which fallback to a disabled field
+     *
+     * @param Field $field
+     *
+     * @return Element
+     */
+    public function createPlainTextField(Field $field)
+    {
+        return $this->createDisabledField($field);
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    //////////////////////////// WRAP BLOCKS ///////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Wrap an item to be prepended or appended to the current field.
+     * For Zurb we return the item and handle the wrapping in prependAppend
+     * as wrapping is dependent on whether we're prepending or appending.
+     *
+     * @return string A wrapped item
+     */
+    public function placeAround($item)
+    {
+        return $item;
+    }
+
+    /**
+     * Wrap a field with prepended and appended items
+     *
+     * @param  Field $field
+     * @param  array $prepend
+     * @param  array $append
+     *
+     * @return string A field concatented with prepended and/or appended items
+     */
+    public function prependAppend($field, $prepend, $append)
+    {
+        $return = '';
+
+        foreach ($prepend as $item) {
+            $return .= '<div class="large-2 small-3 columns"><span class="prefix">'.$item.'</span></div>';
+        }
+
+        $return .= '<div class="large-10 small-9 columns">'.$field->render().'</div>';
+
+        foreach ($append as $item) {
+            $return .= '<div class="large-2 small-3 columns"><span class="postfix">'.$item.'</span></div>';
+        }
+
+        return $return;
+    }
+
+    /**
+     * Wraps all label contents with potential additional tags.
+     *
+     * @param  string $label
+     *
+     * @return string A wrapped label
+     */
+    public function wrapLabel($label)
+    {
+        if ($this->app['former.form']->isOfType('horizontal')) {
+            return Element::create('div', $label)->addClass($this->labelWidth);
+        } else {
+            return $label;
+        }
+    }
+
+    /**
+     * Wraps all field contents with potential additional tags.
+     *
+     * @param  Field $field
+     *
+     * @return Element A wrapped field
+     */
+    public function wrapField($field)
+    {
+        if ($this->app['former.form']->isOfType('horizontal')) {
+            return Element::create('div', $field)->addClass($this->fieldWidth);
+        } else {
+            return $field;
+        }
+    }
+
+    /**
+     * Wrap actions block with potential additional tags
+     *
+     * @param  Actions $actions
+     *
+     * @return string A wrapped actions block
+     */
+    public function wrapActions($actions)
+    {
+        return $actions;
+    }
 }

src/Former/Form/Fields/File.php

Indentation +123 added lines, -124 removed lines

@@ -12,128 +12,127 @@
 class File extends Field
 {
 
-	/**
-	 * The maximum file size
-	 *
-	 * @var integer
-	 */
-	private $maxSize;
-
-	/**
-	 * An array of mime groups to use as shortcuts
-	 *
-	 * @var array
-	 */
-	private $mimeGroups = array('audio', 'video', 'image');
-
-	/**
-	 * A list of properties to be injected in the attributes
-	 *
-	 * @var array
-	 */
-	protected $injectedProperties = array('type', 'name');
-
-	////////////////////////////////////////////////////////////////////
-	/////////////////////////// CORE METHODS ///////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Easier arguments order for hidden fields
-	 *
-	 * @param Container $app        The Illuminate Container
-	 * @param string    $type       file
-	 * @param string    $name       Field name
-	 * @param string    $label      Its label
-	 * @param string    $value      Its value
-	 * @param array     $attributes Attributes
-	 */
-	public function __construct(Container $app, $type, $name, $label, $value, $attributes)
-	{
-		// Multiple files field
-		if ($type == 'files') {
-			$attributes['multiple'] = 'true';
-			$type                   = 'file';
-			$name                   = $name.'[]';
-		}
-
-		parent::__construct($app, $type, $name, $label, $value, $attributes);
-	}
-
-	/**
-	 * Prints out the current tag
-	 *
-	 * @return string An input file tag
-	 */
-	public function render()
-	{
-		// Maximum file size
-		$hidden = $this->maxSize
-			? HtmlInput::hidden('MAX_FILE_SIZE', $this->maxSize)
-			: null;
-
-		return $hidden.parent::render();
-	}
-
-	////////////////////////////////////////////////////////////////////
-	////////////////////////// FIELD METHODS ///////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Set which types of files are accepted by the file input
-
-	 */
-	public function accept()
-	{
-		$mimes = array();
-
-		// Transform all extensions/groups to mime types
-		foreach (func_get_args() as $mime) {
-
-			// Shortcuts and extensions
-			if (in_array($mime, $this->mimeGroups)) {
-				$mime .= '/*';
-			}
-			$mime = LaravelFile::mime($mime, $mime);
-
-			$mimes[] = $mime;
-		}
-
-		// Add accept attribute by concatenating the mimes
-		$this->attributes['accept'] = implode(',', $mimes);
-
-		return $this;
-	}
-
-	/**
-	 * Set a maximum size for files
-	 *
-	 * @param integer $size  A maximum size
-	 * @param string  $units The size's unit
-	 */
-	public function max($size, $units = 'KB')
-	{
-		// Bytes or bits ?
-		$unit = substr($units, -1);
-		$base = 1024;
-		if ($unit == 'b') {
-			$size = $size / 8;
-		}
-
-		// Convert
-		switch ($units[0]) {
-			case 'K':
-				$size = $size * $base;
-				break;
-			case 'M':
-				$size = $size * pow($base, 2);
-				break;
-			case 'G':
-				$size = $size * pow($base, 3);
-				break;
-		}
-
-		$this->maxSize = (int) $size;
-
-		return $this;
-	}
+    /**
+     * The maximum file size
+     *
+     * @var integer
+     */
+    private $maxSize;
+
+    /**
+     * An array of mime groups to use as shortcuts
+     *
+     * @var array
+     */
+    private $mimeGroups = array('audio', 'video', 'image');
+
+    /**
+     * A list of properties to be injected in the attributes
+     *
+     * @var array
+     */
+    protected $injectedProperties = array('type', 'name');
+
+    ////////////////////////////////////////////////////////////////////
+    /////////////////////////// CORE METHODS ///////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Easier arguments order for hidden fields
+     *
+     * @param Container $app        The Illuminate Container
+     * @param string    $type       file
+     * @param string    $name       Field name
+     * @param string    $label      Its label
+     * @param string    $value      Its value
+     * @param array     $attributes Attributes
+     */
+    public function __construct(Container $app, $type, $name, $label, $value, $attributes)
+    {
+        // Multiple files field
+        if ($type == 'files') {
+            $attributes['multiple'] = 'true';
+            $type                   = 'file';
+            $name                   = $name.'[]';
+        }
+
+        parent::__construct($app, $type, $name, $label, $value, $attributes);
+    }
+
+    /**
+     * Prints out the current tag
+     *
+     * @return string An input file tag
+     */
+    public function render()
+    {
+        // Maximum file size
+        $hidden = $this->maxSize
+            ? HtmlInput::hidden('MAX_FILE_SIZE', $this->maxSize)
+            : null;
+
+        return $hidden.parent::render();
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ////////////////////////// FIELD METHODS ///////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Set which types of files are accepted by the file input
+     */
+    public function accept()
+    {
+        $mimes = array();
+
+        // Transform all extensions/groups to mime types
+        foreach (func_get_args() as $mime) {
+
+            // Shortcuts and extensions
+            if (in_array($mime, $this->mimeGroups)) {
+                $mime .= '/*';
+            }
+            $mime = LaravelFile::mime($mime, $mime);
+
+            $mimes[] = $mime;
+        }
+
+        // Add accept attribute by concatenating the mimes
+        $this->attributes['accept'] = implode(',', $mimes);
+
+        return $this;
+    }
+
+    /**
+     * Set a maximum size for files
+     *
+     * @param integer $size  A maximum size
+     * @param string  $units The size's unit
+     */
+    public function max($size, $units = 'KB')
+    {
+        // Bytes or bits ?
+        $unit = substr($units, -1);
+        $base = 1024;
+        if ($unit == 'b') {
+            $size = $size / 8;
+        }
+
+        // Convert
+        switch ($units[0]) {
+            case 'K':
+                $size = $size * $base;
+                break;
+            case 'M':
+                $size = $size * pow($base, 2);
+                break;
+            case 'G':
+                $size = $size * pow($base, 3);
+                break;
+        }
+
+        $this->maxSize = (int) $size;
+
+        return $this;
+    }
 }

src/Former/Traits/Field.php

Spacing +2 added lines, -2 removed lines

@@ -196,7 +196,7 @@ 
 	 * @param boolean $isRequired
 	 * @return $this
 	 */
-	public function required($isRequired=true)
+	public function required($isRequired = true)
 	{
 		if ($isRequired) {
 			$this->attributes['required'] = true;
@@ -292,7 +292,7 @@ 
 
             // If we have a rule with a value
             if (($colon = strpos($rule, ':')) !== false) {
-                $rulename = substr($rule, 0, $colon) ;
+                $rulename = substr($rule, 0, $colon);
 
                 /**
                 * Regular expressions may contain commas and should not be divided by str_getcsv.

Indentation +433 added lines, -433 removed lines

@@ -16,281 +16,281 @@ 
  */
 abstract class Field extends FormerObject implements FieldInterface
 {
-	/**
-	 * The IoC Container
-	 *
-	 * @var Container
-	 */
-	protected $app;
-
-	/**
-	 * The Form instance
-	 *
-	 * @var Former\Form
-	 */
-	protected $form;
-
-	/**
-	 * A label for the field (if not using Bootstrap)
-	 *
-	 * @var string
-	 */
-	protected $label;
-
-	/**
-	 * The field's group
-	 *
-	 * @var Group
-	 */
-	protected $group;
-
-	/**
-	 * The field's default element
-	 *
-	 * @var string
-	 */
-	protected $element = 'input';
-
-	/**
-	 * Whether the Field is self-closing or not
-	 *
-	 * @var boolean
-	 */
-	protected $isSelfClosing = true;
-
-	/**
-	 * The field's bind destination
-	 *
-	 * @var string
-	 */
-	protected $bind;
-
-	/**
-	 * Renders with floating label
-	 *
-	 * @var boolean
-	 */
-	protected $floatingLabel = false;
-
-	/**
-	 * Get the current framework instance
-	 *
-	 * @return Framework
-	 */
-	protected function currentFramework()
-	{
-		if ($this->app->bound('former.form.framework')) {
-			return $this->app['former.form.framework'];
-		}
-
-		return $this->app['former.framework'];
-	}
-
-	////////////////////////////////////////////////////////////////////
-	///////////////////////////// INTERFACE ////////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Set up a Field instance
-	 *
-	 * @param string $type A field type
-	 */
-	public function __construct(Container $app, $type, $name, $label, $value, $attributes)
-	{
-		// Set base parameters
-		$this->app   = $app;
-		$this->type  = $type;
-		$this->value = $value;
-		$this->setAttributes($attributes);
-		$this->form = $this->app->bound('former.form') ? $this->app['former.form'] : null;
-
-		// Compute and translate label
-		$this->automaticLabels($name, $label);
-
-		// Repopulate field
-		if ($type != 'password' && $name !== '_token') {
-			$this->value = $this->repopulate();
-		}
-
-		// Apply Live validation rules
-		if ($this->app['former']->getOption('live_validation')) {
-			$rules = new LiveValidation($this);
-			$rules->apply($this->getRules());
-		}
-
-		// Bind the Group class
-		$groupClass = $this->isCheckable() ? 'CheckableGroup' : 'Group';
-		$groupClass = Former::FORMSPACE.$groupClass;
-
-		$this->group = new $groupClass($this->app, $this->label);
-	}
-
-	/**
-	 * Redirect calls to the group if necessary
-	 *
-	 * @param string $method
-	 */
-	public function __call($method, $parameters)
-	{
-		// Translate attributes
-		$translatable = $this->app['former']->getOption('translatable', array());
-		if (in_array($method, $translatable) and isset($parameters[0])) {
-			$parameters[0] = Helpers::translate($parameters[0]);
-		}
-
-		// Redirect calls to the Control Group
-		if ((!empty($this->group) && method_exists($this->group, $method)) or Str::startsWith($method, 'onGroup')) {
-			$method = str_replace('onGroup', '', $method);
-			$method = lcfirst($method);
-
-			call_user_func_array(array($this->group, $method), $parameters);
-
-			return $this;
-		}
-
-		return parent::__call($method, $parameters);
-	}
-
-	/**
-	 * Prints out the field, wrapped in its group
-	 *
-	 * @return string
-	 */
-	public function wrapAndRender()
-	{
-		// Dry syntax (hidden fields, plain fields)
-		if ($this->isUnwrappable()) {
-			$html = $this->render();
-			// Control group syntax
-		} elseif (Form::hasInstanceOpened()) {
-			$html = $this->group->wrapField($this);
-			// Classic syntax
-		} else {
-			$html = $this->currentFramework()->createLabelOf($this);
-			$html .= $this->render();
-		}
-
-		return $html;
-	}
-
-	/**
-	 * Prints out the field
-	 *
-	 * @return string
-	 */
-	public function __toString()
-	{
-		return $this->wrapAndRender();
-	}
-
-	////////////////////////////////////////////////////////////////////
-	////////////////////////// PUBLIC INTERFACE ////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Whether the current field is required or not
-	 *
-	 * @return boolean
-	 */
-	public function isRequired()
-	{
-		return isset($this->attributes['required']);
-	}
-
-	/**
-	 * Set required live validation attribute
-	 *
-	 * @param boolean $isRequired
-	 * @return $this
-	 */
-	public function required($isRequired=true)
-	{
-		if ($isRequired) {
-			$this->attributes['required'] = true;
-		} else {
-			unset($this->attributes['required']);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Check if a field is unwrappable (no label)
-	 *
-	 * @return boolean
-	 */
-	public function isUnwrappable()
-	{
-		return
-			($this->form and $this->currentFramework()->is('Nude')) or
-			($this->form and $this->isOfType('inline')) or
-			$this->isButton() or
-			$this->isOfType('hidden') or
-			\Former\Form\Group::$opened or
-			$this->group and $this->group->isRaw();
-	}
-
-	/**
-	 * Check if field is a checkbox or a radio
-	 *
-	 * @return boolean
-	 */
-	public function isCheckable()
-	{
-		return $this->isOfType('checkbox', 'checkboxes', 'radio', 'radios', 'switch', 'switches');
-	}
-
-	/**
-	 * Check if the field is a button
-	 *
-	 * @return boolean
-	 */
-	public function isButton()
-	{
-		return false;
-	}
-
-	/**
-	 * Check if the field get a floating label
-	 *
-	 * @return boolean
-	 */
-	public function withFloatingLabel()
-	{
-		return $this->floatingLabel;
-	}
-
-	/**
-	 * Get the rules applied to the current field
-	 *
-	 * @return array An array of rules
-	 */
-	public function getRules()
-	{
-		return $this->app['former']->getRules($this->name);
-	}
-
-	////////////////////////////////////////////////////////////////////
-	//////////////////////// SETTERS AND GETTERS ///////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Apply a Live Validation rule by chaining
-	 *
-	 * @param string $rule The rule
-	 */
-	public function rule($rule)
-	{
-		$parameters = func_get_args();
-		array_shift($parameters);
-
-		$live = new LiveValidation($this);
-		$live->apply(array(
-			$rule => $parameters,
-		));
-
-		return $this;
-	}
+    /**
+     * The IoC Container
+     *
+     * @var Container
+     */
+    protected $app;
+
+    /**
+     * The Form instance
+     *
+     * @var Former\Form
+     */
+    protected $form;
+
+    /**
+     * A label for the field (if not using Bootstrap)
+     *
+     * @var string
+     */
+    protected $label;
+
+    /**
+     * The field's group
+     *
+     * @var Group
+     */
+    protected $group;
+
+    /**
+     * The field's default element
+     *
+     * @var string
+     */
+    protected $element = 'input';
+
+    /**
+     * Whether the Field is self-closing or not
+     *
+     * @var boolean
+     */
+    protected $isSelfClosing = true;
+
+    /**
+     * The field's bind destination
+     *
+     * @var string
+     */
+    protected $bind;
+
+    /**
+     * Renders with floating label
+     *
+     * @var boolean
+     */
+    protected $floatingLabel = false;
+
+    /**
+     * Get the current framework instance
+     *
+     * @return Framework
+     */
+    protected function currentFramework()
+    {
+        if ($this->app->bound('former.form.framework')) {
+            return $this->app['former.form.framework'];
+        }
+
+        return $this->app['former.framework'];
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ///////////////////////////// INTERFACE ////////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Set up a Field instance
+     *
+     * @param string $type A field type
+     */
+    public function __construct(Container $app, $type, $name, $label, $value, $attributes)
+    {
+        // Set base parameters
+        $this->app   = $app;
+        $this->type  = $type;
+        $this->value = $value;
+        $this->setAttributes($attributes);
+        $this->form = $this->app->bound('former.form') ? $this->app['former.form'] : null;
+
+        // Compute and translate label
+        $this->automaticLabels($name, $label);
+
+        // Repopulate field
+        if ($type != 'password' && $name !== '_token') {
+            $this->value = $this->repopulate();
+        }
+
+        // Apply Live validation rules
+        if ($this->app['former']->getOption('live_validation')) {
+            $rules = new LiveValidation($this);
+            $rules->apply($this->getRules());
+        }
+
+        // Bind the Group class
+        $groupClass = $this->isCheckable() ? 'CheckableGroup' : 'Group';
+        $groupClass = Former::FORMSPACE.$groupClass;
+
+        $this->group = new $groupClass($this->app, $this->label);
+    }
+
+    /**
+     * Redirect calls to the group if necessary
+     *
+     * @param string $method
+     */
+    public function __call($method, $parameters)
+    {
+        // Translate attributes
+        $translatable = $this->app['former']->getOption('translatable', array());
+        if (in_array($method, $translatable) and isset($parameters[0])) {
+            $parameters[0] = Helpers::translate($parameters[0]);
+        }
+
+        // Redirect calls to the Control Group
+        if ((!empty($this->group) && method_exists($this->group, $method)) or Str::startsWith($method, 'onGroup')) {
+            $method = str_replace('onGroup', '', $method);
+            $method = lcfirst($method);
+
+            call_user_func_array(array($this->group, $method), $parameters);
+
+            return $this;
+        }
+
+        return parent::__call($method, $parameters);
+    }
+
+    /**
+     * Prints out the field, wrapped in its group
+     *
+     * @return string
+     */
+    public function wrapAndRender()
+    {
+        // Dry syntax (hidden fields, plain fields)
+        if ($this->isUnwrappable()) {
+            $html = $this->render();
+            // Control group syntax
+        } elseif (Form::hasInstanceOpened()) {
+            $html = $this->group->wrapField($this);
+            // Classic syntax
+        } else {
+            $html = $this->currentFramework()->createLabelOf($this);
+            $html .= $this->render();
+        }
+
+        return $html;
+    }
+
+    /**
+     * Prints out the field
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return $this->wrapAndRender();
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ////////////////////////// PUBLIC INTERFACE ////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Whether the current field is required or not
+     *
+     * @return boolean
+     */
+    public function isRequired()
+    {
+        return isset($this->attributes['required']);
+    }
+
+    /**
+     * Set required live validation attribute
+     *
+     * @param boolean $isRequired
+     * @return $this
+     */
+    public function required($isRequired=true)
+    {
+        if ($isRequired) {
+            $this->attributes['required'] = true;
+        } else {
+            unset($this->attributes['required']);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Check if a field is unwrappable (no label)
+     *
+     * @return boolean
+     */
+    public function isUnwrappable()
+    {
+        return
+            ($this->form and $this->currentFramework()->is('Nude')) or
+            ($this->form and $this->isOfType('inline')) or
+            $this->isButton() or
+            $this->isOfType('hidden') or
+            \Former\Form\Group::$opened or
+            $this->group and $this->group->isRaw();
+    }
+
+    /**
+     * Check if field is a checkbox or a radio
+     *
+     * @return boolean
+     */
+    public function isCheckable()
+    {
+        return $this->isOfType('checkbox', 'checkboxes', 'radio', 'radios', 'switch', 'switches');
+    }
+
+    /**
+     * Check if the field is a button
+     *
+     * @return boolean
+     */
+    public function isButton()
+    {
+        return false;
+    }
+
+    /**
+     * Check if the field get a floating label
+     *
+     * @return boolean
+     */
+    public function withFloatingLabel()
+    {
+        return $this->floatingLabel;
+    }
+
+    /**
+     * Get the rules applied to the current field
+     *
+     * @return array An array of rules
+     */
+    public function getRules()
+    {
+        return $this->app['former']->getRules($this->name);
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    //////////////////////// SETTERS AND GETTERS ///////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Apply a Live Validation rule by chaining
+     *
+     * @param string $rule The rule
+     */
+    public function rule($rule)
+    {
+        $parameters = func_get_args();
+        array_shift($parameters);
+
+        $live = new LiveValidation($this);
+        $live->apply(array(
+            $rule => $parameters,
+        ));
+
+        return $this;
+    }
 
     /**
      * Apply multiple rules passed as a string.
@@ -312,9 +312,9 @@ 
                 $rulename = substr($rule, 0, $colon) ;
 
                 /**
-                * Regular expressions may contain commas and should not be divided by str_getcsv.
-                * For regular expressions we are just using the complete expression as a parameter.
-                */
+                 * Regular expressions may contain commas and should not be divided by str_getcsv.
+                 * For regular expressions we are just using the complete expression as a parameter.
+                 */
                 if ($rulename !== 'regex') {
                     $parameters = str_getcsv(substr($rule, $colon + 1), ',', '"', "\\");
                 } else {
@@ -336,159 +336,159 @@ 
         return $this;
     }
 
-	/**
-	 * Adds a label to the group/field
-	 *
-	 * @param  string $text       A label
-	 * @param  array  $attributes The label's attributes
-	 *
-	 * @return Field              A field
-	 */
-	public function label($text, $attributes = array())
-	{
-		// Create the Label element
-		$for   = $this->id ?: $this->name;
-		$label = $this->app['former']->label($text, $for, $attributes);
-
-		// Set label
-		$this->label = $label;
-		if ($this->group) {
-			$this->group->setLabel($label);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Set the Field value no matter what
-	 *
-	 * @param string $value A new value
-	 */
-	public function forceValue($value)
-	{
-		$this->value = $value;
-
-		return $this;
-	}
-
-	/**
-	 * Classic setting of attribute, won't overwrite any populate() attempt
-	 *
-	 * @param  string $value A new value
-	 */
-	public function value($value)
-	{
-		// Check if we already have a value stored for this field or in POST data
-		$already = $this->repopulate();
-
-		if (!$already) {
-			$this->value = $value;
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Change the field's name
-	 *
-	 * @param  string $name The new name
-	 */
-	public function name($name)
-	{
-		$this->name = $name;
-
-		// Also relink the label to the new name
-		$this->label($name);
-
-		return $this;
-	}
-
-	/**
-	 * Set the field as floating label
-	 */
-	public function floatingLabel($isFloatingLabel = true)
-	{
-		$this->floatingLabel = $isFloatingLabel;
-
-		return $this;
-	}
-
-	/**
-	 * Get the field's labels
-	 *
-	 * @return string
-	 */
-	public function getLabel()
-	{
-		return $this->label;
-	}
-
-	/**
-	 * Change the field's bind destination
-	 *
-	 * @param $destination
-	 */
-	public function bind($destination) {
-		$this->bind = $destination;
-		if ($this->type != 'password') {
-			$this->value = $this->repopulate();
-		}
-
-		return $this;
-	}
-
-	////////////////////////////////////////////////////////////////////
-	//////////////////////////////// HELPERS ///////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Use values stored in Former to populate the current field
-	 */
-	private function repopulate($fallback = null)
-	{
-		// Get values from POST, populated, and manually set value
-		$post      = $this->app['former']->getPost($this->name);
-		$populator = $this->form ? $this->form->getPopulator() : $this->app['former.populator'];
-		$populate  = $populator->get($this->bind ?: $this->name);
-
-		// Assign a priority to each
-		if (!is_null($post)) {
-			return $post;
-		}
-		if (!is_null($populate)) {
-			return $populate;
-		}
-
-		return $fallback ?: $this->value;
-	}
-
-	/**
-	 * Ponders a label and a field name, and tries to get the best out of it
-	 *
-	 * @param  string $label A label
-	 * @param  string $name  A field name
-	 *
-	 * @return false|null         A label and a field name
-	 */
-	private function automaticLabels($name, $label)
-	{
-		// Disabled automatic labels
-		if (!$this->app['former']->getOption('automatic_label')) {
-			$this->name = $name;
-			$this->label($label);
-
-			return false;
-		}
-
-		// Check for the two possibilities
-		if ($label and is_null($name)) {
-			$name = Str::slug($label);
-		} elseif (is_null($label) and $name) {
-			$label = preg_replace('/\[\]$/', '', $name);
-		}
-
-		// Save values
-		$this->name = $name;
-		$this->label($label);
-	}
+    /**
+     * Adds a label to the group/field
+     *
+     * @param  string $text       A label
+     * @param  array  $attributes The label's attributes
+     *
+     * @return Field              A field
+     */
+    public function label($text, $attributes = array())
+    {
+        // Create the Label element
+        $for   = $this->id ?: $this->name;
+        $label = $this->app['former']->label($text, $for, $attributes);
+
+        // Set label
+        $this->label = $label;
+        if ($this->group) {
+            $this->group->setLabel($label);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set the Field value no matter what
+     *
+     * @param string $value A new value
+     */
+    public function forceValue($value)
+    {
+        $this->value = $value;
+
+        return $this;
+    }
+
+    /**
+     * Classic setting of attribute, won't overwrite any populate() attempt
+     *
+     * @param  string $value A new value
+     */
+    public function value($value)
+    {
+        // Check if we already have a value stored for this field or in POST data
+        $already = $this->repopulate();
+
+        if (!$already) {
+            $this->value = $value;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Change the field's name
+     *
+     * @param  string $name The new name
+     */
+    public function name($name)
+    {
+        $this->name = $name;
+
+        // Also relink the label to the new name
+        $this->label($name);
+
+        return $this;
+    }
+
+    /**
+     * Set the field as floating label
+     */
+    public function floatingLabel($isFloatingLabel = true)
+    {
+        $this->floatingLabel = $isFloatingLabel;
+
+        return $this;
+    }
+
+    /**
+     * Get the field's labels
+     *
+     * @return string
+     */
+    public function getLabel()
+    {
+        return $this->label;
+    }
+
+    /**
+     * Change the field's bind destination
+     *
+     * @param $destination
+     */
+    public function bind($destination) {
+        $this->bind = $destination;
+        if ($this->type != 'password') {
+            $this->value = $this->repopulate();
+        }
+
+        return $this;
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    //////////////////////////////// HELPERS ///////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Use values stored in Former to populate the current field
+     */
+    private function repopulate($fallback = null)
+    {
+        // Get values from POST, populated, and manually set value
+        $post      = $this->app['former']->getPost($this->name);
+        $populator = $this->form ? $this->form->getPopulator() : $this->app['former.populator'];
+        $populate  = $populator->get($this->bind ?: $this->name);
+
+        // Assign a priority to each
+        if (!is_null($post)) {
+            return $post;
+        }
+        if (!is_null($populate)) {
+            return $populate;
+        }
+
+        return $fallback ?: $this->value;
+    }
+
+    /**
+     * Ponders a label and a field name, and tries to get the best out of it
+     *
+     * @param  string $label A label
+     * @param  string $name  A field name
+     *
+     * @return false|null         A label and a field name
+     */
+    private function automaticLabels($name, $label)
+    {
+        // Disabled automatic labels
+        if (!$this->app['former']->getOption('automatic_label')) {
+            $this->name = $name;
+            $this->label($label);
+
+            return false;
+        }
+
+        // Check for the two possibilities
+        if ($label and is_null($name)) {
+            $name = Str::slug($label);
+        } elseif (is_null($label) and $name) {
+            $label = preg_replace('/\[\]$/', '', $name);
+        }
+
+        // Save values
+        $this->name = $name;
+        $this->label($label);
+    }
 }

src/Former/Traits/FormerObject.php

Indentation +187 added lines, -187 removed lines

@@ -10,192 +10,192 @@
  */
 abstract class FormerObject extends Element
 {
-	/**
-	 * The field's name
-	 *
-	 * @var string
-	 */
-	protected $name;
-
-	/**
-	 * The field type
-	 *
-	 * @var string
-	 */
-	protected $type;
-
-	/**
-	 * A list of class properties to be added to attributes
-	 *
-	 * @var array
-	 */
-	protected $injectedProperties = array('name');
-
-	/**
-	 * The field's modifiers from method call
-	 *
-	 * @var string
-	 */
-	protected $modifiers;
-
-	////////////////////////////////////////////////////////////////////
-	/////////////////////////// ID AND LABELS //////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Create an unique ID and return it
-	 *
-	 * @return string
-	 */
-	public function getCreatedId()
-	{
-		$this->setId();
-
-		return $this->attributes['id'];
-	}
-
-	/**
-	 * Set the matching ID on a field if possible
-	 */
-	protected function setId()
-	{
-		if (!array_key_exists('id', $this->attributes) and
-			in_array($this->name, $this->app['former']->labels)
-		) {
-			// Set and save the field's ID
-			$id                         = $this->getUniqueId($this->name);
-			$this->attributes['id']     = $id;
-			$this->app['former']->ids[] = $id;
-		}
-	}
-
-	/**
-	 * Get an unique ID for a field from its name
-	 *
-	 * @param string $name
-	 *
-	 * @return string
-	 */
-	protected function getUniqueId($name)
-	{
-		$names = &$this->app['former']->names;
-
-		if (array_key_exists($name, $names)) {
-			$count = $names[$name] + 1;
-			$names[$name] = $count;
-			return $name . '-' . $count;
-		}
-
-		$names[$name] = 1;
-		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
-	 *
-	 * @return string
-	 */
-	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)) {
-			$this->value = Helpers::encode($this->value);
-		}
-
-		return parent::render();
-	}
-
-	////////////////////////////////////////////////////////////////////
-	////////////////////////////// GETTERS /////////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Get the object's name
-	 *
-	 * @return string
-	 */
-	public function getName()
-	{
-		return $this->name;
-	}
-
-	////////////////////////////////////////////////////////////////////
-	//////////////////////////// OBJECT TYPE ///////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Get the object's type
-	 *
-	 * @return string
-	 */
-	public function getType()
-	{
-		return $this->type;
-	}
-
-	/**
-	 * Change a object's type
-	 *
-	 * @param string $type
-	 */
-	public function setType($type)
-	{
-		$this->type = $type;
-
-		return $this;
-	}
-
-	/**
-	 * Check if an object is of a certain type
-	 *
-	 * @return boolean
-	 */
-	public function isOfType()
-	{
-		$types = func_get_args();
-
-		return in_array($this->type, $types);
-	}
+    /**
+     * The field's name
+     *
+     * @var string
+     */
+    protected $name;
+
+    /**
+     * The field type
+     *
+     * @var string
+     */
+    protected $type;
+
+    /**
+     * A list of class properties to be added to attributes
+     *
+     * @var array
+     */
+    protected $injectedProperties = array('name');
+
+    /**
+     * The field's modifiers from method call
+     *
+     * @var string
+     */
+    protected $modifiers;
+
+    ////////////////////////////////////////////////////////////////////
+    /////////////////////////// ID AND LABELS //////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Create an unique ID and return it
+     *
+     * @return string
+     */
+    public function getCreatedId()
+    {
+        $this->setId();
+
+        return $this->attributes['id'];
+    }
+
+    /**
+     * Set the matching ID on a field if possible
+     */
+    protected function setId()
+    {
+        if (!array_key_exists('id', $this->attributes) and
+            in_array($this->name, $this->app['former']->labels)
+        ) {
+            // Set and save the field's ID
+            $id                         = $this->getUniqueId($this->name);
+            $this->attributes['id']     = $id;
+            $this->app['former']->ids[] = $id;
+        }
+    }
+
+    /**
+     * Get an unique ID for a field from its name
+     *
+     * @param string $name
+     *
+     * @return string
+     */
+    protected function getUniqueId($name)
+    {
+        $names = &$this->app['former']->names;
+
+        if (array_key_exists($name, $names)) {
+            $count = $names[$name] + 1;
+            $names[$name] = $count;
+            return $name . '-' . $count;
+        }
+
+        $names[$name] = 1;
+        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
+     *
+     * @return string
+     */
+    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)) {
+            $this->value = Helpers::encode($this->value);
+        }
+
+        return parent::render();
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ////////////////////////////// GETTERS /////////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Get the object's name
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    //////////////////////////// OBJECT TYPE ///////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Get the object's type
+     *
+     * @return string
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
+
+    /**
+     * Change a object's type
+     *
+     * @param string $type
+     */
+    public function setType($type)
+    {
+        $this->type = $type;
+
+        return $this;
+    }
+
+    /**
+     * Check if an object is of a certain type
+     *
+     * @return boolean
+     */
+    public function isOfType()
+    {
+        $types = func_get_args();
+
+        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;
-	}
+    /**
+     * 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;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -83,7 +83,7 @@ 
 		if (array_key_exists($name, $names)) {
 			$count = $names[$name] + 1;
 			$names[$name] = $count;
-			return $name . '-' . $count;
+			return $name.'-'.$count;
 		}
 
 		$names[$name] = 1;
@@ -113,7 +113,7 @@ 
 		// Set the proper ID according to the label
 		$this->setId();
 
-		if($this instanceof Field) {
+		if ($this instanceof Field) {
 			$this->setFieldClasses();
 		}
 

src/Former/Form/Fields/Choice.php

Spacing +5 added lines, -5 removed lines

@@ -217,7 +217,7 @@ 
 				$attributes['disabled'] = true;
 			}
 
-			if(isset($attributes['name'])) {
+			if (isset($attributes['name'])) {
 				$name = $attributes['name'];
 				unset($attributes['name']);
 			} else {
@@ -227,7 +227,7 @@ 
 				$name .= '[]';
 			}
 		
-			if(!isset($attributes['id'])) {
+			if (!isset($attributes['id'])) {
 				$attributes['id'] = $this->id.'_'.count($children);
 			}
 
@@ -282,7 +282,7 @@ 
 		}
 
 		$attributes = array('value' => '', 'disabled' => 'disabled');
-		if (!(array)$this->value) {
+		if (!(array) $this->value) {
 			$attributes['selected'] = 'selected';
 		}
 
@@ -315,11 +315,11 @@ 
 	 */
 	protected function hasValue($choiceValue)
 	{
-		foreach ((array)$this->value as $key => $value) {
+		foreach ((array) $this->value as $key => $value) {
 			if (is_object($value) && method_exists($value, 'getKey')) {
 				$value = $value->getKey();
 			}
-			if ($choiceValue === $value || is_numeric($value) && $choiceValue === (int)$value) {
+			if ($choiceValue === $value || is_numeric($value) && $choiceValue === (int) $value) {
 				return true;
 			}
 		}

Indentation +468 added lines, -468 removed lines

@@ -13,477 +13,477 @@
  */
 class Choice extends Field
 {
-	/**
-	 * Renders the checkables as inline
-	 *
-	 * @var boolean
-	 */
-	protected $inline = false;
-
-	/**
-	 * The choice's placeholder
-	 *
-	 * @var string
-	 */
-	private $placeholder = null;
-
-	/**
-	 * The choice's options
-	 *
-	 * @var array
-	 */
-	protected $options = [
+    /**
+     * Renders the checkables as inline
+     *
+     * @var boolean
+     */
+    protected $inline = false;
+
+    /**
+     * The choice's placeholder
+     *
+     * @var string
+     */
+    private $placeholder = null;
+
+    /**
+     * The choice's options
+     *
+     * @var array
+     */
+    protected $options = [
         'isMultiple' => false,
         'isExpanded' => false,
     ];
 
-	/**
-	 * The choice's choices
-	 *
-	 * @var array
-	 */
-	protected $choices = [];
-
-	/**
-	 * The choice's element
-	 *
-	 * @var string
-	 */
-	protected $element = 'choice';
-
-	/**
-	 * The choice's self-closing state
-	 *
-	 * @var boolean
-	 */
-	protected $isSelfClosing = false;
-
-	////////////////////////////////////////////////////////////////////
-	/////////////////////////// CORE METHODS ///////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Easier arguments order for selects
-	 *
-	 * @param Container $app        The Container instance
-	 * @param string    $type       select
-	 * @param string    $name       Field name
-	 * @param string    $label      Its label
-	 * @param array     $choices    The choice's choices
-	 * @param string    $selected   The selected choice(s)
-	 * @param array     $attributes Attributes
-	 */
-	public function __construct(Container $app, $type, $name, $label, $choices, $selected, $attributes)
-	{
-		if ($selected) {
-			$this->value = $selected;
-		}
-		if ($choices) {
-			$this->choices($choices);
-		}
-
-		parent::__construct($app, $type, $name, $label, $selected, $attributes);
-
-		$this->setChoiceType();
-
-		// Nested models population
-		if (Str::contains($this->name, '.') and is_array($this->value) and !empty($this->value) and is_string($this->value[key($this->value)])) {
-			$this->fromQuery($this->value);
-			$this->value = $selected ?: null;
-		}
-	}
-
-	/**
-	 * Renders the choice
-	 *
-	 * @return string A <select> tag
-	 */
-	public function render()
-	{
-		$choiceType = $this->getType();
-		$this->setFieldClasses();
-
-		if (!isset($this->attributes['id'])) {
-			$this->setAttribute('id', $this->name);
-		}
-
-		switch ($choiceType) {
-			case 'select':
-				$field = $this->getSelect();
-				break;
-			case 'checkbox':
-			case 'radio':
-				$field = $this->getCheckables($choiceType);
-				break;
-		}
-		$this->value = null;
-		$content = $field->render();
-		return $content;
-	}
-
-	public function getSelect()
-	{
-		$field = Element::create('select', null, $this->attributes);
-
-		$name = $this->name;
-		if ($this->options['isMultiple']) {
-			$field->multiple();
-			$name .= '[]';
-		}
-
-		$field->setAttribute('name', $name);
-
-		$field->nest($this->getOptions());
-
-		return $field;
-	}
-
-	public function getOptions()
-	{
-		$children = [];
-
-		// Add placeholder text if any
-		if ($placeholder = $this->getPlaceholder()) {
-			$children[] = $placeholder;
-		}
-
-		foreach ($this->choices as $key => $value) {
-			if (is_array($value) and !isset($value['value'])) {
-				$children[] = $this->getOptGroup($key, $value);
-			} else {
-				$children[] = $this->getOption($key, $value);
-			}
-		}
-		return $children;
-	}
-
-	public function getOptGroup($label, $options)
-	{
-		$element = Element::create('optgroup')->label($label);
-		$children = [];
-		foreach ($options as $key => $value) {
-			$option = $this->getOption($key, $value);
-			$children[] = $option;
-		}
-		$element->nest($children);
-
-		return $element;
-	}
-
-	public function getOption($key, $value)
-	{
-		if (is_array($value) and isset($value['value'])) {
-			$attributes = $value;
-			$text = $key;
-			$key = null;
-		} else {
-			$attributes = array('value' => $key);
-			$text = $value;
-		}
-
-		$element = Element::create('option', $text, $attributes);
-		if ($this->hasValue($attributes['value'])) {
-			$element->selected('selected');
-		}
-
-		return $element;
-	}
-
-	public function getCheckables($choiceType)
-	{
-		if ($this->value !== null && !(is_array($this->value) || $this->value instanceof \ArrayAccess)) {
-			$this->value = explode(',', $this->value);
-		}
-
-		$disabled = isset($this->attributes['disabled']);
-		unset($this->attributes['disabled']);
-
-		$field = Element::create('div', null, $this->attributes);
-
-		$children = [];
-		foreach ($this->choices as $key => $value) {
-			$attributes = [];
-
-			if (is_array($value) and isset($value['value'])) {
-				$attributes = $value;
-				$label = $key;
-				$inputValue = $value['value'];
-			} else {
-				$attributes = [];
-				$label = $value;
-				$inputValue = $key;
-			}
-
-			if ($disabled) {
-				$attributes['disabled'] = true;
-			}
-
-			if(isset($attributes['name'])) {
-				$name = $attributes['name'];
-				unset($attributes['name']);
-			} else {
-				$name = $this->name;
-			}
-			if ($this->options['isMultiple']) {
-				$name .= '[]';
-			}
-
-			if(!isset($attributes['id'])) {
-				$attributes['id'] = $this->id.'_'.count($children);
-			}
-
-			// If inline items, add class
-			$isInline = $this->inline ? ' '.$this->app['former.framework']->getInlineLabelClass($this) : '';
-
-			// In Bootsrap 3, don't append the the checkable type (radio/checkbox) as a class if
-			// rendering inline.
-			$class = $this->app['former']->framework() == 'TwitterBootstrap3' ? trim($isInline) : $choiceType.$isInline;
-
-			$element = Input::create($choiceType, $name, $inputValue, $attributes);
-
-			// $element->setAttribute('name', $name);
-
-			if ($this->hasValue($inputValue)) {
-				$element->checked('checked');
-			}
-			// $attributes['value'] = $key;
-			if (!$label) {
-				$element = (is_object($field)) ? $field->render() : $field;
-			} else {
-				$rendered = $element->render();
-				$labelElement = Element::create('label', $rendered.$label);
-				$element = $labelElement->for($attributes['id'])->class($class);
-			}
-
-			// If BS3, if checkables are stacked, wrap them in a div with the checkable type
-			if (!$isInline && $this->app['former']->framework() == 'TwitterBootstrap3') {
-				$wrapper = Element::create('div', $element->render())->class($choiceType);
-				if ($disabled) {
-					$wrapper->addClass('disabled');
-				}
-				$element = $wrapper;
-			}
-
-			$children[] = $element;
-		}
-		$field->nest($children);
-
-		return $field;
-	}
-
-	/**
-	 * Get the choice's placeholder
-	 *
-	 * @return Element
-	 */
-	protected function getPlaceholder()
-	{
-		if (!$this->placeholder) {
-			return false;
-		}
-
-		$attributes = array('value' => '', 'disabled' => 'disabled');
-		if (!(array)$this->value) {
-			$attributes['selected'] = 'selected';
-		}
-
-		return Element::create('option', $this->placeholder, $attributes);
-	}
-
-	/**
-	 * Sets the element's type based on options
-	 *
-	 * @return this
-	 */
-	protected function setChoiceType()
-	{
-		if ($this->options['isExpanded'] && !$this->options['isMultiple']) {
-			$this->setType('radio');
-		} elseif ($this->options['isExpanded'] && $this->options['isMultiple']) {
-			$this->setType('checkbox');
-		} else {
-			$this->setType('select');
-		}
-		return $this;
-	}
-
-	/**
-	 * Select a value in the field's children
-	 *
-	 * @param mixed   $value
-	 *
-	 * @return bool
-	 */
-	protected function hasValue($choiceValue)
-	{
-		foreach ((array)$this->value as $key => $value) {
-			if (is_object($value) && method_exists($value, 'getKey')) {
-				$value = $value->getKey();
-			}
-			if ($choiceValue === $value || is_numeric($value) && $choiceValue === (int)$value) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	////////////////////////////////////////////////////////////////////
-	////////////////////////// FIELD METHODS ///////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Set the choices
-	 *
-	 * @param  array   $_choices     The choices as an array
-	 * @param  mixed   $selected     Facultative selected entry
-	 * @param  boolean $valuesAsKeys Whether the array's values should be used as
-	 *                               the option's values instead of the array's keys
-	 */
-	public function addChoice($value, $key = null)
-	{
-		$this->choices[$key ?? $value] = $value;
-
-		return $this;
-	}
-
-	/**
-	 * Set the choices
-	 *
-	 * @param  array   $_choices     The choices as an array
-	 * @param  mixed   $selected     Facultative selected entry
-	 * @param  boolean $valuesAsKeys Whether the array's values should be used as
-	 *                               the option's values instead of the array's keys
-	 */
-	public function choices($_choices, $valuesAsKeys = false)
-	{
-		$choices = (array) $_choices;
-
-		// If valuesAsKeys is true, use the values as keys
-		if ($valuesAsKeys) {
-			foreach ($choices as $value) {
-				$this->addChoice($value, $value);
-			}
-		} else {
-			foreach ($choices as $key => $value) {
-				$this->addChoice($value, $key);
-			}
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Creates a list of choices from a range
-	 *
-	 * @param  integer $from
-	 * @param  integer $to
-	 * @param  integer $step
-	 */
-	public function range($from, $to, $step = 1)
-	{
-		$range = range($from, $to, $step);
-		$this->choices($range, true);
-
-		return $this;
-	}
-
-	/**
-	 * Use the results from a Fluent/Eloquent query as choices
-	 *
-	 * @param  array           $results    An array of Eloquent models
-	 * @param  string|function $text       The value to use as text
-	 * @param  string|array    $attributes The data to use as attributes
-	 * @param  string	       $selected   The default selected item
-	 */
-	public function fromQuery($results, $text = null, $attributes = null, $selected = null)
-	{
-		$this->choices(Helpers::queryToArray($results, $text, $attributes))->value($selected);
-
-		return $this;
-	}
-
-	/**
-	 * Add a placeholder to the current select
-	 *
-	 * @param  string $placeholder The placeholder text
-	 */
-	public function placeholder($placeholder)
-	{
-		$this->placeholder = Helpers::translate($placeholder);
-
-		return $this;
-	}
-
-	/**
-	 * Set isMultiple
-	 *
-	 * @param boolean $isMultiple
-	 * @return $this
-	 */
-	public function multiple($isMultiple = true)
-	{
-		$this->options['isMultiple'] = $isMultiple;
-		$this->setChoiceType();
-
-		return $this;
-	}
-
-	/**
-	 * Set isExpanded
-	 *
-	 * @param boolean $isExpanded
-	 * @return $this
-	 */
-	public function expanded($isExpanded = true)
-	{
-		$this->options['isExpanded'] = $isExpanded;
-		$this->setChoiceType();
-
-		return $this;
-	}
-
-	/**
-	 * Set the choices as inline (for expanded items)
-	 */
-	public function inline($isInline = true)
-	{
-		$this->inline = $isInline;
-
-		return $this;
-	}
-
-	/**
-	 * Set the choices as stacked (for expanded items)
-	 */
-	public function stacked($isStacked = true)
-	{
-		$this->inline = !$isStacked;
-
-		return $this;
-	}
-
-	/**
-	 * Check if field is a checkbox or a radio
-	 *
-	 * @return boolean
-	 */
-	public function isCheckable()
-	{
-		return $this->options['isExpanded'];
-	}
-
-	////////////////////////////////////////////////////////////////////
-	////////////////////////////// HELPERS /////////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Returns the current choices in memory for manipulations
-	 *
-	 * @return array The current choices array
-	 */
-	public function getChoices()
-	{
-		return $this->choices;
-	}
+    /**
+     * The choice's choices
+     *
+     * @var array
+     */
+    protected $choices = [];
+
+    /**
+     * The choice's element
+     *
+     * @var string
+     */
+    protected $element = 'choice';
+
+    /**
+     * The choice's self-closing state
+     *
+     * @var boolean
+     */
+    protected $isSelfClosing = false;
+
+    ////////////////////////////////////////////////////////////////////
+    /////////////////////////// CORE METHODS ///////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Easier arguments order for selects
+     *
+     * @param Container $app        The Container instance
+     * @param string    $type       select
+     * @param string    $name       Field name
+     * @param string    $label      Its label
+     * @param array     $choices    The choice's choices
+     * @param string    $selected   The selected choice(s)
+     * @param array     $attributes Attributes
+     */
+    public function __construct(Container $app, $type, $name, $label, $choices, $selected, $attributes)
+    {
+        if ($selected) {
+            $this->value = $selected;
+        }
+        if ($choices) {
+            $this->choices($choices);
+        }
+
+        parent::__construct($app, $type, $name, $label, $selected, $attributes);
+
+        $this->setChoiceType();
+
+        // Nested models population
+        if (Str::contains($this->name, '.') and is_array($this->value) and !empty($this->value) and is_string($this->value[key($this->value)])) {
+            $this->fromQuery($this->value);
+            $this->value = $selected ?: null;
+        }
+    }
+
+    /**
+     * Renders the choice
+     *
+     * @return string A <select> tag
+     */
+    public function render()
+    {
+        $choiceType = $this->getType();
+        $this->setFieldClasses();
+
+        if (!isset($this->attributes['id'])) {
+            $this->setAttribute('id', $this->name);
+        }
+
+        switch ($choiceType) {
+            case 'select':
+                $field = $this->getSelect();
+                break;
+            case 'checkbox':
+            case 'radio':
+                $field = $this->getCheckables($choiceType);
+                break;
+        }
+        $this->value = null;
+        $content = $field->render();
+        return $content;
+    }
+
+    public function getSelect()
+    {
+        $field = Element::create('select', null, $this->attributes);
+
+        $name = $this->name;
+        if ($this->options['isMultiple']) {
+            $field->multiple();
+            $name .= '[]';
+        }
+
+        $field->setAttribute('name', $name);
+
+        $field->nest($this->getOptions());
+
+        return $field;
+    }
+
+    public function getOptions()
+    {
+        $children = [];
+
+        // Add placeholder text if any
+        if ($placeholder = $this->getPlaceholder()) {
+            $children[] = $placeholder;
+        }
+
+        foreach ($this->choices as $key => $value) {
+            if (is_array($value) and !isset($value['value'])) {
+                $children[] = $this->getOptGroup($key, $value);
+            } else {
+                $children[] = $this->getOption($key, $value);
+            }
+        }
+        return $children;
+    }
+
+    public function getOptGroup($label, $options)
+    {
+        $element = Element::create('optgroup')->label($label);
+        $children = [];
+        foreach ($options as $key => $value) {
+            $option = $this->getOption($key, $value);
+            $children[] = $option;
+        }
+        $element->nest($children);
+
+        return $element;
+    }
+
+    public function getOption($key, $value)
+    {
+        if (is_array($value) and isset($value['value'])) {
+            $attributes = $value;
+            $text = $key;
+            $key = null;
+        } else {
+            $attributes = array('value' => $key);
+            $text = $value;
+        }
+
+        $element = Element::create('option', $text, $attributes);
+        if ($this->hasValue($attributes['value'])) {
+            $element->selected('selected');
+        }
+
+        return $element;
+    }
+
+    public function getCheckables($choiceType)
+    {
+        if ($this->value !== null && !(is_array($this->value) || $this->value instanceof \ArrayAccess)) {
+            $this->value = explode(',', $this->value);
+        }
+
+        $disabled = isset($this->attributes['disabled']);
+        unset($this->attributes['disabled']);
+
+        $field = Element::create('div', null, $this->attributes);
+
+        $children = [];
+        foreach ($this->choices as $key => $value) {
+            $attributes = [];
+
+            if (is_array($value) and isset($value['value'])) {
+                $attributes = $value;
+                $label = $key;
+                $inputValue = $value['value'];
+            } else {
+                $attributes = [];
+                $label = $value;
+                $inputValue = $key;
+            }
+
+            if ($disabled) {
+                $attributes['disabled'] = true;
+            }
+
+            if(isset($attributes['name'])) {
+                $name = $attributes['name'];
+                unset($attributes['name']);
+            } else {
+                $name = $this->name;
+            }
+            if ($this->options['isMultiple']) {
+                $name .= '[]';
+            }
+
+            if(!isset($attributes['id'])) {
+                $attributes['id'] = $this->id.'_'.count($children);
+            }
+
+            // If inline items, add class
+            $isInline = $this->inline ? ' '.$this->app['former.framework']->getInlineLabelClass($this) : '';
+
+            // In Bootsrap 3, don't append the the checkable type (radio/checkbox) as a class if
+            // rendering inline.
+            $class = $this->app['former']->framework() == 'TwitterBootstrap3' ? trim($isInline) : $choiceType.$isInline;
+
+            $element = Input::create($choiceType, $name, $inputValue, $attributes);
+
+            // $element->setAttribute('name', $name);
+
+            if ($this->hasValue($inputValue)) {
+                $element->checked('checked');
+            }
+            // $attributes['value'] = $key;
+            if (!$label) {
+                $element = (is_object($field)) ? $field->render() : $field;
+            } else {
+                $rendered = $element->render();
+                $labelElement = Element::create('label', $rendered.$label);
+                $element = $labelElement->for($attributes['id'])->class($class);
+            }
+
+            // If BS3, if checkables are stacked, wrap them in a div with the checkable type
+            if (!$isInline && $this->app['former']->framework() == 'TwitterBootstrap3') {
+                $wrapper = Element::create('div', $element->render())->class($choiceType);
+                if ($disabled) {
+                    $wrapper->addClass('disabled');
+                }
+                $element = $wrapper;
+            }
+
+            $children[] = $element;
+        }
+        $field->nest($children);
+
+        return $field;
+    }
+
+    /**
+     * Get the choice's placeholder
+     *
+     * @return Element
+     */
+    protected function getPlaceholder()
+    {
+        if (!$this->placeholder) {
+            return false;
+        }
+
+        $attributes = array('value' => '', 'disabled' => 'disabled');
+        if (!(array)$this->value) {
+            $attributes['selected'] = 'selected';
+        }
+
+        return Element::create('option', $this->placeholder, $attributes);
+    }
+
+    /**
+     * Sets the element's type based on options
+     *
+     * @return this
+     */
+    protected function setChoiceType()
+    {
+        if ($this->options['isExpanded'] && !$this->options['isMultiple']) {
+            $this->setType('radio');
+        } elseif ($this->options['isExpanded'] && $this->options['isMultiple']) {
+            $this->setType('checkbox');
+        } else {
+            $this->setType('select');
+        }
+        return $this;
+    }
+
+    /**
+     * Select a value in the field's children
+     *
+     * @param mixed   $value
+     *
+     * @return bool
+     */
+    protected function hasValue($choiceValue)
+    {
+        foreach ((array)$this->value as $key => $value) {
+            if (is_object($value) && method_exists($value, 'getKey')) {
+                $value = $value->getKey();
+            }
+            if ($choiceValue === $value || is_numeric($value) && $choiceValue === (int)$value) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ////////////////////////// FIELD METHODS ///////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Set the choices
+     *
+     * @param  array   $_choices     The choices as an array
+     * @param  mixed   $selected     Facultative selected entry
+     * @param  boolean $valuesAsKeys Whether the array's values should be used as
+     *                               the option's values instead of the array's keys
+     */
+    public function addChoice($value, $key = null)
+    {
+        $this->choices[$key ?? $value] = $value;
+
+        return $this;
+    }
+
+    /**
+     * Set the choices
+     *
+     * @param  array   $_choices     The choices as an array
+     * @param  mixed   $selected     Facultative selected entry
+     * @param  boolean $valuesAsKeys Whether the array's values should be used as
+     *                               the option's values instead of the array's keys
+     */
+    public function choices($_choices, $valuesAsKeys = false)
+    {
+        $choices = (array) $_choices;
+
+        // If valuesAsKeys is true, use the values as keys
+        if ($valuesAsKeys) {
+            foreach ($choices as $value) {
+                $this->addChoice($value, $value);
+            }
+        } else {
+            foreach ($choices as $key => $value) {
+                $this->addChoice($value, $key);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Creates a list of choices from a range
+     *
+     * @param  integer $from
+     * @param  integer $to
+     * @param  integer $step
+     */
+    public function range($from, $to, $step = 1)
+    {
+        $range = range($from, $to, $step);
+        $this->choices($range, true);
+
+        return $this;
+    }
+
+    /**
+     * Use the results from a Fluent/Eloquent query as choices
+     *
+     * @param  array           $results    An array of Eloquent models
+     * @param  string|function $text       The value to use as text
+     * @param  string|array    $attributes The data to use as attributes
+     * @param  string	       $selected   The default selected item
+     */
+    public function fromQuery($results, $text = null, $attributes = null, $selected = null)
+    {
+        $this->choices(Helpers::queryToArray($results, $text, $attributes))->value($selected);
+
+        return $this;
+    }
+
+    /**
+     * Add a placeholder to the current select
+     *
+     * @param  string $placeholder The placeholder text
+     */
+    public function placeholder($placeholder)
+    {
+        $this->placeholder = Helpers::translate($placeholder);
+
+        return $this;
+    }
+
+    /**
+     * Set isMultiple
+     *
+     * @param boolean $isMultiple
+     * @return $this
+     */
+    public function multiple($isMultiple = true)
+    {
+        $this->options['isMultiple'] = $isMultiple;
+        $this->setChoiceType();
+
+        return $this;
+    }
+
+    /**
+     * Set isExpanded
+     *
+     * @param boolean $isExpanded
+     * @return $this
+     */
+    public function expanded($isExpanded = true)
+    {
+        $this->options['isExpanded'] = $isExpanded;
+        $this->setChoiceType();
+
+        return $this;
+    }
+
+    /**
+     * Set the choices as inline (for expanded items)
+     */
+    public function inline($isInline = true)
+    {
+        $this->inline = $isInline;
+
+        return $this;
+    }
+
+    /**
+     * Set the choices as stacked (for expanded items)
+     */
+    public function stacked($isStacked = true)
+    {
+        $this->inline = !$isStacked;
+
+        return $this;
+    }
+
+    /**
+     * Check if field is a checkbox or a radio
+     *
+     * @return boolean
+     */
+    public function isCheckable()
+    {
+        return $this->options['isExpanded'];
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ////////////////////////////// HELPERS /////////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Returns the current choices in memory for manipulations
+     *
+     * @return array The current choices array
+     */
+    public function getChoices()
+    {
+        return $this->choices;
+    }
 
 }

src/Former/Former.php

Spacing +5 added lines, -5 removed lines

@@ -147,10 +147,10 @@ 
 
 		// Checking for any supplementary classes
 		$modifiers = explode('_', $method);
-		$method  = array_pop($modifiers);
+		$method = array_pop($modifiers);
 		
 		// Dispatch to the different Form\Fields
-		$field     = $this->dispatch->toFields($method, $parameters);
+		$field = $this->dispatch->toFields($method, $parameters);
 		$field->setModifiers($modifiers);
 		$field->addClass('');
 		
@@ -350,7 +350,7 @@ 
 		$this->setOption('framework', $framework);
 
 		$framework = $this->getFrameworkInstance($framework);
-		$this->app->bind('former.framework', function ($app) use ($framework) {
+		$this->app->bind('former.framework', function($app) use ($framework) {
 			return $framework;
 		});
 	}
@@ -370,9 +370,9 @@ 
 		//get interfaces of the given framework
 		$interfaces = class_exists($framework) ? class_implements($framework) : array();
 
-		if(class_exists($formerClass)) {
+		if (class_exists($formerClass)) {
 			$returnClass = $formerClass;
-		} elseif(class_exists($framework) && isset($interfaces['Former\Interfaces\FrameworkInterface'])) {
+		} elseif (class_exists($framework) && isset($interfaces['Former\Interfaces\FrameworkInterface'])) {
 			// We have some outside class, lets return it.
 			$returnClass = $framework;
 		} else {

Indentation +486 added lines, -486 removed lines

@@ -14,490 +14,490 @@
  */
 class Former
 {
-	// Instances
-	////////////////////////////////////////////////////////////////////
-
-
-	/**
-	 * The current environment
-	 *
-	 * @var \Illuminate\Container\Container
-	 */
-	protected $app;
-
-	/**
-	 * The Method Dispatcher
-	 *
-	 * @var MethodDispatcher
-	 */
-	protected $dispatch;
-
-	// Informations
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * The form's errors
-	 *
-	 * @var Message
-	 */
-	protected $errors;
-
-	/**
-	 * An array of rules to use
-	 *
-	 * @var array
-	 */
-	protected $rules = array();
-
-	/**
-	 * An array of field macros
-	 *
-	 * @var array
-	 */
-	protected $macros = array();
-
-	/**
-	 * The labels created so far
-	 *
-	 * @var array
-	 */
-	public $labels = array();
-
-	/**
-	 * The IDs created so far
-	 *
-	 * @var array
-	 */
-	public $ids = array();
-
-	/**
-	 * A lookup table where the key is the input name,
-	 * and the value is number of times seen. This is
-	 * used to calculate unique ids.
-	 *
-	 * @var array
-	 */
-	public $names = array();
-
-	// Namespaces
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * The namespace of Form elements
-	 */
-	const FORMSPACE = 'Former\Form\\';
-
-	/**
-	 * The namespace of fields
-	 */
-	const FIELDSPACE = 'Former\Form\Fields\\';
-
-	/**
-	 * Build a new Former instance
-	 *
-	 * @param Container        $app
-	 * @param MethodDispatcher $dispatcher
-	 */
-	public function __construct(Container $app, MethodDispatcher $dispatcher)
-	{
-		$this->app      = $app;
-		$this->dispatch = $dispatcher;
-	}
-
-	////////////////////////////////////////////////////////////////////
-	//////////////////////////// INTERFACE /////////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Acts as a router that redirects methods to all of Former classes
-	 *
-	 * @param  string $method     The method called
-	 * @param  array  $parameters An array of parameters
-	 *
-	 * @return mixed
-	 */
-	public function __call($method, $parameters)
-	{
-		// Dispatch to Form\Elements
-		// Explicitly check false since closeGroup() may return an empty string
-		if (($element = $this->dispatch->toElements($method, $parameters)) !== false) {
-			return $element;
-		}
-
-		// Dispatch to Form\Form
-		if ($form = $this->dispatch->toForm($method, $parameters)) {
-			$this->app->instance('former.form', $form);
-
-			return $this->app['former.form'];
-		}
-
-		// Dispatch to Form\Group
-		if ($group = $this->dispatch->toGroup($method, $parameters)) {
-			return $group;
-		}
-
-		// Dispatch to Form\Actions
-		if ($actions = $this->dispatch->toActions($method, $parameters)) {
-			return $actions;
-		}
-
-		// Dispatch to macros
-		if ($macro = $this->dispatch->toMacros($method, $parameters)) {
-			return $macro;
-		}
-
-		// Checking for any supplementary classes
-		$modifiers = explode('_', $method);
-		$method  = array_pop($modifiers);
-
-		// Dispatch to the different Form\Fields
-		$field     = $this->dispatch->toFields($method, $parameters);
-		$field->setModifiers($modifiers);
-		$field->addClass('');
-
-		// Else bind field
-		$this->app->instance('former.field', $field);
-
-		return $this->app['former.field'];
-	}
-
-	////////////////////////////////////////////////////////////////////
-	//////////////////////////////// MACROS ////////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Register a macro with Former
-	 *
-	 * @param  string   $name  The name of the macro
-	 * @param  Callable $macro The macro itself
-	 *
-	 * @return mixed
-	 */
-	public function macro($name, $macro)
-	{
-		$this->macros[$name] = $macro;
-	}
-
-	/**
-	 * Check if a macro exists
-	 *
-	 * @param  string $name
-	 *
-	 * @return boolean
-	 */
-	public function hasMacro($name)
-	{
-		return isset($this->macros[$name]);
-	}
-
-	/**
-	 * Get a registered macro
-	 *
-	 * @param  string $name
-	 *
-	 * @return Closure
-	 */
-	public function getMacro($name)
-	{
-		return $this->macros[$name];
-	}
-
-	////////////////////////////////////////////////////////////////////
-	///////////////////////////// POPULATOR ////////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Add values to populate the array
-	 *
-	 * @param mixed $values Can be an Eloquent object or an array
-	 */
-	public function populate($values)
-	{
-		$this->app['former.populator']->replace($values);
-	}
-
-	/**
-	 * Set the value of a particular field
-	 *
-	 * @param string $field The field's name
-	 * @param mixed  $value Its new value
-	 */
-	public function populateField($field, $value)
-	{
-		$this->app['former.populator']->put($field, $value);
-	}
-
-	/**
-	 * Get the value of a field
-	 *
-	 * @param string $field The field's name
-	 * @param null   $fallback
-	 *
-	 * @return mixed
-	 */
-	public function getValue($field, $fallback = null)
-	{
-		return $this->app['former.populator']->get($field, $fallback);
-	}
-
-	/**
-	 * Fetch a field value from both the new and old POST array
-	 *
-	 * @param  string $name     A field name
-	 * @param  string $fallback A fallback if nothing was found
-	 *
-	 * @return string           The results
-	 */
-	public function getPost($name, $fallback = null)
-	{
-		$name     = str_replace(array('[', ']'), array('.', ''), $name ?? '');
-		$name     = trim($name, '.');
-		$oldValue = $this->app['request']->old($name, $fallback);
-
-		return $this->app['request']->input($name, $oldValue, true);
-	}
-
-	////////////////////////////////////////////////////////////////////
-	////////////////////////////// TOOLKIT /////////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Set the errors to use for validations
-	 *
-	 * @param Message $validator The result from a validation
-	 *
-	 * @return  void
-	 */
-	public function withErrors($validator = null)
-	{
-		// Try to get the errors form the session
-		if ($this->app['session']->has('errors')) {
-			$this->errors = $this->app['session']->get('errors');
-		}
-
-		// If we're given a raw Validator, go fetch the errors in it
-		if ($validator instanceof Validator) {
-			$this->errors = $validator->getMessageBag();
-		} else {
-			if ($validator instanceof MessageBag) {
-				$this->errors = $validator;
-			}
-		}
-
-		return $this->errors;
-	}
-
-	/**
-	 * Add live validation rules
-	 *
-	 * @param  array *$rules An array of Laravel rules
-	 *
-	 * @return  void
-	 */
-	public function withRules()
-	{
-		$rules = call_user_func_array('array_merge', func_get_args());
-
-		// Parse the rules according to Laravel conventions
-		foreach ($rules as $name => $fieldRules) {
-			$expFieldRules = $fieldRules;
-			if (!is_array($expFieldRules)) {
-				if (is_object($expFieldRules)) {
-					continue;
-				}
-
-				$expFieldRules = explode('|', $expFieldRules);
-				$expFieldRules = array_map('trim', $expFieldRules);
-			}
-
-			foreach ($expFieldRules as $rule) {
-				if (is_object($rule)) {
-					continue;
-				}
-
-				$parameters = null;
-
-				if (($colon = strpos($rule, ':')) !== false) {
-					$rulename = substr($rule, 0, $colon);
-
-					/**
-					 * Regular expressions may contain commas and should not be divided by str_getcsv.
-					 * For regular expressions we are just using the complete expression as a parameter.
-					 */
-					if ($rulename !== 'regex') {
-						$parameters = str_getcsv(substr($rule, $colon + 1), ',', '"', "\\");
-					} else {
-						$parameters = [substr($rule, $colon + 1)];
-					}
-				}
-
-				// Exclude unsupported rules
-				$rule = is_numeric($colon) ? substr($rule, 0, $colon) : $rule;
-
-				// Store processed rule in Former's array
-				if (!isset($parameters)) {
-					$parameters = array();
-				}
-
-				$this->rules[$name][$rule] = $parameters;
-			}
-		}
-	}
-
-	/**
-	 * Switch the framework used by Former
-	 *
-	 * @param string $framework The name of the framework to use
-	 */
-	public function framework($framework = null)
-	{
-		if (!$framework) {
-			return $this->app['former.framework']->current();
-		}
-
-		$this->setOption('framework', $framework);
-
-		$framework = $this->getFrameworkInstance($framework);
-		$this->app->bind('former.framework', function ($app) use ($framework) {
-			return $framework;
-		});
-	}
-
-	/**
-	 * Get a new framework instance
-	 *
-	 * @param string $framework
-	 *
-	 * @throws Exceptions\InvalidFrameworkException
-	 * @return \Former\Interfaces\FrameworkInterface
-	 */
-	public function getFrameworkInstance($framework)
-	{
-		$formerClass = __NAMESPACE__.'\Framework\\'.$framework;
-
-		//get interfaces of the given framework
-		$interfaces = class_exists($framework) ? class_implements($framework) : array();
-
-		if(class_exists($formerClass)) {
-			$returnClass = $formerClass;
-		} elseif(class_exists($framework) && isset($interfaces['Former\Interfaces\FrameworkInterface'])) {
-			// We have some outside class, lets return it.
-			$returnClass = $framework;
-		} else {
-			throw (new InvalidFrameworkException())->setFramework($framework);
-		}
-
-		return new $returnClass($this->app);
-	}
-
-	/**
-	 * Get an option from the config
-	 *
-	 * @param string $option  The option
-	 * @param mixed  $default Optional fallback
-	 *
-	 * @return mixed
-	 */
-	public function getOption($option, $default = null)
-	{
-		return $this->app['config']->get('former.'.$option, $default);
-	}
-
-	/**
-	 * Set an option on the config
-	 *
-	 * @param string $option
-	 * @param string $value
-	 */
-	public function setOption($option, $value)
-	{
-		return $this->app['config']->set('former.'.$option, $value);
-	}
-
-	////////////////////////////////////////////////////////////////////
-	////////////////////////////// BUILDERS ////////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Closes a form
-	 *
-	 * @return string A form closing tag
-	 */
-	public function close()
-	{
-		if ($this->app->bound('former.form')) {
-			$closing = $this->app['former.form']->close();
-		}
-
-		// Destroy instances
-		$instances = array('former.form', 'former.form.framework');
-		foreach ($instances as $instance) {
-			$this->app[$instance] = null;
-			unset($this->app[$instance]);
-		}
-
-		// Reset populator
-		$this->app['former.populator']->reset();
-
-		// Reset all values
-		$this->errors = null;
-		$this->rules  = array();
-
-		return isset($closing) ? $closing : null;
-	}
-
-	////////////////////////////////////////////////////////////////////
-	////////////////////////////// HELPERS /////////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Get the errors for the current field
-	 *
-	 * @param  string $name A field name
-	 *
-	 * @return string       An error message
-	 */
-	public function getErrors($name = null)
-	{
-		// Get name and translate array notation
-		if (!$name and $this->app['former.field']) {
-			$name = $this->app['former.field']->getName();
-
-			// Always return empty string for anonymous fields (i.e. fields with no name/id)
-			if (!$name) {
-				return '';
-			}
-		}
-
-		if ($this->errors and $name) {
-			$name = str_replace(array('[', ']'), array('.', ''), $name);
-			$name = trim($name, '.');
-
-			return $this->errors->first($name);
-		}
-
-		return $this->errors;
-	}
-
-	/**
-	 * Get a rule from the Rules array
-	 *
-	 * @param  string $name The field to fetch
-	 *
-	 * @return array        An array of rules
-	 */
-	public function getRules($name)
-	{
-		// Check the rules for the name as given
-		$ruleset = Arr::get($this->rules, $name);
-
-		// If no rules found, convert to dot notation and try again
-		if (is_null($ruleset)) {
-			$name = str_replace(array('[', ']'), array('.', ''), $name);
-			$name = trim($name, '.');
-			$ruleset = Arr::get($this->rules, $name);
-		}
-
-		return $ruleset;
-	}
+    // Instances
+    ////////////////////////////////////////////////////////////////////
+
+
+    /**
+     * The current environment
+     *
+     * @var \Illuminate\Container\Container
+     */
+    protected $app;
+
+    /**
+     * The Method Dispatcher
+     *
+     * @var MethodDispatcher
+     */
+    protected $dispatch;
+
+    // Informations
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * The form's errors
+     *
+     * @var Message
+     */
+    protected $errors;
+
+    /**
+     * An array of rules to use
+     *
+     * @var array
+     */
+    protected $rules = array();
+
+    /**
+     * An array of field macros
+     *
+     * @var array
+     */
+    protected $macros = array();
+
+    /**
+     * The labels created so far
+     *
+     * @var array
+     */
+    public $labels = array();
+
+    /**
+     * The IDs created so far
+     *
+     * @var array
+     */
+    public $ids = array();
+
+    /**
+     * A lookup table where the key is the input name,
+     * and the value is number of times seen. This is
+     * used to calculate unique ids.
+     *
+     * @var array
+     */
+    public $names = array();
+
+    // Namespaces
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * The namespace of Form elements
+     */
+    const FORMSPACE = 'Former\Form\\';
+
+    /**
+     * The namespace of fields
+     */
+    const FIELDSPACE = 'Former\Form\Fields\\';
+
+    /**
+     * Build a new Former instance
+     *
+     * @param Container        $app
+     * @param MethodDispatcher $dispatcher
+     */
+    public function __construct(Container $app, MethodDispatcher $dispatcher)
+    {
+        $this->app      = $app;
+        $this->dispatch = $dispatcher;
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    //////////////////////////// INTERFACE /////////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Acts as a router that redirects methods to all of Former classes
+     *
+     * @param  string $method     The method called
+     * @param  array  $parameters An array of parameters
+     *
+     * @return mixed
+     */
+    public function __call($method, $parameters)
+    {
+        // Dispatch to Form\Elements
+        // Explicitly check false since closeGroup() may return an empty string
+        if (($element = $this->dispatch->toElements($method, $parameters)) !== false) {
+            return $element;
+        }
+
+        // Dispatch to Form\Form
+        if ($form = $this->dispatch->toForm($method, $parameters)) {
+            $this->app->instance('former.form', $form);
+
+            return $this->app['former.form'];
+        }
+
+        // Dispatch to Form\Group
+        if ($group = $this->dispatch->toGroup($method, $parameters)) {
+            return $group;
+        }
+
+        // Dispatch to Form\Actions
+        if ($actions = $this->dispatch->toActions($method, $parameters)) {
+            return $actions;
+        }
+
+        // Dispatch to macros
+        if ($macro = $this->dispatch->toMacros($method, $parameters)) {
+            return $macro;
+        }
+
+        // Checking for any supplementary classes
+        $modifiers = explode('_', $method);
+        $method  = array_pop($modifiers);
+
+        // Dispatch to the different Form\Fields
+        $field     = $this->dispatch->toFields($method, $parameters);
+        $field->setModifiers($modifiers);
+        $field->addClass('');
+
+        // Else bind field
+        $this->app->instance('former.field', $field);
+
+        return $this->app['former.field'];
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    //////////////////////////////// MACROS ////////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Register a macro with Former
+     *
+     * @param  string   $name  The name of the macro
+     * @param  Callable $macro The macro itself
+     *
+     * @return mixed
+     */
+    public function macro($name, $macro)
+    {
+        $this->macros[$name] = $macro;
+    }
+
+    /**
+     * Check if a macro exists
+     *
+     * @param  string $name
+     *
+     * @return boolean
+     */
+    public function hasMacro($name)
+    {
+        return isset($this->macros[$name]);
+    }
+
+    /**
+     * Get a registered macro
+     *
+     * @param  string $name
+     *
+     * @return Closure
+     */
+    public function getMacro($name)
+    {
+        return $this->macros[$name];
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ///////////////////////////// POPULATOR ////////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Add values to populate the array
+     *
+     * @param mixed $values Can be an Eloquent object or an array
+     */
+    public function populate($values)
+    {
+        $this->app['former.populator']->replace($values);
+    }
+
+    /**
+     * Set the value of a particular field
+     *
+     * @param string $field The field's name
+     * @param mixed  $value Its new value
+     */
+    public function populateField($field, $value)
+    {
+        $this->app['former.populator']->put($field, $value);
+    }
+
+    /**
+     * Get the value of a field
+     *
+     * @param string $field The field's name
+     * @param null   $fallback
+     *
+     * @return mixed
+     */
+    public function getValue($field, $fallback = null)
+    {
+        return $this->app['former.populator']->get($field, $fallback);
+    }
+
+    /**
+     * Fetch a field value from both the new and old POST array
+     *
+     * @param  string $name     A field name
+     * @param  string $fallback A fallback if nothing was found
+     *
+     * @return string           The results
+     */
+    public function getPost($name, $fallback = null)
+    {
+        $name     = str_replace(array('[', ']'), array('.', ''), $name ?? '');
+        $name     = trim($name, '.');
+        $oldValue = $this->app['request']->old($name, $fallback);
+
+        return $this->app['request']->input($name, $oldValue, true);
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ////////////////////////////// TOOLKIT /////////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Set the errors to use for validations
+     *
+     * @param Message $validator The result from a validation
+     *
+     * @return  void
+     */
+    public function withErrors($validator = null)
+    {
+        // Try to get the errors form the session
+        if ($this->app['session']->has('errors')) {
+            $this->errors = $this->app['session']->get('errors');
+        }
+
+        // If we're given a raw Validator, go fetch the errors in it
+        if ($validator instanceof Validator) {
+            $this->errors = $validator->getMessageBag();
+        } else {
+            if ($validator instanceof MessageBag) {
+                $this->errors = $validator;
+            }
+        }
+
+        return $this->errors;
+    }
+
+    /**
+     * Add live validation rules
+     *
+     * @param  array *$rules An array of Laravel rules
+     *
+     * @return  void
+     */
+    public function withRules()
+    {
+        $rules = call_user_func_array('array_merge', func_get_args());
+
+        // Parse the rules according to Laravel conventions
+        foreach ($rules as $name => $fieldRules) {
+            $expFieldRules = $fieldRules;
+            if (!is_array($expFieldRules)) {
+                if (is_object($expFieldRules)) {
+                    continue;
+                }
+
+                $expFieldRules = explode('|', $expFieldRules);
+                $expFieldRules = array_map('trim', $expFieldRules);
+            }
+
+            foreach ($expFieldRules as $rule) {
+                if (is_object($rule)) {
+                    continue;
+                }
+
+                $parameters = null;
+
+                if (($colon = strpos($rule, ':')) !== false) {
+                    $rulename = substr($rule, 0, $colon);
+
+                    /**
+                     * Regular expressions may contain commas and should not be divided by str_getcsv.
+                     * For regular expressions we are just using the complete expression as a parameter.
+                     */
+                    if ($rulename !== 'regex') {
+                        $parameters = str_getcsv(substr($rule, $colon + 1), ',', '"', "\\");
+                    } else {
+                        $parameters = [substr($rule, $colon + 1)];
+                    }
+                }
+
+                // Exclude unsupported rules
+                $rule = is_numeric($colon) ? substr($rule, 0, $colon) : $rule;
+
+                // Store processed rule in Former's array
+                if (!isset($parameters)) {
+                    $parameters = array();
+                }
+
+                $this->rules[$name][$rule] = $parameters;
+            }
+        }
+    }
+
+    /**
+     * Switch the framework used by Former
+     *
+     * @param string $framework The name of the framework to use
+     */
+    public function framework($framework = null)
+    {
+        if (!$framework) {
+            return $this->app['former.framework']->current();
+        }
+
+        $this->setOption('framework', $framework);
+
+        $framework = $this->getFrameworkInstance($framework);
+        $this->app->bind('former.framework', function ($app) use ($framework) {
+            return $framework;
+        });
+    }
+
+    /**
+     * Get a new framework instance
+     *
+     * @param string $framework
+     *
+     * @throws Exceptions\InvalidFrameworkException
+     * @return \Former\Interfaces\FrameworkInterface
+     */
+    public function getFrameworkInstance($framework)
+    {
+        $formerClass = __NAMESPACE__.'\Framework\\'.$framework;
+
+        //get interfaces of the given framework
+        $interfaces = class_exists($framework) ? class_implements($framework) : array();
+
+        if(class_exists($formerClass)) {
+            $returnClass = $formerClass;
+        } elseif(class_exists($framework) && isset($interfaces['Former\Interfaces\FrameworkInterface'])) {
+            // We have some outside class, lets return it.
+            $returnClass = $framework;
+        } else {
+            throw (new InvalidFrameworkException())->setFramework($framework);
+        }
+
+        return new $returnClass($this->app);
+    }
+
+    /**
+     * Get an option from the config
+     *
+     * @param string $option  The option
+     * @param mixed  $default Optional fallback
+     *
+     * @return mixed
+     */
+    public function getOption($option, $default = null)
+    {
+        return $this->app['config']->get('former.'.$option, $default);
+    }
+
+    /**
+     * Set an option on the config
+     *
+     * @param string $option
+     * @param string $value
+     */
+    public function setOption($option, $value)
+    {
+        return $this->app['config']->set('former.'.$option, $value);
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ////////////////////////////// BUILDERS ////////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Closes a form
+     *
+     * @return string A form closing tag
+     */
+    public function close()
+    {
+        if ($this->app->bound('former.form')) {
+            $closing = $this->app['former.form']->close();
+        }
+
+        // Destroy instances
+        $instances = array('former.form', 'former.form.framework');
+        foreach ($instances as $instance) {
+            $this->app[$instance] = null;
+            unset($this->app[$instance]);
+        }
+
+        // Reset populator
+        $this->app['former.populator']->reset();
+
+        // Reset all values
+        $this->errors = null;
+        $this->rules  = array();
+
+        return isset($closing) ? $closing : null;
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ////////////////////////////// HELPERS /////////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Get the errors for the current field
+     *
+     * @param  string $name A field name
+     *
+     * @return string       An error message
+     */
+    public function getErrors($name = null)
+    {
+        // Get name and translate array notation
+        if (!$name and $this->app['former.field']) {
+            $name = $this->app['former.field']->getName();
+
+            // Always return empty string for anonymous fields (i.e. fields with no name/id)
+            if (!$name) {
+                return '';
+            }
+        }
+
+        if ($this->errors and $name) {
+            $name = str_replace(array('[', ']'), array('.', ''), $name);
+            $name = trim($name, '.');
+
+            return $this->errors->first($name);
+        }
+
+        return $this->errors;
+    }
+
+    /**
+     * Get a rule from the Rules array
+     *
+     * @param  string $name The field to fetch
+     *
+     * @return array        An array of rules
+     */
+    public function getRules($name)
+    {
+        // Check the rules for the name as given
+        $ruleset = Arr::get($this->rules, $name);
+
+        // If no rules found, convert to dot notation and try again
+        if (is_null($ruleset)) {
+            $name = str_replace(array('[', ']'), array('.', ''), $name);
+            $name = trim($name, '.');
+            $ruleset = Arr::get($this->rules, $name);
+        }
+
+        return $ruleset;
+    }
 }

src/Former/Framework/TwitterBootstrap4.php

Spacing +1 added lines, -1 removed lines

@@ -139,7 +139,7 @@
 		$classes = array_intersect($classes, $this->fields);
 
 		// Prepend field type
-		$classes = array_map(function ($class) {
+		$classes = array_map(function($class) {
 			return Str::startsWith($class, 'col') ? $class : 'input-'.$class;
 		}, $classes);
 

Indentation +465 added lines, -465 removed lines

@@ -13,469 +13,469 @@
  */
 class TwitterBootstrap4 extends Framework implements FrameworkInterface
 {
-	/**
-	 * Form types that trigger special styling for this Framework
-	 *
-	 * @var array
-	 */
-	protected $availableTypes = array('horizontal', 'vertical', 'inline');
-
-	/**
-	 * The button types available
-	 *
-	 * @var array
-	 */
-	private $buttons = array(
-		'lg',
-		'sm',
-		'xs',
-		'block',
-		'link',
-		'primary',
-		'secondary',
-		'warning',
-		'danger',
-		'success',
-		'info',
-		'light',
-		'dark',
-	);
-
-	/**
-	 * The field sizes available
-	 *
-	 * @var array
-	 */
-	private $fields = array(
-		'lg',
-		'sm',
-		// 'col-xs-1', 'col-xs-2', 'col-xs-3', 'col-xs-4', 'col-xs-5', 'col-xs-6',
-		// 'col-xs-7', 'col-xs-8', 'col-xs-9', 'col-xs-10', 'col-xs-11', 'col-xs-12',
-		// 'col-sm-1', 'col-sm-2', 'col-sm-3', 'col-sm-4', 'col-sm-5', 'col-sm-6',
-		// 'col-sm-7', 'col-sm-8', 'col-sm-9', 'col-sm-10', 'col-sm-11', 'col-sm-12',
-		// 'col-md-1', 'col-md-2', 'col-md-3', 'col-md-4', 'col-md-5', 'col-md-6',
-		// 'col-md-7', 'col-md-8', 'col-md-9', 'col-md-10', 'col-md-11', 'col-md-12',
-		// 'col-lg-1', 'col-lg-2', 'col-lg-3', 'col-lg-4', 'col-lg-5', 'col-lg-6',
-		// 'col-lg-7', 'col-lg-8', 'col-lg-9', 'col-lg-10', 'col-lg-11', 'col-lg-12',
-	);
-
-	/**
-	 * The field states available
-	 *
-	 * @var array
-	 */
-	protected $states = array(
-		'is-invalid',
-	);
-
-	/**
-	 * The default HTML tag used for icons
-	 *
-	 * @var string
-	 */
-	protected $iconTag = 'i';
-
-	/**
-	 * The default set for icon fonts
-	 * By default Bootstrap 4 offers no fonts, but we'll add Font Awesome
-	 *
-	 * @var string
-	 */
-	protected $iconSet = 'fa';
-
-	/**
-	 * The default prefix icon names
-	 * Using Font Awesome 5, this can be 'fa' or 'fas' for solid, 'far' for regular
-	 *
-	 * @var string
-	 */
-	protected $iconPrefix = 'fa';
-
-	/**
-	 * Create a new TwitterBootstrap instance
-	 *
-	 * @param \Illuminate\Container\Container $app
-	 */
-	public function __construct(Container $app)
-	{
-		$this->app = $app;
-		$this->setFrameworkDefaults();
-	}
-
-	////////////////////////////////////////////////////////////////////
-	/////////////////////////// FILTER ARRAYS //////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Filter buttons classes
-	 *
-	 * @param  array $classes An array of classes
-	 *
-	 * @return string[] A filtered array
-	 */
-	public function filterButtonClasses($classes)
-	{
-		// Filter classes
-		// $classes = array_intersect($classes, $this->buttons);
-
-		// Prepend button type
-		$classes   = $this->prependWith($classes, 'btn-');
-		$classes[] = 'btn';
-
-		return $classes;
-	}
-
-	/**
-	 * Filter field classes
-	 *
-	 * @param  array $classes An array of classes
-	 *
-	 * @return array A filtered array
-	 */
-	public function filterFieldClasses($classes)
-	{
-		// Filter classes
-		$classes = array_intersect($classes, $this->fields);
-
-		// Prepend field type
-		$classes = array_map(function ($class) {
-			return Str::startsWith($class, 'col') ? $class : 'input-'.$class;
-		}, $classes);
-
-		return $classes;
-	}
-
-	////////////////////////////////////////////////////////////////////
-	///////////////////// EXPOSE FRAMEWORK SPECIFICS ///////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Framework error state
-	 *
-	 * @return string
-	 */
-	public function errorState()
-	{
-		return 'is-invalid';
-	}
-
-	/**
-	 * Returns corresponding inline class of a field
-	 *
-	 * @param Field $field
-	 *
-	 * @return string
-	 */
-	public function getInlineLabelClass($field)
-	{
-		$inlineClass = parent::getInlineLabelClass($field);
-		if ($field->isOfType('checkbox', 'checkboxes', 'radio', 'radios')) {
-			$inlineClass = 'form-check-label';
-		}
-
-		return $inlineClass;
-	}
-
-	/**
-	 * Set the fields width from a label width
-	 *
-	 * @param array $labelWidths
-	 */
-	protected function setFieldWidths($labelWidths)
-	{
-		$labelWidthClass = $fieldWidthClass = $fieldOffsetClass = '';
-
-		$viewports = $this->getFrameworkOption('viewports');
-		foreach ($labelWidths as $viewport => $columns) {
-			if ($viewport) {
-				$labelWidthClass .= " col-$viewports[$viewport]-$columns";
-				$fieldWidthClass .= " col-$viewports[$viewport]-".(12 - $columns);
-				$fieldOffsetClass .= " col-$viewports[$viewport]-offset-$columns";
-			}
-		}
-
-		$this->labelWidth  = ltrim($labelWidthClass);
-		$this->fieldWidth  = ltrim($fieldWidthClass);
-		$this->fieldOffset = ltrim($fieldOffsetClass);
-	}
-
-	////////////////////////////////////////////////////////////////////
-	///////////////////////////// ADD CLASSES //////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Add classes to a field
-	 *
-	 * @param Field $field
-	 * @param array $classes The possible classes to add
-	 *
-	 * @return Field
-	 */
-	public function getFieldClasses(Field $field, $classes)
-	{
-		// Add inline class for checkables
-		if ($field->isCheckable()) {
-			// Adds correct checkbox input class when is a checkbox (or radio)
-			$field->addClass('form-check-input');
-			$classes[] = 'form-check';
-
-			if (in_array('inline', $classes)) {
-				$field->inline();
-			}
-		}
-
-		// Filter classes according to field type
-		if ($field->isButton()) {
-			$classes = $this->filterButtonClasses($classes);
-		} else {
-			$classes = $this->filterFieldClasses($classes);
-		}
-
-		// Add form-control class for text-type, textarea and select fields
-		// As text-type is open-ended we instead exclude those that shouldn't receive the class
-		if (!$field->isCheckable() and !$field->isButton() and !in_array($field->getType(), array(
-					'file',
-					'plaintext',
-				)) and !in_array('form-control', $classes)
-		) {
-			$classes[] = 'form-control';
-		}
-
-		if ($this->app['former']->getErrors($field->getName())) {
-			$classes[] = $this->errorState();
-		}
-
-		return $this->addClassesToField($field, $classes);
-	}
-
-	/**
-	 * Add group classes
-	 *
-	 * @return string A list of group classes
-	 */
-	public function getGroupClasses()
-	{
-		if ($this->app['former.form']->isOfType('horizontal')) {
-			return 'form-group row';
-		} else {
-			return 'form-group';
-		}
-	}
-
-	/**
-	 * Add label classes
-	 *
-	 * @return string[] An array of attributes with the label class
-	 */
-	public function getLabelClasses()
-	{
-		if ($this->app['former.form']->isOfType('horizontal')) {
-			return array('col-form-label', $this->labelWidth);
-		} elseif ($this->app['former.form']->isOfType('inline')) {
-			return array('sr-only');
-		} else {
-			return array('col-form-label');
-		}
-	}
-
-	/**
-	 * Add uneditable field classes
-	 *
-	 * @return string An array of attributes with the uneditable class
-	 */
-	public function getUneditableClasses()
-	{
-		return '';
-	}
-
-	/**
-	 * Add plain text field classes
-	 *
-	 * @return string An array of attributes with the plain text class
-	 */
-	public function getPlainTextClasses()
-	{
-		return 'form-control-plaintext';
-	}
-
-	/**
-	 * Add form class
-	 *
-	 * @param  string $type The type of form to add
-	 *
-	 * @return string|null
-	 */
-	public function getFormClasses($type)
-	{
-		return $type ? 'form-'.$type : null;
-	}
-
-	/**
-	 * Add actions block class
-	 *
-	 * @return string|null
-	 */
-	public function getActionClasses()
-	{
-		if ($this->app['former.form']->isOfType('horizontal') || $this->app['former.form']->isOfType('inline')) {
-			return 'form-group row';
-		}
-
-		return null;
-	}
-
-	////////////////////////////////////////////////////////////////////
-	//////////////////////////// RENDER BLOCKS /////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Render an help text
-	 *
-	 * @param string $text
-	 * @param array  $attributes
-	 *
-	 * @return Element
-	 */
-	public function createHelp($text, $attributes = array())
-	{
-		return Element::create('small', $text, $attributes)->addClass('text-muted');
-	}
-
-	/**
-	 * Render an validation error text
-	 *
-	 * @param string $text
-	 * @param array  $attributes
-	 *
-	 * @return string
-	 */
-	public function createValidationError($text, $attributes = array())
-	{
-		return Element::create('div', $text, $attributes)->addClass('invalid-feedback');
-	}
-
-	/**
-	 * Render an help text
-	 *
-	 * @param string $text
-	 * @param array  $attributes
-	 *
-	 * @return Element
-	 */
-	public function createBlockHelp($text, $attributes = array())
-	{
-		return Element::create('small', $text, $attributes)->addClass('form-text text-muted');
-	}
-
-	/**
-	 * Render a disabled field
-	 *
-	 * @param Field $field
-	 *
-	 * @return Element
-	 */
-	public function createDisabledField(Field $field)
-	{
-		return Element::create('span', $field->getValue(), $field->getAttributes());
-	}
-
-	/**
-	 * Render a plain text field
-	 *
-	 * @param Field $field
-	 *
-	 * @return Element
-	 */
-	public function createPlainTextField(Field $field)
-	{
-		$label = $field->getLabel();
-		if ($label) {
-			$label->for('');
-		}
-
-		return Element::create('div', $field->getValue(), $field->getAttributes());
-	}
-
-	////////////////////////////////////////////////////////////////////
-	//////////////////////////// WRAP BLOCKS ///////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Wrap an item to be prepended or appended to the current field
-	 *
-	 * @return Element A wrapped item
-	 */
-	public function placeAround($item, $place = null)
-	{
-		// Render object
-		if (is_object($item) and method_exists($item, '__toString')) {
-			$item = $item->__toString();
-		}
-
-		$items = (array) $item;
-		$element = '';
-		foreach ($items as $item) {
-			$hasButtonTag = strpos(ltrim($item), '<button') === 0;
-
-			// Get class to use
-			$class = $hasButtonTag ? '' : 'input-group-text';
-
-			$element .= $hasButtonTag ? $item : Element::create('span', $item)->addClass($class);
-		}
-
-		return Element::create('div', $element)->addClass('input-group-'.$place);
-	}
-
-	/**
-	 * Wrap a field with prepended and appended items
-	 *
-	 * @param  Field $field
-	 * @param  array $prepend
-	 * @param  array $append
-	 *
-	 * @return string A field concatented with prepended and/or appended items
-	 */
-	public function prependAppend($field, $prepend, $append)
-	{
-		$return = '<div class="input-group">';
-		$return .= implode('', $prepend);
-		$return .= $field->render();
-		$return .= implode('', $append);
-		$return .= '</div>';
-
-		return $return;
-	}
-
-	/**
-	 * Wrap a field with potential additional tags
-	 *
-	 * @param  Field $field
-	 *
-	 * @return Element A wrapped field
-	 */
-	public function wrapField($field)
-	{
-		if ($this->app['former.form']->isOfType('horizontal')) {
-			return Element::create('div', $field)->addClass($this->fieldWidth);
-		}
-
-		return $field;
-	}
-
-	/**
-	 * Wrap actions block with potential additional tags
-	 *
-	 * @param  Actions $actions
-	 *
-	 * @return string A wrapped actions block
-	 */
-	public function wrapActions($actions)
-	{
-		// For horizontal forms, we wrap the actions in a div
-		if ($this->app['former.form']->isOfType('horizontal')) {
-			return Element::create('div', $actions)->addClass(array($this->fieldOffset, $this->fieldWidth));
-		}
-
-		return $actions;
-	}
+    /**
+     * Form types that trigger special styling for this Framework
+     *
+     * @var array
+     */
+    protected $availableTypes = array('horizontal', 'vertical', 'inline');
+
+    /**
+     * The button types available
+     *
+     * @var array
+     */
+    private $buttons = array(
+        'lg',
+        'sm',
+        'xs',
+        'block',
+        'link',
+        'primary',
+        'secondary',
+        'warning',
+        'danger',
+        'success',
+        'info',
+        'light',
+        'dark',
+    );
+
+    /**
+     * The field sizes available
+     *
+     * @var array
+     */
+    private $fields = array(
+        'lg',
+        'sm',
+        // 'col-xs-1', 'col-xs-2', 'col-xs-3', 'col-xs-4', 'col-xs-5', 'col-xs-6',
+        // 'col-xs-7', 'col-xs-8', 'col-xs-9', 'col-xs-10', 'col-xs-11', 'col-xs-12',
+        // 'col-sm-1', 'col-sm-2', 'col-sm-3', 'col-sm-4', 'col-sm-5', 'col-sm-6',
+        // 'col-sm-7', 'col-sm-8', 'col-sm-9', 'col-sm-10', 'col-sm-11', 'col-sm-12',
+        // 'col-md-1', 'col-md-2', 'col-md-3', 'col-md-4', 'col-md-5', 'col-md-6',
+        // 'col-md-7', 'col-md-8', 'col-md-9', 'col-md-10', 'col-md-11', 'col-md-12',
+        // 'col-lg-1', 'col-lg-2', 'col-lg-3', 'col-lg-4', 'col-lg-5', 'col-lg-6',
+        // 'col-lg-7', 'col-lg-8', 'col-lg-9', 'col-lg-10', 'col-lg-11', 'col-lg-12',
+    );
+
+    /**
+     * The field states available
+     *
+     * @var array
+     */
+    protected $states = array(
+        'is-invalid',
+    );
+
+    /**
+     * The default HTML tag used for icons
+     *
+     * @var string
+     */
+    protected $iconTag = 'i';
+
+    /**
+     * The default set for icon fonts
+     * By default Bootstrap 4 offers no fonts, but we'll add Font Awesome
+     *
+     * @var string
+     */
+    protected $iconSet = 'fa';
+
+    /**
+     * The default prefix icon names
+     * Using Font Awesome 5, this can be 'fa' or 'fas' for solid, 'far' for regular
+     *
+     * @var string
+     */
+    protected $iconPrefix = 'fa';
+
+    /**
+     * Create a new TwitterBootstrap instance
+     *
+     * @param \Illuminate\Container\Container $app
+     */
+    public function __construct(Container $app)
+    {
+        $this->app = $app;
+        $this->setFrameworkDefaults();
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    /////////////////////////// FILTER ARRAYS //////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Filter buttons classes
+     *
+     * @param  array $classes An array of classes
+     *
+     * @return string[] A filtered array
+     */
+    public function filterButtonClasses($classes)
+    {
+        // Filter classes
+        // $classes = array_intersect($classes, $this->buttons);
+
+        // Prepend button type
+        $classes   = $this->prependWith($classes, 'btn-');
+        $classes[] = 'btn';
+
+        return $classes;
+    }
+
+    /**
+     * Filter field classes
+     *
+     * @param  array $classes An array of classes
+     *
+     * @return array A filtered array
+     */
+    public function filterFieldClasses($classes)
+    {
+        // Filter classes
+        $classes = array_intersect($classes, $this->fields);
+
+        // Prepend field type
+        $classes = array_map(function ($class) {
+            return Str::startsWith($class, 'col') ? $class : 'input-'.$class;
+        }, $classes);
+
+        return $classes;
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ///////////////////// EXPOSE FRAMEWORK SPECIFICS ///////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Framework error state
+     *
+     * @return string
+     */
+    public function errorState()
+    {
+        return 'is-invalid';
+    }
+
+    /**
+     * Returns corresponding inline class of a field
+     *
+     * @param Field $field
+     *
+     * @return string
+     */
+    public function getInlineLabelClass($field)
+    {
+        $inlineClass = parent::getInlineLabelClass($field);
+        if ($field->isOfType('checkbox', 'checkboxes', 'radio', 'radios')) {
+            $inlineClass = 'form-check-label';
+        }
+
+        return $inlineClass;
+    }
+
+    /**
+     * Set the fields width from a label width
+     *
+     * @param array $labelWidths
+     */
+    protected function setFieldWidths($labelWidths)
+    {
+        $labelWidthClass = $fieldWidthClass = $fieldOffsetClass = '';
+
+        $viewports = $this->getFrameworkOption('viewports');
+        foreach ($labelWidths as $viewport => $columns) {
+            if ($viewport) {
+                $labelWidthClass .= " col-$viewports[$viewport]-$columns";
+                $fieldWidthClass .= " col-$viewports[$viewport]-".(12 - $columns);
+                $fieldOffsetClass .= " col-$viewports[$viewport]-offset-$columns";
+            }
+        }
+
+        $this->labelWidth  = ltrim($labelWidthClass);
+        $this->fieldWidth  = ltrim($fieldWidthClass);
+        $this->fieldOffset = ltrim($fieldOffsetClass);
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ///////////////////////////// ADD CLASSES //////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Add classes to a field
+     *
+     * @param Field $field
+     * @param array $classes The possible classes to add
+     *
+     * @return Field
+     */
+    public function getFieldClasses(Field $field, $classes)
+    {
+        // Add inline class for checkables
+        if ($field->isCheckable()) {
+            // Adds correct checkbox input class when is a checkbox (or radio)
+            $field->addClass('form-check-input');
+            $classes[] = 'form-check';
+
+            if (in_array('inline', $classes)) {
+                $field->inline();
+            }
+        }
+
+        // Filter classes according to field type
+        if ($field->isButton()) {
+            $classes = $this->filterButtonClasses($classes);
+        } else {
+            $classes = $this->filterFieldClasses($classes);
+        }
+
+        // Add form-control class for text-type, textarea and select fields
+        // As text-type is open-ended we instead exclude those that shouldn't receive the class
+        if (!$field->isCheckable() and !$field->isButton() and !in_array($field->getType(), array(
+                    'file',
+                    'plaintext',
+                )) and !in_array('form-control', $classes)
+        ) {
+            $classes[] = 'form-control';
+        }
+
+        if ($this->app['former']->getErrors($field->getName())) {
+            $classes[] = $this->errorState();
+        }
+
+        return $this->addClassesToField($field, $classes);
+    }
+
+    /**
+     * Add group classes
+     *
+     * @return string A list of group classes
+     */
+    public function getGroupClasses()
+    {
+        if ($this->app['former.form']->isOfType('horizontal')) {
+            return 'form-group row';
+        } else {
+            return 'form-group';
+        }
+    }
+
+    /**
+     * Add label classes
+     *
+     * @return string[] An array of attributes with the label class
+     */
+    public function getLabelClasses()
+    {
+        if ($this->app['former.form']->isOfType('horizontal')) {
+            return array('col-form-label', $this->labelWidth);
+        } elseif ($this->app['former.form']->isOfType('inline')) {
+            return array('sr-only');
+        } else {
+            return array('col-form-label');
+        }
+    }
+
+    /**
+     * Add uneditable field classes
+     *
+     * @return string An array of attributes with the uneditable class
+     */
+    public function getUneditableClasses()
+    {
+        return '';
+    }
+
+    /**
+     * Add plain text field classes
+     *
+     * @return string An array of attributes with the plain text class
+     */
+    public function getPlainTextClasses()
+    {
+        return 'form-control-plaintext';
+    }
+
+    /**
+     * Add form class
+     *
+     * @param  string $type The type of form to add
+     *
+     * @return string|null
+     */
+    public function getFormClasses($type)
+    {
+        return $type ? 'form-'.$type : null;
+    }
+
+    /**
+     * Add actions block class
+     *
+     * @return string|null
+     */
+    public function getActionClasses()
+    {
+        if ($this->app['former.form']->isOfType('horizontal') || $this->app['former.form']->isOfType('inline')) {
+            return 'form-group row';
+        }
+
+        return null;
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    //////////////////////////// RENDER BLOCKS /////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Render an help text
+     *
+     * @param string $text
+     * @param array  $attributes
+     *
+     * @return Element
+     */
+    public function createHelp($text, $attributes = array())
+    {
+        return Element::create('small', $text, $attributes)->addClass('text-muted');
+    }
+
+    /**
+     * Render an validation error text
+     *
+     * @param string $text
+     * @param array  $attributes
+     *
+     * @return string
+     */
+    public function createValidationError($text, $attributes = array())
+    {
+        return Element::create('div', $text, $attributes)->addClass('invalid-feedback');
+    }
+
+    /**
+     * Render an help text
+     *
+     * @param string $text
+     * @param array  $attributes
+     *
+     * @return Element
+     */
+    public function createBlockHelp($text, $attributes = array())
+    {
+        return Element::create('small', $text, $attributes)->addClass('form-text text-muted');
+    }
+
+    /**
+     * Render a disabled field
+     *
+     * @param Field $field
+     *
+     * @return Element
+     */
+    public function createDisabledField(Field $field)
+    {
+        return Element::create('span', $field->getValue(), $field->getAttributes());
+    }
+
+    /**
+     * Render a plain text field
+     *
+     * @param Field $field
+     *
+     * @return Element
+     */
+    public function createPlainTextField(Field $field)
+    {
+        $label = $field->getLabel();
+        if ($label) {
+            $label->for('');
+        }
+
+        return Element::create('div', $field->getValue(), $field->getAttributes());
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    //////////////////////////// WRAP BLOCKS ///////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Wrap an item to be prepended or appended to the current field
+     *
+     * @return Element A wrapped item
+     */
+    public function placeAround($item, $place = null)
+    {
+        // Render object
+        if (is_object($item) and method_exists($item, '__toString')) {
+            $item = $item->__toString();
+        }
+
+        $items = (array) $item;
+        $element = '';
+        foreach ($items as $item) {
+            $hasButtonTag = strpos(ltrim($item), '<button') === 0;
+
+            // Get class to use
+            $class = $hasButtonTag ? '' : 'input-group-text';
+
+            $element .= $hasButtonTag ? $item : Element::create('span', $item)->addClass($class);
+        }
+
+        return Element::create('div', $element)->addClass('input-group-'.$place);
+    }
+
+    /**
+     * Wrap a field with prepended and appended items
+     *
+     * @param  Field $field
+     * @param  array $prepend
+     * @param  array $append
+     *
+     * @return string A field concatented with prepended and/or appended items
+     */
+    public function prependAppend($field, $prepend, $append)
+    {
+        $return = '<div class="input-group">';
+        $return .= implode('', $prepend);
+        $return .= $field->render();
+        $return .= implode('', $append);
+        $return .= '</div>';
+
+        return $return;
+    }
+
+    /**
+     * Wrap a field with potential additional tags
+     *
+     * @param  Field $field
+     *
+     * @return Element A wrapped field
+     */
+    public function wrapField($field)
+    {
+        if ($this->app['former.form']->isOfType('horizontal')) {
+            return Element::create('div', $field)->addClass($this->fieldWidth);
+        }
+
+        return $field;
+    }
+
+    /**
+     * Wrap actions block with potential additional tags
+     *
+     * @param  Actions $actions
+     *
+     * @return string A wrapped actions block
+     */
+    public function wrapActions($actions)
+    {
+        // For horizontal forms, we wrap the actions in a div
+        if ($this->app['former.form']->isOfType('horizontal')) {
+            return Element::create('div', $actions)->addClass(array($this->fieldOffset, $this->fieldWidth));
+        }
+
+        return $actions;
+    }
 }

src/Former/Populator.php

Indentation +167 added lines, -167 removed lines

@@ -11,171 +11,171 @@
  */
 class Populator extends Collection
 {
-	/**
-	 * Create a new collection.
-	 *
-	 * @param  array|Model $items
-	 *
-	 * @return void
-	 */
-	public function __construct($items = array())
-	{
-		$this->items = $items;
-	}
-
-	////////////////////////////////////////////////////////////////////
-	///////////////////////// INDIVIDUAL VALUES ////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Get the value of a field
-	 *
-	 * @param string $field The field's name
-	 *
-	 * @return mixed
-	 */
-	public function get($field, $fallback = null)
-	{
-		// Anonymous fields should not return any value
-		if ($field == null) {
-			return null;
-		}
-
-		// Plain array
-		if (is_array($this->items) and !Str::contains($field, '[')) {
-			return parent::get($field, $fallback);
-		}
-
-		// Transform the name into an array
-		$value = $this->items;
-		$field = $this->parseFieldAsArray($field);
-
-		// Dive into the model
-		foreach ($field as $relationship) {
-
-			// Get attribute from model
-			if (!is_array($value)) {
-				$value = $this->getAttributeFromModel($value, $relationship, $fallback);
-
-				continue;
-			}
-
-			// Get attribute from model
-			if (array_key_exists($relationship, $value)) {
-				$value = $value[$relationship];
-			} else {
-				// Check array for submodels that may contain the relationship
-				$inSubmodel = false;
-
-				foreach ($value as $key => $submodel) {
-					$value[$key] = $this->getAttributeFromModel($submodel, $relationship, $fallback);
-
-					if ($value[$key] !== $fallback) {
-						$inSubmodel = true;
-					}
-				}
-
-				// If no submodels contained the relationship, return the fallback, not an array of fallbacks
-				if (!$inSubmodel) {
-					$value = $fallback;
-					break;
-				}
-			}
-		}
-
-		return $value;
-	}
-
-	////////////////////////////////////////////////////////////////////
-	///////////////////////////// SWAPPERS /////////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Replace the items
-	 *
-	 * @param  mixed $items
-	 *
-	 * @return void
-	 */
-	public function replace($items)
-	{
-		$this->items = $items;
-	}
-
-	/**
-	 * Reset the current values array
-	 *
-	 * @return void
-	 */
-	public function reset()
-	{
-		$this->items = array();
-	}
-
-	////////////////////////////////////////////////////////////////////
-	////////////////////////////// HELPERS /////////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Parses the name of a field to a tree of fields
-	 *
-	 * @param string $field The field's name
-	 *
-	 * @return array A tree of field
-	 */
-	protected function parseFieldAsArray($field)
-	{
-		if (Str::contains($field, '[]')) {
-			return (array) $field;
-		}
-
-		// Transform array notation to dot notation
-		if (Str::contains($field, '[')) {
-			$field = preg_replace("/[\[\]]/", '.', $field);
-			$field = str_replace('..', '.', $field);
-			$field = trim($field, '.');
-		}
-
-		// Parse dot notation
-		if (Str::contains($field, '.')) {
-			$field = explode('.', $field);
-		} else {
-			$field = (array) $field;
-		}
-
-		return $field;
-	}
-
-	/**
-	 * Get an attribute from a model
-	 *
-	 * @param object $model     The model
-	 * @param string $attribute The attribute's name
-	 * @param string $fallback  Fallback value
-	 *
-	 * @return mixed
-	 */
-	public function getAttributeFromModel($model, $attribute, $fallback)
-	{
-		if ($model instanceof Model) {
-			// Return fallback if attribute is null
-			$value = $model->getAttribute($attribute);
-			return is_null($value) ? $fallback : $value;
-		}
-
-		if ($model instanceof Collection) {
-			return $model->get($attribute, $fallback);
-		}
-
-		if (is_object($model) && method_exists($model, 'toArray')) {
-			$model = $model->toArray();
-		} else {
-			$model = (array) $model;
-		}
-		if (array_key_exists($attribute, $model)) {
-			return $model[$attribute];
-		}
-
-		return $fallback;
-	}
+    /**
+     * Create a new collection.
+     *
+     * @param  array|Model $items
+     *
+     * @return void
+     */
+    public function __construct($items = array())
+    {
+        $this->items = $items;
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ///////////////////////// INDIVIDUAL VALUES ////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Get the value of a field
+     *
+     * @param string $field The field's name
+     *
+     * @return mixed
+     */
+    public function get($field, $fallback = null)
+    {
+        // Anonymous fields should not return any value
+        if ($field == null) {
+            return null;
+        }
+
+        // Plain array
+        if (is_array($this->items) and !Str::contains($field, '[')) {
+            return parent::get($field, $fallback);
+        }
+
+        // Transform the name into an array
+        $value = $this->items;
+        $field = $this->parseFieldAsArray($field);
+
+        // Dive into the model
+        foreach ($field as $relationship) {
+
+            // Get attribute from model
+            if (!is_array($value)) {
+                $value = $this->getAttributeFromModel($value, $relationship, $fallback);
+
+                continue;
+            }
+
+            // Get attribute from model
+            if (array_key_exists($relationship, $value)) {
+                $value = $value[$relationship];
+            } else {
+                // Check array for submodels that may contain the relationship
+                $inSubmodel = false;
+
+                foreach ($value as $key => $submodel) {
+                    $value[$key] = $this->getAttributeFromModel($submodel, $relationship, $fallback);
+
+                    if ($value[$key] !== $fallback) {
+                        $inSubmodel = true;
+                    }
+                }
+
+                // If no submodels contained the relationship, return the fallback, not an array of fallbacks
+                if (!$inSubmodel) {
+                    $value = $fallback;
+                    break;
+                }
+            }
+        }
+
+        return $value;
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ///////////////////////////// SWAPPERS /////////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Replace the items
+     *
+     * @param  mixed $items
+     *
+     * @return void
+     */
+    public function replace($items)
+    {
+        $this->items = $items;
+    }
+
+    /**
+     * Reset the current values array
+     *
+     * @return void
+     */
+    public function reset()
+    {
+        $this->items = array();
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ////////////////////////////// HELPERS /////////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Parses the name of a field to a tree of fields
+     *
+     * @param string $field The field's name
+     *
+     * @return array A tree of field
+     */
+    protected function parseFieldAsArray($field)
+    {
+        if (Str::contains($field, '[]')) {
+            return (array) $field;
+        }
+
+        // Transform array notation to dot notation
+        if (Str::contains($field, '[')) {
+            $field = preg_replace("/[\[\]]/", '.', $field);
+            $field = str_replace('..', '.', $field);
+            $field = trim($field, '.');
+        }
+
+        // Parse dot notation
+        if (Str::contains($field, '.')) {
+            $field = explode('.', $field);
+        } else {
+            $field = (array) $field;
+        }
+
+        return $field;
+    }
+
+    /**
+     * Get an attribute from a model
+     *
+     * @param object $model     The model
+     * @param string $attribute The attribute's name
+     * @param string $fallback  Fallback value
+     *
+     * @return mixed
+     */
+    public function getAttributeFromModel($model, $attribute, $fallback)
+    {
+        if ($model instanceof Model) {
+            // Return fallback if attribute is null
+            $value = $model->getAttribute($attribute);
+            return is_null($value) ? $fallback : $value;
+        }
+
+        if ($model instanceof Collection) {
+            return $model->get($attribute, $fallback);
+        }
+
+        if (is_object($model) && method_exists($model, 'toArray')) {
+            $model = $model->toArray();
+        } else {
+            $model = (array) $model;
+        }
+        if (array_key_exists($attribute, $model)) {
+            return $model[$attribute];
+        }
+
+        return $fallback;
+    }
 }