formers / former

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/config/former.php

Indentation +179 added lines, -179 removed lines

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

src/Former/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

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

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.

src/Former/Framework/TwitterBootstrap4.php

Indentation +440 added lines, -440 removed lines

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

Spacing +1 added lines, -1 removed lines

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

src/Former/Traits/Checkable.php

Indentation +553 added lines, -553 removed lines

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

Spacing +3 added lines, -3 removed lines

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