formers / former

src/Former/Former.php

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/Form/Group.php

Indentation +551 added lines, -551 removed lines

@@ -14,555 +14,555 @@
  */
 class Group extends Tag
 {
-	/**
-	 * The Container
-	 *
-	 * @var Container
-	 */
-	protected $app;
-
-	/**
-	 * The current state of the group
-	 *
-	 * @var string
-	 */
-	protected $state = null;
-
-	/**
-	 * Whether the field should be displayed raw or not
-	 *
-	 * @var boolean
-	 */
-	protected $raw = false;
-
-	/**
-	 * The group label
-	 *
-	 * @var Element
-	 */
-	protected $label;
-
-	/**
-	 * The group help
-	 *
-	 * @var array
-	 */
-	protected $help = array();
-
-	/**
-	 * An array of elements to preprend the field
-	 *
-	 * @var array
-	 */
-	protected $prepend = array();
-
-	/**
-	 * An array of elements to append the field
-	 *
-	 * @var array
-	 */
-	protected $append = array();
-
-	/**
-	 * The field validations to be checked for errors
-	 *
-	 * @var array
-	 */
-	protected $validations = array();
-
-	/**
-	 * The group's element
-	 *
-	 * @var string
-	 */
-	protected $element = 'div';
-
-	/**
-	 * Whether a custom group is opened or not
-	 *
-	 * @var boolean
-	 */
-	public static $opened = false;
-
-	/**
-	 * The custom group that is open
-	 *
-	 * @var Former\Form\Group
-	 */
-	public static $openGroup = null;
-
-	////////////////////////////////////////////////////////////////////
-	/////////////////////////// CORE METHODS ///////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Creates a group
-	 *
-	 * @param string $label Its label
-	 */
-	public function __construct(Container $app, $label, $validations = null)
-	{
-		// Get special classes
-		$this->app = $app;
-		$this->addClass($this->app['former.framework']->getGroupClasses());
-
-		// Invisible if Nude
-		if ($this->app['former.framework']->is('Nude')) {
-			$this->element = '';
-		}
-
-		// Set group label
-		if ($label) {
-			$this->setLabel($label);
-		}
-
-		// Set validations used to override groups own conclusions
-		$this->validations = (array) $validations;
-	}
-
-	/**
-	 * Prints out the opening of the Control Group
-	 *
-	 * @return string A control group opening tag
-	 */
-	public function __toString()
-	{
-		return $this->open().$this->getFormattedLabel();
-	}
-
-	/**
-	 * Opens a group
-	 *
-	 * @return string Opening tag
-	 */
-	public function open()
-	{
-		if ($this->getErrors()) {
-			$this->state($this->app['former.framework']->errorState());
-		}
-
-		// Retrieve state and append it to classes
-		if ($this->state) {
-			$this->addClass($this->state);
-		}
-
-		// Required state
-		if ($this->app->bound('former.field') and $this->app['former.field']->isRequired()) {
-			$this->addClass($this->app['former']->getOption('required_class'));
-		}
-
-		return parent::open();
-	}
-
-	/**
-	 * Set the contents of the current group
-	 *
-	 * @param string $contents The group contents
-	 *
-	 * @return string A group
-	 */
-	public function contents($contents)
-	{
-		return $this->wrap($contents, $this->getFormattedLabel());
-	}
-
-	/**
-	 * Wrap a Field with the current group
-	 *
-	 * @param  \Former\Traits\Field $field A Field instance
-	 *
-	 * @return string        A group
-	 */
-	public function wrapField($field)
-	{
-		$label = $this->getLabel($field);
-		$help = $this->getHelp();
-		if ($field->isCheckable() &&
-			in_array($this->app['former']->framework(), ['TwitterBootstrap4', 'TwitterBootstrap5'])
-		) {
-			$wrapperClass = null;
-			if ($this->app['former']->framework() === 'TwitterBootstrap4') {
-				$wrapperClass = $field->isInline() ? 'form-check form-check-inline' : 'form-check';
-			}
-			if ($this->app['former']->getErrors($field->getName())) {
-				$hiddenInput = Input::create('hidden')->addClass('form-check-input is-invalid');
-				$help = $hiddenInput.$help;
-			}
-			$help = $help ? Element::create('div', $help)->addClass($wrapperClass) : '';
-		}
-		$withFloatingLabel = $field->withFloatingLabel();
-
-		$field = $this->prependAppend($field);
-		$field .= $help;
-
-		if ($withFloatingLabel &&
-			$this->app['former']->framework() === 'TwitterBootstrap5'
-		) {
-			return $this->wrapWithFloatingLabel($field, $label);
-		}
-
-		return $this->wrap($field, $label);
-	}
-
-	////////////////////////////////////////////////////////////////////
-	//////////////////////////// FIELD METHODS /////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Set the state of the group
-	 *
-	 * @param  string $state A Bootstrap state class
-	 */
-	public function state($state)
-	{
-		// Filter state
-		$state = $this->app['former.framework']->filterState($state);
-
-		$this->state = $state;
-	}
-
-	/**
-	 * Set a class on the Group
-	 *
-	 * @param string $class The class(es) to add on the Group
-	 */
-	public function addGroupClass($class)
-	{
-		$this->addClass($class);
-	}
-
-	/**
-	 * Remove one or more classes on the Group
-	 *
-	 * @param string $class The class(es) to remove on the Group
-	 */
-	public function removeGroupClass($class)
-	{
-		$this->removeClass($class);
-	}
-
-	/**
-	 * Set a class on the Label
-	 *
-	 * @param string $class The class(es) to add on the Label
-	 */
-	public function addLabelClass($class)
-	{
-		// Don't add a label class if it isn't an Element instance
-		if (!$this->label instanceof Element) {
-			return $this;
-		}
-
-		$this->label->addClass($class);
-
-		return $this;
-	}
-
-	/**
-	 * Remove one or more classes on the Label
-	 *
-	 * @param string $class The class(es) to remove on the Label
-	 */
-	public function removeLabelClass($class)
-	{
-		// Don't remove a label class if it isn't an Element instance
-		if (!$this->label instanceof Element) {
-			return $this;
-		}
-
-		$this->label->removeClass($class);
-
-		return $this;
-	}
-
-	/**
-	 * Adds a label to the group
-	 *
-	 * @param  string $label A label
-	 */
-	public function setLabel($label)
-	{
-		if (!$label instanceof Element) {
-			$label = Helpers::translate($label);
-			$label = Element::create('label', $label)->for($label);
-		}
-
-		$this->label = $label;
-	}
-
-	/**
-	 * Get the formatted group label
-	 *
-	 * @return string|null
-	 */
-	public function getFormattedLabel()
-	{
-		if (!$this->label) {
-			return false;
-		}
-
-		return $this->label->addClass($this->app['former.framework']->getLabelClasses());
-	}
-
-	/**
-	 * Disables the control group for the current field
-	 */
-	public function raw()
-	{
-		$this->raw = true;
-	}
-
-	/**
-	 * Check if the current group is to be displayed or not
-	 *
-	 * @return boolean
-	 */
-	public function isRaw()
-	{
-		return (bool) $this->raw;
-	}
-
-	////////////////////////////////////////////////////////////////////
-	///////////////////////////// HELP BLOCKS //////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Alias for inlineHelp
-	 *
-	 * @param  string $help       The help text
-	 * @param  array  $attributes Facultative attributes
-	 */
-	public function help($help, $attributes = array())
-	{
-		return $this->inlineHelp($help, $attributes);
-	}
-
-	/**
-	 * Add an inline help
-	 *
-	 * @param  string $help       The help text
-	 * @param  array  $attributes Facultative attributes
-	 */
-	public function inlineHelp($help, $attributes = array())
-	{
-		// If no help text, do nothing
-		if (!$help) {
-			return false;
-		}
-
-		$this->help['inline'] = $this->app['former.framework']->createHelp($help, $attributes);
-	}
-
-	/**
-	 * Add an block help
-	 *
-	 * @param  string $help       The help text
-	 * @param  array  $attributes Facultative attributes
-	 */
-	public function blockHelp($help, $attributes = array())
-	{
-		// Reserved method
-		if ($this->app['former.framework']->isnt('TwitterBootstrap') &&
-			$this->app['former.framework']->isnt('TwitterBootstrap3') &&
-			$this->app['former.framework']->isnt('TwitterBootstrap4') &&
-			$this->app['former.framework']->isnt('TwitterBootstrap5')
-		) {
-			throw new BadMethodCallException('This method is only available on the Bootstrap framework');
-		}
-
-		// If no help text, do nothing
-		if (!$help) {
-			return false;
-		}
-
-		$this->help['block'] = $this->app['former.framework']->createBlockHelp($help, $attributes);
-	}
-
-	////////////////////////////////////////////////////////////////////
-	///////////////////////// PREPEND/APPEND METHODS ///////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Prepend elements to the field
-	 */
-	public function prepend()
-	{
-		$this->placeAround(func_get_args(), 'prepend');
-	}
-
-	/**
-	 * Append elements to the field
-	 */
-	public function append()
-	{
-		$this->placeAround(func_get_args(), 'append');
-	}
-
-	/**
-	 * Prepends an icon to a field
-	 *
-	 * @param string $icon       The icon to prepend
-	 * @param array  $attributes Its attributes
-	 */
-	public function prependIcon($icon, $attributes = array(), $iconSettings = array())
-	{
-		$icon = $this->app['former.framework']->createIcon($icon, $attributes, $iconSettings);
-
-		$this->prepend($icon);
-	}
-
-	/**
-	 * Append an icon to a field
-	 *
-	 * @param string $icon       The icon to prepend
-	 * @param array  $attributes Its attributes
-	 */
-	public function appendIcon($icon, $attributes = array(), $iconSettings = array())
-	{
-		$icon = $this->app['former.framework']->createIcon($icon, $attributes, $iconSettings);
-
-		$this->append($icon);
-	}
-
-	////////////////////////////////////////////////////////////////////
-	//////////////////////////////// HELPERS ///////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Get the errors for the group
-	 *
-	 * @return string
-	 */
-	public function getErrors()
-	{
-		$errors = '';
-
-		if (!self::$opened) {
-
-			// for non-custom groups, normal error handling applies
-			$errors = $this->app['former']->getErrors();
-		} elseif (!empty($this->validations)) {
-
-			// error handling only when validations specified for custom groups
-			foreach ($this->validations as $validation) {
-				$errors .= $this->app['former']->getErrors($validation);
-			}
-		}
-
-		return $errors;
-	}
-
-	/**
-	 * Wraps content in a group
-	 *
-	 * @param string $contents The content
-	 * @param string $label    The label to add
-	 *
-	 * @return string A group
-	 */
-	public function wrap($contents, $label = null)
-	{
-		$group = $this->open();
-		$group .= $label;
-		$group .= $this->app['former.framework']->wrapField($contents);
-		$group .= $this->close();
-
-		return $group;
-	}
-
-	/**
-	 * Wraps content in a group with floating label
-	 *
-	 * @param string $contents The content
-	 * @param string $label    The label to add
-	 *
-	 * @return string A group
-	 */
-	public function wrapWithFloatingLabel($contents, $label = null)
-	{
-		$floatingLabelClass = $this->app['former.framework']->getFloatingLabelClass();
-		if ($floatingLabelClass) {
-			$this->addClass($floatingLabelClass);
-		}
-		return $this->wrap($label, $contents);
-	}
-
-	/**
-	 * Prints out the current label
-	 *
-	 * @param  string $field The field to create a label for
-	 *
-	 * @return string        A <label> tag
-	 */
-	 protected function getLabel($field = null)
- 	{
- 		// Don't create a label if none exist
- 		if (!$field or !$this->label) {
- 			return null;
- 		}
-
- 		// Wrap label in framework classes
- 		$labelClasses = $this->app['former.framework']->getLabelClasses();
- 		if ($field->isCheckable() &&
- 			in_array($this->app['former']->framework(), ['TwitterBootstrap4', 'TwitterBootstrap5']) &&
- 			$this->app['former.form']->isOfType('horizontal')
- 		) {
- 			$labelClasses = array_merge($labelClasses, array('pt-0'));
- 		}
- 		$this->label->addClass($labelClasses);
- 		$this->label = $this->app['former.framework']->createLabelOf($field, $this->label);
- 		$this->label = $this->app['former.framework']->wrapLabel($this->label);
-
- 		return $this->label;
- 	}
-
-	/**
-	 * Prints out the current help
-	 *
-	 * @return string A .help-block or .help-inline
-	 */
-	protected function getHelp()
-	{
-		$inline = Arr::get($this->help, 'inline');
-		$block  = Arr::get($this->help, 'block');
-
-		// Replace help text with error if any found
-		$errors = $this->app['former']->getErrors();
-		if ($errors and $this->app['former']->getOption('error_messages')) {
-			$inline = $this->app['former.framework']->createValidationError($errors);
-		}
-
-		return implode('', array($inline, $block));
-	}
-
-	/**
-	 * Format the field with prepended/appended elements
-	 *
-	 * @param  Field $field The field to format
-	 *
-	 * @return string        Field plus supplementary elements
-	 */
-	protected function prependAppend($field)
-	{
-		if (!$this->prepend and !$this->append) {
-			return $field->render();
-		}
-
-		return $this->app['former.framework']->prependAppend($field, $this->prepend, $this->append);
-	}
-
-	/**
-	 * Place elements around the field
-	 *
-	 * @param  array  $items An array of items to place
-	 * @param  string $place Where they should end up (prepend|append)
-	 */
-	protected function placeAround($items, $place)
-	{
-		// Iterate over the items and place them where they should
-		foreach ((array) $items as $item) {
-			$item             = $this->app['former.framework']->placeAround($item, $place);
-			$this->{$place}[] = $item;
-		}
-	}
+    /**
+     * The Container
+     *
+     * @var Container
+     */
+    protected $app;
+
+    /**
+     * The current state of the group
+     *
+     * @var string
+     */
+    protected $state = null;
+
+    /**
+     * Whether the field should be displayed raw or not
+     *
+     * @var boolean
+     */
+    protected $raw = false;
+
+    /**
+     * The group label
+     *
+     * @var Element
+     */
+    protected $label;
+
+    /**
+     * The group help
+     *
+     * @var array
+     */
+    protected $help = array();
+
+    /**
+     * An array of elements to preprend the field
+     *
+     * @var array
+     */
+    protected $prepend = array();
+
+    /**
+     * An array of elements to append the field
+     *
+     * @var array
+     */
+    protected $append = array();
+
+    /**
+     * The field validations to be checked for errors
+     *
+     * @var array
+     */
+    protected $validations = array();
+
+    /**
+     * The group's element
+     *
+     * @var string
+     */
+    protected $element = 'div';
+
+    /**
+     * Whether a custom group is opened or not
+     *
+     * @var boolean
+     */
+    public static $opened = false;
+
+    /**
+     * The custom group that is open
+     *
+     * @var Former\Form\Group
+     */
+    public static $openGroup = null;
+
+    ////////////////////////////////////////////////////////////////////
+    /////////////////////////// CORE METHODS ///////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Creates a group
+     *
+     * @param string $label Its label
+     */
+    public function __construct(Container $app, $label, $validations = null)
+    {
+        // Get special classes
+        $this->app = $app;
+        $this->addClass($this->app['former.framework']->getGroupClasses());
+
+        // Invisible if Nude
+        if ($this->app['former.framework']->is('Nude')) {
+            $this->element = '';
+        }
+
+        // Set group label
+        if ($label) {
+            $this->setLabel($label);
+        }
+
+        // Set validations used to override groups own conclusions
+        $this->validations = (array) $validations;
+    }
+
+    /**
+     * Prints out the opening of the Control Group
+     *
+     * @return string A control group opening tag
+     */
+    public function __toString()
+    {
+        return $this->open().$this->getFormattedLabel();
+    }
+
+    /**
+     * Opens a group
+     *
+     * @return string Opening tag
+     */
+    public function open()
+    {
+        if ($this->getErrors()) {
+            $this->state($this->app['former.framework']->errorState());
+        }
+
+        // Retrieve state and append it to classes
+        if ($this->state) {
+            $this->addClass($this->state);
+        }
+
+        // Required state
+        if ($this->app->bound('former.field') and $this->app['former.field']->isRequired()) {
+            $this->addClass($this->app['former']->getOption('required_class'));
+        }
+
+        return parent::open();
+    }
+
+    /**
+     * Set the contents of the current group
+     *
+     * @param string $contents The group contents
+     *
+     * @return string A group
+     */
+    public function contents($contents)
+    {
+        return $this->wrap($contents, $this->getFormattedLabel());
+    }
+
+    /**
+     * Wrap a Field with the current group
+     *
+     * @param  \Former\Traits\Field $field A Field instance
+     *
+     * @return string        A group
+     */
+    public function wrapField($field)
+    {
+        $label = $this->getLabel($field);
+        $help = $this->getHelp();
+        if ($field->isCheckable() &&
+            in_array($this->app['former']->framework(), ['TwitterBootstrap4', 'TwitterBootstrap5'])
+        ) {
+            $wrapperClass = null;
+            if ($this->app['former']->framework() === 'TwitterBootstrap4') {
+                $wrapperClass = $field->isInline() ? 'form-check form-check-inline' : 'form-check';
+            }
+            if ($this->app['former']->getErrors($field->getName())) {
+                $hiddenInput = Input::create('hidden')->addClass('form-check-input is-invalid');
+                $help = $hiddenInput.$help;
+            }
+            $help = $help ? Element::create('div', $help)->addClass($wrapperClass) : '';
+        }
+        $withFloatingLabel = $field->withFloatingLabel();
+
+        $field = $this->prependAppend($field);
+        $field .= $help;
+
+        if ($withFloatingLabel &&
+            $this->app['former']->framework() === 'TwitterBootstrap5'
+        ) {
+            return $this->wrapWithFloatingLabel($field, $label);
+        }
+
+        return $this->wrap($field, $label);
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    //////////////////////////// FIELD METHODS /////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Set the state of the group
+     *
+     * @param  string $state A Bootstrap state class
+     */
+    public function state($state)
+    {
+        // Filter state
+        $state = $this->app['former.framework']->filterState($state);
+
+        $this->state = $state;
+    }
+
+    /**
+     * Set a class on the Group
+     *
+     * @param string $class The class(es) to add on the Group
+     */
+    public function addGroupClass($class)
+    {
+        $this->addClass($class);
+    }
+
+    /**
+     * Remove one or more classes on the Group
+     *
+     * @param string $class The class(es) to remove on the Group
+     */
+    public function removeGroupClass($class)
+    {
+        $this->removeClass($class);
+    }
+
+    /**
+     * Set a class on the Label
+     *
+     * @param string $class The class(es) to add on the Label
+     */
+    public function addLabelClass($class)
+    {
+        // Don't add a label class if it isn't an Element instance
+        if (!$this->label instanceof Element) {
+            return $this;
+        }
+
+        $this->label->addClass($class);
+
+        return $this;
+    }
+
+    /**
+     * Remove one or more classes on the Label
+     *
+     * @param string $class The class(es) to remove on the Label
+     */
+    public function removeLabelClass($class)
+    {
+        // Don't remove a label class if it isn't an Element instance
+        if (!$this->label instanceof Element) {
+            return $this;
+        }
+
+        $this->label->removeClass($class);
+
+        return $this;
+    }
+
+    /**
+     * Adds a label to the group
+     *
+     * @param  string $label A label
+     */
+    public function setLabel($label)
+    {
+        if (!$label instanceof Element) {
+            $label = Helpers::translate($label);
+            $label = Element::create('label', $label)->for($label);
+        }
+
+        $this->label = $label;
+    }
+
+    /**
+     * Get the formatted group label
+     *
+     * @return string|null
+     */
+    public function getFormattedLabel()
+    {
+        if (!$this->label) {
+            return false;
+        }
+
+        return $this->label->addClass($this->app['former.framework']->getLabelClasses());
+    }
+
+    /**
+     * Disables the control group for the current field
+     */
+    public function raw()
+    {
+        $this->raw = true;
+    }
+
+    /**
+     * Check if the current group is to be displayed or not
+     *
+     * @return boolean
+     */
+    public function isRaw()
+    {
+        return (bool) $this->raw;
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ///////////////////////////// HELP BLOCKS //////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Alias for inlineHelp
+     *
+     * @param  string $help       The help text
+     * @param  array  $attributes Facultative attributes
+     */
+    public function help($help, $attributes = array())
+    {
+        return $this->inlineHelp($help, $attributes);
+    }
+
+    /**
+     * Add an inline help
+     *
+     * @param  string $help       The help text
+     * @param  array  $attributes Facultative attributes
+     */
+    public function inlineHelp($help, $attributes = array())
+    {
+        // If no help text, do nothing
+        if (!$help) {
+            return false;
+        }
+
+        $this->help['inline'] = $this->app['former.framework']->createHelp($help, $attributes);
+    }
+
+    /**
+     * Add an block help
+     *
+     * @param  string $help       The help text
+     * @param  array  $attributes Facultative attributes
+     */
+    public function blockHelp($help, $attributes = array())
+    {
+        // Reserved method
+        if ($this->app['former.framework']->isnt('TwitterBootstrap') &&
+            $this->app['former.framework']->isnt('TwitterBootstrap3') &&
+            $this->app['former.framework']->isnt('TwitterBootstrap4') &&
+            $this->app['former.framework']->isnt('TwitterBootstrap5')
+        ) {
+            throw new BadMethodCallException('This method is only available on the Bootstrap framework');
+        }
+
+        // If no help text, do nothing
+        if (!$help) {
+            return false;
+        }
+
+        $this->help['block'] = $this->app['former.framework']->createBlockHelp($help, $attributes);
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ///////////////////////// PREPEND/APPEND METHODS ///////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Prepend elements to the field
+     */
+    public function prepend()
+    {
+        $this->placeAround(func_get_args(), 'prepend');
+    }
+
+    /**
+     * Append elements to the field
+     */
+    public function append()
+    {
+        $this->placeAround(func_get_args(), 'append');
+    }
+
+    /**
+     * Prepends an icon to a field
+     *
+     * @param string $icon       The icon to prepend
+     * @param array  $attributes Its attributes
+     */
+    public function prependIcon($icon, $attributes = array(), $iconSettings = array())
+    {
+        $icon = $this->app['former.framework']->createIcon($icon, $attributes, $iconSettings);
+
+        $this->prepend($icon);
+    }
+
+    /**
+     * Append an icon to a field
+     *
+     * @param string $icon       The icon to prepend
+     * @param array  $attributes Its attributes
+     */
+    public function appendIcon($icon, $attributes = array(), $iconSettings = array())
+    {
+        $icon = $this->app['former.framework']->createIcon($icon, $attributes, $iconSettings);
+
+        $this->append($icon);
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    //////////////////////////////// HELPERS ///////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Get the errors for the group
+     *
+     * @return string
+     */
+    public function getErrors()
+    {
+        $errors = '';
+
+        if (!self::$opened) {
+
+            // for non-custom groups, normal error handling applies
+            $errors = $this->app['former']->getErrors();
+        } elseif (!empty($this->validations)) {
+
+            // error handling only when validations specified for custom groups
+            foreach ($this->validations as $validation) {
+                $errors .= $this->app['former']->getErrors($validation);
+            }
+        }
+
+        return $errors;
+    }
+
+    /**
+     * Wraps content in a group
+     *
+     * @param string $contents The content
+     * @param string $label    The label to add
+     *
+     * @return string A group
+     */
+    public function wrap($contents, $label = null)
+    {
+        $group = $this->open();
+        $group .= $label;
+        $group .= $this->app['former.framework']->wrapField($contents);
+        $group .= $this->close();
+
+        return $group;
+    }
+
+    /**
+     * Wraps content in a group with floating label
+     *
+     * @param string $contents The content
+     * @param string $label    The label to add
+     *
+     * @return string A group
+     */
+    public function wrapWithFloatingLabel($contents, $label = null)
+    {
+        $floatingLabelClass = $this->app['former.framework']->getFloatingLabelClass();
+        if ($floatingLabelClass) {
+            $this->addClass($floatingLabelClass);
+        }
+        return $this->wrap($label, $contents);
+    }
+
+    /**
+     * Prints out the current label
+     *
+     * @param  string $field The field to create a label for
+     *
+     * @return string        A <label> tag
+     */
+        protected function getLabel($field = null)
+        {
+            // Don't create a label if none exist
+            if (!$field or !$this->label) {
+                return null;
+            }
+
+            // Wrap label in framework classes
+            $labelClasses = $this->app['former.framework']->getLabelClasses();
+            if ($field->isCheckable() &&
+             in_array($this->app['former']->framework(), ['TwitterBootstrap4', 'TwitterBootstrap5']) &&
+             $this->app['former.form']->isOfType('horizontal')
+            ) {
+                $labelClasses = array_merge($labelClasses, array('pt-0'));
+            }
+            $this->label->addClass($labelClasses);
+            $this->label = $this->app['former.framework']->createLabelOf($field, $this->label);
+            $this->label = $this->app['former.framework']->wrapLabel($this->label);
+
+            return $this->label;
+        }
+
+    /**
+     * Prints out the current help
+     *
+     * @return string A .help-block or .help-inline
+     */
+    protected function getHelp()
+    {
+        $inline = Arr::get($this->help, 'inline');
+        $block  = Arr::get($this->help, 'block');
+
+        // Replace help text with error if any found
+        $errors = $this->app['former']->getErrors();
+        if ($errors and $this->app['former']->getOption('error_messages')) {
+            $inline = $this->app['former.framework']->createValidationError($errors);
+        }
+
+        return implode('', array($inline, $block));
+    }
+
+    /**
+     * Format the field with prepended/appended elements
+     *
+     * @param  Field $field The field to format
+     *
+     * @return string        Field plus supplementary elements
+     */
+    protected function prependAppend($field)
+    {
+        if (!$this->prepend and !$this->append) {
+            return $field->render();
+        }
+
+        return $this->app['former.framework']->prependAppend($field, $this->prepend, $this->append);
+    }
+
+    /**
+     * Place elements around the field
+     *
+     * @param  array  $items An array of items to place
+     * @param  string $place Where they should end up (prepend|append)
+     */
+    protected function placeAround($items, $place)
+    {
+        // Iterate over the items and place them where they should
+        foreach ((array) $items as $item) {
+            $item             = $this->app['former.framework']->placeAround($item, $place);
+            $this->{$place}[] = $item;
+        }
+    }
 }

src/Former/Form/Fields/Choice.php

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/Form/Elements.php

Indentation +102 added lines, -102 removed lines

@@ -12,106 +12,106 @@
  */
 class Elements
 {
-	/**
-	 * The Container
-	 *
-	 * @var Container
-	 */
-	protected $app;
-
-	/**
-	 * The Session instance
-	 *
-	 * @var Session
-	 */
-	protected $session;
-
-	/**
-	 * Build a new Element
-	 *
-	 * @param Container $app
-	 */
-	public function __construct(Container $app, $session)
-	{
-		$this->app     = $app;
-		$this->session = $session;
-	}
-
-	/**
-	 * Generate a hidden field containing the current CSRF token.
-	 *
-	 * @return string
-	 */
-	public function token()
-	{
-		$csrf = method_exists($this->session, 'getToken') ? $this->session->getToken() : $this->session->token();
-
-		return (string) $this->app['former']->hidden('_token', $csrf);
-	}
-
-	/**
-	 * Creates a label tag
-	 *
-	 * @param  string $label      The label content
-	 * @param  string $for        The field the label's for
-	 * @param  array  $attributes The label's attributes
-	 *
-	 * @return Element             A <label> tag
-	 */
-	public function label($label, $for = null, $attributes = array())
-	{
-		if (!$label instanceof Htmlable) {
-			$oldLabel = (string) $label;
-			$label    = Helpers::translate($oldLabel, '');
-
-			// If there was no change to the label,
-			// then a Laravel translation did not occur
-			if (lcfirst($label) == $oldLabel) {
-				$label = str_replace('_', ' ', $label);
-			}
-		} else {
-			$label = $label->toHtml();
-		}
-
-		$attributes['for']             = $for;
-		$this->app['former']->labels[] = $for;
-
-		return Element::create('label', $label, $attributes);
-	}
-
-	/**
-	 * Creates a form legend
-	 *
-	 * @param  string $legend     The text
-	 * @param  array  $attributes Its attributes
-	 *
-	 * @return Element             A <legend> tag
-	 */
-	public function legend($legend, $attributes = array())
-	{
-		$legend = Helpers::translate($legend);
-
-		return Element::create('legend', $legend, $attributes);
-	}
-
-	/**
-	 * Close a field group
-	 *
-	 * @return string
-	 */
-	public function closeGroup()
-	{
-		$closing = '';
-		if (Group::$opened && isset(Group::$openGroup)) {
-			$closing = Group::$openGroup->close();
-		}
-
-		// Close custom group
-		Group::$opened = false;
-
-		// Reset custom group reference
-		Group::$openGroup = null;
-
-		return $closing;
-	}
+    /**
+     * The Container
+     *
+     * @var Container
+     */
+    protected $app;
+
+    /**
+     * The Session instance
+     *
+     * @var Session
+     */
+    protected $session;
+
+    /**
+     * Build a new Element
+     *
+     * @param Container $app
+     */
+    public function __construct(Container $app, $session)
+    {
+        $this->app     = $app;
+        $this->session = $session;
+    }
+
+    /**
+     * Generate a hidden field containing the current CSRF token.
+     *
+     * @return string
+     */
+    public function token()
+    {
+        $csrf = method_exists($this->session, 'getToken') ? $this->session->getToken() : $this->session->token();
+
+        return (string) $this->app['former']->hidden('_token', $csrf);
+    }
+
+    /**
+     * Creates a label tag
+     *
+     * @param  string $label      The label content
+     * @param  string $for        The field the label's for
+     * @param  array  $attributes The label's attributes
+     *
+     * @return Element             A <label> tag
+     */
+    public function label($label, $for = null, $attributes = array())
+    {
+        if (!$label instanceof Htmlable) {
+            $oldLabel = (string) $label;
+            $label    = Helpers::translate($oldLabel, '');
+
+            // If there was no change to the label,
+            // then a Laravel translation did not occur
+            if (lcfirst($label) == $oldLabel) {
+                $label = str_replace('_', ' ', $label);
+            }
+        } else {
+            $label = $label->toHtml();
+        }
+
+        $attributes['for']             = $for;
+        $this->app['former']->labels[] = $for;
+
+        return Element::create('label', $label, $attributes);
+    }
+
+    /**
+     * Creates a form legend
+     *
+     * @param  string $legend     The text
+     * @param  array  $attributes Its attributes
+     *
+     * @return Element             A <legend> tag
+     */
+    public function legend($legend, $attributes = array())
+    {
+        $legend = Helpers::translate($legend);
+
+        return Element::create('legend', $legend, $attributes);
+    }
+
+    /**
+     * Close a field group
+     *
+     * @return string
+     */
+    public function closeGroup()
+    {
+        $closing = '';
+        if (Group::$opened && isset(Group::$openGroup)) {
+            $closing = Group::$openGroup->close();
+        }
+
+        // Close custom group
+        Group::$opened = false;
+
+        // Reset custom group reference
+        Group::$openGroup = null;
+
+        return $closing;
+    }
 }

src/Former/Helpers.php

Indentation +191 added lines, -191 removed lines

@@ -9,195 +9,195 @@
  */
 class Helpers
 {
-	/**
-	 * The IoC Container
-	 *
-	 * @var Container
-	 */
-	protected static $app;
-
-	/**
-	 * Bind a Container to the Helpers class
-	 *
-	 * @param Container $app
-	 */
-	public static function setApp(Container $app)
-	{
-		static::$app = $app;
-	}
-
-	/**
-	 * Encodes HTML
-	 *
-	 * @param string|null $value The string to encode
-	 *
-	 * @return string
-	 */
-	public static function encode($value)
-	{
-		if ($value === null) {
-			return '';
-		}
-
-		return htmlentities($value, ENT_QUOTES, 'UTF-8', true);
-	}
-
-	////////////////////////////////////////////////////////////////////
-	///////////////////////// LOCALIZATION HELPERS /////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Translates a string by trying several fallbacks
-	 *
-	 * @param  string $key      The key to translate
-	 * @param  string $fallback The ultimate fallback
-	 *
-	 * @return string           A translated string
-	 */
-	public static function translate($key, $fallback = null)
-	{
-		// If nothing was given, return nothing, bitch
-		if (!$key) {
-			return $fallback;
-		}
-
-		// If no fallback, use the key
-		if (!$fallback) {
-			$fallback = $key;
-		}
-
-		// Assure we don't already have a Lang object
-		if (is_object($key) and method_exists($key, 'get')) {
-			return $key->get();
-		}
-
-		$translation   = null;
-		$translateFrom = static::$app['former']->getOption('translate_from');
-		if (substr($translateFrom, -1) !== '/') {
-			$translateFrom .= '.';
-		}
-		$translateFrom .= $key;
-
-		// Convert a[b[c]] to a.b.c for nested translations [a => [b => 'B!']]
-		if (strpos($translateFrom, ']') !== false) {
-			$translateFrom = str_replace(array(']', '['), array('', '.'), $translateFrom);
-		}
-
-		// Search for the key itself, if it is valid
-		$validKey = preg_match("/^[a-z0-9_-]+([.][a-z0-9 _-]+)+$/i", $key) === 1;
-		if ($validKey && static::$app['translator']->has($key)) {
-			$translation = static::$app['translator']->get($key);
-		} elseif (static::$app['translator']->has($translateFrom)) {
-			$translation = static::$app['translator']->get($translateFrom);
-		}
-
-		// Replace by fallback if invalid
-		if (!$translation or is_array($translation)) {
-			$translation = $fallback;
-		}
-
-		// Capitalize
-		$capitalize = static::$app['former']->getOption('capitalize_translations');
-
-		return $capitalize ? ucfirst($translation) : $translation;
-	}
-
-	////////////////////////////////////////////////////////////////////
-	////////////////////////// DATABASE HELPERS ////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Transforms an array of models into an associative array
-	 *
-	 * @param  array|object    $query      The array of results
-	 * @param  string|function $text       The value to use as text
-	 * @param  string|array    $attributes The data to use as attributes
-	 *
-	 * @return array               A data array
-	 */
-	public static function queryToArray($query, $text = null, $attributes = null)
-	{
-		// Automatically fetch Lang objects for people who store translated options lists
-		// Same of unfetched queries
-		if (!$query instanceof Collection) {
-			if ((is_object($query) || is_string($query)) && method_exists($query, 'get')) {
-				$query = $query->get();
-			}
-			if (!is_array($query)) {
-				$query = (array) $query;
-			}
-		}
-
-		//Convert parametrs of old format to new format
-		if (!is_callable($text)) {
-			$optionTextValue = $text;
-			$text = function ($model) use ($optionTextValue) {
-				if ($optionTextValue and isset($model->$optionTextValue)) {
-					return $model->$optionTextValue;
-				} elseif ((is_object($model) || is_string($model)) && method_exists($model, '__toString')) {
-					return  $model->__toString();
-				} else {
-					return null;
-				}
-			};
-		}
-
-		if (!is_array($attributes)) {
-			if (is_string($attributes)) {
-				$attributes = ['value' => $attributes];
-			} else {
-				$attributes = ['value' => null];
-			}
-		}
-
-		if (!isset($attributes['value'])) {
-			$attributes['value'] = null;
-		}
-		//-------------------------------------------------
-
-		// Populates the new options
-		foreach ($query as $model) {
-			// If it's an array, convert to object
-			if (is_array($model)) {
-				$model = (object) $model;
-			}
-
-			// Calculate option text
-			$optionText = $text($model);
-
-			// Skip if no text value found
-			if (!$optionText) {
-				continue;
-			}
-
-			//Collect option attributes
-			foreach ($attributes as $optionAttributeName => $modelAttributeName) {
-				if (is_callable($modelAttributeName)) {
-					$optionAttributeValue = $modelAttributeName($model);
-				} elseif ($modelAttributeName and isset($model->$modelAttributeName)) {
-					$optionAttributeValue = $model->$modelAttributeName;
-				} elseif($optionAttributeName === 'value') {
-					//For backward compatibility
-					if (method_exists($model, 'getKey')) {
-						$optionAttributeValue = $model->getKey();
-					} elseif (isset($model->id)) {
-						$optionAttributeValue = $model->id;
-					} else {
-						$optionAttributeValue = $optionText;
-					}
-				} else {
-					$optionAttributeValue = '';
-				}
-
-				//For backward compatibility
-				if (count($attributes) === 1) {
-					$array[$optionAttributeValue] = (string) $optionText;
-				} else {
-					$array[$optionText][$optionAttributeName] = (string) $optionAttributeValue;
-				}
-			}
-		}
-
-		return !empty($array) ? $array : $query;
-	}
+    /**
+     * The IoC Container
+     *
+     * @var Container
+     */
+    protected static $app;
+
+    /**
+     * Bind a Container to the Helpers class
+     *
+     * @param Container $app
+     */
+    public static function setApp(Container $app)
+    {
+        static::$app = $app;
+    }
+
+    /**
+     * Encodes HTML
+     *
+     * @param string|null $value The string to encode
+     *
+     * @return string
+     */
+    public static function encode($value)
+    {
+        if ($value === null) {
+            return '';
+        }
+
+        return htmlentities($value, ENT_QUOTES, 'UTF-8', true);
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ///////////////////////// LOCALIZATION HELPERS /////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Translates a string by trying several fallbacks
+     *
+     * @param  string $key      The key to translate
+     * @param  string $fallback The ultimate fallback
+     *
+     * @return string           A translated string
+     */
+    public static function translate($key, $fallback = null)
+    {
+        // If nothing was given, return nothing, bitch
+        if (!$key) {
+            return $fallback;
+        }
+
+        // If no fallback, use the key
+        if (!$fallback) {
+            $fallback = $key;
+        }
+
+        // Assure we don't already have a Lang object
+        if (is_object($key) and method_exists($key, 'get')) {
+            return $key->get();
+        }
+
+        $translation   = null;
+        $translateFrom = static::$app['former']->getOption('translate_from');
+        if (substr($translateFrom, -1) !== '/') {
+            $translateFrom .= '.';
+        }
+        $translateFrom .= $key;
+
+        // Convert a[b[c]] to a.b.c for nested translations [a => [b => 'B!']]
+        if (strpos($translateFrom, ']') !== false) {
+            $translateFrom = str_replace(array(']', '['), array('', '.'), $translateFrom);
+        }
+
+        // Search for the key itself, if it is valid
+        $validKey = preg_match("/^[a-z0-9_-]+([.][a-z0-9 _-]+)+$/i", $key) === 1;
+        if ($validKey && static::$app['translator']->has($key)) {
+            $translation = static::$app['translator']->get($key);
+        } elseif (static::$app['translator']->has($translateFrom)) {
+            $translation = static::$app['translator']->get($translateFrom);
+        }
+
+        // Replace by fallback if invalid
+        if (!$translation or is_array($translation)) {
+            $translation = $fallback;
+        }
+
+        // Capitalize
+        $capitalize = static::$app['former']->getOption('capitalize_translations');
+
+        return $capitalize ? ucfirst($translation) : $translation;
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ////////////////////////// DATABASE HELPERS ////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Transforms an array of models into an associative array
+     *
+     * @param  array|object    $query      The array of results
+     * @param  string|function $text       The value to use as text
+     * @param  string|array    $attributes The data to use as attributes
+     *
+     * @return array               A data array
+     */
+    public static function queryToArray($query, $text = null, $attributes = null)
+    {
+        // Automatically fetch Lang objects for people who store translated options lists
+        // Same of unfetched queries
+        if (!$query instanceof Collection) {
+            if ((is_object($query) || is_string($query)) && method_exists($query, 'get')) {
+                $query = $query->get();
+            }
+            if (!is_array($query)) {
+                $query = (array) $query;
+            }
+        }
+
+        //Convert parametrs of old format to new format
+        if (!is_callable($text)) {
+            $optionTextValue = $text;
+            $text = function ($model) use ($optionTextValue) {
+                if ($optionTextValue and isset($model->$optionTextValue)) {
+                    return $model->$optionTextValue;
+                } elseif ((is_object($model) || is_string($model)) && method_exists($model, '__toString')) {
+                    return  $model->__toString();
+                } else {
+                    return null;
+                }
+            };
+        }
+
+        if (!is_array($attributes)) {
+            if (is_string($attributes)) {
+                $attributes = ['value' => $attributes];
+            } else {
+                $attributes = ['value' => null];
+            }
+        }
+
+        if (!isset($attributes['value'])) {
+            $attributes['value'] = null;
+        }
+        //-------------------------------------------------
+
+        // Populates the new options
+        foreach ($query as $model) {
+            // If it's an array, convert to object
+            if (is_array($model)) {
+                $model = (object) $model;
+            }
+
+            // Calculate option text
+            $optionText = $text($model);
+
+            // Skip if no text value found
+            if (!$optionText) {
+                continue;
+            }
+
+            //Collect option attributes
+            foreach ($attributes as $optionAttributeName => $modelAttributeName) {
+                if (is_callable($modelAttributeName)) {
+                    $optionAttributeValue = $modelAttributeName($model);
+                } elseif ($modelAttributeName and isset($model->$modelAttributeName)) {
+                    $optionAttributeValue = $model->$modelAttributeName;
+                } elseif($optionAttributeName === 'value') {
+                    //For backward compatibility
+                    if (method_exists($model, 'getKey')) {
+                        $optionAttributeValue = $model->getKey();
+                    } elseif (isset($model->id)) {
+                        $optionAttributeValue = $model->id;
+                    } else {
+                        $optionAttributeValue = $optionText;
+                    }
+                } else {
+                    $optionAttributeValue = '';
+                }
+
+                //For backward compatibility
+                if (count($attributes) === 1) {
+                    $array[$optionAttributeValue] = (string) $optionText;
+                } else {
+                    $array[$optionText][$optionAttributeName] = (string) $optionAttributeValue;
+                }
+            }
+        }
+
+        return !empty($array) ? $array : $query;
+    }
 }

src/Former/Framework/TwitterBootstrap3.php

Indentation +433 added lines, -433 removed lines

@@ -13,437 +13,437 @@
  */
 class TwitterBootstrap3 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',
-		'default',
-		'primary',
-		'warning',
-		'danger',
-		'success',
-		'info',
-	);
-
-	/**
-	 * 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(
-		'has-warning',
-		'has-error',
-		'has-success',
-	);
-
-	/**
-	 * The default HTML tag used for icons
-	 *
-	 * @var string
-	 */
-	protected $iconTag = 'span';
-
-	/**
-	 * The default set for icon fonts
-	 * By default Bootstrap 3 offers only 'glyphicon'
-	 * See Former docs to use 'social' and 'filetypes' sets for specific icons.
-	 *
-	 * @var string
-	 */
-	protected $iconSet = 'glyphicon';
-
-	/**
-	 * The default prefix icon names
-	 * "icon" works for Bootstrap 2 and Font-awesome
-	 *
-	 * @var string
-	 */
-	protected $iconPrefix = 'glyphicon';
-
-	/**
-	 * 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 'has-error';
-	}
-
-	/**
-	 * 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')) {
-			$inlineClass = 'checkbox-'.$inlineClass;
-		} elseif ($field->isOfType('radio', 'radios')) {
-			$inlineClass = 'radio-'.$inlineClass;
-		}
-
-		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() and 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';
-		}
-
-		return $this->addClassesToField($field, $classes);
-	}
-
-	/**
-	 * Add group classes
-	 *
-	 * @return string A list of group classes
-	 */
-	public function getGroupClasses()
-	{
-		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('control-label', $this->labelWidth);
-		} elseif ($this->app['former.form']->isOfType('inline')) {
-			return array('sr-only');
-		} else {
-			return array('control-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-static';
-	}
-
-	/**
-	 * 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';
-		}
-
-		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('span', $text, $attributes)->addClass('help-block');
-	}
-
-	/**
-	 * Render an help text
-	 *
-	 * @param string $text
-	 * @param array  $attributes
-	 *
-	 * @return Element
-	 */
-	public function createBlockHelp($text, $attributes = array())
-	{
-		return Element::create('p', $text, $attributes)->addClass('help-block');
-	}
-
-	/**
-	 * 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)
-	{
-		// Render object
-		if (is_object($item) and method_exists($item, '__toString')) {
-			$item = $item->__toString();
-		}
-
-		// Get class to use
-		$class = (strpos($item, '<button') !== false) ? 'btn' : 'addon';
-
-		return Element::create('span', $item)->addClass('input-group-'.$class);
-	}
-
-	/**
-	 * 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',
+        'default',
+        'primary',
+        'warning',
+        'danger',
+        'success',
+        'info',
+    );
+
+    /**
+     * 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(
+        'has-warning',
+        'has-error',
+        'has-success',
+    );
+
+    /**
+     * The default HTML tag used for icons
+     *
+     * @var string
+     */
+    protected $iconTag = 'span';
+
+    /**
+     * The default set for icon fonts
+     * By default Bootstrap 3 offers only 'glyphicon'
+     * See Former docs to use 'social' and 'filetypes' sets for specific icons.
+     *
+     * @var string
+     */
+    protected $iconSet = 'glyphicon';
+
+    /**
+     * The default prefix icon names
+     * "icon" works for Bootstrap 2 and Font-awesome
+     *
+     * @var string
+     */
+    protected $iconPrefix = 'glyphicon';
+
+    /**
+     * 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 'has-error';
+    }
+
+    /**
+     * 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')) {
+            $inlineClass = 'checkbox-'.$inlineClass;
+        } elseif ($field->isOfType('radio', 'radios')) {
+            $inlineClass = 'radio-'.$inlineClass;
+        }
+
+        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() and 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';
+        }
+
+        return $this->addClassesToField($field, $classes);
+    }
+
+    /**
+     * Add group classes
+     *
+     * @return string A list of group classes
+     */
+    public function getGroupClasses()
+    {
+        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('control-label', $this->labelWidth);
+        } elseif ($this->app['former.form']->isOfType('inline')) {
+            return array('sr-only');
+        } else {
+            return array('control-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-static';
+    }
+
+    /**
+     * 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';
+        }
+
+        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('span', $text, $attributes)->addClass('help-block');
+    }
+
+    /**
+     * Render an help text
+     *
+     * @param string $text
+     * @param array  $attributes
+     *
+     * @return Element
+     */
+    public function createBlockHelp($text, $attributes = array())
+    {
+        return Element::create('p', $text, $attributes)->addClass('help-block');
+    }
+
+    /**
+     * 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)
+    {
+        // Render object
+        if (is_object($item) and method_exists($item, '__toString')) {
+            $item = $item->__toString();
+        }
+
+        // Get class to use
+        $class = (strpos($item, '<button') !== false) ? 'btn' : 'addon';
+
+        return Element::create('span', $item)->addClass('input-group-'.$class);
+    }
+
+    /**
+     * 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/Framework/TwitterBootstrap.php

Indentation +370 added lines, -370 removed lines

@@ -14,374 +14,374 @@
  */
 class TwitterBootstrap extends Framework implements FrameworkInterface
 {
-	/**
-	 * Form types that trigger special styling for this Framework
-	 *
-	 * @var array
-	 */
-	protected $availableTypes = array('horizontal', 'vertical', 'inline', 'search');
-
-	/**
-	 * The button types available
-	 *
-	 * @var array
-	 */
-	private $buttons = array(
-		'large',
-		'small',
-		'mini',
-		'block',
-		'danger',
-		'info',
-		'inverse',
-		'link',
-		'primary',
-		'success',
-		'warning',
-	);
-
-	/**
-	 * The field sizes available
-	 *
-	 * @var array
-	 */
-	private $fields = array(
-		'mini',
-		'small',
-		'medium',
-		'large',
-		'xlarge',
-		'xxlarge',
-		'span1',
-		'span2',
-		'span3',
-		'span4',
-		'span5',
-		'span6',
-		'span7',
-		'span8',
-		'span9',
-		'span10',
-		'span11',
-		'span12',
-	);
-
-	/**
-	 * The field states available
-	 *
-	 * @var array
-	 */
-	protected $states = array(
-		'success',
-		'warning',
-		'error',
-		'info',
-	);
-
-	/**
-	 * 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, 'span') ? $class : 'input-'.$class;
-		}, $classes);
-
-		return $classes;
-	}
-
-	////////////////////////////////////////////////////////////////////
-	///////////////////////////// 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() and in_array('inline', $classes)) {
-			$field->inline();
-		}
-
-		// Filter classes according to field type
-		if ($field->isButton()) {
-			$classes = $this->filterButtonClasses($classes);
-		} else {
-			$classes = $this->filterFieldClasses($classes);
-		}
-
-		return $this->addClassesToField($field, $classes);
-	}
-
-	/**
-	 * Add group classes
-	 *
-	 * @return string A list of group classes
-	 */
-	public function getGroupClasses()
-	{
-		return 'control-group';
-	}
-
-	/**
-	 * Add label classes
-	 *
-	 * @return string An array of attributes with the label class
-	 */
-	public function getLabelClasses()
-	{
-		return 'control-label';
-	}
-
-	/**
-	 * Add uneditable field classes
-	 *
-	 * @return string An array of attributes with the uneditable class
-	 */
-	public function getUneditableClasses()
-	{
-		return 'uneditable-input';
-	}
-
-	public function getPlainTextClasses()
-	{
-		return null;
-	}
-
-	/**
-	 * 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
-	 */
-	public function getActionClasses()
-	{
-		return 'form-actions';
-	}
-
-	////////////////////////////////////////////////////////////////////
-	//////////////////////////// RENDER BLOCKS /////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Render an help text
-	 *
-	 * @param string $text
-	 * @param array  $attributes
-	 *
-	 * @return Element
-	 */
-	public function createHelp($text, $attributes = array())
-	{
-		return Element::create('span', $text, $attributes)->addClass('help-inline');
-	}
-
-	/**
-	 * Render a block help text
-	 *
-	 * @param string $text
-	 * @param array  $attributes
-	 *
-	 * @return Element
-	 */
-	public function createBlockHelp($text, $attributes = array())
-	{
-		return Element::create('p', $text, $attributes)->addClass('help-block');
-	}
-
-	/**
-	 * 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
-	 * Which fallback to a disabled field
-	 *
-	 * @param Field $field
-	 *
-	 * @return Element
-	 */
-	public function createPlainTextField(Field $field)
-	{
-		return $this->createDisabledField($field);
-	}
-
-	/**
-	 * Render an icon
-	 *
-	 * @param array $attributes Its general attributes
-	 *
-	 * @return string
-	 */
-	public function createIcon($iconType, $attributes = array(), $iconSettings = array())
-	{
-		// Check for empty icons
-		if (!$iconType) {
-			return false;
-		}
-
-		// Create tag
-		$tag  = Arr::get($iconSettings, 'tag', $this->iconTag);
-		$icon = Element::create($tag, null, $attributes);
-
-		// White icons ignore user overrides to use legacy Bootstrap styling
-		if (Str::contains($iconType, 'white')) {
-			$iconType = str_replace('white', '', $iconType);
-			$iconType = trim($iconType, '-');
-			$icon->addClass('icon-white');
-			$set    = null;
-			$prefix = 'icon';
-		} else {
-			$set    = Arr::get($iconSettings, 'set', $this->iconSet);
-			$prefix = Arr::get($iconSettings, 'prefix', $this->iconPrefix);
-		}
-		$icon->addClass("$set $prefix-$iconType");
-
-		return $icon;
-	}
-
-	////////////////////////////////////////////////////////////////////
-	//////////////////////////// WRAP BLOCKS ///////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Wrap an item to be prepended or appended to the current field
-	 *
-	 * @param  string $item
-	 *
-	 * @return string A wrapped item
-	 */
-	public function placeAround($item)
-	{
-		// Render object
-		if (is_object($item) and method_exists($item, '__toString')) {
-			$item = $item->__toString();
-		}
-
-		// Return unwrapped if button
-		if (strpos($item, '<button') !== false) {
-			return $item;
-		}
-
-		return Element::create('span', $item)->addClass('add-on');
-	}
-
-	/**
-	 * 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)
-	{
-		$class = array();
-		if ($prepend) {
-			$class[] = 'input-prepend';
-		}
-		if ($append) {
-			$class[] = 'input-append';
-		}
-
-		$return = '<div class="'.join(' ', $class).'">';
-		$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)
-	{
-		return Element::create('div', $field)->addClass('controls');
-	}
-
-	/**
-	 * 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', 'inline', 'search');
+
+    /**
+     * The button types available
+     *
+     * @var array
+     */
+    private $buttons = array(
+        'large',
+        'small',
+        'mini',
+        'block',
+        'danger',
+        'info',
+        'inverse',
+        'link',
+        'primary',
+        'success',
+        'warning',
+    );
+
+    /**
+     * The field sizes available
+     *
+     * @var array
+     */
+    private $fields = array(
+        'mini',
+        'small',
+        'medium',
+        'large',
+        'xlarge',
+        'xxlarge',
+        'span1',
+        'span2',
+        'span3',
+        'span4',
+        'span5',
+        'span6',
+        'span7',
+        'span8',
+        'span9',
+        'span10',
+        'span11',
+        'span12',
+    );
+
+    /**
+     * The field states available
+     *
+     * @var array
+     */
+    protected $states = array(
+        'success',
+        'warning',
+        'error',
+        'info',
+    );
+
+    /**
+     * 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, 'span') ? $class : 'input-'.$class;
+        }, $classes);
+
+        return $classes;
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ///////////////////////////// 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() and in_array('inline', $classes)) {
+            $field->inline();
+        }
+
+        // Filter classes according to field type
+        if ($field->isButton()) {
+            $classes = $this->filterButtonClasses($classes);
+        } else {
+            $classes = $this->filterFieldClasses($classes);
+        }
+
+        return $this->addClassesToField($field, $classes);
+    }
+
+    /**
+     * Add group classes
+     *
+     * @return string A list of group classes
+     */
+    public function getGroupClasses()
+    {
+        return 'control-group';
+    }
+
+    /**
+     * Add label classes
+     *
+     * @return string An array of attributes with the label class
+     */
+    public function getLabelClasses()
+    {
+        return 'control-label';
+    }
+
+    /**
+     * Add uneditable field classes
+     *
+     * @return string An array of attributes with the uneditable class
+     */
+    public function getUneditableClasses()
+    {
+        return 'uneditable-input';
+    }
+
+    public function getPlainTextClasses()
+    {
+        return null;
+    }
+
+    /**
+     * 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
+     */
+    public function getActionClasses()
+    {
+        return 'form-actions';
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    //////////////////////////// RENDER BLOCKS /////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Render an help text
+     *
+     * @param string $text
+     * @param array  $attributes
+     *
+     * @return Element
+     */
+    public function createHelp($text, $attributes = array())
+    {
+        return Element::create('span', $text, $attributes)->addClass('help-inline');
+    }
+
+    /**
+     * Render a block help text
+     *
+     * @param string $text
+     * @param array  $attributes
+     *
+     * @return Element
+     */
+    public function createBlockHelp($text, $attributes = array())
+    {
+        return Element::create('p', $text, $attributes)->addClass('help-block');
+    }
+
+    /**
+     * 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
+     * Which fallback to a disabled field
+     *
+     * @param Field $field
+     *
+     * @return Element
+     */
+    public function createPlainTextField(Field $field)
+    {
+        return $this->createDisabledField($field);
+    }
+
+    /**
+     * Render an icon
+     *
+     * @param array $attributes Its general attributes
+     *
+     * @return string
+     */
+    public function createIcon($iconType, $attributes = array(), $iconSettings = array())
+    {
+        // Check for empty icons
+        if (!$iconType) {
+            return false;
+        }
+
+        // Create tag
+        $tag  = Arr::get($iconSettings, 'tag', $this->iconTag);
+        $icon = Element::create($tag, null, $attributes);
+
+        // White icons ignore user overrides to use legacy Bootstrap styling
+        if (Str::contains($iconType, 'white')) {
+            $iconType = str_replace('white', '', $iconType);
+            $iconType = trim($iconType, '-');
+            $icon->addClass('icon-white');
+            $set    = null;
+            $prefix = 'icon';
+        } else {
+            $set    = Arr::get($iconSettings, 'set', $this->iconSet);
+            $prefix = Arr::get($iconSettings, 'prefix', $this->iconPrefix);
+        }
+        $icon->addClass("$set $prefix-$iconType");
+
+        return $icon;
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    //////////////////////////// WRAP BLOCKS ///////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Wrap an item to be prepended or appended to the current field
+     *
+     * @param  string $item
+     *
+     * @return string A wrapped item
+     */
+    public function placeAround($item)
+    {
+        // Render object
+        if (is_object($item) and method_exists($item, '__toString')) {
+            $item = $item->__toString();
+        }
+
+        // Return unwrapped if button
+        if (strpos($item, '<button') !== false) {
+            return $item;
+        }
+
+        return Element::create('span', $item)->addClass('add-on');
+    }
+
+    /**
+     * 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)
+    {
+        $class = array();
+        if ($prepend) {
+            $class[] = 'input-prepend';
+        }
+        if ($append) {
+            $class[] = 'input-append';
+        }
+
+        $return = '<div class="'.join(' ', $class).'">';
+        $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)
+    {
+        return Element::create('div', $field)->addClass('controls');
+    }
+
+    /**
+     * Wrap actions block with potential additional tags
+     *
+     * @param  Actions $actions
+     *
+     * @return string A wrapped actions block
+     */
+    public function wrapActions($actions)
+    {
+        return $actions;
+    }
 }

src/Former/Framework/Nude.php

Indentation +178 added lines, -178 removed lines

@@ -14,182 +14,182 @@
 class Nude extends Framework implements FrameworkInterface
 {
 
-	/**
-	 * The field states available
-	 *
-	 * @var array
-	 */
-	protected $states = array(
-		'error',
-	);
-
-	/**
-	 * Create a new Nude 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)
-	{
-		return $classes;
-	}
-
-	////////////////////////////////////////////////////////////////////
-	///////////////////////////// ADD CLASSES //////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	public function getFieldClasses(Field $field, $classes = array())
-	{
-		$classes = $this->filterFieldClasses($classes);
-
-		// If we found any class, add them
-		if ($classes) {
-			$field->class(implode(' ', $classes));
-		}
-
-		return $field;
-	}
-
-	public function getGroupClasses()
-	{
-		return null;
-	}
-
-	public function getLabelClasses()
-	{
-		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 /////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Create an help text
-	 */
-	public function createHelp($text, $attributes = array())
-	{
-		return Element::create('span', $text, $attributes)->addClass('help');
-	}
-
-	/**
-	 * 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
-	 *
-	 * @param  string $item
-	 *
-	 * @return Element A wrapped item
-	 */
-	public function placeAround($item)
-	{
-		return Element::create('span', $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 = '<div>';
-		$return .= implode('', $prepend);
-		$return .= $field->render();
-		$return .= implode('', $append);
-		$return .= '</div>';
-
-		return $return;
-	}
-
-	/**
-	 * Wraps all field contents with potential additional tags.
-	 *
-	 * @param  Field $field
-	 *
-	 * @return Field A wrapped field
-	 */
-	public function wrapField($field)
-	{
-		return $field;
-	}
-
-	/**
-	 * Wrap actions block with potential additional tags
-	 *
-	 * @param  Actions $actions
-	 *
-	 * @return string A wrapped actions block
-	 */
-	public function wrapActions($actions)
-	{
-		return $actions;
-	}
+    /**
+     * The field states available
+     *
+     * @var array
+     */
+    protected $states = array(
+        'error',
+    );
+
+    /**
+     * Create a new Nude 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)
+    {
+        return $classes;
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ///////////////////////////// ADD CLASSES //////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    public function getFieldClasses(Field $field, $classes = array())
+    {
+        $classes = $this->filterFieldClasses($classes);
+
+        // If we found any class, add them
+        if ($classes) {
+            $field->class(implode(' ', $classes));
+        }
+
+        return $field;
+    }
+
+    public function getGroupClasses()
+    {
+        return null;
+    }
+
+    public function getLabelClasses()
+    {
+        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 /////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Create an help text
+     */
+    public function createHelp($text, $attributes = array())
+    {
+        return Element::create('span', $text, $attributes)->addClass('help');
+    }
+
+    /**
+     * 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
+     *
+     * @param  string $item
+     *
+     * @return Element A wrapped item
+     */
+    public function placeAround($item)
+    {
+        return Element::create('span', $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 = '<div>';
+        $return .= implode('', $prepend);
+        $return .= $field->render();
+        $return .= implode('', $append);
+        $return .= '</div>';
+
+        return $return;
+    }
+
+    /**
+     * Wraps all field contents with potential additional tags.
+     *
+     * @param  Field $field
+     *
+     * @return Field A wrapped field
+     */
+    public function wrapField($field)
+    {
+        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/Framework/TwitterBootstrap4.php

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