formers / former

src/Former/Former.php

Spacing +5 added lines, -5 removed lines

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

Indentation +486 added lines, -486 removed lines

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

src/Former/Framework/TwitterBootstrap4.php

Spacing +1 added lines, -1 removed lines

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

Doc Comments +1 added lines, -1 removed lines

@@ -345,7 +345,7 @@
 	 * @param string $text
 	 * @param array  $attributes
 	 *
-	 * @return string
+	 * @return Element
 	 */
 	public function createValidationError($text, $attributes = array())
 	{

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 .= join(null, $prepend);
-		$return .= $field->render();
-		$return .= join(null, $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 .= join(null, $prepend);
+        $return .= $field->render();
+        $return .= join(null, $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/MethodDispatcher.php

Indentation +235 added lines, -235 removed lines

@@ -12,239 +12,239 @@
  */
 class MethodDispatcher
 {
-	/**
-	 * The IoC Container
-	 *
-	 * @var Container
-	 */
-	protected $app;
-
-	/**
-	 * An array of fields repositories
-	 *
-	 * @var array
-	 */
-	protected $repositories = array();
-
-	/**
-	 * Build a new Dispatcher
-	 *
-	 * @param Container $app
-	 * @param array     $repositories
-	 */
-	public function __construct(Container $app, $repositories)
-	{
-		$this->app          = $app;
-		$this->repositories = (array) $repositories;
-	}
-
-	////////////////////////////////////////////////////////////////////
-	///////////////////////////// REPOSITORIES /////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Add a fields repository
-	 *
-	 * @param string $repository
-	 *
-	 * @return $this
-	 */
-	public function addRepository($repository)
-	{
-		array_unshift($this->repositories, $repository);
-
-		return $this;
-	}
-
-	////////////////////////////////////////////////////////////////////
-	///////////////////////////// DISPATCHERS //////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Dispatch a call to a registered macro
-	 *
-	 * @param  string $method     The macro's name
-	 * @param  array  $parameters The macro's arguments
-	 *
-	 * @return mixed
-	 */
-	public function toMacros($method, $parameters)
-	{
-		if (!$this->app['former']->hasMacro($method)) {
-			return false;
-		}
-
-		// Get and format macro
-		$callback = $this->app['former']->getMacro($method);
-		if ($callback instanceof Closure) {
-			return call_user_func_array($callback, $parameters);
-		} // Cancel if the macro is invalid
-		elseif (!is_string($callback)) {
-			return false;
-		}
-
-		// Get class and method
-		list($class, $method) = explode('@', $callback);
-		$this->app->instance('Illuminate\Container\Container', $this->app);
-
-		return call_user_func_array(array($this->app->make($class), $method), $parameters);
-	}
-
-	/**
-	 * Dispatch a call over to Elements
-	 *
-	 * @param string $method     The method called
-	 * @param array  $parameters Its parameters
-	 *
-	 * @return string
-	 */
-	public function toElements($method, $parameters)
-	{
-		// Disregards if the method isn't an element
-		if (!method_exists($elements = new Form\Elements($this->app, $this->app['session']), $method)) {
-			return false;
-		}
-
-		return call_user_func_array(array($elements, $method), $parameters);
-	}
-
-	/**
-	 * Dispatch a call over to Form
-	 *
-	 * @param string $method     The method called
-	 * @param array  $parameters Its parameters
-	 *
-	 * @return Form
-	 */
-	public function toForm($method, $parameters)
-	{
-		// Disregards if the method doesn't contain 'open'
-		if (!Str::contains($method, 'open') and !Str::contains($method, 'Open')) {
-			return false;
-		}
-
-		$form = new Form\Form($this->app, $this->app['url'], $this->app['former.populator']);
-
-		return $form->openForm($method, $parameters);
-	}
-
-	/**
-	 * Dispatch a call over to Group
-	 *
-	 * @param string $method     The method called
-	 * @param array  $parameters Its parameters
-	 *
-	 * @return Group
-	 */
-	public function toGroup($method, $parameters)
-	{
-		// Disregards if the method isn't "group"
-		if ($method != 'group') {
-			return false;
-		}
-
-		// Create opener
-		$group = new Form\Group(
-			$this->app,
-			Arr::get($parameters, 0, null),
-			Arr::get($parameters, 1, null)
-		);
-
-		// Set custom group as true
-		Form\Group::$opened = true;
-
-		// Set custom group reference
-		Form\Group::$openGroup = $group;
-
-		return $group;
-	}
-
-	/**
-	 * Dispatch a call over to Actions
-	 *
-	 * @param string $method     The method called
-	 * @param array  $parameters Its parameters
-	 *
-	 * @return Actions
-	 */
-	public function toActions($method, $parameters)
-	{
-		if ($method != 'actions') {
-			return false;
-		}
-
-		return new Form\Actions($this->app, $parameters);
-	}
-
-	/**
-	 * Dispatch a call over to the Fields
-	 *
-	 * @param string $method     The method called
-	 * @param array  $parameters Its parameters
-	 *
-	 * @return Field
-	 */
-	public function toFields($method, $parameters)
-	{
-		// Listing parameters
-		$class = $this->getClassFromMethod($method);
-		$field = new $class(
-			$this->app,
-			$method,
-			Arr::get($parameters, 0),
-			Arr::get($parameters, 1),
-			Arr::get($parameters, 2),
-			Arr::get($parameters, 3),
-			Arr::get($parameters, 4),
-			Arr::get($parameters, 5)
-		);
-
-		return $field;
-	}
-
-	////////////////////////////////////////////////////////////////////
-	///////////////////////////// HELPERS //////////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Get the correct class to call according to the created field
-	 *
-	 * @param  string $method The field created
-	 *
-	 * @return string The correct class
-	 */
-	protected function getClassFromMethod($method)
-	{
-		// If the field's name directly match a class, call it
-		$class        = Str::singular(Str::title($method));
-		$studly_class = Str::singular(Str::studly($method));
-		foreach ($this->repositories as $repository) {
-			if (class_exists($repository.$studly_class)) {
-				return $repository.$studly_class;
-			} else {
-				if (class_exists($repository.$class)) {
-					return $repository.$class;
-				}
-			}
-		}
-
-		// Else convert known fields to their classes
-		switch ($method) {
-			case 'submit':
-			case 'link':
-			case 'reset':
-				$class = Former::FIELDSPACE.'Button';
-				break;
-
-			case 'multiselect':
-				$class = Former::FIELDSPACE.'Select';
-				break;
-
-			default:
-				$class = Former::FIELDSPACE.'Input';
-				break;
-		}
-
-		return $class;
-	}
+    /**
+     * The IoC Container
+     *
+     * @var Container
+     */
+    protected $app;
+
+    /**
+     * An array of fields repositories
+     *
+     * @var array
+     */
+    protected $repositories = array();
+
+    /**
+     * Build a new Dispatcher
+     *
+     * @param Container $app
+     * @param array     $repositories
+     */
+    public function __construct(Container $app, $repositories)
+    {
+        $this->app          = $app;
+        $this->repositories = (array) $repositories;
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ///////////////////////////// REPOSITORIES /////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Add a fields repository
+     *
+     * @param string $repository
+     *
+     * @return $this
+     */
+    public function addRepository($repository)
+    {
+        array_unshift($this->repositories, $repository);
+
+        return $this;
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ///////////////////////////// DISPATCHERS //////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Dispatch a call to a registered macro
+     *
+     * @param  string $method     The macro's name
+     * @param  array  $parameters The macro's arguments
+     *
+     * @return mixed
+     */
+    public function toMacros($method, $parameters)
+    {
+        if (!$this->app['former']->hasMacro($method)) {
+            return false;
+        }
+
+        // Get and format macro
+        $callback = $this->app['former']->getMacro($method);
+        if ($callback instanceof Closure) {
+            return call_user_func_array($callback, $parameters);
+        } // Cancel if the macro is invalid
+        elseif (!is_string($callback)) {
+            return false;
+        }
+
+        // Get class and method
+        list($class, $method) = explode('@', $callback);
+        $this->app->instance('Illuminate\Container\Container', $this->app);
+
+        return call_user_func_array(array($this->app->make($class), $method), $parameters);
+    }
+
+    /**
+     * Dispatch a call over to Elements
+     *
+     * @param string $method     The method called
+     * @param array  $parameters Its parameters
+     *
+     * @return string
+     */
+    public function toElements($method, $parameters)
+    {
+        // Disregards if the method isn't an element
+        if (!method_exists($elements = new Form\Elements($this->app, $this->app['session']), $method)) {
+            return false;
+        }
+
+        return call_user_func_array(array($elements, $method), $parameters);
+    }
+
+    /**
+     * Dispatch a call over to Form
+     *
+     * @param string $method     The method called
+     * @param array  $parameters Its parameters
+     *
+     * @return Form
+     */
+    public function toForm($method, $parameters)
+    {
+        // Disregards if the method doesn't contain 'open'
+        if (!Str::contains($method, 'open') and !Str::contains($method, 'Open')) {
+            return false;
+        }
+
+        $form = new Form\Form($this->app, $this->app['url'], $this->app['former.populator']);
+
+        return $form->openForm($method, $parameters);
+    }
+
+    /**
+     * Dispatch a call over to Group
+     *
+     * @param string $method     The method called
+     * @param array  $parameters Its parameters
+     *
+     * @return Group
+     */
+    public function toGroup($method, $parameters)
+    {
+        // Disregards if the method isn't "group"
+        if ($method != 'group') {
+            return false;
+        }
+
+        // Create opener
+        $group = new Form\Group(
+            $this->app,
+            Arr::get($parameters, 0, null),
+            Arr::get($parameters, 1, null)
+        );
+
+        // Set custom group as true
+        Form\Group::$opened = true;
+
+        // Set custom group reference
+        Form\Group::$openGroup = $group;
+
+        return $group;
+    }
+
+    /**
+     * Dispatch a call over to Actions
+     *
+     * @param string $method     The method called
+     * @param array  $parameters Its parameters
+     *
+     * @return Actions
+     */
+    public function toActions($method, $parameters)
+    {
+        if ($method != 'actions') {
+            return false;
+        }
+
+        return new Form\Actions($this->app, $parameters);
+    }
+
+    /**
+     * Dispatch a call over to the Fields
+     *
+     * @param string $method     The method called
+     * @param array  $parameters Its parameters
+     *
+     * @return Field
+     */
+    public function toFields($method, $parameters)
+    {
+        // Listing parameters
+        $class = $this->getClassFromMethod($method);
+        $field = new $class(
+            $this->app,
+            $method,
+            Arr::get($parameters, 0),
+            Arr::get($parameters, 1),
+            Arr::get($parameters, 2),
+            Arr::get($parameters, 3),
+            Arr::get($parameters, 4),
+            Arr::get($parameters, 5)
+        );
+
+        return $field;
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ///////////////////////////// HELPERS //////////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Get the correct class to call according to the created field
+     *
+     * @param  string $method The field created
+     *
+     * @return string The correct class
+     */
+    protected function getClassFromMethod($method)
+    {
+        // If the field's name directly match a class, call it
+        $class        = Str::singular(Str::title($method));
+        $studly_class = Str::singular(Str::studly($method));
+        foreach ($this->repositories as $repository) {
+            if (class_exists($repository.$studly_class)) {
+                return $repository.$studly_class;
+            } else {
+                if (class_exists($repository.$class)) {
+                    return $repository.$class;
+                }
+            }
+        }
+
+        // Else convert known fields to their classes
+        switch ($method) {
+            case 'submit':
+            case 'link':
+            case 'reset':
+                $class = Former::FIELDSPACE.'Button';
+                break;
+
+            case 'multiselect':
+                $class = Former::FIELDSPACE.'Select';
+                break;
+
+            default:
+                $class = Former::FIELDSPACE.'Input';
+                break;
+        }
+
+        return $class;
+    }
 }

src/Former/Populator.php

Indentation +167 added lines, -167 removed lines

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

src/Former/Helpers.php

Indentation +187 added lines, -187 removed lines

@@ -9,191 +9,191 @@
  */
 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 $value The string to encode
-	 *
-	 * @return string
-	 */
-	public static function encode($value)
-	{
-		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 null;
-		}
-
-		// 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 $value The string to encode
+     *
+     * @return string
+     */
+    public static function encode($value)
+    {
+        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 null;
+        }
+
+        // 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;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -127,7 +127,7 @@ 
 		//Convert parametrs of old format to new format
 		if (!is_callable($text)) {
 			$optionTextValue = $text;
-			$text = function ($model) use ($optionTextValue) {
+			$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')) {
@@ -172,7 +172,7 @@ 
 					$optionAttributeValue = $modelAttributeName($model);
 				} elseif ($modelAttributeName and isset($model->$modelAttributeName)) {
 					$optionAttributeValue = $model->$modelAttributeName;
-				} elseif($optionAttributeName === 'value') {
+				} elseif ($optionAttributeName === 'value') {
 					//For backward compatibility
 					if (method_exists($model, 'getKey')) {
 						$optionAttributeValue = $model->getKey();

src/Former/Form/Fields/Plaintext.php

Indentation +23 added lines, -23 removed lines

@@ -9,31 +9,31 @@
  */
 class Plaintext extends Field
 {
-	////////////////////////////////////////////////////////////////////
-	/////////////////////////// CORE METHODS ///////////////////////////
-	////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////
+    /////////////////////////// CORE METHODS ///////////////////////////
+    ////////////////////////////////////////////////////////////////////
 
-	/**
-	 * Prints out the current tag
-	 *
-	 * @return string A plain text tag
-	 */
-	public function render()
-	{
-		$this->addClass($this->app['former.framework']->getPlainTextClasses());
-		$this->setId();
-		if ($this->app['former']->getOption('escape_plaintext_value', true)) {
-			$this->escapeValue();
-		}
+    /**
+     * Prints out the current tag
+     *
+     * @return string A plain text tag
+     */
+    public function render()
+    {
+        $this->addClass($this->app['former.framework']->getPlainTextClasses());
+        $this->setId();
+        if ($this->app['former']->getOption('escape_plaintext_value', true)) {
+            $this->escapeValue();
+        }
 
-		return $this->app['former.framework']->createPlainTextField($this);
-	}
+        return $this->app['former.framework']->createPlainTextField($this);
+    }
 
-	protected function escapeValue()
-	{
-		$valueToEscape = $this->getValue();
-		$value = is_string($valueToEscape) || $valueToEscape instanceof HtmlString ? e($valueToEscape) : $valueToEscape;
+    protected function escapeValue()
+    {
+        $valueToEscape = $this->getValue();
+        $value = is_string($valueToEscape) || $valueToEscape instanceof HtmlString ? e($valueToEscape) : $valueToEscape;
 
-		return $this->forceValue($value);
-	}
+        return $this->forceValue($value);
+    }
 }

src/Former/Framework/TwitterBootstrap5.php

Doc Comments +2 added lines, -2 removed lines

@@ -352,7 +352,7 @@ 
 	 * @param string $text
 	 * @param array  $attributes
 	 *
-	 * @return string
+	 * @return Element
 	 */
 	public function createValidationError($text, $attributes = array())
 	{
@@ -408,7 +408,7 @@ 
 	/**
 	 * Wrap an item to be prepended or appended to the current field
 	 *
-	 * @return Element A wrapped item
+	 * @return string A wrapped item
 	 */
 	public function placeAround($item, $place = null)
 	{

Spacing +1 added lines, -1 removed lines

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

Indentation +470 added lines, -470 removed lines

@@ -13,474 +13,474 @@
  */
 class TwitterBootstrap5 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 .= " offset-$viewports[$viewport]-$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 file fields
-		// As text-type is open-ended we instead exclude those that shouldn't receive the class
-		if (!$field->isCheckable() && !$field->isButton() && !in_array($field->getType(), [
-					'plaintext',
-					'select',
-				]) && !in_array('form-control', $classes)
-		) {
-			$classes[] = 'form-control';
-		}
-
-		// Add form-select class for select fields
-		if ($field->getType() === 'select' && !in_array('form-select', $classes)) {
-			$classes[] = 'form-select';
-		}
-
-		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 'mb-3 row';
-		} else {
-			return 'mb-3';
-		}
-	}
-
-	/**
-	 * 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('visually-hidden');
-		} else {
-			return array('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 'mb-3 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('span', $text, $attributes)->addClass('form-text');
-	}
-
-	/**
-	 * 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('div', $text, $attributes)->addClass('form-text');
-	}
-
-	/**
-	 * 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;
-	}
-
-	/**
-	 * 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 .= join(null, $prepend);
-		$return .= $field->render();
-		$return .= join(null, $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 .= " offset-$viewports[$viewport]-$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 file fields
+        // As text-type is open-ended we instead exclude those that shouldn't receive the class
+        if (!$field->isCheckable() && !$field->isButton() && !in_array($field->getType(), [
+                    'plaintext',
+                    'select',
+                ]) && !in_array('form-control', $classes)
+        ) {
+            $classes[] = 'form-control';
+        }
+
+        // Add form-select class for select fields
+        if ($field->getType() === 'select' && !in_array('form-select', $classes)) {
+            $classes[] = 'form-select';
+        }
+
+        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 'mb-3 row';
+        } else {
+            return 'mb-3';
+        }
+    }
+
+    /**
+     * 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('visually-hidden');
+        } else {
+            return array('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 'mb-3 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('span', $text, $attributes)->addClass('form-text');
+    }
+
+    /**
+     * 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('div', $text, $attributes)->addClass('form-text');
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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 .= join(null, $prepend);
+        $return .= $field->render();
+        $return .= join(null, $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/config/former.php

Indentation +235 added lines, -235 removed lines

@@ -1,240 +1,240 @@
 <?php return array(
 
-	// Markup
-	////////////////////////////////////////////////////////////////////
-
-	// Whether labels should be automatically computed from name
-	'automatic_label'         => true,
-
-	// The default form type
-	'default_form_type'       => 'horizontal',
-
-	// Whether Former should escape HTML tags of 'plaintext' fields value
-	// Enabled by default
-	//
-	// Instead of disabled this option, you should use the 'HtmlString' class:
-	//  Former::plaintext('text')
-	//      ->forceValue(
-	//          new Illuminate\Support\HtmlString('<b>your HTML data</b>')
-	//      )
-	'escape_plaintext_value'  => true,
-
-	// Validation
-	////////////////////////////////////////////////////////////////////
-
-	// Whether Former should fetch errors from Session
-	'fetch_errors'            => true,
-
-	// Whether Former should try to apply Validator rules as attributes
-	'live_validation'         => true,
-
-	// Whether Former should automatically fetch error messages and
-	// display them next to the matching fields
-	'error_messages'          => true,
-
-	// Checkables
-	////////////////////////////////////////////////////////////////////
-
-	// Whether checkboxes should always be present in the POST data,
-	// no matter if you checked them or not
-	'push_checkboxes'         => false,
-
-	// The value a checkbox will have in the POST array if unchecked
-	'unchecked_value'         => 0,
-
-	// Required fields
-	////////////////////////////////////////////////////////////////////
-
-	// The class to be added to required fields
-	'required_class'          => 'required',
-
-	// A facultative text to append to the labels of required fields
-	'required_text'           => '<sup>*</sup>',
-
-	// Translations
-	////////////////////////////////////////////////////////////////////
-
-	// Where Former should look for translations
-	'translate_from'          => 'validation.attributes',
-
-	// Whether text that comes out of the translated
-	// should be capitalized (ex: email => Email) automatically
-	'capitalize_translations' => true,
-
-	// An array of attributes to automatically translate
-	'translatable'            => array(
-		'help',
-		'inlineHelp',
-		'blockHelp',
-		'placeholder',
-		'data_placeholder',
-		'label',
-	),
-
-	// Framework
-	////////////////////////////////////////////////////////////////////
-
-	// The framework to be used by Former
-	'framework'               => 'TwitterBootstrap3',
-
-	'TwitterBootstrap5'       => array(
-
-		// Map Former-supported viewports to Bootstrap 5 equivalents
-		'viewports'   => array(
-			'large'  => 'lg',
-			'medium' => 'md',
-			'small'  => 'sm',
-			'mini'   => 'xs',
-		),
-		// Width of labels for horizontal forms expressed as viewport => grid columns
-		'labelWidths' => array(
-			'large' => 2,
-			'small' => 4,
-		),
-		// HTML markup and classes used by Bootstrap 5 for icons
-		'icon'        => array(
-			'tag'    => 'i',
-			'set'    => 'fa',
-			'prefix' => 'fa',
-		),
-
-	),
-
-	'TwitterBootstrap4'       => array(
-
-		// Map Former-supported viewports to Bootstrap 4 equivalents
-		'viewports'   => array(
-			'large'  => 'lg',
-			'medium' => 'md',
-			'small'  => 'sm',
-			'mini'   => 'xs',
-		),
-		// Width of labels for horizontal forms expressed as viewport => grid columns
-		'labelWidths' => array(
-			'large' => 2,
-			'small' => 4,
-		),
-		// HTML markup and classes used by Bootstrap 4 for icons
-		'icon'        => array(
-			'tag'    => 'i',
-			'set'    => 'fa',
-			'prefix' => 'fa',
-		),
-
-	),
-
-	'TwitterBootstrap3'       => array(
-
-		// Map Former-supported viewports to Bootstrap 3 equivalents
-		'viewports'   => array(
-			'large'  => 'lg',
-			'medium' => 'md',
-			'small'  => 'sm',
-			'mini'   => 'xs',
-		),
-		// Width of labels for horizontal forms expressed as viewport => grid columns
-		'labelWidths' => array(
-			'large' => 2,
-			'small' => 4,
-		),
-		// HTML markup and classes used by Bootstrap 3 for icons
-		'icon'        => array(
-			'tag'    => 'span',
-			'set'    => 'glyphicon',
-			'prefix' => 'glyphicon',
-		),
-
-	),
-
-	'Nude'                    => array(  // No-framework markup
-		'icon' => array(
-			'tag'    => 'i',
-			'set'    => null,
-			'prefix' => 'icon',
-		),
-	),
-
-	'TwitterBootstrap'        => array( // Twitter Bootstrap version 2
-		'icon' => array(
-			'tag'    => 'i',
-			'set'    => null,
-			'prefix' => 'icon',
-		),
-	),
-
-	'ZurbFoundation5'         => array(
-		// Map Former-supported viewports to Foundation 5 equivalents
-		'viewports'           => array(
-			'large'  => 'large',
-			'medium' => null,
-			'small'  => 'small',
-			'mini'   => null,
-		),
-		// Width of labels for horizontal forms expressed as viewport => grid columns
-		'labelWidths'         => array(
-			'small' => 3,
-		),
-		// Classes to be applied to wrapped labels in horizontal forms
-		'wrappedLabelClasses' => array('right', 'inline'),
-		// HTML markup and classes used by Foundation 5 for icons
-		'icon'                => array(
-			'tag'    => 'i',
-			'set'    => null,
-			'prefix' => 'fi',
-		),
-		// CSS for inline validation errors
-		'error_classes'       => array('class' => 'error'),
-	),
-
-	'ZurbFoundation4'         => array(
-		// Foundation 4 also has an experimental "medium" breakpoint
-		// explained at http://foundation.zurb.com/docs/components/grid.html
-		'viewports'           => array(
-			'large'  => 'large',
-			'medium' => null,
-			'small'  => 'small',
-			'mini'   => null,
-		),
-		// Width of labels for horizontal forms expressed as viewport => grid columns
-		'labelWidths'         => array(
-			'small' => 3,
-		),
-		// Classes to be applied to wrapped labels in horizontal forms
-		'wrappedLabelClasses' => array('right', 'inline'),
-		// HTML markup and classes used by Foundation 4 for icons
-		'icon'                => array(
-			'tag'    => 'i',
-			'set'    => 'general',
-			'prefix' => 'foundicon',
-		),
-		// CSS for inline validation errors
-		'error_classes'       => array('class' => 'alert-box radius warning'),
-	),
-
-	'ZurbFoundation'          => array( // Foundation 3
-		'viewports'           => array(
-			'large'  => '',
-			'medium' => null,
-			'small'  => 'mobile-',
-			'mini'   => null,
-		),
-		// Width of labels for horizontal forms expressed as viewport => grid columns
-		'labelWidths'         => array(
-			'large' => 2,
-			'small' => 4,
-		),
-		// Classes to be applied to wrapped labels in horizontal forms
-		'wrappedLabelClasses' => array('right', 'inline'),
-		// HTML markup and classes used by Foundation 3 for icons
-		'icon'                => array(
-			'tag'    => 'i',
-			'set'    => null,
-			'prefix' => 'fi',
-		),
-		// CSS for inline validation errors
-		// should work for Zurb 2 and 3
-		'error_classes'       => array('class' => 'alert-box alert error'),
-	),
+    // Markup
+    ////////////////////////////////////////////////////////////////////
+
+    // Whether labels should be automatically computed from name
+    'automatic_label'         => true,
+
+    // The default form type
+    'default_form_type'       => 'horizontal',
+
+    // Whether Former should escape HTML tags of 'plaintext' fields value
+    // Enabled by default
+    //
+    // Instead of disabled this option, you should use the 'HtmlString' class:
+    //  Former::plaintext('text')
+    //      ->forceValue(
+    //          new Illuminate\Support\HtmlString('<b>your HTML data</b>')
+    //      )
+    'escape_plaintext_value'  => true,
+
+    // Validation
+    ////////////////////////////////////////////////////////////////////
+
+    // Whether Former should fetch errors from Session
+    'fetch_errors'            => true,
+
+    // Whether Former should try to apply Validator rules as attributes
+    'live_validation'         => true,
+
+    // Whether Former should automatically fetch error messages and
+    // display them next to the matching fields
+    'error_messages'          => true,
+
+    // Checkables
+    ////////////////////////////////////////////////////////////////////
+
+    // Whether checkboxes should always be present in the POST data,
+    // no matter if you checked them or not
+    'push_checkboxes'         => false,
+
+    // The value a checkbox will have in the POST array if unchecked
+    'unchecked_value'         => 0,
+
+    // Required fields
+    ////////////////////////////////////////////////////////////////////
+
+    // The class to be added to required fields
+    'required_class'          => 'required',
+
+    // A facultative text to append to the labels of required fields
+    'required_text'           => '<sup>*</sup>',
+
+    // Translations
+    ////////////////////////////////////////////////////////////////////
+
+    // Where Former should look for translations
+    'translate_from'          => 'validation.attributes',
+
+    // Whether text that comes out of the translated
+    // should be capitalized (ex: email => Email) automatically
+    'capitalize_translations' => true,
+
+    // An array of attributes to automatically translate
+    'translatable'            => array(
+        'help',
+        'inlineHelp',
+        'blockHelp',
+        'placeholder',
+        'data_placeholder',
+        'label',
+    ),
+
+    // Framework
+    ////////////////////////////////////////////////////////////////////
+
+    // The framework to be used by Former
+    'framework'               => 'TwitterBootstrap3',
+
+    'TwitterBootstrap5'       => array(
+
+        // Map Former-supported viewports to Bootstrap 5 equivalents
+        'viewports'   => array(
+            'large'  => 'lg',
+            'medium' => 'md',
+            'small'  => 'sm',
+            'mini'   => 'xs',
+        ),
+        // Width of labels for horizontal forms expressed as viewport => grid columns
+        'labelWidths' => array(
+            'large' => 2,
+            'small' => 4,
+        ),
+        // HTML markup and classes used by Bootstrap 5 for icons
+        'icon'        => array(
+            'tag'    => 'i',
+            'set'    => 'fa',
+            'prefix' => 'fa',
+        ),
+
+    ),
+
+    'TwitterBootstrap4'       => array(
+
+        // Map Former-supported viewports to Bootstrap 4 equivalents
+        'viewports'   => array(
+            'large'  => 'lg',
+            'medium' => 'md',
+            'small'  => 'sm',
+            'mini'   => 'xs',
+        ),
+        // Width of labels for horizontal forms expressed as viewport => grid columns
+        'labelWidths' => array(
+            'large' => 2,
+            'small' => 4,
+        ),
+        // HTML markup and classes used by Bootstrap 4 for icons
+        'icon'        => array(
+            'tag'    => 'i',
+            'set'    => 'fa',
+            'prefix' => 'fa',
+        ),
+
+    ),
+
+    'TwitterBootstrap3'       => array(
+
+        // Map Former-supported viewports to Bootstrap 3 equivalents
+        'viewports'   => array(
+            'large'  => 'lg',
+            'medium' => 'md',
+            'small'  => 'sm',
+            'mini'   => 'xs',
+        ),
+        // Width of labels for horizontal forms expressed as viewport => grid columns
+        'labelWidths' => array(
+            'large' => 2,
+            'small' => 4,
+        ),
+        // HTML markup and classes used by Bootstrap 3 for icons
+        'icon'        => array(
+            'tag'    => 'span',
+            'set'    => 'glyphicon',
+            'prefix' => 'glyphicon',
+        ),
+
+    ),
+
+    'Nude'                    => array(  // No-framework markup
+        'icon' => array(
+            'tag'    => 'i',
+            'set'    => null,
+            'prefix' => 'icon',
+        ),
+    ),
+
+    'TwitterBootstrap'        => array( // Twitter Bootstrap version 2
+        'icon' => array(
+            'tag'    => 'i',
+            'set'    => null,
+            'prefix' => 'icon',
+        ),
+    ),
+
+    'ZurbFoundation5'         => array(
+        // Map Former-supported viewports to Foundation 5 equivalents
+        'viewports'           => array(
+            'large'  => 'large',
+            'medium' => null,
+            'small'  => 'small',
+            'mini'   => null,
+        ),
+        // Width of labels for horizontal forms expressed as viewport => grid columns
+        'labelWidths'         => array(
+            'small' => 3,
+        ),
+        // Classes to be applied to wrapped labels in horizontal forms
+        'wrappedLabelClasses' => array('right', 'inline'),
+        // HTML markup and classes used by Foundation 5 for icons
+        'icon'                => array(
+            'tag'    => 'i',
+            'set'    => null,
+            'prefix' => 'fi',
+        ),
+        // CSS for inline validation errors
+        'error_classes'       => array('class' => 'error'),
+    ),
+
+    'ZurbFoundation4'         => array(
+        // Foundation 4 also has an experimental "medium" breakpoint
+        // explained at http://foundation.zurb.com/docs/components/grid.html
+        'viewports'           => array(
+            'large'  => 'large',
+            'medium' => null,
+            'small'  => 'small',
+            'mini'   => null,
+        ),
+        // Width of labels for horizontal forms expressed as viewport => grid columns
+        'labelWidths'         => array(
+            'small' => 3,
+        ),
+        // Classes to be applied to wrapped labels in horizontal forms
+        'wrappedLabelClasses' => array('right', 'inline'),
+        // HTML markup and classes used by Foundation 4 for icons
+        'icon'                => array(
+            'tag'    => 'i',
+            'set'    => 'general',
+            'prefix' => 'foundicon',
+        ),
+        // CSS for inline validation errors
+        'error_classes'       => array('class' => 'alert-box radius warning'),
+    ),
+
+    'ZurbFoundation'          => array( // Foundation 3
+        'viewports'           => array(
+            'large'  => '',
+            'medium' => null,
+            'small'  => 'mobile-',
+            'mini'   => null,
+        ),
+        // Width of labels for horizontal forms expressed as viewport => grid columns
+        'labelWidths'         => array(
+            'large' => 2,
+            'small' => 4,
+        ),
+        // Classes to be applied to wrapped labels in horizontal forms
+        'wrappedLabelClasses' => array('right', 'inline'),
+        // HTML markup and classes used by Foundation 3 for icons
+        'icon'                => array(
+            'tag'    => 'i',
+            'set'    => null,
+            'prefix' => 'fi',
+        ),
+        // CSS for inline validation errors
+        // should work for Zurb 2 and 3
+        'error_classes'       => array('class' => 'alert-box alert error'),
+    ),
 
 
 );

src/Former/Traits/Checkable.php

Indentation +566 added lines, -566 removed lines

@@ -14,570 +14,570 @@
  */
 abstract class Checkable extends Field
 {
-	/**
-	 * Renders the checkables as inline
-	 *
-	 * @var boolean
-	 */
-	protected $inline = false;
-
-	/**
-	 * Add a text to a single element
-	 *
-	 * @var string
-	 */
-	protected $text = null;
-
-	/**
-	 * Renders the checkables as grouped
-	 *
-	 * @var boolean
-	 */
-	protected $grouped = false;
-
-	/**
-	 * The checkable items currently stored
-	 *
-	 * @var array
-	 */
-	protected $items = array();
-
-	/**
-	 * The type of checkable item
-	 *
-	 * @var string
-	 */
-	protected $checkable = null;
-
-	/**
-	 * An array of checked items
-	 *
-	 * @var array
-	 */
-	protected $checked = array();
-
-	/**
-	 * The checkable currently being focused on
-	 *
-	 * @var integer
-	 */
-	protected $focus = null;
-
-	/**
-	 * Whether this particular checkable is to be pushed
-	 *
-	 * @var boolean
-	 */
-	protected $isPushed = null;
-
-	////////////////////////////////////////////////////////////////////
-	//////////////////////////// CORE METHODS //////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Build a new checkable
-	 *
-	 * @param Container $app
-	 * @param string    $type
-	 * @param array     $name
-	 * @param           $label
-	 * @param           $value
-	 * @param           $attributes
-	 */
-	public function __construct(Container $app, $type, $name, $label, $value, $attributes)
-	{
-		// Unify auto and chained methods of grouping checkboxes
-		if (Str::endsWith($name, '[]')) {
-			$name = substr($name, 0, -2);
-			$this->grouped();
-		}
-		parent::__construct($app, $type, $name, $label, $value, $attributes);
-
-		if (is_array($this->value)) {
-			$this->items($this->value);
-		}
-	}
-
-	/**
-	 * Apply methods to focused checkable
-	 *
-	 * @param string $method
-	 * @param array  $parameters
-	 *
-	 * @return $this
-	 */
-	public function __call($method, $parameters)
-	{
-		$focused = $this->setOnFocused('attributes.'.$method, Arr::get($parameters, 0));
-		if ($focused) {
-			return $this;
-		}
-
-		return parent::__call($method, $parameters);
-	}
-
-	/**
-	 * Prints out the currently stored checkables
-	 */
-	public function render()
-	{
-		$html = null;
-
-		$this->setFieldClasses();
-
-		// Multiple items
-		if ($this->items) {
-			unset($this->app['former']->labels[array_search($this->name, $this->app['former']->labels)]);
-			foreach ($this->items as $key => $item) {
-				$value = $this->isCheckbox() && !$this->isGrouped() ? 1 : $key;
-				$html .= $this->createCheckable($item, $value);
-			}
-
-			return $html;
-		}
-
-		// Single item
-		return $this->createCheckable(array(
-			'name'  => $this->name,
-			'label' => $this->text,
-			'value' => $this->value,
-			'attributes' => $this->attributes,
-		));
-	}
-
-	////////////////////////////////////////////////////////////////////
-	////////////////////////// FIELD METHODS ///////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Focus on a particular checkable
-	 *
-	 * @param integer $on The checkable to focus on
-	 *
-	 * @return $this
-	 */
-	public function on($on)
-	{
-		if (!isset($this->items[$on])) {
-			return $this;
-		} else {
-			$this->focus = $on;
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Set the checkables as inline
-	 */
-	public function inline($isInline = true)
-	{
-		$this->inline = $isInline;
-
-		return $this;
-	}
-
-	/**
-	 * Set the checkables as stacked
-	 */
-	public function stacked($isStacked = true)
-	{
-		$this->inline = !$isStacked;
-
-		return $this;
-	}
-
-	/**
-	 * Set the checkables as grouped
-	 */
-	public function grouped($isGrouped = true)
-	{
-		$this->grouped = $isGrouped;
-
-		return $this;
-	}
-
-	/**
-	 * Add text to a single checkable
-	 *
-	 * @param  string $text The checkable label
-	 *
-	 * @return $this
-	 */
-	public function text($text)
-	{
-		// Translate and format
-		$text = Helpers::translate($text);
-
-		// Apply on focused if any
-		$focused = $this->setOnFocused('label', $text);
-		if ($focused) {
-			return $this;
-		}
-
-		$this->text = $text;
-
-		return $this;
-	}
-
-	/**
-	 * Push this particular checkbox
-	 *
-	 * @param boolean $pushed
-	 *
-	 * @return $this
-	 */
-	public function push($pushed = true)
-	{
-		$this->isPushed = $pushed;
-
-		return $this;
-	}
-
-	/**
-	 * Check a specific item
-	 *
-	 * @param bool|string $checked The checkable to check, or an array of checked items
-	 *
-	 * @return $this
-	 */
-	public function check($checked = true)
-	{
-		// If we're setting all the checked items at once
-		if (is_array($checked)) {
-			$this->checked = $checked;
-			// Checking an item in particular
-		} elseif (is_string($checked) or is_int($checked)) {
-			$this->checked[$checked] = true;
-			// Only setting a single item
-		} else {
-			$this->checked[$this->name] = (bool) $checked;
-		}
-
-		return $this;
-	}
-
-
-	/**
-	 * Check if the checkables are inline
-	 *
-	 * @return boolean
-	 */
-	public function isInline()
-	{
-		return $this->inline;
-	}
-
-	////////////////////////////////////////////////////////////////////
-	////////////////////////// INTERNAL METHODS ////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Creates a series of checkable items
-	 *
-	 * @param array $_items Items to create
-	 */
-	protected function items($_items)
-	{
-		// If passing an array
-		if (sizeof($_items) == 1 and
-			isset($_items[0]) and
-			is_array($_items[0])
-		) {
-			$_items = $_items[0];
-		}
-
-		// Fetch models if that's what we were passed
-		if (isset($_items[0]) and is_object($_items[0])) {
-			$_items = Helpers::queryToArray($_items);
-			$_items = array_flip($_items);
-		}
-
-		// Iterate through items, assign a name and a label to each
-		$count = 0;
-		foreach ($_items as $label => $name) {
-
-			// Define a fallback name in case none is found
-			$fallback = $this->isCheckbox()
-				? $this->name.'_'.$count
-				: $this->name;
-
-			// Grouped fields
-			if ($this->isGrouped()) {
-				$attributes['id'] = str_replace('[]', null, $fallback);
-				$fallback         = str_replace('[]', null, $this->name).'[]';
-			}
-
-			// If we haven't any name defined for the checkable, try to compute some
-			if (!is_string($label) and !is_array($name)) {
-				$label = $name;
-				$name  = $fallback;
-			}
-
-			// If we gave custom information on the item, add them
-			if (is_array($name)) {
-				$attributes = $name;
-				$name       = Arr::get($attributes, 'name', $fallback);
-				unset($attributes['name']);
-			}
-
-			// Store all informations we have in an array
-			$item = array(
-				'name'  => $name,
-				'label' => Helpers::translate($label),
-				'count' => $count,
-			);
-			if (isset($attributes)) {
-				$item['attributes'] = $attributes;
-			}
-
-			$this->items[] = $item;
-			$count++;
-		}
-	}
-
-	/**
-	 * Renders a checkable
-	 *
-	 * @param string|array $item          A checkable item
-	 * @param integer      $fallbackValue A fallback value if none is set
-	 *
-	 * @return string
-	 */
-	protected function createCheckable($item, $fallbackValue = 1)
-	{
-		// Extract informations
-		extract($item);
-
-		// Set default values
-		if (!isset($attributes)) {
-			$attributes = array();
-		}
-		if (isset($attributes['value'])) {
-			$value = $attributes['value'];
-		}
-		if (!isset($value) or $value === $this->app['former']->getOption('unchecked_value')) {
-			$value = $fallbackValue;
-		}
-
-		// If inline items, add class
-		$isInline = $this->inline ? ' '.$this->app['former.framework']->getInlineLabelClass($this) : null;
-
-		// In Bootsrap 3 or 4 or 5, don't append the the checkable type (radio/checkbox) as a class if
-		// rendering inline.
-		$class =  in_array($this->app['former']->framework(), ['TwitterBootstrap3', 'TwitterBootstrap4', 'TwitterBootstrap5']) ? trim($isInline) : $this->checkable.$isInline;
-
-		// Merge custom attributes with global attributes
-		$attributes = array_merge($this->attributes, $attributes);
-		if (!isset($attributes['id'])) {
-			$attributes['id'] = $name.$this->unique($name);
-		}
-
-		// Create field
-		$field = Input::create($this->checkable, $name, Helpers::encode($value), $attributes);
-		if ($this->isChecked($item, $value)) {
-			$field->checked('checked');
-		}
-
-		// Add hidden checkbox if requested
-		if ($this->isOfType('checkbox', 'checkboxes')) {
-			if ($this->isPushed or ($this->app['former']->getOption('push_checkboxes') and $this->isPushed !== false)) {
-				$field = $this->app['former']->hidden($name)->forceValue($this->app['former']->getOption('unchecked_value')).$field->render();
-
-				// app['former.field'] was overwritten by Former::hidden() call in the line above, so here
-				// we reset it to $this to enable $this->app['former']->getErrors() to retrieve the correct object
-				$this->app->instance('former.field', $this);
-			}
-		}
-
-		// If no label to wrap, return plain checkable
-		if (!$label) {
-			$element = (is_object($field)) ? $field->render() : $field;
-		} elseif (in_array($this->app['former']->framework(), ['TwitterBootstrap4', 'TwitterBootstrap5'])) {
-			// Revised for Bootstrap 4, move the 'input' outside of the 'label'
-			$labelClass = 'form-check-label';
-			$element = $field . Element::create('label', $label)->for($attributes['id'])->class($labelClass)->render();
-
-			$wrapper_class = $this->inline ? 'form-check form-check-inline' : 'form-check';
-
-			$element = Element::create('div', $element)->class($wrapper_class)->render();
-		} else {
-			// Original way is to add the 'input' inside the 'label'
-			$element = Element::create('label', $field.$label)->for($attributes['id'])->class($class)->render();
-		}
-
-		// 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)->class($this->checkable);
-			if ($this->getAttribute('disabled')) {
-				$wrapper->addClass('disabled');
-			}
-			$element = $wrapper->render();
-		}
-
-		// Return the field
-		return $element;
-	}
-
-	////////////////////////////////////////////////////////////////////
-	///////////////////////////// HELPERS //////////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Generate an unique ID for a field
-	 *
-	 * @param string $name The field's name
-	 *
-	 * @return string A field number to use
-	 */
-	protected function unique($name)
-	{
-		$this->app['former']->labels[] = $name;
-
-		// Count number of fields with the same ID
-		$where  = array_filter($this->app['former']->labels, function ($label) use ($name) {
-			return $label == $name;
-		});
-		$unique = sizeof($where);
-
-		// In case the field doesn't need to be numbered
-		if ($unique < 2 or empty($this->items)) {
-			return false;
-		}
-
-		return $unique;
-	}
-
-	/**
-	 * Set something on the currently focused checkable
-	 *
-	 * @param string $attribute The key to set
-	 * @param string $value     Its value
-	 *
-	 * @return $this|bool
-	 */
-	protected function setOnFocused($attribute, $value)
-	{
-		if (is_null($this->focus)) {
-			return false;
-		}
-
-		$this->items[$this->focus] = Arr::set($this->items[$this->focus], $attribute, $value);
-
-		return $this;
-	}
-
-	/**
-	 * Check if a checkable is checked
-	 *
-	 * @return boolean Checked or not
-	 */
-	protected function isChecked($item = null, $value = null)
-	{
-		if (isset($item['name'])) {
-			$name = $item['name'];
-		}
-		if (empty($name)) {
-			$name = $this->name;
-		}
-
-		// If it's a checkbox, see if we marqued that one as checked in the array
-		// Or if it's a single radio, simply see if we called check
-		if ($this->isCheckbox() or
-			!$this->isCheckbox() and !$this->items
-		) {
-			$checked = Arr::get($this->checked, $name, false);
-
-			// If there are multiple, search for the value
-			// as the name are the same between radios
-		} else {
-			$checked = Arr::get($this->checked, $value, false);
-		}
-
-		// Check the values and POST array
-		if ($this->isGrouped()) {
-			// The group index. (e.g. 'bar' if the item name is foo[bar], or the item index for foo[])
-			$groupIndex = self::getGroupIndexFromItem($item);
-
-			// Search using the bare name, not the individual item name
-			$post   = $this->app['former']->getPost($this->name);
-			$static = $this->app['former']->getValue($this->bind ?: $this->name);
-
-			if (isset($post[$groupIndex])) {
-				$post = $post[$groupIndex];
-			}
-
-			/**
-			 * Support for Laravel Collection repopulating for grouped checkboxes. Note that the groupIndex must
-			 * match the value in order for the checkbox to be considered checked, e.g.:
-			 *
-			 *  array(
-			 *    'name' = 'roles[foo]',
-			 *    'value' => 'foo',
-			 *  )
-			 */
-			if ($static instanceof Collection) {
-				// If the repopulate value is a collection, search for an item matching the $groupIndex
-				foreach ($static as $staticItem) {
-					$staticItemValue = method_exists($staticItem, 'getKey') ? $staticItem->getKey() : $staticItem;
-					if ($staticItemValue == $groupIndex) {
-						$static = $staticItemValue;
-						break;
-					}
-				}
-			} else if (isset($static[$groupIndex])) {
-				$static = $static[$groupIndex];
-			}
-		} else {
-			$post   = $this->app['former']->getPost($name);
-			$static = $this->app['former']->getValue($this->bind ?: $name);
-		}
-
-		if (!is_null($post) and $post !== $this->app['former']->getOption('unchecked_value')) {
-			$isChecked = ($post == $value);
-		} elseif (!is_null($static)) {
-			$isChecked = ($static == $value);
-		} else {
-			$isChecked = $checked;
-		}
-
-		return $isChecked ? true : false;
-	}
-
-	/**
-	 * Check if the current element is a checkbox
-	 *
-	 * @return boolean Checkbox or radio
-	 */
-	protected function isCheckbox()
-	{
-		return $this->checkable == 'checkbox';
-	}
-
-	/**
-	 * Check if the checkables are grouped or not
-	 *
-	 * @return boolean
-	 */
-	protected function isGrouped()
-	{
-		return
-			$this->grouped == true or
-			strpos($this->name, '[]') !== false;
-	}
-
-	/**
-	 * @param array $item The item array, containing at least name and count keys.
-	 *
-	 * @return mixed The group index. (e.g. returns bar if the item name is foo[bar], or the item count for foo[])
-	 */
-	public static function getGroupIndexFromItem($item)
-	{
-		$groupIndex = preg_replace('/^.*?\[(.*)\]$/', '$1', $item['name']);
-		if (empty($groupIndex) or $groupIndex == $item['name']) {
-			return $item['count'];
-		}
-
-		return $groupIndex;
-	}
+    /**
+     * Renders the checkables as inline
+     *
+     * @var boolean
+     */
+    protected $inline = false;
+
+    /**
+     * Add a text to a single element
+     *
+     * @var string
+     */
+    protected $text = null;
+
+    /**
+     * Renders the checkables as grouped
+     *
+     * @var boolean
+     */
+    protected $grouped = false;
+
+    /**
+     * The checkable items currently stored
+     *
+     * @var array
+     */
+    protected $items = array();
+
+    /**
+     * The type of checkable item
+     *
+     * @var string
+     */
+    protected $checkable = null;
+
+    /**
+     * An array of checked items
+     *
+     * @var array
+     */
+    protected $checked = array();
+
+    /**
+     * The checkable currently being focused on
+     *
+     * @var integer
+     */
+    protected $focus = null;
+
+    /**
+     * Whether this particular checkable is to be pushed
+     *
+     * @var boolean
+     */
+    protected $isPushed = null;
+
+    ////////////////////////////////////////////////////////////////////
+    //////////////////////////// CORE METHODS //////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Build a new checkable
+     *
+     * @param Container $app
+     * @param string    $type
+     * @param array     $name
+     * @param           $label
+     * @param           $value
+     * @param           $attributes
+     */
+    public function __construct(Container $app, $type, $name, $label, $value, $attributes)
+    {
+        // Unify auto and chained methods of grouping checkboxes
+        if (Str::endsWith($name, '[]')) {
+            $name = substr($name, 0, -2);
+            $this->grouped();
+        }
+        parent::__construct($app, $type, $name, $label, $value, $attributes);
+
+        if (is_array($this->value)) {
+            $this->items($this->value);
+        }
+    }
+
+    /**
+     * Apply methods to focused checkable
+     *
+     * @param string $method
+     * @param array  $parameters
+     *
+     * @return $this
+     */
+    public function __call($method, $parameters)
+    {
+        $focused = $this->setOnFocused('attributes.'.$method, Arr::get($parameters, 0));
+        if ($focused) {
+            return $this;
+        }
+
+        return parent::__call($method, $parameters);
+    }
+
+    /**
+     * Prints out the currently stored checkables
+     */
+    public function render()
+    {
+        $html = null;
+
+        $this->setFieldClasses();
+
+        // Multiple items
+        if ($this->items) {
+            unset($this->app['former']->labels[array_search($this->name, $this->app['former']->labels)]);
+            foreach ($this->items as $key => $item) {
+                $value = $this->isCheckbox() && !$this->isGrouped() ? 1 : $key;
+                $html .= $this->createCheckable($item, $value);
+            }
+
+            return $html;
+        }
+
+        // Single item
+        return $this->createCheckable(array(
+            'name'  => $this->name,
+            'label' => $this->text,
+            'value' => $this->value,
+            'attributes' => $this->attributes,
+        ));
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ////////////////////////// FIELD METHODS ///////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Focus on a particular checkable
+     *
+     * @param integer $on The checkable to focus on
+     *
+     * @return $this
+     */
+    public function on($on)
+    {
+        if (!isset($this->items[$on])) {
+            return $this;
+        } else {
+            $this->focus = $on;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set the checkables as inline
+     */
+    public function inline($isInline = true)
+    {
+        $this->inline = $isInline;
+
+        return $this;
+    }
+
+    /**
+     * Set the checkables as stacked
+     */
+    public function stacked($isStacked = true)
+    {
+        $this->inline = !$isStacked;
+
+        return $this;
+    }
+
+    /**
+     * Set the checkables as grouped
+     */
+    public function grouped($isGrouped = true)
+    {
+        $this->grouped = $isGrouped;
+
+        return $this;
+    }
+
+    /**
+     * Add text to a single checkable
+     *
+     * @param  string $text The checkable label
+     *
+     * @return $this
+     */
+    public function text($text)
+    {
+        // Translate and format
+        $text = Helpers::translate($text);
+
+        // Apply on focused if any
+        $focused = $this->setOnFocused('label', $text);
+        if ($focused) {
+            return $this;
+        }
+
+        $this->text = $text;
+
+        return $this;
+    }
+
+    /**
+     * Push this particular checkbox
+     *
+     * @param boolean $pushed
+     *
+     * @return $this
+     */
+    public function push($pushed = true)
+    {
+        $this->isPushed = $pushed;
+
+        return $this;
+    }
+
+    /**
+     * Check a specific item
+     *
+     * @param bool|string $checked The checkable to check, or an array of checked items
+     *
+     * @return $this
+     */
+    public function check($checked = true)
+    {
+        // If we're setting all the checked items at once
+        if (is_array($checked)) {
+            $this->checked = $checked;
+            // Checking an item in particular
+        } elseif (is_string($checked) or is_int($checked)) {
+            $this->checked[$checked] = true;
+            // Only setting a single item
+        } else {
+            $this->checked[$this->name] = (bool) $checked;
+        }
+
+        return $this;
+    }
+
+
+    /**
+     * Check if the checkables are inline
+     *
+     * @return boolean
+     */
+    public function isInline()
+    {
+        return $this->inline;
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ////////////////////////// INTERNAL METHODS ////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Creates a series of checkable items
+     *
+     * @param array $_items Items to create
+     */
+    protected function items($_items)
+    {
+        // If passing an array
+        if (sizeof($_items) == 1 and
+            isset($_items[0]) and
+            is_array($_items[0])
+        ) {
+            $_items = $_items[0];
+        }
+
+        // Fetch models if that's what we were passed
+        if (isset($_items[0]) and is_object($_items[0])) {
+            $_items = Helpers::queryToArray($_items);
+            $_items = array_flip($_items);
+        }
+
+        // Iterate through items, assign a name and a label to each
+        $count = 0;
+        foreach ($_items as $label => $name) {
+
+            // Define a fallback name in case none is found
+            $fallback = $this->isCheckbox()
+                ? $this->name.'_'.$count
+                : $this->name;
+
+            // Grouped fields
+            if ($this->isGrouped()) {
+                $attributes['id'] = str_replace('[]', null, $fallback);
+                $fallback         = str_replace('[]', null, $this->name).'[]';
+            }
+
+            // If we haven't any name defined for the checkable, try to compute some
+            if (!is_string($label) and !is_array($name)) {
+                $label = $name;
+                $name  = $fallback;
+            }
+
+            // If we gave custom information on the item, add them
+            if (is_array($name)) {
+                $attributes = $name;
+                $name       = Arr::get($attributes, 'name', $fallback);
+                unset($attributes['name']);
+            }
+
+            // Store all informations we have in an array
+            $item = array(
+                'name'  => $name,
+                'label' => Helpers::translate($label),
+                'count' => $count,
+            );
+            if (isset($attributes)) {
+                $item['attributes'] = $attributes;
+            }
+
+            $this->items[] = $item;
+            $count++;
+        }
+    }
+
+    /**
+     * Renders a checkable
+     *
+     * @param string|array $item          A checkable item
+     * @param integer      $fallbackValue A fallback value if none is set
+     *
+     * @return string
+     */
+    protected function createCheckable($item, $fallbackValue = 1)
+    {
+        // Extract informations
+        extract($item);
+
+        // Set default values
+        if (!isset($attributes)) {
+            $attributes = array();
+        }
+        if (isset($attributes['value'])) {
+            $value = $attributes['value'];
+        }
+        if (!isset($value) or $value === $this->app['former']->getOption('unchecked_value')) {
+            $value = $fallbackValue;
+        }
+
+        // If inline items, add class
+        $isInline = $this->inline ? ' '.$this->app['former.framework']->getInlineLabelClass($this) : null;
+
+        // In Bootsrap 3 or 4 or 5, don't append the the checkable type (radio/checkbox) as a class if
+        // rendering inline.
+        $class =  in_array($this->app['former']->framework(), ['TwitterBootstrap3', 'TwitterBootstrap4', 'TwitterBootstrap5']) ? trim($isInline) : $this->checkable.$isInline;
+
+        // Merge custom attributes with global attributes
+        $attributes = array_merge($this->attributes, $attributes);
+        if (!isset($attributes['id'])) {
+            $attributes['id'] = $name.$this->unique($name);
+        }
+
+        // Create field
+        $field = Input::create($this->checkable, $name, Helpers::encode($value), $attributes);
+        if ($this->isChecked($item, $value)) {
+            $field->checked('checked');
+        }
+
+        // Add hidden checkbox if requested
+        if ($this->isOfType('checkbox', 'checkboxes')) {
+            if ($this->isPushed or ($this->app['former']->getOption('push_checkboxes') and $this->isPushed !== false)) {
+                $field = $this->app['former']->hidden($name)->forceValue($this->app['former']->getOption('unchecked_value')).$field->render();
+
+                // app['former.field'] was overwritten by Former::hidden() call in the line above, so here
+                // we reset it to $this to enable $this->app['former']->getErrors() to retrieve the correct object
+                $this->app->instance('former.field', $this);
+            }
+        }
+
+        // If no label to wrap, return plain checkable
+        if (!$label) {
+            $element = (is_object($field)) ? $field->render() : $field;
+        } elseif (in_array($this->app['former']->framework(), ['TwitterBootstrap4', 'TwitterBootstrap5'])) {
+            // Revised for Bootstrap 4, move the 'input' outside of the 'label'
+            $labelClass = 'form-check-label';
+            $element = $field . Element::create('label', $label)->for($attributes['id'])->class($labelClass)->render();
+
+            $wrapper_class = $this->inline ? 'form-check form-check-inline' : 'form-check';
+
+            $element = Element::create('div', $element)->class($wrapper_class)->render();
+        } else {
+            // Original way is to add the 'input' inside the 'label'
+            $element = Element::create('label', $field.$label)->for($attributes['id'])->class($class)->render();
+        }
+
+        // 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)->class($this->checkable);
+            if ($this->getAttribute('disabled')) {
+                $wrapper->addClass('disabled');
+            }
+            $element = $wrapper->render();
+        }
+
+        // Return the field
+        return $element;
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ///////////////////////////// HELPERS //////////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Generate an unique ID for a field
+     *
+     * @param string $name The field's name
+     *
+     * @return string A field number to use
+     */
+    protected function unique($name)
+    {
+        $this->app['former']->labels[] = $name;
+
+        // Count number of fields with the same ID
+        $where  = array_filter($this->app['former']->labels, function ($label) use ($name) {
+            return $label == $name;
+        });
+        $unique = sizeof($where);
+
+        // In case the field doesn't need to be numbered
+        if ($unique < 2 or empty($this->items)) {
+            return false;
+        }
+
+        return $unique;
+    }
+
+    /**
+     * Set something on the currently focused checkable
+     *
+     * @param string $attribute The key to set
+     * @param string $value     Its value
+     *
+     * @return $this|bool
+     */
+    protected function setOnFocused($attribute, $value)
+    {
+        if (is_null($this->focus)) {
+            return false;
+        }
+
+        $this->items[$this->focus] = Arr::set($this->items[$this->focus], $attribute, $value);
+
+        return $this;
+    }
+
+    /**
+     * Check if a checkable is checked
+     *
+     * @return boolean Checked or not
+     */
+    protected function isChecked($item = null, $value = null)
+    {
+        if (isset($item['name'])) {
+            $name = $item['name'];
+        }
+        if (empty($name)) {
+            $name = $this->name;
+        }
+
+        // If it's a checkbox, see if we marqued that one as checked in the array
+        // Or if it's a single radio, simply see if we called check
+        if ($this->isCheckbox() or
+            !$this->isCheckbox() and !$this->items
+        ) {
+            $checked = Arr::get($this->checked, $name, false);
+
+            // If there are multiple, search for the value
+            // as the name are the same between radios
+        } else {
+            $checked = Arr::get($this->checked, $value, false);
+        }
+
+        // Check the values and POST array
+        if ($this->isGrouped()) {
+            // The group index. (e.g. 'bar' if the item name is foo[bar], or the item index for foo[])
+            $groupIndex = self::getGroupIndexFromItem($item);
+
+            // Search using the bare name, not the individual item name
+            $post   = $this->app['former']->getPost($this->name);
+            $static = $this->app['former']->getValue($this->bind ?: $this->name);
+
+            if (isset($post[$groupIndex])) {
+                $post = $post[$groupIndex];
+            }
+
+            /**
+             * Support for Laravel Collection repopulating for grouped checkboxes. Note that the groupIndex must
+             * match the value in order for the checkbox to be considered checked, e.g.:
+             *
+             *  array(
+             *    'name' = 'roles[foo]',
+             *    'value' => 'foo',
+             *  )
+             */
+            if ($static instanceof Collection) {
+                // If the repopulate value is a collection, search for an item matching the $groupIndex
+                foreach ($static as $staticItem) {
+                    $staticItemValue = method_exists($staticItem, 'getKey') ? $staticItem->getKey() : $staticItem;
+                    if ($staticItemValue == $groupIndex) {
+                        $static = $staticItemValue;
+                        break;
+                    }
+                }
+            } else if (isset($static[$groupIndex])) {
+                $static = $static[$groupIndex];
+            }
+        } else {
+            $post   = $this->app['former']->getPost($name);
+            $static = $this->app['former']->getValue($this->bind ?: $name);
+        }
+
+        if (!is_null($post) and $post !== $this->app['former']->getOption('unchecked_value')) {
+            $isChecked = ($post == $value);
+        } elseif (!is_null($static)) {
+            $isChecked = ($static == $value);
+        } else {
+            $isChecked = $checked;
+        }
+
+        return $isChecked ? true : false;
+    }
+
+    /**
+     * Check if the current element is a checkbox
+     *
+     * @return boolean Checkbox or radio
+     */
+    protected function isCheckbox()
+    {
+        return $this->checkable == 'checkbox';
+    }
+
+    /**
+     * Check if the checkables are grouped or not
+     *
+     * @return boolean
+     */
+    protected function isGrouped()
+    {
+        return
+            $this->grouped == true or
+            strpos($this->name, '[]') !== false;
+    }
+
+    /**
+     * @param array $item The item array, containing at least name and count keys.
+     *
+     * @return mixed The group index. (e.g. returns bar if the item name is foo[bar], or the item count for foo[])
+     */
+    public static function getGroupIndexFromItem($item)
+    {
+        $groupIndex = preg_replace('/^.*?\[(.*)\]$/', '$1', $item['name']);
+        if (empty($groupIndex) or $groupIndex == $item['name']) {
+            return $item['count'];
+        }
+
+        return $groupIndex;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -365,7 +365,7 @@ 
 
 		// In Bootsrap 3 or 4 or 5, don't append the the checkable type (radio/checkbox) as a class if
 		// rendering inline.
-		$class =  in_array($this->app['former']->framework(), ['TwitterBootstrap3', 'TwitterBootstrap4', 'TwitterBootstrap5']) ? trim($isInline) : $this->checkable.$isInline;
+		$class = in_array($this->app['former']->framework(), ['TwitterBootstrap3', 'TwitterBootstrap4', 'TwitterBootstrap5']) ? trim($isInline) : $this->checkable.$isInline;
 
 		// Merge custom attributes with global attributes
 		$attributes = array_merge($this->attributes, $attributes);
@@ -396,7 +396,7 @@ 
 		} elseif (in_array($this->app['former']->framework(), ['TwitterBootstrap4', 'TwitterBootstrap5'])) {
 			// Revised for Bootstrap 4, move the 'input' outside of the 'label'
 			$labelClass = 'form-check-label';
-			$element = $field . Element::create('label', $label)->for($attributes['id'])->class($labelClass)->render();
+			$element = $field.Element::create('label', $label)->for($attributes['id'])->class($labelClass)->render();
 
 			$wrapper_class = $this->inline ? 'form-check form-check-inline' : 'form-check';
 
@@ -435,7 +435,7 @@ 
 		$this->app['former']->labels[] = $name;
 
 		// Count number of fields with the same ID
-		$where  = array_filter($this->app['former']->labels, function ($label) use ($name) {
+		$where  = array_filter($this->app['former']->labels, function($label) use ($name) {
 			return $label == $name;
 		});
 		$unique = sizeof($where);