formers / former

src/Former/Traits/Framework.php

Spacing +1 added lines, -1 removed lines

@@ -239,7 +239,7 @@
 	 */
 	protected function prependWith($classes, $with)
 	{
-		return array_map(function ($class) use ($with) {
+		return array_map(function($class) use ($with) {
 			return $with.$class;
 		}, $classes);
 	}

Indentation +301 added lines, -301 removed lines

@@ -8,305 +8,305 @@
  */
 abstract class Framework
 {
-	/**
-	 * The Container
-	 *
-	 * @var Container
-	 */
-	protected $app;
-
-	/**
-	 * Form types that trigger special styling
-	 *
-	 * @var array
-	 */
-	protected $availableTypes = array();
-
-	/**
-	 * The field states available
-	 *
-	 * @var array
-	 */
-	protected $states = array();
-
-	/**
-	 * The default label width (for horizontal forms)
-	 *
-	 * @var string
-	 */
-	protected $labelWidth;
-
-	/**
-	 * The default field width (for horizontal forms)
-	 *
-	 * @var string
-	 */
-	protected $fieldWidth;
-
-	/**
-	 * The default offset for fields (for horizontal form fields
-	 * with no label, so usually equal to the default label width)
-	 *
-	 * @var string
-	 */
-	protected $fieldOffset;
-
-	/**
-	 * The default HTML tag used for icons
-	 *
-	 * @var string
-	 */
-	protected $iconTag;
-
-	/**
-	 * The default set for icon fonts
-	 *
-	 * @var string
-	 */
-	protected $iconSet;
-
-	/**
-	 * The default prefix icon names
-	 *
-	 * @var string
-	 */
-	protected $iconPrefix;
-
-	////////////////////////////////////////////////////////////////////
-	//////////////////////// CURRENT FRAMEWORK /////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Get the name of the current framework
-	 *
-	 * @return string
-	 */
-	public function current()
-	{
-		return basename(str_replace('\\', '/', get_class($this)));
-	}
-
-	/**
-	 * Check if the current framework matches something
-	 *
-	 * @param  string $framework
-	 *
-	 * @return boolean
-	 */
-	public function is($framework)
-	{
-		return $framework == $this->current();
-	}
-
-	/**
-	 * Check if the current framework doesn't match something
-	 *
-	 * @param  string $framework
-	 *
-	 * @return boolean
-	 */
-	public function isnt($framework)
-	{
-		return $framework != $this->current();
-	}
-
-	////////////////////////////////////////////////////////////////////
-	/////////////////////////// COMMON METHODS /////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * List form types triggered special styling form current framework
-	 *
-	 * @return array
-	 */
-	public function availableTypes()
-	{
-		return $this->availableTypes;
-	}
-
-	/**
-	 * Filter a field state
-	 *
-	 * @param string $state
-	 *
-	 * @return string
-	 */
-	public function filterState($state)
-	{
-		// Filter out wrong states
-		return in_array($state, $this->states) ? $state : null;
-	}
-
-	/**
-	 * Framework error state
-	 *
-	 * @return string
-	 */
-	public function errorState()
-	{
-		return 'error';
-	}
-
-	/**
-	 * Returns corresponding inline class of a field
-	 *
-	 * @param Field $field
-	 *
-	 * @return string
-	 */
-	public function getInlineLabelClass($field)
-	{
-		return 'inline';
-	}
-
-	/**
-	 * Set framework defaults from its config file
-	 */
-	protected function setFrameworkDefaults()
-	{
-		$this->setFieldWidths($this->getFrameworkOption('labelWidths'));
-		$this->setIconDefaults();
-	}
-
-	/**
-	 * @param string $widths
-	 */
-	protected function setFieldWidths($widths)
-	{
-	}
-
-	/**
-	 * Override framework defaults for icons with config values where set
-	 */
-	protected function setIconDefaults()
-	{
-		$this->iconTag    = $this->getFrameworkOption('icon.tag');
-		$this->iconSet    = $this->getFrameworkOption('icon.set');
-		$this->iconPrefix = $this->getFrameworkOption('icon.prefix');
-	}
-
-	/**
-	 * Render an icon
-	 *
-	 * @param array $attributes Its general attributes
-	 *
-	 * @return string
-	 */
-	public function createIcon($iconType, $attributes = array(), $iconSettings = array())
-	{
-		// Check for empty icons
-		if (!$iconType) {
-			return false;
-		}
-
-		// icon settings can be overridden for a specific icon
-		$tag    = array_get($iconSettings, 'tag', $this->iconTag);
-		$set    = array_get($iconSettings, 'set', $this->iconSet);
-		$prefix = array_get($iconSettings, 'prefix', $this->iconPrefix);
-
-		return Element::create($tag, null, $attributes)->addClass("$set $prefix-$iconType");
-	}
-
-	////////////////////////////////////////////////////////////////////
-	///////////////////////////// HELPERS //////////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Add classes to a field
-	 *
-	 * @param Field $field
-	 * @param array $classes
-	 *
-	 * @return \Former\Traits\Field
-	 */
-	protected function addClassesToField($field, $classes)
-	{
-		// If we found any class, add them
-		if ($classes) {
-			$field->addClass(implode(' ', $classes));
-		}
-
-		return $field;
-	}
-
-	/**
-	 * Prepend an array of classes with a string
-	 *
-	 * @param array  $classes The classes to prepend
-	 * @param string $with    The string to prepend them with
-	 *
-	 * @return array A prepended array
-	 */
-	protected function prependWith($classes, $with)
-	{
-		return array_map(function ($class) use ($with) {
-			return $with.$class;
-		}, $classes);
-	}
-
-	/**
-	 * Create a label for a field
-	 *
-	 * @param Field   $field
-	 * @param Element $label The field label if non provided
-	 *
-	 * @return string A label
-	 */
-	public function createLabelOf(Field $field, Element $label = null)
-	{
-		// Get the label and its informations
-		if (!$label) {
-			$label = $field->getLabel();
-		}
-
-		// Get label "for"
-		$for = $field->id ?: $field->getName();
-
-		// Get label text
-		$text = $label->getValue();
-		if (!$text) {
-			return false;
-		}
-
-		// Append required text
-		if ($field->isRequired()) {
-			$text .= $this->app['former']->getOption('required_text');
-		}
-
-		// Render plain label if checkable, else a classic one
-		$label->setValue($text);
-		if (!$field->isCheckable()) {
-			$label->for($for);
-		}
-
-		return $label;
-	}
-
-	/**
-	 * Get an option for the current framework
-	 *
-	 * @param string $option
-	 *
-	 * @return string
-	 */
-	protected function getFrameworkOption($option)
-	{
-		return $this->app['config']->get("former.{$this->current()}.$option");
-	}
-
-	////////////////////////////////////////////////////////////////////
-	//////////////////////////// WRAP BLOCKS ///////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Wraps all label contents with potential additional tags.
-	 *
-	 * @param  string $label
-	 *
-	 * @return string A wrapped label
-	 */
-	public function wrapLabel($label)
-	{
-		return $label;
-	}
+    /**
+     * The Container
+     *
+     * @var Container
+     */
+    protected $app;
+
+    /**
+     * Form types that trigger special styling
+     *
+     * @var array
+     */
+    protected $availableTypes = array();
+
+    /**
+     * The field states available
+     *
+     * @var array
+     */
+    protected $states = array();
+
+    /**
+     * The default label width (for horizontal forms)
+     *
+     * @var string
+     */
+    protected $labelWidth;
+
+    /**
+     * The default field width (for horizontal forms)
+     *
+     * @var string
+     */
+    protected $fieldWidth;
+
+    /**
+     * The default offset for fields (for horizontal form fields
+     * with no label, so usually equal to the default label width)
+     *
+     * @var string
+     */
+    protected $fieldOffset;
+
+    /**
+     * The default HTML tag used for icons
+     *
+     * @var string
+     */
+    protected $iconTag;
+
+    /**
+     * The default set for icon fonts
+     *
+     * @var string
+     */
+    protected $iconSet;
+
+    /**
+     * The default prefix icon names
+     *
+     * @var string
+     */
+    protected $iconPrefix;
+
+    ////////////////////////////////////////////////////////////////////
+    //////////////////////// CURRENT FRAMEWORK /////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Get the name of the current framework
+     *
+     * @return string
+     */
+    public function current()
+    {
+        return basename(str_replace('\\', '/', get_class($this)));
+    }
+
+    /**
+     * Check if the current framework matches something
+     *
+     * @param  string $framework
+     *
+     * @return boolean
+     */
+    public function is($framework)
+    {
+        return $framework == $this->current();
+    }
+
+    /**
+     * Check if the current framework doesn't match something
+     *
+     * @param  string $framework
+     *
+     * @return boolean
+     */
+    public function isnt($framework)
+    {
+        return $framework != $this->current();
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    /////////////////////////// COMMON METHODS /////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * List form types triggered special styling form current framework
+     *
+     * @return array
+     */
+    public function availableTypes()
+    {
+        return $this->availableTypes;
+    }
+
+    /**
+     * Filter a field state
+     *
+     * @param string $state
+     *
+     * @return string
+     */
+    public function filterState($state)
+    {
+        // Filter out wrong states
+        return in_array($state, $this->states) ? $state : null;
+    }
+
+    /**
+     * Framework error state
+     *
+     * @return string
+     */
+    public function errorState()
+    {
+        return 'error';
+    }
+
+    /**
+     * Returns corresponding inline class of a field
+     *
+     * @param Field $field
+     *
+     * @return string
+     */
+    public function getInlineLabelClass($field)
+    {
+        return 'inline';
+    }
+
+    /**
+     * Set framework defaults from its config file
+     */
+    protected function setFrameworkDefaults()
+    {
+        $this->setFieldWidths($this->getFrameworkOption('labelWidths'));
+        $this->setIconDefaults();
+    }
+
+    /**
+     * @param string $widths
+     */
+    protected function setFieldWidths($widths)
+    {
+    }
+
+    /**
+     * Override framework defaults for icons with config values where set
+     */
+    protected function setIconDefaults()
+    {
+        $this->iconTag    = $this->getFrameworkOption('icon.tag');
+        $this->iconSet    = $this->getFrameworkOption('icon.set');
+        $this->iconPrefix = $this->getFrameworkOption('icon.prefix');
+    }
+
+    /**
+     * Render an icon
+     *
+     * @param array $attributes Its general attributes
+     *
+     * @return string
+     */
+    public function createIcon($iconType, $attributes = array(), $iconSettings = array())
+    {
+        // Check for empty icons
+        if (!$iconType) {
+            return false;
+        }
+
+        // icon settings can be overridden for a specific icon
+        $tag    = array_get($iconSettings, 'tag', $this->iconTag);
+        $set    = array_get($iconSettings, 'set', $this->iconSet);
+        $prefix = array_get($iconSettings, 'prefix', $this->iconPrefix);
+
+        return Element::create($tag, null, $attributes)->addClass("$set $prefix-$iconType");
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ///////////////////////////// HELPERS //////////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Add classes to a field
+     *
+     * @param Field $field
+     * @param array $classes
+     *
+     * @return \Former\Traits\Field
+     */
+    protected function addClassesToField($field, $classes)
+    {
+        // If we found any class, add them
+        if ($classes) {
+            $field->addClass(implode(' ', $classes));
+        }
+
+        return $field;
+    }
+
+    /**
+     * Prepend an array of classes with a string
+     *
+     * @param array  $classes The classes to prepend
+     * @param string $with    The string to prepend them with
+     *
+     * @return array A prepended array
+     */
+    protected function prependWith($classes, $with)
+    {
+        return array_map(function ($class) use ($with) {
+            return $with.$class;
+        }, $classes);
+    }
+
+    /**
+     * Create a label for a field
+     *
+     * @param Field   $field
+     * @param Element $label The field label if non provided
+     *
+     * @return string A label
+     */
+    public function createLabelOf(Field $field, Element $label = null)
+    {
+        // Get the label and its informations
+        if (!$label) {
+            $label = $field->getLabel();
+        }
+
+        // Get label "for"
+        $for = $field->id ?: $field->getName();
+
+        // Get label text
+        $text = $label->getValue();
+        if (!$text) {
+            return false;
+        }
+
+        // Append required text
+        if ($field->isRequired()) {
+            $text .= $this->app['former']->getOption('required_text');
+        }
+
+        // Render plain label if checkable, else a classic one
+        $label->setValue($text);
+        if (!$field->isCheckable()) {
+            $label->for($for);
+        }
+
+        return $label;
+    }
+
+    /**
+     * Get an option for the current framework
+     *
+     * @param string $option
+     *
+     * @return string
+     */
+    protected function getFrameworkOption($option)
+    {
+        return $this->app['config']->get("former.{$this->current()}.$option");
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    //////////////////////////// WRAP BLOCKS ///////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Wraps all label contents with potential additional tags.
+     *
+     * @param  string $label
+     *
+     * @return string A wrapped label
+     */
+    public function wrapLabel($label)
+    {
+        return $label;
+    }
 }

src/Former/Traits/FormerObject.php

Spacing +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
 		if (array_key_exists($name, $names)) {
 			$count = $names[$name] + 1;
 			$names[$name] = $count;
-			return $name . '-' . $count;
+			return $name.'-'.$count;
 		}
 
 		$names[$name] = 1;

Indentation +143 added lines, -143 removed lines

@@ -10,147 +10,147 @@
  */
 abstract class FormerObject extends Element
 {
-	/**
-	 * The field's name
-	 *
-	 * @var string
-	 */
-	protected $name;
-
-	/**
-	 * The field type
-	 *
-	 * @var string
-	 */
-	protected $type;
-
-	/**
-	 * A list of class properties to be added to attributes
-	 *
-	 * @var array
-	 */
-	protected $injectedProperties = array('name');
-
-	////////////////////////////////////////////////////////////////////
-	/////////////////////////// ID AND LABELS //////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Create an unique ID and return it
-	 *
-	 * @return string
-	 */
-	public function getCreatedId()
-	{
-		$this->setId();
-
-		return $this->attributes['id'];
-	}
-
-	/**
-	 * Set the matching ID on a field if possible
-	 */
-	protected function setId()
-	{
-		if (!array_key_exists('id', $this->attributes) and
-			in_array($this->name, $this->app['former']->labels)
-		) {
-			// Set and save the field's ID
-			$id                         = $this->getUniqueId($this->name);
-			$this->attributes['id']     = $id;
-			$this->app['former']->ids[] = $id;
-		}
-	}
-
-	/**
-	 * Get an unique ID for a field from its name
-	 *
-	 * @param string $name
-	 *
-	 * @return string
-	 */
-	protected function getUniqueId($name)
-	{
-		$names = &$this->app['former']->names;
-
-		if (array_key_exists($name, $names)) {
-			$count = $names[$name] + 1;
-			$names[$name] = $count;
-			return $name . '-' . $count;
-		}
-
-		$names[$name] = 1;
-		return $name;
-	}
-
-	/**
-	 * Render the FormerObject and set its id
-	 *
-	 * @return string
-	 */
-	public function render()
-	{
-		// Set the proper ID according to the label
-		$this->setId();
-
-		// Encode HTML value
-		$isButton = ($this instanceof Field) ? $this->isButton() : false;
-		if (!$isButton and is_string($this->value)) {
-			$this->value = Helpers::encode($this->value);
-		}
-
-		return parent::render();
-	}
-
-	////////////////////////////////////////////////////////////////////
-	////////////////////////////// GETTERS /////////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Get the object's name
-	 *
-	 * @return string
-	 */
-	public function getName()
-	{
-		return $this->name;
-	}
-
-	////////////////////////////////////////////////////////////////////
-	//////////////////////////// OBJECT TYPE ///////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Get the object's type
-	 *
-	 * @return string
-	 */
-	public function getType()
-	{
-		return $this->type;
-	}
-
-	/**
-	 * Change a object's type
-	 *
-	 * @param string $type
-	 */
-	public function setType($type)
-	{
-		$this->type = $type;
-
-		return $this;
-	}
-
-	/**
-	 * Check if an object is of a certain type
-	 *
-	 * @return boolean
-	 */
-	public function isOfType()
-	{
-		$types = func_get_args();
-
-		return in_array($this->type, $types);
-	}
+    /**
+     * The field's name
+     *
+     * @var string
+     */
+    protected $name;
+
+    /**
+     * The field type
+     *
+     * @var string
+     */
+    protected $type;
+
+    /**
+     * A list of class properties to be added to attributes
+     *
+     * @var array
+     */
+    protected $injectedProperties = array('name');
+
+    ////////////////////////////////////////////////////////////////////
+    /////////////////////////// ID AND LABELS //////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Create an unique ID and return it
+     *
+     * @return string
+     */
+    public function getCreatedId()
+    {
+        $this->setId();
+
+        return $this->attributes['id'];
+    }
+
+    /**
+     * Set the matching ID on a field if possible
+     */
+    protected function setId()
+    {
+        if (!array_key_exists('id', $this->attributes) and
+            in_array($this->name, $this->app['former']->labels)
+        ) {
+            // Set and save the field's ID
+            $id                         = $this->getUniqueId($this->name);
+            $this->attributes['id']     = $id;
+            $this->app['former']->ids[] = $id;
+        }
+    }
+
+    /**
+     * Get an unique ID for a field from its name
+     *
+     * @param string $name
+     *
+     * @return string
+     */
+    protected function getUniqueId($name)
+    {
+        $names = &$this->app['former']->names;
+
+        if (array_key_exists($name, $names)) {
+            $count = $names[$name] + 1;
+            $names[$name] = $count;
+            return $name . '-' . $count;
+        }
+
+        $names[$name] = 1;
+        return $name;
+    }
+
+    /**
+     * Render the FormerObject and set its id
+     *
+     * @return string
+     */
+    public function render()
+    {
+        // Set the proper ID according to the label
+        $this->setId();
+
+        // Encode HTML value
+        $isButton = ($this instanceof Field) ? $this->isButton() : false;
+        if (!$isButton and is_string($this->value)) {
+            $this->value = Helpers::encode($this->value);
+        }
+
+        return parent::render();
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ////////////////////////////// GETTERS /////////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Get the object's name
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    //////////////////////////// OBJECT TYPE ///////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Get the object's type
+     *
+     * @return string
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
+
+    /**
+     * Change a object's type
+     *
+     * @param string $type
+     */
+    public function setType($type)
+    {
+        $this->type = $type;
+
+        return $this;
+    }
+
+    /**
+     * Check if an object is of a certain type
+     *
+     * @return boolean
+     */
+    public function isOfType()
+    {
+        $types = func_get_args();
+
+        return in_array($this->type, $types);
+    }
 }

src/Former/Framework/TwitterBootstrap3.php

Spacing +1 added lines, -1 removed lines

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

Indentation +433 added lines, -433 removed lines

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

src/Former/Framework/TwitterBootstrap.php

Spacing +1 added lines, -1 removed lines

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

Indentation +370 added lines, -370 removed lines

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

src/Former/Framework/ZurbFoundation.php

Doc Comments +1 added lines, -1 removed lines

@@ -126,7 +126,7 @@
 	 *
 	 * @param Field $field
 	 *
-	 * @return Element
+	 * @return Input
 	 */
 	public function createPlainTextField(Field $field)
 	{

Indentation +270 added lines, -270 removed lines

@@ -13,274 +13,274 @@
  */
 class ZurbFoundation extends Framework implements FrameworkInterface
 {
-	/**
-	 * Form types that trigger special styling for this Framework
-	 *
-	 * @var array
-	 */
-	protected $availableTypes = array('horizontal', 'vertical');
-
-	/**
-	 * The field sizes available
-	 *
-	 * @var array
-	 */
-	private $fields = array(
-		1  => 'one',
-		2  => 'two',
-		3  => 'three',
-		4  => 'four',
-		5  => 'five',
-		6  => 'six',
-		7  => 'seven',
-		8  => 'eight',
-		9  => 'nine',
-		10 => 'ten',
-		11 => 'eleven',
-		12 => 'twelve',
-	);
-
-	/**
-	 * The field states available
-	 *
-	 * @var array
-	 */
-	protected $states = array(
-		'error',
-	);
-
-	/**
-	 * Create a new ZurbFoundation instance
-	 *
-	 * @param Container $app
-	 */
-	public function __construct(Container $app)
-	{
-		$this->app = $app;
-		$this->setFrameworkDefaults();
-	}
-
-	////////////////////////////////////////////////////////////////////
-	/////////////////////////// FILTER ARRAYS //////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	public function filterButtonClasses($classes)
-	{
-		return $classes;
-	}
-
-	public function filterFieldClasses($classes)
-	{
-		// Filter classes
-		$classes = array_intersect($classes, $this->fields);
-
-		return $classes;
-	}
-
-	////////////////////////////////////////////////////////////////////
-	///////////////////// EXPOSE FRAMEWORK SPECIFICS ///////////////////
-	////////////////////////////////////////////////////////////////////
-
-	protected function setFieldWidths($labelWidths)
-	{
-		$labelWidthClass = $fieldWidthClass = $fieldOffsetClass = '';
-
-		$viewports = $this->getFrameworkOption('viewports');
-
-		foreach ($labelWidths as $viewport => $columns) {
-			if ($viewport) {
-				$labelWidthClass .= $viewports[$viewport].$this->fields[$columns].' ';
-				$fieldWidthClass .= $viewports[$viewport].$this->fields[12 - $columns].' ';
-				$fieldOffsetClass .= $viewports[$viewport].'offset-by-'.$this->fields[$columns].' ';
-			}
-		}
-
-		$this->labelWidth  = $labelWidthClass.'columns';
-		$this->fieldWidth  = $fieldWidthClass.'columns';
-		$this->fieldOffset = $fieldOffsetClass.'columns';
-	}
-
-	////////////////////////////////////////////////////////////////////
-	///////////////////////////// ADD CLASSES //////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	public function getFieldClasses(Field $field, $classes = array())
-	{
-		$classes = $this->filterFieldClasses($classes);
-
-		return $this->addClassesToField($field, $classes);
-	}
-
-	public function getGroupClasses()
-	{
-		if ($this->app['former.form']->isOfType('horizontal')) {
-			return 'row';
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Add label classes
-	 *
-	 * @return string|null An array of attributes with the label class
-	 */
-	public function getLabelClasses()
-	{
-		if ($this->app['former.form']->isOfType('horizontal')) {
-			return $this->getFrameworkOption('wrappedLabelClasses');
-		} else {
-			return null;
-		}
-	}
-
-	public function getUneditableClasses()
-	{
-		return null;
-	}
-
-	public function getPlainTextClasses()
-	{
-		return null;
-	}
-
-	public function getFormClasses($type)
-	{
-		return null;
-	}
-
-	public function getActionClasses()
-	{
-		return null;
-	}
-
-	////////////////////////////////////////////////////////////////////
-	//////////////////////////// RENDER BLOCKS /////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	public function createHelp($text, $attributes = null)
-	{
-		if (is_null($attributes) or empty($attributes)) {
-			$attributes = $this->getFrameworkOption('error_classes');
-		}
-
-		return Element::create('span', $text, $attributes);
-	}
-
-	/**
-	 * Render a disabled field
-	 *
-	 * @param Field $field
-	 *
-	 * @return Input
-	 */
-	public function createDisabledField(Field $field)
-	{
-		$field->disabled();
-
-		return Input::create('text', $field->getName(), $field->getValue(), $field->getAttributes());
-	}
-
-	/**
-	 * Render a plain text field
-	 * Which fallback to a disabled field
-	 *
-	 * @param Field $field
-	 *
-	 * @return Element
-	 */
-	public function createPlainTextField(Field $field)
-	{
-		return $this->createDisabledField($field);
-	}
-
-	////////////////////////////////////////////////////////////////////
-	//////////////////////////// WRAP BLOCKS ///////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Wrap an item to be prepended or appended to the current field.
-	 * For Zurb we return the item and handle the wrapping in prependAppend
-	 * as wrapping is dependent on whether we're prepending or appending.
-	 *
-	 * @return string A wrapped item
-	 */
-	public function placeAround($item)
-	{
-		return $item;
-	}
-
-	/**
-	 * Wrap a field with prepended and appended items
-	 *
-	 * @param  Field $field
-	 * @param  array $prepend
-	 * @param  array $append
-	 *
-	 * @return string A field concatented with prepended and/or appended items
-	 */
-	public function prependAppend($field, $prepend, $append)
-	{
-		$return = '';
-
-		foreach ($prepend as $item) {
-			$return .= '<div class="two mobile-one columns"><span class="prefix">'.$item.'</span></div>';
-		}
-
-		$return .= '<div class="ten mobile-three columns">'.$field->render().'</div>';
-
-		foreach ($append as $item) {
-			$return .= '<div class="two mobile-one columns"><span class="postfix">'.$item.'</span></div>';
-		}
-
-		return $return;
-	}
-
-	/**
-	 * Wraps all label contents with potential additional tags.
-	 *
-	 * @param  string $label
-	 *
-	 * @return string A wrapped label
-	 */
-	public function wrapLabel($label)
-	{
-		if ($this->app['former.form']->isOfType('horizontal')) {
-			return Element::create('div', $label)->addClass($this->labelWidth);
-		} else {
-			return $label;
-		}
-	}
-
-	/**
-	 * Wraps all field contents 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);
-		} else {
-			return $field;
-		}
-	}
-
-	/**
-	 * Wrap actions block with potential additional tags
-	 *
-	 * @param  Actions $actions
-	 *
-	 * @return string A wrapped actions block
-	 */
-	public function wrapActions($actions)
-	{
-		if ($this->app['former.form']->isOfType('horizontal')) {
-			return Element::create('div', $actions)->addClass(array($this->fieldOffset, $this->fieldWidth));
-		} else {
-			return $actions;
-		}
-	}
+    /**
+     * Form types that trigger special styling for this Framework
+     *
+     * @var array
+     */
+    protected $availableTypes = array('horizontal', 'vertical');
+
+    /**
+     * The field sizes available
+     *
+     * @var array
+     */
+    private $fields = array(
+        1  => 'one',
+        2  => 'two',
+        3  => 'three',
+        4  => 'four',
+        5  => 'five',
+        6  => 'six',
+        7  => 'seven',
+        8  => 'eight',
+        9  => 'nine',
+        10 => 'ten',
+        11 => 'eleven',
+        12 => 'twelve',
+    );
+
+    /**
+     * The field states available
+     *
+     * @var array
+     */
+    protected $states = array(
+        'error',
+    );
+
+    /**
+     * Create a new ZurbFoundation instance
+     *
+     * @param Container $app
+     */
+    public function __construct(Container $app)
+    {
+        $this->app = $app;
+        $this->setFrameworkDefaults();
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    /////////////////////////// FILTER ARRAYS //////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    public function filterButtonClasses($classes)
+    {
+        return $classes;
+    }
+
+    public function filterFieldClasses($classes)
+    {
+        // Filter classes
+        $classes = array_intersect($classes, $this->fields);
+
+        return $classes;
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ///////////////////// EXPOSE FRAMEWORK SPECIFICS ///////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    protected function setFieldWidths($labelWidths)
+    {
+        $labelWidthClass = $fieldWidthClass = $fieldOffsetClass = '';
+
+        $viewports = $this->getFrameworkOption('viewports');
+
+        foreach ($labelWidths as $viewport => $columns) {
+            if ($viewport) {
+                $labelWidthClass .= $viewports[$viewport].$this->fields[$columns].' ';
+                $fieldWidthClass .= $viewports[$viewport].$this->fields[12 - $columns].' ';
+                $fieldOffsetClass .= $viewports[$viewport].'offset-by-'.$this->fields[$columns].' ';
+            }
+        }
+
+        $this->labelWidth  = $labelWidthClass.'columns';
+        $this->fieldWidth  = $fieldWidthClass.'columns';
+        $this->fieldOffset = $fieldOffsetClass.'columns';
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ///////////////////////////// ADD CLASSES //////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    public function getFieldClasses(Field $field, $classes = array())
+    {
+        $classes = $this->filterFieldClasses($classes);
+
+        return $this->addClassesToField($field, $classes);
+    }
+
+    public function getGroupClasses()
+    {
+        if ($this->app['former.form']->isOfType('horizontal')) {
+            return 'row';
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Add label classes
+     *
+     * @return string|null An array of attributes with the label class
+     */
+    public function getLabelClasses()
+    {
+        if ($this->app['former.form']->isOfType('horizontal')) {
+            return $this->getFrameworkOption('wrappedLabelClasses');
+        } else {
+            return null;
+        }
+    }
+
+    public function getUneditableClasses()
+    {
+        return null;
+    }
+
+    public function getPlainTextClasses()
+    {
+        return null;
+    }
+
+    public function getFormClasses($type)
+    {
+        return null;
+    }
+
+    public function getActionClasses()
+    {
+        return null;
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    //////////////////////////// RENDER BLOCKS /////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    public function createHelp($text, $attributes = null)
+    {
+        if (is_null($attributes) or empty($attributes)) {
+            $attributes = $this->getFrameworkOption('error_classes');
+        }
+
+        return Element::create('span', $text, $attributes);
+    }
+
+    /**
+     * Render a disabled field
+     *
+     * @param Field $field
+     *
+     * @return Input
+     */
+    public function createDisabledField(Field $field)
+    {
+        $field->disabled();
+
+        return Input::create('text', $field->getName(), $field->getValue(), $field->getAttributes());
+    }
+
+    /**
+     * Render a plain text field
+     * Which fallback to a disabled field
+     *
+     * @param Field $field
+     *
+     * @return Element
+     */
+    public function createPlainTextField(Field $field)
+    {
+        return $this->createDisabledField($field);
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    //////////////////////////// WRAP BLOCKS ///////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Wrap an item to be prepended or appended to the current field.
+     * For Zurb we return the item and handle the wrapping in prependAppend
+     * as wrapping is dependent on whether we're prepending or appending.
+     *
+     * @return string A wrapped item
+     */
+    public function placeAround($item)
+    {
+        return $item;
+    }
+
+    /**
+     * Wrap a field with prepended and appended items
+     *
+     * @param  Field $field
+     * @param  array $prepend
+     * @param  array $append
+     *
+     * @return string A field concatented with prepended and/or appended items
+     */
+    public function prependAppend($field, $prepend, $append)
+    {
+        $return = '';
+
+        foreach ($prepend as $item) {
+            $return .= '<div class="two mobile-one columns"><span class="prefix">'.$item.'</span></div>';
+        }
+
+        $return .= '<div class="ten mobile-three columns">'.$field->render().'</div>';
+
+        foreach ($append as $item) {
+            $return .= '<div class="two mobile-one columns"><span class="postfix">'.$item.'</span></div>';
+        }
+
+        return $return;
+    }
+
+    /**
+     * Wraps all label contents with potential additional tags.
+     *
+     * @param  string $label
+     *
+     * @return string A wrapped label
+     */
+    public function wrapLabel($label)
+    {
+        if ($this->app['former.form']->isOfType('horizontal')) {
+            return Element::create('div', $label)->addClass($this->labelWidth);
+        } else {
+            return $label;
+        }
+    }
+
+    /**
+     * Wraps all field contents 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);
+        } else {
+            return $field;
+        }
+    }
+
+    /**
+     * Wrap actions block with potential additional tags
+     *
+     * @param  Actions $actions
+     *
+     * @return string A wrapped actions block
+     */
+    public function wrapActions($actions)
+    {
+        if ($this->app['former.form']->isOfType('horizontal')) {
+            return Element::create('div', $actions)->addClass(array($this->fieldOffset, $this->fieldWidth));
+        } else {
+            return $actions;
+        }
+    }
 }

src/Former/Framework/ZurbFoundation4.php

Doc Comments +1 added lines, -1 removed lines

@@ -126,7 +126,7 @@
 	 *
 	 * @param Field $field
 	 *
-	 * @return Element
+	 * @return Input
 	 */
 	public function createPlainTextField(Field $field)
 	{

Indentation +277 added lines, -277 removed lines

@@ -13,281 +13,281 @@
  */
 class ZurbFoundation4 extends Framework implements FrameworkInterface
 {
-	/**
-	 * Form types that trigger special styling for this Framework
-	 *
-	 * @var array
-	 */
-	protected $availableTypes = array('horizontal', 'vertical');
-
-	/**
-	 * The button types available
-	 *
-	 * @var array
-	 */
-	private $buttons = array(
-		'tiny',
-		'small',
-		'medium',
-		'large',
-		'success',
-		'radius',
-		'round',
-		'disabled',
-		'prefix',
-		'postfix',
-	);
-
-	/**
-	 * The field sizes available
-	 * Zurb Foundation 4 does not apply sizes to the form element, but to the wrapper div
-	 *
-	 * @var array
-	 */
-	private $fields = array();
-
-	/**
-	 * The field states available
-	 *
-	 * @var array
-	 */
-	protected $states = array(
-		'error',
-	);
-
-	/**
-	 * Create a new ZurbFoundation instance
-	 *
-	 * @param \Illuminate\Container\Container $app
-	 */
-	public function __construct(Container $app)
-	{
-		$this->app = $app;
-		$this->setFrameworkDefaults();
-	}
-
-	////////////////////////////////////////////////////////////////////
-	/////////////////////////// FILTER ARRAYS //////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	public function filterButtonClasses($classes)
-	{
-		// Filter classes
-		$classes   = array_intersect($classes, $this->buttons);
-		$classes[] = 'button';
-
-		return $classes;
-	}
-
-	public function filterFieldClasses($classes)
-	{
-		return null;
-	}
-
-	////////////////////////////////////////////////////////////////////
-	///////////////////// EXPOSE FRAMEWORK SPECIFICS ///////////////////
-	////////////////////////////////////////////////////////////////////
-
-	protected function setFieldWidths($labelWidths)
-	{
-		$labelWidthClass = $fieldWidthClass = $fieldOffsetClass = '';
-
-		$viewports = $this->getFrameworkOption('viewports');
-
-		foreach ($labelWidths as $viewport => $columns) {
-			if ($viewport) {
-				$labelWidthClass .= $viewports[$viewport].'-'.$columns.' ';
-				$fieldWidthClass .= $viewports[$viewport].'-'.(12 - $columns).' ';
-				$fieldOffsetClass .= $viewports[$viewport].'-offset-'.$columns.' ';
-			}
-		}
-
-		$this->labelWidth  = $labelWidthClass.'columns';
-		$this->fieldWidth  = $fieldWidthClass.'columns';
-		$this->fieldOffset = $fieldOffsetClass.'columns';
-	}
-
-	////////////////////////////////////////////////////////////////////
-	///////////////////////////// ADD CLASSES //////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	public function getFieldClasses(Field $field, $classes = array())
-	{
-		if ($field->isButton()) {
-			$classes = $this->filterButtonClasses($classes);
-		} else {
-			$classes = $this->filterFieldClasses($classes);
-		}
-
-		return $this->addClassesToField($field, $classes);
-	}
-
-	public function getGroupClasses()
-	{
-		if ($this->app['former.form']->isOfType('horizontal')) {
-			return 'row';
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Add label classes
-	 *
-	 * @return string|null An array of attributes with the label class
-	 */
-	public function getLabelClasses()
-	{
-		if ($this->app['former.form']->isOfType('horizontal')) {
-			return $this->getFrameworkOption('wrappedLabelClasses');
-		} else {
-			return null;
-		}
-	}
-
-	public function getUneditableClasses()
-	{
-		return null;
-	}
-
-	public function getPlainTextClasses()
-	{
-		return null;
-	}
-
-	public function getFormClasses($type)
-	{
-		return null;
-	}
-
-	public function getActionClasses()
-	{
-		return null;
-	}
-
-	////////////////////////////////////////////////////////////////////
-	//////////////////////////// RENDER BLOCKS /////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	public function createHelp($text, $attributes = null)
-	{
-		if (is_null($attributes) or empty($attributes)) {
-			$attributes = $this->getFrameworkOption('error_classes');
-		}
-
-		return Element::create('span', $text, $attributes);
-	}
-
-	/**
-	 * Render a disabled field
-	 *
-	 * @param Field $field
-	 *
-	 * @return Input
-	 */
-	public function createDisabledField(Field $field)
-	{
-		$field->disabled();
-
-		return Input::create('text', $field->getName(), $field->getValue(), $field->getAttributes());
-	}
-
-	/**
-	 * Render a plain text field
-	 * Which fallback to a disabled field
-	 *
-	 * @param Field $field
-	 *
-	 * @return Element
-	 */
-	public function createPlainTextField(Field $field)
-	{
-		return $this->createDisabledField($field);
-	}
-
-	////////////////////////////////////////////////////////////////////
-	//////////////////////////// WRAP BLOCKS ///////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Wrap an item to be prepended or appended to the current field.
-	 * For Zurb we return the item and handle the wrapping in prependAppend
-	 * as wrapping is dependent on whether we're prepending or appending.
-	 *
-	 * @return string A wrapped item
-	 */
-	public function placeAround($item)
-	{
-		return $item;
-	}
-
-	/**
-	 * Wrap a field with prepended and appended items
-	 *
-	 * @param  Field $field
-	 * @param  array $prepend
-	 * @param  array $append
-	 *
-	 * @return string A field concatented with prepended and/or appended items
-	 */
-	public function prependAppend($field, $prepend, $append)
-	{
-		$return = '';
-
-		foreach ($prepend as $item) {
-			$return .= '<div class="large-2 small-3 columns"><span class="prefix">'.$item.'</span></div>';
-		}
-
-		$return .= '<div class="large-10 small-9 columns">'.$field->render().'</div>';
-
-		foreach ($append as $item) {
-			$return .= '<div class="large-2 small-3 columns"><span class="postfix">'.$item.'</span></div>';
-		}
-
-		return $return;
-	}
-
-	/**
-	 * Wraps all label contents with potential additional tags.
-	 *
-	 * @param  string $label
-	 *
-	 * @return string A wrapped label
-	 */
-	public function wrapLabel($label)
-	{
-		if ($this->app['former.form']->isOfType('horizontal')) {
-			return Element::create('div', $label)->addClass($this->labelWidth);
-		} else {
-			return $label;
-		}
-	}
-
-	/**
-	 * Wraps all field contents 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);
-		} else {
-			return $field;
-		}
-	}
-
-	/**
-	 * Wrap actions block with potential additional tags
-	 *
-	 * @param  Actions $actions
-	 *
-	 * @return string A wrapped actions block
-	 */
-	public function wrapActions($actions)
-	{
-		return $actions;
-	}
+    /**
+     * Form types that trigger special styling for this Framework
+     *
+     * @var array
+     */
+    protected $availableTypes = array('horizontal', 'vertical');
+
+    /**
+     * The button types available
+     *
+     * @var array
+     */
+    private $buttons = array(
+        'tiny',
+        'small',
+        'medium',
+        'large',
+        'success',
+        'radius',
+        'round',
+        'disabled',
+        'prefix',
+        'postfix',
+    );
+
+    /**
+     * The field sizes available
+     * Zurb Foundation 4 does not apply sizes to the form element, but to the wrapper div
+     *
+     * @var array
+     */
+    private $fields = array();
+
+    /**
+     * The field states available
+     *
+     * @var array
+     */
+    protected $states = array(
+        'error',
+    );
+
+    /**
+     * Create a new ZurbFoundation instance
+     *
+     * @param \Illuminate\Container\Container $app
+     */
+    public function __construct(Container $app)
+    {
+        $this->app = $app;
+        $this->setFrameworkDefaults();
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    /////////////////////////// FILTER ARRAYS //////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    public function filterButtonClasses($classes)
+    {
+        // Filter classes
+        $classes   = array_intersect($classes, $this->buttons);
+        $classes[] = 'button';
+
+        return $classes;
+    }
+
+    public function filterFieldClasses($classes)
+    {
+        return null;
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ///////////////////// EXPOSE FRAMEWORK SPECIFICS ///////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    protected function setFieldWidths($labelWidths)
+    {
+        $labelWidthClass = $fieldWidthClass = $fieldOffsetClass = '';
+
+        $viewports = $this->getFrameworkOption('viewports');
+
+        foreach ($labelWidths as $viewport => $columns) {
+            if ($viewport) {
+                $labelWidthClass .= $viewports[$viewport].'-'.$columns.' ';
+                $fieldWidthClass .= $viewports[$viewport].'-'.(12 - $columns).' ';
+                $fieldOffsetClass .= $viewports[$viewport].'-offset-'.$columns.' ';
+            }
+        }
+
+        $this->labelWidth  = $labelWidthClass.'columns';
+        $this->fieldWidth  = $fieldWidthClass.'columns';
+        $this->fieldOffset = $fieldOffsetClass.'columns';
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ///////////////////////////// ADD CLASSES //////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    public function getFieldClasses(Field $field, $classes = array())
+    {
+        if ($field->isButton()) {
+            $classes = $this->filterButtonClasses($classes);
+        } else {
+            $classes = $this->filterFieldClasses($classes);
+        }
+
+        return $this->addClassesToField($field, $classes);
+    }
+
+    public function getGroupClasses()
+    {
+        if ($this->app['former.form']->isOfType('horizontal')) {
+            return 'row';
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Add label classes
+     *
+     * @return string|null An array of attributes with the label class
+     */
+    public function getLabelClasses()
+    {
+        if ($this->app['former.form']->isOfType('horizontal')) {
+            return $this->getFrameworkOption('wrappedLabelClasses');
+        } else {
+            return null;
+        }
+    }
+
+    public function getUneditableClasses()
+    {
+        return null;
+    }
+
+    public function getPlainTextClasses()
+    {
+        return null;
+    }
+
+    public function getFormClasses($type)
+    {
+        return null;
+    }
+
+    public function getActionClasses()
+    {
+        return null;
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    //////////////////////////// RENDER BLOCKS /////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    public function createHelp($text, $attributes = null)
+    {
+        if (is_null($attributes) or empty($attributes)) {
+            $attributes = $this->getFrameworkOption('error_classes');
+        }
+
+        return Element::create('span', $text, $attributes);
+    }
+
+    /**
+     * Render a disabled field
+     *
+     * @param Field $field
+     *
+     * @return Input
+     */
+    public function createDisabledField(Field $field)
+    {
+        $field->disabled();
+
+        return Input::create('text', $field->getName(), $field->getValue(), $field->getAttributes());
+    }
+
+    /**
+     * Render a plain text field
+     * Which fallback to a disabled field
+     *
+     * @param Field $field
+     *
+     * @return Element
+     */
+    public function createPlainTextField(Field $field)
+    {
+        return $this->createDisabledField($field);
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    //////////////////////////// WRAP BLOCKS ///////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Wrap an item to be prepended or appended to the current field.
+     * For Zurb we return the item and handle the wrapping in prependAppend
+     * as wrapping is dependent on whether we're prepending or appending.
+     *
+     * @return string A wrapped item
+     */
+    public function placeAround($item)
+    {
+        return $item;
+    }
+
+    /**
+     * Wrap a field with prepended and appended items
+     *
+     * @param  Field $field
+     * @param  array $prepend
+     * @param  array $append
+     *
+     * @return string A field concatented with prepended and/or appended items
+     */
+    public function prependAppend($field, $prepend, $append)
+    {
+        $return = '';
+
+        foreach ($prepend as $item) {
+            $return .= '<div class="large-2 small-3 columns"><span class="prefix">'.$item.'</span></div>';
+        }
+
+        $return .= '<div class="large-10 small-9 columns">'.$field->render().'</div>';
+
+        foreach ($append as $item) {
+            $return .= '<div class="large-2 small-3 columns"><span class="postfix">'.$item.'</span></div>';
+        }
+
+        return $return;
+    }
+
+    /**
+     * Wraps all label contents with potential additional tags.
+     *
+     * @param  string $label
+     *
+     * @return string A wrapped label
+     */
+    public function wrapLabel($label)
+    {
+        if ($this->app['former.form']->isOfType('horizontal')) {
+            return Element::create('div', $label)->addClass($this->labelWidth);
+        } else {
+            return $label;
+        }
+    }
+
+    /**
+     * Wraps all field contents 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);
+        } else {
+            return $field;
+        }
+    }
+
+    /**
+     * Wrap actions block with potential additional tags
+     *
+     * @param  Actions $actions
+     *
+     * @return string A wrapped actions block
+     */
+    public function wrapActions($actions)
+    {
+        return $actions;
+    }
 }

src/Former/Framework/ZurbFoundation5.php

Doc Comments +1 added lines, -1 removed lines

@@ -126,7 +126,7 @@
 	 *
 	 * @param Field $field
 	 *
-	 * @return Element
+	 * @return Input
 	 */
 	public function createPlainTextField(Field $field)
 	{

Indentation +279 added lines, -279 removed lines

@@ -13,283 +13,283 @@
  */
 class ZurbFoundation5 extends Framework implements FrameworkInterface
 {
-	/**
-	 * Form types that trigger special styling for this Framework
-	 *
-	 * @var array
-	 */
-	protected $availableTypes = array('horizontal', 'vertical');
-
-	/**
-	 * The button types available
-	 *
-	 * @var array
-	 */
-	private $buttons = array(
-		'tiny',
-		'small',
-		'medium',
-		'large',
-		'success',
-		'radius',
-		'round',
-		'disabled',
-		'prefix',
-		'postfix',
-	);
-
-	/**
-	 * The field sizes available
-	 * Zurb Foundation 5 does not apply sizes to the form element, but to the wrapper div
-	 *
-	 * @var array
-	 */
-	private $fields = array();
-
-	/**
-	 * The field states available
-	 *
-	 * @var array
-	 */
-	protected $states = array(
-		'error',
-	);
-
-	/**
-	 * Create a new ZurbFoundation instance
-	 *
-	 * @param \Illuminate\Container\Container $app
-	 */
-	public function __construct(Container $app)
-	{
-		$this->app = $app;
-		$this->setFrameworkDefaults();
-	}
-
-	////////////////////////////////////////////////////////////////////
-	/////////////////////////// FILTER ARRAYS //////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	public function filterButtonClasses($classes)
-	{
-		// Filter classes
-		$classes   = array_intersect($classes, $this->buttons);
-		$classes[] = 'button';
-
-		return $classes;
-	}
-
-	public function filterFieldClasses($classes)
-	{
-		return null;
-	}
-
-	////////////////////////////////////////////////////////////////////
-	///////////////////// EXPOSE FRAMEWORK SPECIFICS ///////////////////
-	////////////////////////////////////////////////////////////////////
-
-	protected function setFieldWidths($labelWidths)
-	{
-		$labelWidthClass = $fieldWidthClass = $fieldOffsetClass = '';
-
-		$viewports = $this->getFrameworkOption('viewports');
-
-		foreach ($labelWidths as $viewport => $columns) {
-			if ($viewport) {
-				$labelWidthClass .= $viewports[$viewport].'-'.$columns.' ';
-				$fieldWidthClass .= $viewports[$viewport].'-'.(12 - $columns).' ';
-				$fieldOffsetClass .= $viewports[$viewport].'-offset-'.$columns.' ';
-			}
-		}
-
-		$this->labelWidth  = $labelWidthClass.'columns';
-		$this->fieldWidth  = $fieldWidthClass.'columns';
-		$this->fieldOffset = $fieldOffsetClass.'columns';
-	}
-
-	////////////////////////////////////////////////////////////////////
-	///////////////////////////// ADD CLASSES //////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	public function getFieldClasses(Field $field, $classes = array())
-	{
-		if ($field->isButton()) {
-			$classes = $this->filterButtonClasses($classes);
-		} else {
-			$classes = $this->filterFieldClasses($classes);
-		}
-
-		return $this->addClassesToField($field, $classes);
-	}
-
-	public function getGroupClasses()
-	{
-		if ($this->app['former.form']->isOfType('horizontal')) {
-			return 'row';
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Add label classes
-	 *
-	 * @return string|null An array of attributes with the label class
-	 */
-	public function getLabelClasses()
-	{
-		if ($this->app['former.form']->isOfType('horizontal')) {
-			return $this->getFrameworkOption('wrappedLabelClasses');
-		} else {
-			return null;
-		}
-	}
-
-	public function getUneditableClasses()
-	{
-		return null;
-	}
-
-	public function getPlainTextClasses()
-	{
-		return null;
-	}
-
-	public function getFormClasses($type)
-	{
-		return null;
-	}
-
-	public function getActionClasses()
-	{
-		return null;
-	}
-
-	////////////////////////////////////////////////////////////////////
-	//////////////////////////// RENDER BLOCKS /////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	public function createHelp($text, $attributes = null)
-	{
-		if (is_null($attributes) or empty($attributes)) {
-			$attributes = $this->getFrameworkOption('error_classes');
-		}
-
-		return Element::create('small', $text, $attributes);
-	}
-
-	/**
-	 * Render a disabled field
-	 *
-	 * @param Field $field
-	 *
-	 * @return Input
-	 */
-	public function createDisabledField(Field $field)
-	{
-		$field->disabled();
-
-		return Input::create('text', $field->getName(), $field->getValue(), $field->getAttributes());
-	}
-
-	/**
-	 * Render a plain text field
-	 * Which fallback to a disabled field
-	 *
-	 * @param Field $field
-	 *
-	 * @return Element
-	 */
-	public function createPlainTextField(Field $field)
-	{
-		return $this->createDisabledField($field);
-	}
-
-	////////////////////////////////////////////////////////////////////
-	//////////////////////////// WRAP BLOCKS ///////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Wrap an item to be prepended or appended to the current field.
-	 * For Zurb we return the item and handle the wrapping in prependAppend
-	 * as wrapping is dependent on whether we're prepending or appending.
-	 *
-	 * @return string A wrapped item
-	 */
-	public function placeAround($item)
-	{
-		return $item;
-	}
-
-	/**
-	 * Wrap a field with prepended and appended items
-	 *
-	 * @param  Field $field
-	 * @param  array $prepend
-	 * @param  array $append
-	 *
-	 * @return string A field concatented with prepended and/or appended items
-	 */
-	public function prependAppend($field, $prepend, $append)
-	{
-		$return = '<div class="row collapse">';
-
-		foreach ($prepend as $item) {
-			$return .= '<div class="large-2 small-3 columns"><span class="prefix">'.$item.'</span></div>';
-		}
-
-		$return .= '<div class="large-10 small-9 columns">'.$field->render().'</div>';
-
-		foreach ($append as $item) {
-			$return .= '<div class="large-2 small-3 columns"><span class="postfix">'.$item.'</span></div>';
-		}
-
-		$return .= '</div>';
-
-		return $return;
-	}
-
-	/**
-	 * Wraps all label contents with potential additional tags.
-	 *
-	 * @param  string $label
-	 *
-	 * @return string A wrapped label
-	 */
-	public function wrapLabel($label)
-	{
-		if ($this->app['former.form']->isOfType('horizontal')) {
-			return Element::create('div', $label)->addClass($this->labelWidth);
-		} else {
-			return $label;
-		}
-	}
-
-	/**
-	 * Wraps all field contents 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);
-		} else {
-			return $field;
-		}
-	}
-
-	/**
-	 * Wrap actions block with potential additional tags
-	 *
-	 * @param  Actions $actions
-	 *
-	 * @return string A wrapped actions block
-	 */
-	public function wrapActions($actions)
-	{
-		return $actions;
-	}
+    /**
+     * Form types that trigger special styling for this Framework
+     *
+     * @var array
+     */
+    protected $availableTypes = array('horizontal', 'vertical');
+
+    /**
+     * The button types available
+     *
+     * @var array
+     */
+    private $buttons = array(
+        'tiny',
+        'small',
+        'medium',
+        'large',
+        'success',
+        'radius',
+        'round',
+        'disabled',
+        'prefix',
+        'postfix',
+    );
+
+    /**
+     * The field sizes available
+     * Zurb Foundation 5 does not apply sizes to the form element, but to the wrapper div
+     *
+     * @var array
+     */
+    private $fields = array();
+
+    /**
+     * The field states available
+     *
+     * @var array
+     */
+    protected $states = array(
+        'error',
+    );
+
+    /**
+     * Create a new ZurbFoundation instance
+     *
+     * @param \Illuminate\Container\Container $app
+     */
+    public function __construct(Container $app)
+    {
+        $this->app = $app;
+        $this->setFrameworkDefaults();
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    /////////////////////////// FILTER ARRAYS //////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    public function filterButtonClasses($classes)
+    {
+        // Filter classes
+        $classes   = array_intersect($classes, $this->buttons);
+        $classes[] = 'button';
+
+        return $classes;
+    }
+
+    public function filterFieldClasses($classes)
+    {
+        return null;
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ///////////////////// EXPOSE FRAMEWORK SPECIFICS ///////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    protected function setFieldWidths($labelWidths)
+    {
+        $labelWidthClass = $fieldWidthClass = $fieldOffsetClass = '';
+
+        $viewports = $this->getFrameworkOption('viewports');
+
+        foreach ($labelWidths as $viewport => $columns) {
+            if ($viewport) {
+                $labelWidthClass .= $viewports[$viewport].'-'.$columns.' ';
+                $fieldWidthClass .= $viewports[$viewport].'-'.(12 - $columns).' ';
+                $fieldOffsetClass .= $viewports[$viewport].'-offset-'.$columns.' ';
+            }
+        }
+
+        $this->labelWidth  = $labelWidthClass.'columns';
+        $this->fieldWidth  = $fieldWidthClass.'columns';
+        $this->fieldOffset = $fieldOffsetClass.'columns';
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ///////////////////////////// ADD CLASSES //////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    public function getFieldClasses(Field $field, $classes = array())
+    {
+        if ($field->isButton()) {
+            $classes = $this->filterButtonClasses($classes);
+        } else {
+            $classes = $this->filterFieldClasses($classes);
+        }
+
+        return $this->addClassesToField($field, $classes);
+    }
+
+    public function getGroupClasses()
+    {
+        if ($this->app['former.form']->isOfType('horizontal')) {
+            return 'row';
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Add label classes
+     *
+     * @return string|null An array of attributes with the label class
+     */
+    public function getLabelClasses()
+    {
+        if ($this->app['former.form']->isOfType('horizontal')) {
+            return $this->getFrameworkOption('wrappedLabelClasses');
+        } else {
+            return null;
+        }
+    }
+
+    public function getUneditableClasses()
+    {
+        return null;
+    }
+
+    public function getPlainTextClasses()
+    {
+        return null;
+    }
+
+    public function getFormClasses($type)
+    {
+        return null;
+    }
+
+    public function getActionClasses()
+    {
+        return null;
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    //////////////////////////// RENDER BLOCKS /////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    public function createHelp($text, $attributes = null)
+    {
+        if (is_null($attributes) or empty($attributes)) {
+            $attributes = $this->getFrameworkOption('error_classes');
+        }
+
+        return Element::create('small', $text, $attributes);
+    }
+
+    /**
+     * Render a disabled field
+     *
+     * @param Field $field
+     *
+     * @return Input
+     */
+    public function createDisabledField(Field $field)
+    {
+        $field->disabled();
+
+        return Input::create('text', $field->getName(), $field->getValue(), $field->getAttributes());
+    }
+
+    /**
+     * Render a plain text field
+     * Which fallback to a disabled field
+     *
+     * @param Field $field
+     *
+     * @return Element
+     */
+    public function createPlainTextField(Field $field)
+    {
+        return $this->createDisabledField($field);
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    //////////////////////////// WRAP BLOCKS ///////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Wrap an item to be prepended or appended to the current field.
+     * For Zurb we return the item and handle the wrapping in prependAppend
+     * as wrapping is dependent on whether we're prepending or appending.
+     *
+     * @return string A wrapped item
+     */
+    public function placeAround($item)
+    {
+        return $item;
+    }
+
+    /**
+     * Wrap a field with prepended and appended items
+     *
+     * @param  Field $field
+     * @param  array $prepend
+     * @param  array $append
+     *
+     * @return string A field concatented with prepended and/or appended items
+     */
+    public function prependAppend($field, $prepend, $append)
+    {
+        $return = '<div class="row collapse">';
+
+        foreach ($prepend as $item) {
+            $return .= '<div class="large-2 small-3 columns"><span class="prefix">'.$item.'</span></div>';
+        }
+
+        $return .= '<div class="large-10 small-9 columns">'.$field->render().'</div>';
+
+        foreach ($append as $item) {
+            $return .= '<div class="large-2 small-3 columns"><span class="postfix">'.$item.'</span></div>';
+        }
+
+        $return .= '</div>';
+
+        return $return;
+    }
+
+    /**
+     * Wraps all label contents with potential additional tags.
+     *
+     * @param  string $label
+     *
+     * @return string A wrapped label
+     */
+    public function wrapLabel($label)
+    {
+        if ($this->app['former.form']->isOfType('horizontal')) {
+            return Element::create('div', $label)->addClass($this->labelWidth);
+        } else {
+            return $label;
+        }
+    }
+
+    /**
+     * Wraps all field contents 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);
+        } else {
+            return $field;
+        }
+    }
+
+    /**
+     * Wrap actions block with potential additional tags
+     *
+     * @param  Actions $actions
+     *
+     * @return string A wrapped actions block
+     */
+    public function wrapActions($actions)
+    {
+        return $actions;
+    }
 }

src/Former/Form/Fields/Button.php

Indentation +90 added lines, -90 removed lines

@@ -10,105 +10,105 @@
  */
 class Button extends Field
 {
-	/**
-	 * The Button default element
-	 *
-	 * @var string
-	 */
-	protected $element = 'input';
+    /**
+     * The Button default element
+     *
+     * @var string
+     */
+    protected $element = 'input';
 
-	/**
-	 * Default value for self-closing
-	 *
-	 * @var boolean
-	 */
-	protected $isSelfClosing = true;
+    /**
+     * Default value for self-closing
+     *
+     * @var boolean
+     */
+    protected $isSelfClosing = true;
 
-	/**
-	 * A list of class properties to be added to attributes
-	 *
-	 * @var array
-	 */
-	protected $injectedProperties = array(
-		'name',
-		'type',
-		'value',
-	);
+    /**
+     * A list of class properties to be added to attributes
+     *
+     * @var array
+     */
+    protected $injectedProperties = array(
+        'name',
+        'type',
+        'value',
+    );
 
-	////////////////////////////////////////////////////////////////////
-	/////////////////////////// CORE METHODS ///////////////////////////
-	////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////
+    /////////////////////////// CORE METHODS ///////////////////////////
+    ////////////////////////////////////////////////////////////////////
 
-	/**
-	 * Easier arguments order for button fields
-	 *
-	 * @param Container $app        The Container
-	 * @param string    $type       button/submit/reset/etc
-	 * @param string    $value      The text of the button
-	 * @param string    $link       Its link
-	 * @param array     $attributes Its attributes
-	 */
-	public function __construct(Container $app, $type, $value, $link, $attributes)
-	{
-		$this->app        = $app;
-		$this->attributes = (array) $attributes;
-		$this->type       = $type;
-		$this->value($value);
+    /**
+     * Easier arguments order for button fields
+     *
+     * @param Container $app        The Container
+     * @param string    $type       button/submit/reset/etc
+     * @param string    $value      The text of the button
+     * @param string    $link       Its link
+     * @param array     $attributes Its attributes
+     */
+    public function __construct(Container $app, $type, $value, $link, $attributes)
+    {
+        $this->app        = $app;
+        $this->attributes = (array) $attributes;
+        $this->type       = $type;
+        $this->value($value);
 
-		// Set correct element for the various button patterns
-		switch ($type) {
-			case 'button':
-				$this->element       = 'button';
-				$this->isSelfClosing = false;
-				break;
-			case 'link':
-				$this->type               = null;
-				$this->element            = 'a';
-				$this->attributes['href'] = $link;
-				$this->isSelfClosing      = false;
-				break;
-		}
-	}
+        // Set correct element for the various button patterns
+        switch ($type) {
+            case 'button':
+                $this->element       = 'button';
+                $this->isSelfClosing = false;
+                break;
+            case 'link':
+                $this->type               = null;
+                $this->element            = 'a';
+                $this->attributes['href'] = $link;
+                $this->isSelfClosing      = false;
+                break;
+        }
+    }
 
-	////////////////////////////////////////////////////////////////////
-	////////////////////////// FIELD METHODS ///////////////////////////
-	////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////
+    ////////////////////////// FIELD METHODS ///////////////////////////
+    ////////////////////////////////////////////////////////////////////
 
-	/**
-	 * Check if the field is a button
-	 *
-	 * @return boolean
-	 */
-	public function isButton()
-	{
-		return true;
-	}
+    /**
+     * Check if the field is a button
+     *
+     * @return boolean
+     */
+    public function isButton()
+    {
+        return true;
+    }
 
-	/**
-	 * Prepend an icon to the button
-	 *
-	 * @param  string $icon
-	 * @param  array  $attributes
-	 *
-	 * @return self
-	 */
-	public function icon($icon, $attributes = array())
-	{
-		$icon        = $this->app['former.framework']->createIcon($icon, $attributes);
-		$this->value = $icon.' '.$this->value;
+    /**
+     * Prepend an icon to the button
+     *
+     * @param  string $icon
+     * @param  array  $attributes
+     *
+     * @return self
+     */
+    public function icon($icon, $attributes = array())
+    {
+        $icon        = $this->app['former.framework']->createIcon($icon, $attributes);
+        $this->value = $icon.' '.$this->value;
 
-		return $this;
-	}
+        return $this;
+    }
 
-	/**
-	 * Hijack Former's Object model value method
-	 *
-	 * @param  string $value The new button text
-	 */
-	public function value($value)
-	{
-		$this->value = Helpers::translate($value);
+    /**
+     * Hijack Former's Object model value method
+     *
+     * @param  string $value The new button text
+     */
+    public function value($value)
+    {
+        $this->value = Helpers::translate($value);
 
-		return $this;
-	}
+        return $this;
+    }
 }

src/Former/Form/Fields/Checkbox.php

Indentation +21 added lines, -21 removed lines

@@ -8,28 +8,28 @@
  */
 class Checkbox extends Checkable
 {
-	/**
-	 * The current checkable type
-	 *
-	 * @var string
-	 */
-	protected $checkable = 'checkbox';
+    /**
+     * The current checkable type
+     *
+     * @var string
+     */
+    protected $checkable = 'checkbox';
 
-	////////////////////////////////////////////////////////////////////
-	////////////////////////// FIELD METHODS ///////////////////////////
-	////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////
+    ////////////////////////// FIELD METHODS ///////////////////////////
+    ////////////////////////////////////////////////////////////////////
 
-	/**
-	 * Create a serie of checkboxes
-	 */
-	public function checkboxes()
-	{
-		if ($this->isGrouped()) {
-			// Remove any possible items added by the Populator.
-			$this->items = array();
-		}
-		$this->items(func_get_args());
+    /**
+     * Create a serie of checkboxes
+     */
+    public function checkboxes()
+    {
+        if ($this->isGrouped()) {
+            // Remove any possible items added by the Populator.
+            $this->items = array();
+        }
+        $this->items(func_get_args());
 
-		return $this;
-	}
+        return $this;
+    }
 }