formers / former

src/Former/Form/Fields/File.php

Indentation +123 added lines, -123 removed lines

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

src/Former/Framework/Nude.php

Indentation +178 added lines, -178 removed lines

@@ -14,182 +14,182 @@
 class Nude extends Framework implements FrameworkInterface
 {
 
-	/**
-	 * The field states available
-	 *
-	 * @var array
-	 */
-	protected $states = array(
-		'error',
-	);
-
-	/**
-	 * Create a new Nude 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)
-	{
-		return $classes;
-	}
-
-	////////////////////////////////////////////////////////////////////
-	///////////////////////////// ADD CLASSES //////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	public function getFieldClasses(Field $field, $classes = array())
-	{
-		$classes = $this->filterFieldClasses($classes);
-
-		// If we found any class, add them
-		if ($classes) {
-			$field->class(implode(' ', $classes));
-		}
-
-		return $field;
-	}
-
-	public function getGroupClasses()
-	{
-		return null;
-	}
-
-	public function getLabelClasses()
-	{
-		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 /////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Create an help text
-	 */
-	public function createHelp($text, $attributes = array())
-	{
-		return Element::create('span', $text, $attributes)->addClass('help');
-	}
-
-	/**
-	 * 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 Input
-	 */
-	public function createPlainTextField(Field $field)
-	{
-		return $this->createDisabledField($field);
-	}
-
-	////////////////////////////////////////////////////////////////////
-	//////////////////////////// WRAP BLOCKS ///////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Wrap an item to be prepended or appended to the current field
-	 *
-	 * @param  string $item
-	 *
-	 * @return Element A wrapped item
-	 */
-	public function placeAround($item)
-	{
-		return Element::create('span', $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>';
-		$return .= join(null, $prepend);
-		$return .= $field->render();
-		$return .= join(null, $append);
-		$return .= '</div>';
-
-		return $return;
-	}
-
-	/**
-	 * Wraps all field contents with potential additional tags.
-	 *
-	 * @param  Field $field
-	 *
-	 * @return Field A wrapped field
-	 */
-	public function wrapField($field)
-	{
-		return $field;
-	}
-
-	/**
-	 * Wrap actions block with potential additional tags
-	 *
-	 * @param  Actions $actions
-	 *
-	 * @return string A wrapped actions block
-	 */
-	public function wrapActions($actions)
-	{
-		return $actions;
-	}
+    /**
+     * The field states available
+     *
+     * @var array
+     */
+    protected $states = array(
+        'error',
+    );
+
+    /**
+     * Create a new Nude 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)
+    {
+        return $classes;
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ///////////////////////////// ADD CLASSES //////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    public function getFieldClasses(Field $field, $classes = array())
+    {
+        $classes = $this->filterFieldClasses($classes);
+
+        // If we found any class, add them
+        if ($classes) {
+            $field->class(implode(' ', $classes));
+        }
+
+        return $field;
+    }
+
+    public function getGroupClasses()
+    {
+        return null;
+    }
+
+    public function getLabelClasses()
+    {
+        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 /////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Create an help text
+     */
+    public function createHelp($text, $attributes = array())
+    {
+        return Element::create('span', $text, $attributes)->addClass('help');
+    }
+
+    /**
+     * 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 Input
+     */
+    public function createPlainTextField(Field $field)
+    {
+        return $this->createDisabledField($field);
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    //////////////////////////// WRAP BLOCKS ///////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Wrap an item to be prepended or appended to the current field
+     *
+     * @param  string $item
+     *
+     * @return Element A wrapped item
+     */
+    public function placeAround($item)
+    {
+        return Element::create('span', $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>';
+        $return .= join(null, $prepend);
+        $return .= $field->render();
+        $return .= join(null, $append);
+        $return .= '</div>';
+
+        return $return;
+    }
+
+    /**
+     * Wraps all field contents with potential additional tags.
+     *
+     * @param  Field $field
+     *
+     * @return Field A wrapped field
+     */
+    public function wrapField($field)
+    {
+        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/TwitterBootstrap.php

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/ZurbFoundation5.php

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 Input
-	 */
-	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 Input
+     */
+    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/Framework/TwitterBootstrap3.php

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/ZurbFoundation.php

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 Input
-	 */
-	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 Input
+     */
+    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

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 Input
-	 */
-	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 Input
+     */
+    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/Former.php

Indentation +482 added lines, -482 removed lines

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

src/Former/Helpers.php

Indentation +187 added lines, -187 removed lines

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