formers / former

src/Former/Form/Fields/Textarea.php

Indentation +12 added lines, -12 removed lines

@@ -8,17 +8,17 @@
  */
 class Textarea extends Field
 {
-	/**
-	 * The textarea's element
-	 *
-	 * @var string
-	 */
-	protected $element = 'textarea';
+    /**
+     * The textarea's element
+     *
+     * @var string
+     */
+    protected $element = 'textarea';
 
-	/**
-	 * The textarea's self-closing state
-	 *
-	 * @var boolean
-	 */
-	protected $isSelfClosing = false;
+    /**
+     * The textarea's self-closing state
+     *
+     * @var boolean
+     */
+    protected $isSelfClosing = false;
 }

src/Former/Facades/Former.php

Indentation +12 added lines, -12 removed lines

@@ -9,17 +9,17 @@
  */
 class Former extends Facade
 {
-	/**
-	 * Get the registered component.
-	 *
-	 * @return string
-	 */
-	protected static function getFacadeAccessor()
-	{
-		if (!static::$app) {
-			static::$app = FormerServiceProvider::make();
-		}
+    /**
+     * Get the registered component.
+     *
+     * @return string
+     */
+    protected static function getFacadeAccessor()
+    {
+        if (!static::$app) {
+            static::$app = FormerServiceProvider::make();
+        }
 
-		return 'former';
-	}
+        return 'former';
+    }
 }

src/Former/Interfaces/FrameworkInterface.php

Indentation +137 added lines, -137 removed lines

@@ -8,141 +8,141 @@
  */
 interface FrameworkInterface
 {
-	/**
-	 * Filter buttons classes
-	 *
-	 * @param  array $classes An array of classes
-	 *
-	 * @return array A filtered array
-	 */
-	public function filterButtonClasses($classes);
-
-	/**
-	 * Filter field classes
-	 *
-	 * @param  array $classes An array of classes
-	 *
-	 * @return array A filtered array
-	 */
-	public function filterFieldClasses($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 group classes
-	 *
-	 * @return string A list of group classes
-	 */
-	public function getGroupClasses();
-
-	/**
-	 * Add label classes
-	 *
-	 * @return array An array of attributes with the label class
-	 */
-	public function getLabelClasses();
-
-	/**
-	 * Add uneditable field classes
-	 *
-	 * @return array An array of attributes with the uneditable class
-	 */
-	public function getUneditableClasses();
-
-	/**
-	 * Add plain text field classes
-	 *
-	 * @return array An array of attributes with the plain text class
-	 */
-	public function getPlainTextClasses();
-
-	/**
-	 * Add form class
-	 *
-	 * @param  string $type The type of form to add
-	 *
-	 * @return array
-	 */
-	public function getFormClasses($type);
-
-	/**
-	 * Add actions block class
-	 *
-	 * @return array
-	 */
-	public function getActionClasses();
-
-	/**
-	 * Render an help text
-	 *
-	 * @param string $text
-	 * @param array  $attributes
-	 *
-	 * @return string
-	 */
-	public function createHelp($text, $attributes = array());
-
-	/**
-	 * Render a disabled field
-	 *
-	 * @param Field $field
-	 *
-	 * @return string
-	 */
-	public function createDisabledField(Field $field);
-
-	/**
-	 * Render a plain text field
-	 *
-	 * @param Field $field
-	 *
-	 * @return string
-	 */
-	public function createPlainTextField(Field $field);
-
-	/**
-	 * Render an icon
-	 *
-	 * @param array $attributes Its attributes
-	 *
-	 * @return string
-	 */
-	public function createIcon($iconType, $attributes = array());
-
-	/**
-	 * Wrap an item to be prepended or appended to the current field
-	 *
-	 * @param  string $item
-	 *
-	 * @return string A wrapped item
-	 */
-	public function placeAround($item);
-
-	/**
-	 * Wrap a field with prepended and appended items
-	 *
-	 * @param  Field $field
-	 * @param  array $prepend
-	 * @param  array $append
-	 *
-	 * @return string A field concatented with prepended and/or appended items
-	 */
-	public function prependAppend($field, $prepend, $append);
-
-	/**
-	 * Wrap a field with potential additional tags
-	 *
-	 * @param  Field $field
-	 *
-	 * @return string A wrapped field
-	 */
-	public function wrapField($field);
+    /**
+     * Filter buttons classes
+     *
+     * @param  array $classes An array of classes
+     *
+     * @return array A filtered array
+     */
+    public function filterButtonClasses($classes);
+
+    /**
+     * Filter field classes
+     *
+     * @param  array $classes An array of classes
+     *
+     * @return array A filtered array
+     */
+    public function filterFieldClasses($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 group classes
+     *
+     * @return string A list of group classes
+     */
+    public function getGroupClasses();
+
+    /**
+     * Add label classes
+     *
+     * @return array An array of attributes with the label class
+     */
+    public function getLabelClasses();
+
+    /**
+     * Add uneditable field classes
+     *
+     * @return array An array of attributes with the uneditable class
+     */
+    public function getUneditableClasses();
+
+    /**
+     * Add plain text field classes
+     *
+     * @return array An array of attributes with the plain text class
+     */
+    public function getPlainTextClasses();
+
+    /**
+     * Add form class
+     *
+     * @param  string $type The type of form to add
+     *
+     * @return array
+     */
+    public function getFormClasses($type);
+
+    /**
+     * Add actions block class
+     *
+     * @return array
+     */
+    public function getActionClasses();
+
+    /**
+     * Render an help text
+     *
+     * @param string $text
+     * @param array  $attributes
+     *
+     * @return string
+     */
+    public function createHelp($text, $attributes = array());
+
+    /**
+     * Render a disabled field
+     *
+     * @param Field $field
+     *
+     * @return string
+     */
+    public function createDisabledField(Field $field);
+
+    /**
+     * Render a plain text field
+     *
+     * @param Field $field
+     *
+     * @return string
+     */
+    public function createPlainTextField(Field $field);
+
+    /**
+     * Render an icon
+     *
+     * @param array $attributes Its attributes
+     *
+     * @return string
+     */
+    public function createIcon($iconType, $attributes = array());
+
+    /**
+     * Wrap an item to be prepended or appended to the current field
+     *
+     * @param  string $item
+     *
+     * @return string A wrapped item
+     */
+    public function placeAround($item);
+
+    /**
+     * Wrap a field with prepended and appended items
+     *
+     * @param  Field $field
+     * @param  array $prepend
+     * @param  array $append
+     *
+     * @return string A field concatented with prepended and/or appended items
+     */
+    public function prependAppend($field, $prepend, $append);
+
+    /**
+     * Wrap a field with potential additional tags
+     *
+     * @param  Field $field
+     *
+     * @return string A wrapped field
+     */
+    public function wrapField($field);
 }

src/Former/Interfaces/FieldInterface.php

Indentation +6 added lines, -6 removed lines

@@ -6,10 +6,10 @@
  */
 interface FieldInterface
 {
-	/**
-	 * Renders the field
-	 *
-	 * @return string
-	 */
-	public function render();
+    /**
+     * Renders the field
+     *
+     * @return string
+     */
+    public function render();
 }

src/Laravel/File.php

Indentation +121 added lines, -121 removed lines

@@ -7,128 +7,128 @@
 
 class File
 {
-	private static $mimes = array(
-		'ai'    => 'application/postscript',
-		'aif'   => 'audio/x-aiff',
-		'aifc'  => 'audio/x-aiff',
-		'aiff'  => 'audio/x-aiff',
-		'avi'   => 'video/x-msvideo',
-		'bin'   => 'application/macbinary',
-		'bmp'   => 'image/bmp',
-		'class' => 'application/octet-stream',
-		'cpt'   => 'application/mac-compactpro',
-		'css'   => 'text/css',
-		'csv'   => array('text/x-comma-separated-values', 'text/comma-separated-values', 'application/octet-stream'),
-		'dcr'   => 'application/x-director',
-		'dir'   => 'application/x-director',
-		'dll'   => 'application/octet-stream',
-		'dms'   => 'application/octet-stream',
-		'doc'   => 'application/msword',
-		'docx'  => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-		'dvi'   => 'application/x-dvi',
-		'dxr'   => 'application/x-director',
-		'eml'   => 'message/rfc822',
-		'eps'   => 'application/postscript',
-		'exe'   => array('application/octet-stream', 'application/x-msdownload'),
-		'gif'   => 'image/gif',
-		'gtar'  => 'application/x-gtar',
-		'gz'    => 'application/x-gzip',
-		'hqx'   => 'application/mac-binhex40',
-		'htm'   => 'text/html',
-		'html'  => 'text/html',
-		'jpe'   => array('image/jpeg', 'image/pjpeg'),
-		'jpeg'  => array('image/jpeg', 'image/pjpeg'),
-		'jpg'   => array('image/jpeg', 'image/pjpeg'),
-		'js'    => 'application/x-javascript',
-		'json'  => array('application/json', 'text/json'),
-		'lha'   => 'application/octet-stream',
-		'log'   => array('text/plain', 'text/x-log'),
-		'lzh'   => 'application/octet-stream',
-		'mid'   => 'audio/midi',
-		'midi'  => 'audio/midi',
-		'mif'   => 'application/vnd.mif',
-		'mov'   => 'video/quicktime',
-		'movie' => 'video/x-sgi-movie',
-		'mp2'   => 'audio/mpeg',
-		'mp3'   => array('audio/mpeg', 'audio/mpg', 'audio/mpeg3', 'audio/mp3'),
-		'mpe'   => 'video/mpeg',
-		'mpeg'  => 'video/mpeg',
-		'mpg'   => 'video/mpeg',
-		'mpga'  => 'audio/mpeg',
-		'oda'   => 'application/oda',
-		'odp'   => 'application/vnd.oasis.opendocument.presentation',
-		'ods'   => 'application/vnd.oasis.opendocument.spreadsheet',
-		'odt'   => 'application/vnd.oasis.opendocument.text',
-		'pdf'   => array('application/pdf', 'application/x-download'),
-		'php'   => array('application/x-httpd-php', 'text/x-php'),
-		'php3'  => 'application/x-httpd-php',
-		'php4'  => 'application/x-httpd-php',
-		'phps'  => 'application/x-httpd-php-source',
-		'phtml' => 'application/x-httpd-php',
-		'png'   => 'image/png',
-		'pps'   => array('application/mspowerpoint', 'application/vnd.ms-powerpoint'),
-		'ppsx'  => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
-		'ppt'   => array('application/vnd.ms-powerpoint', 'application/powerpoint'),
-		'pptx'  => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
-		'ps'    => 'application/postscript',
-		'psd'   => 'application/x-photoshop',
-		'qt'    => 'video/quicktime',
-		'ra'    => 'audio/x-realaudio',
-		'ram'   => 'audio/x-pn-realaudio',
-		'rm'    => 'audio/x-pn-realaudio',
-		'rpm'   => 'audio/x-pn-realaudio-plugin',
-		'rtf'   => array('application/rtf', 'text/rtf'),
-		'rtx'   => 'text/richtext',
-		'rv'    => 'video/vnd.rn-realvideo',
-		'sea'   => 'application/octet-stream',
-		'shtml' => 'text/html',
-		'sit'   => 'application/x-stuffit',
-		'smi'   => 'application/smil',
-		'smil'  => 'application/smil',
-		'so'    => 'application/octet-stream',
-		'swf'   => 'application/x-shockwave-flash',
-		'tar'   => 'application/x-tar',
-		'text'  => 'text/plain',
-		'tgz'   => array('application/x-tar', 'application/x-gzip-compressed'),
-		'tif'   => 'image/tiff',
-		'tiff'  => 'image/tiff',
-		'txt'   => 'text/plain',
-		'wav'   => 'audio/x-wav',
-		'wbxml' => 'application/wbxml',
-		'wmlc'  => 'application/wmlc',
-		'word'  => array('application/msword', 'application/octet-stream'),
-		'xht'   => 'application/xhtml+xml',
-		'xhtml' => 'application/xhtml+xml',
-		'xl'    => 'application/excel',
-		'xls'   => array('application/vnd.ms-excel', 'application/excel', 'application/msexcel'),
-		'xlsx'  => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-		'xml'   => 'text/xml',
-		'xsl'   => 'text/xml',
-		'zip'   => array('application/x-zip', 'application/zip', 'application/x-zip-compressed'),
-	);
+    private static $mimes = array(
+        'ai'    => 'application/postscript',
+        'aif'   => 'audio/x-aiff',
+        'aifc'  => 'audio/x-aiff',
+        'aiff'  => 'audio/x-aiff',
+        'avi'   => 'video/x-msvideo',
+        'bin'   => 'application/macbinary',
+        'bmp'   => 'image/bmp',
+        'class' => 'application/octet-stream',
+        'cpt'   => 'application/mac-compactpro',
+        'css'   => 'text/css',
+        'csv'   => array('text/x-comma-separated-values', 'text/comma-separated-values', 'application/octet-stream'),
+        'dcr'   => 'application/x-director',
+        'dir'   => 'application/x-director',
+        'dll'   => 'application/octet-stream',
+        'dms'   => 'application/octet-stream',
+        'doc'   => 'application/msword',
+        'docx'  => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+        'dvi'   => 'application/x-dvi',
+        'dxr'   => 'application/x-director',
+        'eml'   => 'message/rfc822',
+        'eps'   => 'application/postscript',
+        'exe'   => array('application/octet-stream', 'application/x-msdownload'),
+        'gif'   => 'image/gif',
+        'gtar'  => 'application/x-gtar',
+        'gz'    => 'application/x-gzip',
+        'hqx'   => 'application/mac-binhex40',
+        'htm'   => 'text/html',
+        'html'  => 'text/html',
+        'jpe'   => array('image/jpeg', 'image/pjpeg'),
+        'jpeg'  => array('image/jpeg', 'image/pjpeg'),
+        'jpg'   => array('image/jpeg', 'image/pjpeg'),
+        'js'    => 'application/x-javascript',
+        'json'  => array('application/json', 'text/json'),
+        'lha'   => 'application/octet-stream',
+        'log'   => array('text/plain', 'text/x-log'),
+        'lzh'   => 'application/octet-stream',
+        'mid'   => 'audio/midi',
+        'midi'  => 'audio/midi',
+        'mif'   => 'application/vnd.mif',
+        'mov'   => 'video/quicktime',
+        'movie' => 'video/x-sgi-movie',
+        'mp2'   => 'audio/mpeg',
+        'mp3'   => array('audio/mpeg', 'audio/mpg', 'audio/mpeg3', 'audio/mp3'),
+        'mpe'   => 'video/mpeg',
+        'mpeg'  => 'video/mpeg',
+        'mpg'   => 'video/mpeg',
+        'mpga'  => 'audio/mpeg',
+        'oda'   => 'application/oda',
+        'odp'   => 'application/vnd.oasis.opendocument.presentation',
+        'ods'   => 'application/vnd.oasis.opendocument.spreadsheet',
+        'odt'   => 'application/vnd.oasis.opendocument.text',
+        'pdf'   => array('application/pdf', 'application/x-download'),
+        'php'   => array('application/x-httpd-php', 'text/x-php'),
+        'php3'  => 'application/x-httpd-php',
+        'php4'  => 'application/x-httpd-php',
+        'phps'  => 'application/x-httpd-php-source',
+        'phtml' => 'application/x-httpd-php',
+        'png'   => 'image/png',
+        'pps'   => array('application/mspowerpoint', 'application/vnd.ms-powerpoint'),
+        'ppsx'  => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
+        'ppt'   => array('application/vnd.ms-powerpoint', 'application/powerpoint'),
+        'pptx'  => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+        'ps'    => 'application/postscript',
+        'psd'   => 'application/x-photoshop',
+        'qt'    => 'video/quicktime',
+        'ra'    => 'audio/x-realaudio',
+        'ram'   => 'audio/x-pn-realaudio',
+        'rm'    => 'audio/x-pn-realaudio',
+        'rpm'   => 'audio/x-pn-realaudio-plugin',
+        'rtf'   => array('application/rtf', 'text/rtf'),
+        'rtx'   => 'text/richtext',
+        'rv'    => 'video/vnd.rn-realvideo',
+        'sea'   => 'application/octet-stream',
+        'shtml' => 'text/html',
+        'sit'   => 'application/x-stuffit',
+        'smi'   => 'application/smil',
+        'smil'  => 'application/smil',
+        'so'    => 'application/octet-stream',
+        'swf'   => 'application/x-shockwave-flash',
+        'tar'   => 'application/x-tar',
+        'text'  => 'text/plain',
+        'tgz'   => array('application/x-tar', 'application/x-gzip-compressed'),
+        'tif'   => 'image/tiff',
+        'tiff'  => 'image/tiff',
+        'txt'   => 'text/plain',
+        'wav'   => 'audio/x-wav',
+        'wbxml' => 'application/wbxml',
+        'wmlc'  => 'application/wmlc',
+        'word'  => array('application/msword', 'application/octet-stream'),
+        'xht'   => 'application/xhtml+xml',
+        'xhtml' => 'application/xhtml+xml',
+        'xl'    => 'application/excel',
+        'xls'   => array('application/vnd.ms-excel', 'application/excel', 'application/msexcel'),
+        'xlsx'  => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+        'xml'   => 'text/xml',
+        'xsl'   => 'text/xml',
+        'zip'   => array('application/x-zip', 'application/zip', 'application/x-zip-compressed'),
+    );
 
-	/**
-	 * Get a file MIME type by extension.
-	 * <code>
-	 *    // Determine the MIME type for the .tar extension
-	 *    $mime = File::mime('tar');
-	 *    // Return a default value if the MIME can't be determined
-	 *    $mime = File::mime('ext', 'application/octet-stream');
-	 * </code>
-	 *
-	 * @param  string $extension
-	 * @param  string $default
-	 *
-	 * @return string
-	 */
-	public static function mime($extension, $default = 'application/octet-stream')
-	{
-		$mimes = self::$mimes;
+    /**
+     * Get a file MIME type by extension.
+     * <code>
+     *    // Determine the MIME type for the .tar extension
+     *    $mime = File::mime('tar');
+     *    // Return a default value if the MIME can't be determined
+     *    $mime = File::mime('ext', 'application/octet-stream');
+     * </code>
+     *
+     * @param  string $extension
+     * @param  string $default
+     *
+     * @return string
+     */
+    public static function mime($extension, $default = 'application/octet-stream')
+    {
+        $mimes = self::$mimes;
 
-		if (!array_key_exists($extension, $mimes)) {
-			return $default;
-		}
+        if (!array_key_exists($extension, $mimes)) {
+            return $default;
+        }
 
-		return (is_array($mimes[$extension])) ? $mimes[$extension][0] : $mimes[$extension];
-	}
+        return (is_array($mimes[$extension])) ? $mimes[$extension][0] : $mimes[$extension];
+    }
 }

src/Former/Form/Fields/File.php

Indentation +123 added lines, -124 removed lines

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

src/Former/Form/Elements.php

Indentation +102 added lines, -102 removed lines

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

src/Former/Traits/Field.php

Spacing +2 added lines, -2 removed lines

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

Indentation +406 added lines, -406 removed lines

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

src/Former/Form/Fields/Choice.php

Doc Comments +4 added lines, -7 removed lines

@@ -188,6 +188,9 @@ 
 		return $element;
 	}
 
+	/**
+	 * @param string $choiceType
+	 */
 	public function getCheckables($choiceType)
 	{
 		if (!(is_array($this->value) || $this->value instanceof \ArrayAccess)) {
@@ -292,7 +295,7 @@ 
 	/**
 	 * Sets the element's type based on options
 	 *
-	 * @return this
+	 * @return Choice
 	 */
 	protected function setChoiceType()
 	{
@@ -309,7 +312,6 @@ 
 	/**
 	 * Select a value in the field's children
 	 *
-	 * @param mixed   $value
 	 *
 	 * @return bool
 	 */
@@ -333,10 +335,6 @@ 
 	/**
 	 * Set the choices
 	 *
-	 * @param  array   $_choices     The choices as an array
-	 * @param  mixed   $selected     Facultative selected entry
-	 * @param  boolean $valuesAsKeys Whether the array's values should be used as
-	 *                               the option's values instead of the array's keys
 	 */
 	public function addChoice($value, $key = null)
 	{
@@ -349,7 +347,6 @@ 
 	 * Set the choices
 	 *
 	 * @param  array   $_choices     The choices as an array
-	 * @param  mixed   $selected     Facultative selected entry
 	 * @param  boolean $valuesAsKeys Whether the array's values should be used as
 	 *                               the option's values instead of the array's keys
 	 */

Spacing +5 added lines, -5 removed lines

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

Indentation +468 added lines, -468 removed lines

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