formers / former

src/Former/Traits/Checkable.php

Indentation +595 added lines, -595 removed lines

@@ -14,599 +14,599 @@
  */
 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;
-	}
-
-	/**
-	 * Creates a series of checkable items from query with attributes
-	 *
-	 * @param mixed $query
-	 * @param mixed $text
-	 * @param mixed $attributes
-	 * @return $this
-	 */
-	public function fromQuery($query, $text = null, $attributes = null)
-	{
-		if ($this->isGrouped()) {
-			// Remove any possible items added by the Populator.
-			$this->items = array();
-		}
-		$this->items($query, $text, $attributes);
-
-		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|Collection $_items Items to create
-	 * @param string|function  $text The value to use as text
-	 * @param string|array     $attributes The data to use as attributes
-	 */
-	protected function items($_items, $text = null, $attributes = null)
-	{
-		// 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])) or ($_items instanceof Collection)) {
-			$_items = Helpers::queryToArray($_items, $text, $attributes);
-			if (is_null($text) && is_null($attributes)) {
-				$_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('[]', '', $fallback);
-				$fallback         = str_replace('[]', '', $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) : '';
-
-		// 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', 'switch', 'switches')) {
-			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 && !$this->isOfType('switch', 'switches')) {
-			$element = (is_object($field)) ? $field->render() : $field;
-		} elseif (in_array($this->app['former']->framework(), ['TwitterBootstrap4', 'TwitterBootstrap5'])) {
-			$element = $field;
-			if ($label) {
-				// Revised for Bootstrap 4 and 5, move the 'input' outside of the 'label'
-				$labelClass = 'form-check-label';
-				$element .= Element::create('label', $label)->for($attributes['id'])->class($labelClass)->render();
-			}
-
-			$wrapperClass = $this->inline ? 'form-check form-check-inline' : 'form-check';
-			if ($this->app['former']->framework() === 'TwitterBootstrap5' &&
-				$this->isOfType('switch', 'switches')
-			) {
-				$wrapperClass.= ' form-switch';
-			}
-			$element = Element::create('div', $element)->class($wrapperClass)->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) && !(is_array($static) && empty($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;
+    }
+
+    /**
+     * Creates a series of checkable items from query with attributes
+     *
+     * @param mixed $query
+     * @param mixed $text
+     * @param mixed $attributes
+     * @return $this
+     */
+    public function fromQuery($query, $text = null, $attributes = null)
+    {
+        if ($this->isGrouped()) {
+            // Remove any possible items added by the Populator.
+            $this->items = array();
+        }
+        $this->items($query, $text, $attributes);
+
+        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|Collection $_items Items to create
+     * @param string|function  $text The value to use as text
+     * @param string|array     $attributes The data to use as attributes
+     */
+    protected function items($_items, $text = null, $attributes = null)
+    {
+        // 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])) or ($_items instanceof Collection)) {
+            $_items = Helpers::queryToArray($_items, $text, $attributes);
+            if (is_null($text) && is_null($attributes)) {
+                $_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('[]', '', $fallback);
+                $fallback         = str_replace('[]', '', $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) : '';
+
+        // 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', 'switch', 'switches')) {
+            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 && !$this->isOfType('switch', 'switches')) {
+            $element = (is_object($field)) ? $field->render() : $field;
+        } elseif (in_array($this->app['former']->framework(), ['TwitterBootstrap4', 'TwitterBootstrap5'])) {
+            $element = $field;
+            if ($label) {
+                // Revised for Bootstrap 4 and 5, move the 'input' outside of the 'label'
+                $labelClass = 'form-check-label';
+                $element .= Element::create('label', $label)->for($attributes['id'])->class($labelClass)->render();
+            }
+
+            $wrapperClass = $this->inline ? 'form-check form-check-inline' : 'form-check';
+            if ($this->app['former']->framework() === 'TwitterBootstrap5' &&
+                $this->isOfType('switch', 'switches')
+            ) {
+                $wrapperClass.= ' form-switch';
+            }
+            $element = Element::create('div', $element)->class($wrapperClass)->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) && !(is_array($static) && empty($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;
+    }
 }

src/Former/Helpers.php

Indentation +195 added lines, -195 removed lines

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

src/Former/Form/Fields/Select.php

Indentation +322 added lines, -322 removed lines

@@ -13,326 +13,326 @@
 class Select extends Field
 {
 
-	/**
-	 * The select's placeholder
-	 *
-	 * @var string
-	 */
-	private $placeholder = null;
-
-	/**
-	 * The Select's options
-	 *
-	 * @var array
-	 */
-	protected $options;
-
-	/**
-	 * The select's element
-	 *
-	 * @var string
-	 */
-	protected $element = 'select';
-
-	/**
-	 * The select's self-closing state
-	 *
-	 * @var boolean
-	 */
-	protected $isSelfClosing = false;
-
-	////////////////////////////////////////////////////////////////////
-	/////////////////////////// CORE METHODS ///////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Easier arguments order for selects
-	 *
-	 * @param Container $app        The Container instance
-	 * @param string    $type       select
-	 * @param string    $name       Field name
-	 * @param string    $label      Its label
-	 * @param array     $options    The select's options
-	 * @param string    $selected   The selected option
-	 * @param array     $attributes Attributes
-	 */
-	public function __construct(Container $app, $type, $name, $label, $options, $selected, $attributes)
-	{
-		if ($selected) {
-			$this->value = $selected;
-		}
-		if ($options) {
-			$this->options($options);
-		}
-
-		parent::__construct($app, $type, $name, $label, $selected, $attributes);
-
-		// Nested models population
-		if (Str::contains($this->name, '.') and is_array($this->value) and !empty($this->value) and is_string($this->value[key($this->value)])) {
-			$this->fromQuery($this->value);
-			$this->value = $selected ?: null;
-		}
-	}
-
-	/**
-	 * Renders the select
-	 *
-	 * @return string A <select> tag
-	 */
-	public function render()
-	{
-		// Multiselects
-		if ($this->isOfType('multiselect')) {
-			if (!isset($this->attributes['id'])) {
-				$this->setAttribute('id', $this->name);
-			}
-
-			$this->multiple();
-			$this->name .= '[]';
-		}
-
-		if ( ! $this->value instanceOf \ArrayAccess) {
-			$this->value = (array) $this->value;
-		}
-
-		$this->clearSelected();
-
-		// Mark selected values as selected
-		if ($this->hasChildren() and !empty($this->value)) {
-			foreach ($this->value as $value) {
-				if (is_object($value) && method_exists($value, 'getKey')) {
-					$value = $value->getKey();
-				}
-				$this->selectValue($value);
-			}
-		}
-
-		// Add placeholder text if any
-		if ($placeholder = $this->getPlaceholder()) {
-			array_unshift($this->children, $placeholder);
-		}
-
-		$this->value = null;
-
-		return parent::render();
-	}
-
-	/**
-	 * Select a value in the field's children
-	 *
-	 * @param mixed   $value
-	 * @param Element $parent
-	 *
-	 * @return void
-	 */
-	protected function selectValue($value, $parent = null)
-	{
-		// If no parent element defined, use direct children
-		if (!$parent) {
-			$parent = $this;
-		}
-
-		foreach ($parent->getChildren() as $child) {
-			$optionValue = $child->getAttribute('value');
-
-			if ($optionValue === $value || (is_numeric($value) && is_numeric($optionValue) && (int)$optionValue === (int)$value)) {
-				$child->selected('selected');
-			}
-
-			// Else iterate over subchilds
-			if ($child->hasChildren()) {
-				$this->selectValue($value, $child);
-			}
-		}
-	}
-
-	/**
-	 * Get the Select's placeholder
-	 *
-	 * @return Element
-	 */
-	protected function getPlaceholder()
-	{
-		if (!$this->placeholder) {
-			return false;
-		}
-
-		$attributes = array('value' => '', 'disabled' => 'disabled');
-		if (!$this->value) {
-			$attributes['selected'] = 'selected';
-		}
-
-		return Element::create('option', $this->placeholder, $attributes);
-	}
-
-	////////////////////////////////////////////////////////////////////
-	////////////////////////// FIELD METHODS ///////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Set the select options
-	 *
-	 * @param  array   $_options     The options as an array
-	 * @param  mixed   $selected     Facultative selected entry
-	 * @param  boolean $valuesAsKeys Whether the array's values should be used as
-	 *                               the option's values instead of the array's keys
-	 */
-	public function options($_options, $selected = null, $valuesAsKeys = false)
-	{
-		$options = array();
-
-		// If valuesAsKeys is true, use the values as keys
-		if ($valuesAsKeys) {
-			foreach ($_options as $v) {
-				$options[$v] = $v;
-			}
-		} else {
-			$options = $_options;
-		}
-
-		// Add the various options
-		foreach ($options as $value => $text) {
-			if (is_array($text) and isset($text['value'])) {
-				$attributes = $text;
-				$text       = $value;
-				$value      = null;
-			} else {
-				$attributes = array();
-			}
-			$this->addOption($text, $value, $attributes);
-		}
-
-		// Set the selected value
-		if (!is_null($selected)) {
-			$this->select($selected);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Creates a list of options from a range
-	 *
-	 * @param  integer $from
-	 * @param  integer $to
-	 * @param  integer $step
-	 */
-	public function range($from, $to, $step = 1)
-	{
-		$range = range($from, $to, $step);
-		$this->options($range, null, true);
-
-		return $this;
-	}
-
-	/**
-	 * Add an option to the Select's options
-	 *
-	 * @param array|string $text       It's value or an array of values
-	 * @param string       $value      It's text
-	 * @param array        $attributes The option's attributes
-	 */
-	public function addOption($text = null, $value = null, $attributes = array())
-	{
-		// Get the option's value
-		$childrenKey = !is_null($value) ? $value : sizeof($this->children);
-
-		// If we passed an options group
-		if (is_array($text)) {
-			$this->children[$childrenKey] = Element::create('optgroup')->label($value);
-			foreach ($text as $key => $value) {
-				if (is_array($value)) {
-					$option = Element::create('option', $key)->setAttributes($value);
-				} else {
-					$option = Element::create('option', $value)->setAttribute('value', $key);
-				}
-				$this->children[$childrenKey]->nest($option);
-			}
-			// Else if it's a simple option
-		} else {
-			if (!isset($attributes['value'])) {
-				$attributes['value'] = $value;
-			}
-
-			$this->children[$attributes['value']] = Element::create('option', $text)->setAttributes($attributes);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Clear selected attribute for select options
-	 *
-	 * @param Element $parent
-	 *
-	 * @return void
-	 */
-	public function clearSelected($parent = null)
-	{
-		// If no parent element defined, use direct children
-		if (!$parent) {
-			$parent = $this;
-		}
-
-		foreach ($parent->getChildren() as $child) {
-			$child->removeAttribute('selected');
-
-			if ($child->hasChildren()) {
-				$this->clearSelected($child);
-			}
-		}
-	}
-
-	/**
-	 * Use the results from a Fluent/Eloquent query as options
-	 *
-	 * @param  array           $results    An array of Eloquent models
-	 * @param  string|function $text       The value to use as text
-	 * @param  string|array    $attributes The data to use as attributes
-	 * @param  string	   $selected   The default selected item
-	 */
-	public function fromQuery($results, $text = null, $attributes = null, $selected = null)
-	{
-		$this->options(Helpers::queryToArray($results, $text, $attributes), $selected);
-
-		return $this;
-	}
-
-	/**
-	 * Select a particular list item
-	 *
-	 * @param  mixed $selected Selected item
-	 */
-	public function select($selected)
-	{
-		$this->value = $selected;
-
-		return $this;
-	}
-
-	/**
-	 * Add a placeholder to the current select
-	 *
-	 * @param  string $placeholder The placeholder text
-	 */
-	public function placeholder($placeholder)
-	{
-		$this->placeholder = Helpers::translate($placeholder);
-
-		return $this;
-	}
-
-	////////////////////////////////////////////////////////////////////
-	////////////////////////////// HELPERS /////////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Returns the current options in memory for manipulations
-	 *
-	 * @return array The current options array
-	 */
-	public function getOptions()
-	{
-		return $this->children;
-	}
+    /**
+     * The select's placeholder
+     *
+     * @var string
+     */
+    private $placeholder = null;
+
+    /**
+     * The Select's options
+     *
+     * @var array
+     */
+    protected $options;
+
+    /**
+     * The select's element
+     *
+     * @var string
+     */
+    protected $element = 'select';
+
+    /**
+     * The select's self-closing state
+     *
+     * @var boolean
+     */
+    protected $isSelfClosing = false;
+
+    ////////////////////////////////////////////////////////////////////
+    /////////////////////////// CORE METHODS ///////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Easier arguments order for selects
+     *
+     * @param Container $app        The Container instance
+     * @param string    $type       select
+     * @param string    $name       Field name
+     * @param string    $label      Its label
+     * @param array     $options    The select's options
+     * @param string    $selected   The selected option
+     * @param array     $attributes Attributes
+     */
+    public function __construct(Container $app, $type, $name, $label, $options, $selected, $attributes)
+    {
+        if ($selected) {
+            $this->value = $selected;
+        }
+        if ($options) {
+            $this->options($options);
+        }
+
+        parent::__construct($app, $type, $name, $label, $selected, $attributes);
+
+        // Nested models population
+        if (Str::contains($this->name, '.') and is_array($this->value) and !empty($this->value) and is_string($this->value[key($this->value)])) {
+            $this->fromQuery($this->value);
+            $this->value = $selected ?: null;
+        }
+    }
+
+    /**
+     * Renders the select
+     *
+     * @return string A <select> tag
+     */
+    public function render()
+    {
+        // Multiselects
+        if ($this->isOfType('multiselect')) {
+            if (!isset($this->attributes['id'])) {
+                $this->setAttribute('id', $this->name);
+            }
+
+            $this->multiple();
+            $this->name .= '[]';
+        }
+
+        if ( ! $this->value instanceOf \ArrayAccess) {
+            $this->value = (array) $this->value;
+        }
+
+        $this->clearSelected();
+
+        // Mark selected values as selected
+        if ($this->hasChildren() and !empty($this->value)) {
+            foreach ($this->value as $value) {
+                if (is_object($value) && method_exists($value, 'getKey')) {
+                    $value = $value->getKey();
+                }
+                $this->selectValue($value);
+            }
+        }
+
+        // Add placeholder text if any
+        if ($placeholder = $this->getPlaceholder()) {
+            array_unshift($this->children, $placeholder);
+        }
+
+        $this->value = null;
+
+        return parent::render();
+    }
+
+    /**
+     * Select a value in the field's children
+     *
+     * @param mixed   $value
+     * @param Element $parent
+     *
+     * @return void
+     */
+    protected function selectValue($value, $parent = null)
+    {
+        // If no parent element defined, use direct children
+        if (!$parent) {
+            $parent = $this;
+        }
+
+        foreach ($parent->getChildren() as $child) {
+            $optionValue = $child->getAttribute('value');
+
+            if ($optionValue === $value || (is_numeric($value) && is_numeric($optionValue) && (int)$optionValue === (int)$value)) {
+                $child->selected('selected');
+            }
+
+            // Else iterate over subchilds
+            if ($child->hasChildren()) {
+                $this->selectValue($value, $child);
+            }
+        }
+    }
+
+    /**
+     * Get the Select's placeholder
+     *
+     * @return Element
+     */
+    protected function getPlaceholder()
+    {
+        if (!$this->placeholder) {
+            return false;
+        }
+
+        $attributes = array('value' => '', 'disabled' => 'disabled');
+        if (!$this->value) {
+            $attributes['selected'] = 'selected';
+        }
+
+        return Element::create('option', $this->placeholder, $attributes);
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ////////////////////////// FIELD METHODS ///////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Set the select options
+     *
+     * @param  array   $_options     The options as an array
+     * @param  mixed   $selected     Facultative selected entry
+     * @param  boolean $valuesAsKeys Whether the array's values should be used as
+     *                               the option's values instead of the array's keys
+     */
+    public function options($_options, $selected = null, $valuesAsKeys = false)
+    {
+        $options = array();
+
+        // If valuesAsKeys is true, use the values as keys
+        if ($valuesAsKeys) {
+            foreach ($_options as $v) {
+                $options[$v] = $v;
+            }
+        } else {
+            $options = $_options;
+        }
+
+        // Add the various options
+        foreach ($options as $value => $text) {
+            if (is_array($text) and isset($text['value'])) {
+                $attributes = $text;
+                $text       = $value;
+                $value      = null;
+            } else {
+                $attributes = array();
+            }
+            $this->addOption($text, $value, $attributes);
+        }
+
+        // Set the selected value
+        if (!is_null($selected)) {
+            $this->select($selected);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Creates a list of options from a range
+     *
+     * @param  integer $from
+     * @param  integer $to
+     * @param  integer $step
+     */
+    public function range($from, $to, $step = 1)
+    {
+        $range = range($from, $to, $step);
+        $this->options($range, null, true);
+
+        return $this;
+    }
+
+    /**
+     * Add an option to the Select's options
+     *
+     * @param array|string $text       It's value or an array of values
+     * @param string       $value      It's text
+     * @param array        $attributes The option's attributes
+     */
+    public function addOption($text = null, $value = null, $attributes = array())
+    {
+        // Get the option's value
+        $childrenKey = !is_null($value) ? $value : sizeof($this->children);
+
+        // If we passed an options group
+        if (is_array($text)) {
+            $this->children[$childrenKey] = Element::create('optgroup')->label($value);
+            foreach ($text as $key => $value) {
+                if (is_array($value)) {
+                    $option = Element::create('option', $key)->setAttributes($value);
+                } else {
+                    $option = Element::create('option', $value)->setAttribute('value', $key);
+                }
+                $this->children[$childrenKey]->nest($option);
+            }
+            // Else if it's a simple option
+        } else {
+            if (!isset($attributes['value'])) {
+                $attributes['value'] = $value;
+            }
+
+            $this->children[$attributes['value']] = Element::create('option', $text)->setAttributes($attributes);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Clear selected attribute for select options
+     *
+     * @param Element $parent
+     *
+     * @return void
+     */
+    public function clearSelected($parent = null)
+    {
+        // If no parent element defined, use direct children
+        if (!$parent) {
+            $parent = $this;
+        }
+
+        foreach ($parent->getChildren() as $child) {
+            $child->removeAttribute('selected');
+
+            if ($child->hasChildren()) {
+                $this->clearSelected($child);
+            }
+        }
+    }
+
+    /**
+     * Use the results from a Fluent/Eloquent query as options
+     *
+     * @param  array           $results    An array of Eloquent models
+     * @param  string|function $text       The value to use as text
+     * @param  string|array    $attributes The data to use as attributes
+     * @param  string	   $selected   The default selected item
+     */
+    public function fromQuery($results, $text = null, $attributes = null, $selected = null)
+    {
+        $this->options(Helpers::queryToArray($results, $text, $attributes), $selected);
+
+        return $this;
+    }
+
+    /**
+     * Select a particular list item
+     *
+     * @param  mixed $selected Selected item
+     */
+    public function select($selected)
+    {
+        $this->value = $selected;
+
+        return $this;
+    }
+
+    /**
+     * Add a placeholder to the current select
+     *
+     * @param  string $placeholder The placeholder text
+     */
+    public function placeholder($placeholder)
+    {
+        $this->placeholder = Helpers::translate($placeholder);
+
+        return $this;
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ////////////////////////////// HELPERS /////////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Returns the current options in memory for manipulations
+     *
+     * @return array The current options array
+     */
+    public function getOptions()
+    {
+        return $this->children;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -91,7 +91,7 @@ 
 			$this->name .= '[]';
 		}
 
-		if ( ! $this->value instanceOf \ArrayAccess) {
+		if (!$this->value instanceOf \ArrayAccess) {
 			$this->value = (array) $this->value;
 		}
 
@@ -135,7 +135,7 @@ 
 		foreach ($parent->getChildren() as $child) {
 			$optionValue = $child->getAttribute('value');
 
-			if ($optionValue === $value || (is_numeric($value) && is_numeric($optionValue) && (int)$optionValue === (int)$value)) {
+			if ($optionValue === $value || (is_numeric($value) && is_numeric($optionValue) && (int) $optionValue === (int) $value)) {
 				$child->selected('selected');
 			}