formers / former

src/Former/Form/Fields/Select.php

Doc Comments +1 added lines, -1 removed lines

@@ -170,7 +170,7 @@
 	 * Set the select options
 	 *
 	 * @param  array   $_options     The options as an array
-	 * @param  mixed   $selected     Facultative selected entry
+	 * @param  null|string   $selected     Facultative selected entry
 	 * @param  boolean $valuesAsKeys Whether the array's values should be used as
 	 *                               the option's values instead of the array's keys
 	 */

Spacing +2 added lines, -2 removed lines

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

Indentation +293 added lines, -293 removed lines

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

src/Former/Form/Form.php

Doc Comments +2 added lines, -2 removed lines

@@ -351,9 +351,9 @@
 	}
 
 	/**
-	 * @param $name
+	 * @param string $name
 	 * @param $params
-	 * @param $type
+	 * @param string $type
 	 *
 	 * @return $this
 	 */

Spacing +2 added lines, -2 removed lines

@@ -96,7 +96,7 @@ 
 		$this->url       = $url;
 		$this->populator = $populator;
 
-		$this->app->singleton('former.form.framework', function ($app) {
+		$this->app->singleton('former.form.framework', function($app) {
 			return clone $app['former.framework'];
 		});
 	}
@@ -402,7 +402,7 @@ 
 
 		// If raw form
 		if ($type == 'raw') {
-			$this->app->bind('former.form.framework', function ($app) {
+			$this->app->bind('former.form.framework', function($app) {
 				return $app['former']->getFrameworkInstance('Nude');
 			});
 		}

Indentation +403 added lines, -403 removed lines

@@ -11,407 +11,407 @@
  */
 class Form extends FormerObject
 {
-	/**
-	 * The IoC Container
-	 *
-	 * @var Container
-	 */
-	protected $app;
-
-	/**
-	 * The URL generator
-	 *
-	 * @var UrlGenerator
-	 */
-	protected $url;
-
-	/**
-	 * The Populator
-	 *
-	 * @var Populator
-	 */
-	protected $populator;
-
-	/**
-	 * The Form type
-	 *
-	 * @var string
-	 */
-	protected $type = null;
-
-	/**
-	 * The destination of the current form
-	 *
-	 * @var string
-	 */
-	protected $action;
-
-	/**
-	 * The form method
-	 *
-	 * @var string
-	 */
-	protected $method;
-
-	/**
-	 * Whether the form should be secured or not
-	 *
-	 * @var boolean
-	 */
-	protected $secure;
-
-	/**
-	 * The form element
-	 *
-	 * @var string
-	 */
-	protected $element = 'form';
-
-	/**
-	 * A list of injected properties
-	 *
-	 * @var array
-	 */
-	protected $injectedProperties = array('method', 'action');
-
-	/**
-	 * Whether a form is opened or not
-	 *
-	 * @var boolean
-	 */
-	protected static $opened = false;
-
-	////////////////////////////////////////////////////////////////////
-	/////////////////////////// CORE METHODS ///////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Build a new Form instance
-	 *
-	 * @param UrlGenerator $url
-	 */
-	public function __construct(Container $app, $url, Populator $populator)
-	{
-		$this->app       = $app;
-		$this->url       = $url;
-		$this->populator = $populator;
-
-		$this->app->singleton('former.form.framework', function ($app) {
-			return clone $app['former.framework'];
-		});
-	}
-
-	/**
-	 * Opens up magically a form
-	 *
-	 * @param  string $type       The form type asked
-	 * @param  array  $parameters Parameters passed
-	 *
-	 * @return Form             A form opening tag
-	 */
-	public function openForm($type, $parameters)
-	{
-		$action     = array_get($parameters, 0);
-		$method     = array_get($parameters, 1, 'POST');
-		$attributes = array_get($parameters, 2, array());
-		$secure     = array_get($parameters, 3, null);
-
-		// Fetch errors if asked for
-		if ($this->app['former']->getOption('fetch_errors')) {
-			$this->app['former']->withErrors();
-		}
-
-		// Open the form
-		$this->action($action);
-		$this->attributes = $attributes;
-		$this->method     = strtoupper($method);
-		$this->secure     = $secure;
-
-		// Add any effect of the form type
-		$type       = Str::snake($type);
-		$this->type = $this->applyType($type);
-
-		// Add enctype
-		if (!array_key_exists('accept-charset', $attributes)) {
-			$this->attributes['accept-charset'] = 'utf-8';
-		}
-
-		// Add supplementary classes
-		if ($this->type !== 'raw') {
-			$this->addClass($this->app['former.form.framework']->getFormClasses($this->type));
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Closes a Form
-	 *
-	 * @return string A closing <form> tag
-	 */
-	public function close()
-	{
-		static::$opened = false;
-
-		// Add token if necessary
-		$closing = '</form>';
-		if ($this->method != 'GET') {
-			$closing = $this->app['former']->token().$closing;
-		}
-
-		return $closing;
-	}
-
-	////////////////////////////////////////////////////////////////////
-	//////////////////////////// STATIC HELPERS ////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Whether a form is currently opened or not
-	 *
-	 * @return boolean
-	 */
-	public static function hasInstanceOpened()
-	{
-		return static::$opened;
-	}
-
-	////////////////////////////////////////////////////////////////////
-	/////////////////////////////// SETTER /////////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Change the form's action
-	 *
-	 * @param  string $action The new action
-	 *
-	 * @return $this
-	 */
-	public function action($action)
-	{
-		$this->action = $action ? $this->url->to($action, array(), $this->secure) : null;
-
-		return $this;
-	}
-
-	/**
-	 * Change the form's method
-	 *
-	 * @param  string $method The method to use
-	 *
-	 * @return $this
-	 */
-	public function method($method)
-	{
-		$this->method = strtoupper($method);
-
-		return $this;
-	}
-
-	/**
-	 * Whether the form should be secure
-	 *
-	 * @param  boolean $secure Secure or not
-	 *
-	 * @return $this
-	 */
-	public function secure($secure = true)
-	{
-		$this->secure = $secure;
-
-		return $this;
-	}
-
-	/**
-	 * Change the form's action and method to a route
-	 *
-	 * @param  string $name   The name of the route to use
-	 * @param  array  $params Any route parameters
-	 *
-	 * @return Form
-	 */
-	public function route($name, $params = array())
-	{
-		return $this->setRouteOrAction($name, $params, 'route');
-	}
-
-	/**
-	 * Change the form's action to a controller method
-	 *
-	 * @param  string $name   The controller and method
-	 * @param  array  $params Any method parameters
-	 *
-	 * @return Form
-	 */
-	public function controller($name, $params = array())
-	{
-		return $this->setRouteOrAction($name, $params, 'action');
-	}
-
-	/**
-	 * Outputs the current form opened
-	 *
-	 * @return string A <form> opening tag
-	 */
-	public function __toString()
-	{
-		// Mark the form as opened
-		static::$opened = true;
-
-		// Add name to attributes
-		$this->attributes['name'] = $this->name;
-
-		// Add spoof method
-		if (in_array($this->method, array('PUT', 'PATCH', 'DELETE'))) {
-			$spoof        = $this->app['former']->hidden('_method', $this->method);
-			$this->method = 'POST';
-		} else {
-			$spoof = null;
-		}
-
-		return $this->open().$spoof;
-	}
-
-	////////////////////////////////////////////////////////////////////
-	////////////////////////// PUBLIC HELPERS //////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Alias for $this->app['former']->withRules
-	 */
-	public function rules()
-	{
-		call_user_func_array(array($this->app['former'], 'withRules'), func_get_args());
-
-		return $this;
-	}
-
-	/**
-	 * Populate a form with specific values
-	 *
-	 * @param array|object $values
-	 *
-	 * @return $this
-	 */
-	public function populate($values)
-	{
-		$this->populator->replace($values);
-
-		return $this;
-	}
-
-	/**
-	 * Get the Populator binded to the Form
-	 *
-	 * @return Populator
-	 */
-	public function getPopulator()
-	{
-		return $this->populator;
-	}
-
-	////////////////////////////////////////////////////////////////////
-	////////////////////////////// HELPERS /////////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Find the method of a route by its _uses or name
-	 *
-	 * @param  string $name
-	 *
-	 * @return string
-	 */
-	protected function findRouteMethod($name)
-	{
-		if (!$this->app->bound('router')) {
-			return;
-		}
-
-		// Get string by name
-		if (!Str::contains($name, '@')) {
-			$routes = $this->app['router']->getRoutes();
-			$route  = method_exists($routes, 'getByName') ? $routes->getByName($name) : $routes->get($name);
-			// Get string by uses
-		} else {
-			foreach ($this->app['router']->getRoutes() as $route) {
-				$routeUses = method_exists($route, 'getOption') ? $route->getOption('_uses') : array_get($route->getAction(), 'controller');
-				if ($action = $routeUses) {
-					if ($action == $name) {
-						break;
-					}
-				}
-			}
-		}
-
-		// Get method
-		$methods = method_exists($route, 'getMethods') ? $route->getMethods() : $route->methods();
-		$method  = array_get($methods, 0);
-
-		return $method;
-	}
-
-	/**
-	 * @param $name
-	 * @param $params
-	 * @param $type
-	 *
-	 * @return $this
-	 */
-	protected function setRouteOrAction($name, $params, $type)
-	{
-		// Set the form action
-		$this->action = $this->url->$type($name, $params);
-
-		// Set the proper method
-		if ($method = $this->findRouteMethod($name)) {
-			$this->method($method);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Apply various parameters according to form type
-	 *
-	 * @param  string $type The original form type provided
-	 *
-	 * @return string The final form type
-	 */
-	private function applyType($type)
-	{
-		// If classic form
-		if ($type == 'open') {
-			return $this->app['former']->getOption('default_form_type');
-		}
-
-		// Look for HTTPS form
-		if (Str::contains($type, 'secure')) {
-			$type         = str_replace('secure', '', $type);
-			$this->secure = true;
-		}
-
-		// Look for file form
-		if (Str::contains($type, 'for_files')) {
-			$type                        = str_replace('for_files', '', $type);
-			$this->attributes['enctype'] = 'multipart/form-data';
-		}
-
-		// Calculate form type
-		$type = str_replace('open', '', $type);
-		$type = trim($type, '_');
-
-		// If raw form
-		if ($type == 'raw') {
-			$this->app->bind('former.form.framework', function ($app) {
-				return $app['former']->getFrameworkInstance('Nude');
-			});
-		}
-
-		// Use default form type if the one provided is invalid
-		if ($type !== 'raw' and !in_array($type, $this->app['former.form.framework']->availableTypes())) {
-			$type = $this->app['former']->getOption('default_form_type');
-		}
-
-		return $type;
-	}
+    /**
+     * The IoC Container
+     *
+     * @var Container
+     */
+    protected $app;
+
+    /**
+     * The URL generator
+     *
+     * @var UrlGenerator
+     */
+    protected $url;
+
+    /**
+     * The Populator
+     *
+     * @var Populator
+     */
+    protected $populator;
+
+    /**
+     * The Form type
+     *
+     * @var string
+     */
+    protected $type = null;
+
+    /**
+     * The destination of the current form
+     *
+     * @var string
+     */
+    protected $action;
+
+    /**
+     * The form method
+     *
+     * @var string
+     */
+    protected $method;
+
+    /**
+     * Whether the form should be secured or not
+     *
+     * @var boolean
+     */
+    protected $secure;
+
+    /**
+     * The form element
+     *
+     * @var string
+     */
+    protected $element = 'form';
+
+    /**
+     * A list of injected properties
+     *
+     * @var array
+     */
+    protected $injectedProperties = array('method', 'action');
+
+    /**
+     * Whether a form is opened or not
+     *
+     * @var boolean
+     */
+    protected static $opened = false;
+
+    ////////////////////////////////////////////////////////////////////
+    /////////////////////////// CORE METHODS ///////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Build a new Form instance
+     *
+     * @param UrlGenerator $url
+     */
+    public function __construct(Container $app, $url, Populator $populator)
+    {
+        $this->app       = $app;
+        $this->url       = $url;
+        $this->populator = $populator;
+
+        $this->app->singleton('former.form.framework', function ($app) {
+            return clone $app['former.framework'];
+        });
+    }
+
+    /**
+     * Opens up magically a form
+     *
+     * @param  string $type       The form type asked
+     * @param  array  $parameters Parameters passed
+     *
+     * @return Form             A form opening tag
+     */
+    public function openForm($type, $parameters)
+    {
+        $action     = array_get($parameters, 0);
+        $method     = array_get($parameters, 1, 'POST');
+        $attributes = array_get($parameters, 2, array());
+        $secure     = array_get($parameters, 3, null);
+
+        // Fetch errors if asked for
+        if ($this->app['former']->getOption('fetch_errors')) {
+            $this->app['former']->withErrors();
+        }
+
+        // Open the form
+        $this->action($action);
+        $this->attributes = $attributes;
+        $this->method     = strtoupper($method);
+        $this->secure     = $secure;
+
+        // Add any effect of the form type
+        $type       = Str::snake($type);
+        $this->type = $this->applyType($type);
+
+        // Add enctype
+        if (!array_key_exists('accept-charset', $attributes)) {
+            $this->attributes['accept-charset'] = 'utf-8';
+        }
+
+        // Add supplementary classes
+        if ($this->type !== 'raw') {
+            $this->addClass($this->app['former.form.framework']->getFormClasses($this->type));
+        }
+
+        return $this;
+    }
+
+    /**
+     * Closes a Form
+     *
+     * @return string A closing <form> tag
+     */
+    public function close()
+    {
+        static::$opened = false;
+
+        // Add token if necessary
+        $closing = '</form>';
+        if ($this->method != 'GET') {
+            $closing = $this->app['former']->token().$closing;
+        }
+
+        return $closing;
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    //////////////////////////// STATIC HELPERS ////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Whether a form is currently opened or not
+     *
+     * @return boolean
+     */
+    public static function hasInstanceOpened()
+    {
+        return static::$opened;
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    /////////////////////////////// SETTER /////////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Change the form's action
+     *
+     * @param  string $action The new action
+     *
+     * @return $this
+     */
+    public function action($action)
+    {
+        $this->action = $action ? $this->url->to($action, array(), $this->secure) : null;
+
+        return $this;
+    }
+
+    /**
+     * Change the form's method
+     *
+     * @param  string $method The method to use
+     *
+     * @return $this
+     */
+    public function method($method)
+    {
+        $this->method = strtoupper($method);
+
+        return $this;
+    }
+
+    /**
+     * Whether the form should be secure
+     *
+     * @param  boolean $secure Secure or not
+     *
+     * @return $this
+     */
+    public function secure($secure = true)
+    {
+        $this->secure = $secure;
+
+        return $this;
+    }
+
+    /**
+     * Change the form's action and method to a route
+     *
+     * @param  string $name   The name of the route to use
+     * @param  array  $params Any route parameters
+     *
+     * @return Form
+     */
+    public function route($name, $params = array())
+    {
+        return $this->setRouteOrAction($name, $params, 'route');
+    }
+
+    /**
+     * Change the form's action to a controller method
+     *
+     * @param  string $name   The controller and method
+     * @param  array  $params Any method parameters
+     *
+     * @return Form
+     */
+    public function controller($name, $params = array())
+    {
+        return $this->setRouteOrAction($name, $params, 'action');
+    }
+
+    /**
+     * Outputs the current form opened
+     *
+     * @return string A <form> opening tag
+     */
+    public function __toString()
+    {
+        // Mark the form as opened
+        static::$opened = true;
+
+        // Add name to attributes
+        $this->attributes['name'] = $this->name;
+
+        // Add spoof method
+        if (in_array($this->method, array('PUT', 'PATCH', 'DELETE'))) {
+            $spoof        = $this->app['former']->hidden('_method', $this->method);
+            $this->method = 'POST';
+        } else {
+            $spoof = null;
+        }
+
+        return $this->open().$spoof;
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ////////////////////////// PUBLIC HELPERS //////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Alias for $this->app['former']->withRules
+     */
+    public function rules()
+    {
+        call_user_func_array(array($this->app['former'], 'withRules'), func_get_args());
+
+        return $this;
+    }
+
+    /**
+     * Populate a form with specific values
+     *
+     * @param array|object $values
+     *
+     * @return $this
+     */
+    public function populate($values)
+    {
+        $this->populator->replace($values);
+
+        return $this;
+    }
+
+    /**
+     * Get the Populator binded to the Form
+     *
+     * @return Populator
+     */
+    public function getPopulator()
+    {
+        return $this->populator;
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ////////////////////////////// HELPERS /////////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Find the method of a route by its _uses or name
+     *
+     * @param  string $name
+     *
+     * @return string
+     */
+    protected function findRouteMethod($name)
+    {
+        if (!$this->app->bound('router')) {
+            return;
+        }
+
+        // Get string by name
+        if (!Str::contains($name, '@')) {
+            $routes = $this->app['router']->getRoutes();
+            $route  = method_exists($routes, 'getByName') ? $routes->getByName($name) : $routes->get($name);
+            // Get string by uses
+        } else {
+            foreach ($this->app['router']->getRoutes() as $route) {
+                $routeUses = method_exists($route, 'getOption') ? $route->getOption('_uses') : array_get($route->getAction(), 'controller');
+                if ($action = $routeUses) {
+                    if ($action == $name) {
+                        break;
+                    }
+                }
+            }
+        }
+
+        // Get method
+        $methods = method_exists($route, 'getMethods') ? $route->getMethods() : $route->methods();
+        $method  = array_get($methods, 0);
+
+        return $method;
+    }
+
+    /**
+     * @param $name
+     * @param $params
+     * @param $type
+     *
+     * @return $this
+     */
+    protected function setRouteOrAction($name, $params, $type)
+    {
+        // Set the form action
+        $this->action = $this->url->$type($name, $params);
+
+        // Set the proper method
+        if ($method = $this->findRouteMethod($name)) {
+            $this->method($method);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Apply various parameters according to form type
+     *
+     * @param  string $type The original form type provided
+     *
+     * @return string The final form type
+     */
+    private function applyType($type)
+    {
+        // If classic form
+        if ($type == 'open') {
+            return $this->app['former']->getOption('default_form_type');
+        }
+
+        // Look for HTTPS form
+        if (Str::contains($type, 'secure')) {
+            $type         = str_replace('secure', '', $type);
+            $this->secure = true;
+        }
+
+        // Look for file form
+        if (Str::contains($type, 'for_files')) {
+            $type                        = str_replace('for_files', '', $type);
+            $this->attributes['enctype'] = 'multipart/form-data';
+        }
+
+        // Calculate form type
+        $type = str_replace('open', '', $type);
+        $type = trim($type, '_');
+
+        // If raw form
+        if ($type == 'raw') {
+            $this->app->bind('former.form.framework', function ($app) {
+                return $app['former']->getFrameworkInstance('Nude');
+            });
+        }
+
+        // Use default form type if the one provided is invalid
+        if ($type !== 'raw' and !in_array($type, $this->app['former.form.framework']->availableTypes())) {
+            $type = $this->app['former']->getOption('default_form_type');
+        }
+
+        return $type;
+    }
 }

src/Former/Form/Group.php

Doc Comments +1 added lines, -1 removed lines

@@ -442,7 +442,7 @@
 	/**
 	 * Format the field with prepended/appended elements
 	 *
-	 * @param  Field $field The field to format
+	 * @param  \Former\Traits\Field $field The field to format
 	 *
 	 * @return string        Field plus supplementary elements
 	 */

Indentation +457 added lines, -457 removed lines

@@ -12,461 +12,461 @@
  */
 class Group extends Tag
 {
-	/**
-	 * The Container
-	 *
-	 * @var Container
-	 */
-	protected $app;
-
-	/**
-	 * The current state of the group
-	 *
-	 * @var string
-	 */
-	protected $state = null;
-
-	/**
-	 * Whether the field should be displayed raw or not
-	 *
-	 * @var boolean
-	 */
-	protected $raw = false;
-
-	/**
-	 * The group label
-	 *
-	 * @var Element
-	 */
-	protected $label;
-
-	/**
-	 * The group help
-	 *
-	 * @var array
-	 */
-	protected $help = array();
-
-	/**
-	 * An array of elements to preprend the field
-	 *
-	 * @var array
-	 */
-	protected $prepend = array();
-
-	/**
-	 * An array of elements to append the field
-	 *
-	 * @var array
-	 */
-	protected $append = array();
-
-	/**
-	 * The field validations to be checked for errors
-	 *
-	 * @var array
-	 */
-	protected $validations = array();
-
-	/**
-	 * The group's element
-	 *
-	 * @var string
-	 */
-	protected $element = 'div';
-
-	/**
-	 * Whether a custom group is opened or not
-	 *
-	 * @var boolean
-	 */
-	public static $opened = false;
-
-	/**
-	 * The custom group that is open
-	 *
-	 * @var Former\Form\Group
-	 */
-	public static $openGroup = null;
-
-	////////////////////////////////////////////////////////////////////
-	/////////////////////////// CORE METHODS ///////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Creates a group
-	 *
-	 * @param string $label Its label
-	 */
-	public function __construct(Container $app, $label, $validations = null)
-	{
-		// Get special classes
-		$this->app = $app;
-		$this->addClass($this->app['former.framework']->getGroupClasses());
-
-		// Invisible if Nude
-		if ($this->app['former.framework']->is('Nude')) {
-			$this->element = '';
-		}
-
-		// Set group label
-		if ($label) {
-			$this->setLabel($label);
-		}
-
-		// Set validations used to override groups own conclusions
-		$this->validations = (array) $validations;
-	}
-
-	/**
-	 * Prints out the opening of the Control Group
-	 *
-	 * @return string A control group opening tag
-	 */
-	public function __toString()
-	{
-		return $this->open().$this->getFormattedLabel();
-	}
-
-	/**
-	 * Opens a group
-	 *
-	 * @return string Opening tag
-	 */
-	public function open()
-	{
-		if ($this->getErrors()) {
-			$this->state($this->app['former.framework']->errorState());
-		}
-
-		// Retrieve state and append it to classes
-		if ($this->state) {
-			$this->addClass($this->state);
-		}
-
-		// Required state
-		if ($this->app->bound('former.field') and $this->app['former.field']->isRequired()) {
-			$this->addClass($this->app['former']->getOption('required_class'));
-		}
-
-		return parent::open();
-	}
-
-	/**
-	 * Set the contents of the current group
-	 *
-	 * @param string $contents The group contents
-	 *
-	 * @return string A group
-	 */
-	public function contents($contents)
-	{
-		return $this->wrap($contents, $this->getFormattedLabel());
-	}
-
-	/**
-	 * Wrap a Field with the current group
-	 *
-	 * @param  \Former\Traits\Field $field A Field instance
-	 *
-	 * @return string        A group
-	 */
-	public function wrapField($field)
-	{
-		$label = $this->getLabel($field);
-		$field = $this->prependAppend($field);
-		$field .= $this->getHelp();
-
-		return $this->wrap($field, $label);
-	}
-
-	////////////////////////////////////////////////////////////////////
-	//////////////////////////// FIELD METHODS /////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Set the state of the group
-	 *
-	 * @param  string $state A Bootstrap state class
-	 */
-	public function state($state)
-	{
-		// Filter state
-		$state = $this->app['former.framework']->filterState($state);
-
-		$this->state = $state;
-	}
-
-	/**
-	 * Set a class on the Group
-	 *
-	 * @param string $class The class to add
-	 */
-	public function addGroupClass($class)
-	{
-		$this->addClass($class);
-	}
-
-	/**
-	 * Adds a label to the group
-	 *
-	 * @param  string $label A label
-	 */
-	public function setLabel($label)
-	{
-		if (!$label instanceof Element) {
-			$label = Helpers::translate($label);
-			$label = Element::create('label', $label)->for($label);
-		}
-
-		$this->label = $label;
-	}
-
-	/**
-	 * Get the formatted group label
-	 *
-	 * @return string|null
-	 */
-	public function getFormattedLabel()
-	{
-		if (!$this->label) {
-			return false;
-		}
-
-		return $this->label->addClass($this->app['former.framework']->getLabelClasses());
-	}
-
-	/**
-	 * Disables the control group for the current field
-	 */
-	public function raw()
-	{
-		$this->raw = true;
-	}
-
-	/**
-	 * Check if the current group is to be displayed or not
-	 *
-	 * @return boolean
-	 */
-	public function isRaw()
-	{
-		return (bool) $this->raw;
-	}
-
-	////////////////////////////////////////////////////////////////////
-	///////////////////////////// HELP BLOCKS //////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Alias for inlineHelp
-	 *
-	 * @param  string $help       The help text
-	 * @param  array  $attributes Facultative attributes
-	 */
-	public function help($help, $attributes = array())
-	{
-		return $this->inlineHelp($help, $attributes);
-	}
-
-	/**
-	 * Add an inline help
-	 *
-	 * @param  string $help       The help text
-	 * @param  array  $attributes Facultative attributes
-	 */
-	public function inlineHelp($help, $attributes = array())
-	{
-		// If no help text, do nothing
-		if (!$help) {
-			return false;
-		}
-
-		$this->help['inline'] = $this->app['former.framework']->createHelp($help, $attributes);
-	}
-
-	/**
-	 * Add an block help
-	 *
-	 * @param  string $help       The help text
-	 * @param  array  $attributes Facultative attributes
-	 */
-	public function blockHelp($help, $attributes = array())
-	{
-		// Reserved method
-		if ($this->app['former.framework']->isnt('TwitterBootstrap') && $this->app['former.framework']->isnt('TwitterBootstrap3')) {
-			throw new BadMethodCallException('This method is only available on the Bootstrap framework');
-		}
-
-		// If no help text, do nothing
-		if (!$help) {
-			return false;
-		}
-
-		$this->help['block'] = $this->app['former.framework']->createBlockHelp($help, $attributes);
-	}
-
-	////////////////////////////////////////////////////////////////////
-	///////////////////////// PREPEND/APPEND METHODS ///////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Prepend elements to the field
-	 */
-	public function prepend()
-	{
-		$this->placeAround(func_get_args(), 'prepend');
-	}
-
-	/**
-	 * Append elements to the field
-	 */
-	public function append()
-	{
-		$this->placeAround(func_get_args(), 'append');
-	}
-
-	/**
-	 * Prepends an icon to a field
-	 *
-	 * @param string $icon       The icon to prepend
-	 * @param array  $attributes Its attributes
-	 */
-	public function prependIcon($icon, $attributes = array(), $iconSettings = array())
-	{
-		$icon = $this->app['former.framework']->createIcon($icon, $attributes, $iconSettings);
-
-		$this->prepend($icon);
-	}
-
-	/**
-	 * Append an icon to a field
-	 *
-	 * @param string $icon       The icon to prepend
-	 * @param array  $attributes Its attributes
-	 */
-	public function appendIcon($icon, $attributes = array(), $iconSettings = array())
-	{
-		$icon = $this->app['former.framework']->createIcon($icon, $attributes, $iconSettings);
-
-		$this->append($icon);
-	}
-
-	////////////////////////////////////////////////////////////////////
-	//////////////////////////////// HELPERS ///////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Get the errors for the group
-	 *
-	 * @return string
-	 */
-	public function getErrors()
-	{
-		$errors = '';
-
-		if (!self::$opened) {
-
-			// for non-custom groups, normal error handling applies
-			$errors = $this->app['former']->getErrors();
-		} elseif (!empty($this->validations)) {
-
-			// error handling only when validations specified for custom groups
-			foreach ($this->validations as $validation) {
-				$errors .= $this->app['former']->getErrors($validation);
-			}
-		}
-
-		return $errors;
-	}
-
-	/**
-	 * Wraps content in a group
-	 *
-	 * @param string $contents The content
-	 * @param string $label    The label to add
-	 *
-	 * @return string A group
-	 */
-	public function wrap($contents, $label = null)
-	{
-		$group = $this->open();
-		$group .= $label;
-		$group .= $this->app['former.framework']->wrapField($contents);
-		$group .= $this->close();
-
-		return $group;
-	}
-
-	/**
-	 * Prints out the current label
-	 *
-	 * @param  string $field The field to create a label for
-	 *
-	 * @return string        A <label> tag
-	 */
-	protected function getLabel($field = null)
-	{
-		// Don't create a label if none exist
-		if (!$field or !$this->label) {
-			return null;
-		}
-
-		// Wrap label in framework classes
-		$this->label->addClass($this->app['former.framework']->getLabelClasses());
-		$this->label = $this->app['former.framework']->createLabelOf($field, $this->label);
-		$this->label = $this->app['former.framework']->wrapLabel($this->label);
-
-		return $this->label;
-	}
-
-	/**
-	 * Prints out the current help
-	 *
-	 * @return string A .help-block or .help-inline
-	 */
-	protected function getHelp()
-	{
-		$inline = array_get($this->help, 'inline');
-		$block  = array_get($this->help, 'block');
-
-		// Replace help text with error if any found
-		$errors = $this->app['former']->getErrors();
-		if ($errors and $this->app['former']->getOption('error_messages')) {
-			$inline = $this->app['former.framework']->createHelp($errors);
-		}
-
-		return join(null, array($inline, $block));
-	}
-
-	/**
-	 * Format the field with prepended/appended elements
-	 *
-	 * @param  Field $field The field to format
-	 *
-	 * @return string        Field plus supplementary elements
-	 */
-	protected function prependAppend($field)
-	{
-		if (!$this->prepend and !$this->append) {
-			return $field->render();
-		}
-
-		return $this->app['former.framework']->prependAppend($field, $this->prepend, $this->append);
-	}
-
-	/**
-	 * Place elements around the field
-	 *
-	 * @param  array  $items An array of items to place
-	 * @param  string $place Where they should end up (prepend|append)
-	 */
-	protected function placeAround($items, $place)
-	{
-		// Iterate over the items and place them where they should
-		foreach ((array) $items as $item) {
-			$item             = $this->app['former.framework']->placeAround($item);
-			$this->{$place}[] = $item;
-		}
-	}
+    /**
+     * The Container
+     *
+     * @var Container
+     */
+    protected $app;
+
+    /**
+     * The current state of the group
+     *
+     * @var string
+     */
+    protected $state = null;
+
+    /**
+     * Whether the field should be displayed raw or not
+     *
+     * @var boolean
+     */
+    protected $raw = false;
+
+    /**
+     * The group label
+     *
+     * @var Element
+     */
+    protected $label;
+
+    /**
+     * The group help
+     *
+     * @var array
+     */
+    protected $help = array();
+
+    /**
+     * An array of elements to preprend the field
+     *
+     * @var array
+     */
+    protected $prepend = array();
+
+    /**
+     * An array of elements to append the field
+     *
+     * @var array
+     */
+    protected $append = array();
+
+    /**
+     * The field validations to be checked for errors
+     *
+     * @var array
+     */
+    protected $validations = array();
+
+    /**
+     * The group's element
+     *
+     * @var string
+     */
+    protected $element = 'div';
+
+    /**
+     * Whether a custom group is opened or not
+     *
+     * @var boolean
+     */
+    public static $opened = false;
+
+    /**
+     * The custom group that is open
+     *
+     * @var Former\Form\Group
+     */
+    public static $openGroup = null;
+
+    ////////////////////////////////////////////////////////////////////
+    /////////////////////////// CORE METHODS ///////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Creates a group
+     *
+     * @param string $label Its label
+     */
+    public function __construct(Container $app, $label, $validations = null)
+    {
+        // Get special classes
+        $this->app = $app;
+        $this->addClass($this->app['former.framework']->getGroupClasses());
+
+        // Invisible if Nude
+        if ($this->app['former.framework']->is('Nude')) {
+            $this->element = '';
+        }
+
+        // Set group label
+        if ($label) {
+            $this->setLabel($label);
+        }
+
+        // Set validations used to override groups own conclusions
+        $this->validations = (array) $validations;
+    }
+
+    /**
+     * Prints out the opening of the Control Group
+     *
+     * @return string A control group opening tag
+     */
+    public function __toString()
+    {
+        return $this->open().$this->getFormattedLabel();
+    }
+
+    /**
+     * Opens a group
+     *
+     * @return string Opening tag
+     */
+    public function open()
+    {
+        if ($this->getErrors()) {
+            $this->state($this->app['former.framework']->errorState());
+        }
+
+        // Retrieve state and append it to classes
+        if ($this->state) {
+            $this->addClass($this->state);
+        }
+
+        // Required state
+        if ($this->app->bound('former.field') and $this->app['former.field']->isRequired()) {
+            $this->addClass($this->app['former']->getOption('required_class'));
+        }
+
+        return parent::open();
+    }
+
+    /**
+     * Set the contents of the current group
+     *
+     * @param string $contents The group contents
+     *
+     * @return string A group
+     */
+    public function contents($contents)
+    {
+        return $this->wrap($contents, $this->getFormattedLabel());
+    }
+
+    /**
+     * Wrap a Field with the current group
+     *
+     * @param  \Former\Traits\Field $field A Field instance
+     *
+     * @return string        A group
+     */
+    public function wrapField($field)
+    {
+        $label = $this->getLabel($field);
+        $field = $this->prependAppend($field);
+        $field .= $this->getHelp();
+
+        return $this->wrap($field, $label);
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    //////////////////////////// FIELD METHODS /////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Set the state of the group
+     *
+     * @param  string $state A Bootstrap state class
+     */
+    public function state($state)
+    {
+        // Filter state
+        $state = $this->app['former.framework']->filterState($state);
+
+        $this->state = $state;
+    }
+
+    /**
+     * Set a class on the Group
+     *
+     * @param string $class The class to add
+     */
+    public function addGroupClass($class)
+    {
+        $this->addClass($class);
+    }
+
+    /**
+     * Adds a label to the group
+     *
+     * @param  string $label A label
+     */
+    public function setLabel($label)
+    {
+        if (!$label instanceof Element) {
+            $label = Helpers::translate($label);
+            $label = Element::create('label', $label)->for($label);
+        }
+
+        $this->label = $label;
+    }
+
+    /**
+     * Get the formatted group label
+     *
+     * @return string|null
+     */
+    public function getFormattedLabel()
+    {
+        if (!$this->label) {
+            return false;
+        }
+
+        return $this->label->addClass($this->app['former.framework']->getLabelClasses());
+    }
+
+    /**
+     * Disables the control group for the current field
+     */
+    public function raw()
+    {
+        $this->raw = true;
+    }
+
+    /**
+     * Check if the current group is to be displayed or not
+     *
+     * @return boolean
+     */
+    public function isRaw()
+    {
+        return (bool) $this->raw;
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ///////////////////////////// HELP BLOCKS //////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Alias for inlineHelp
+     *
+     * @param  string $help       The help text
+     * @param  array  $attributes Facultative attributes
+     */
+    public function help($help, $attributes = array())
+    {
+        return $this->inlineHelp($help, $attributes);
+    }
+
+    /**
+     * Add an inline help
+     *
+     * @param  string $help       The help text
+     * @param  array  $attributes Facultative attributes
+     */
+    public function inlineHelp($help, $attributes = array())
+    {
+        // If no help text, do nothing
+        if (!$help) {
+            return false;
+        }
+
+        $this->help['inline'] = $this->app['former.framework']->createHelp($help, $attributes);
+    }
+
+    /**
+     * Add an block help
+     *
+     * @param  string $help       The help text
+     * @param  array  $attributes Facultative attributes
+     */
+    public function blockHelp($help, $attributes = array())
+    {
+        // Reserved method
+        if ($this->app['former.framework']->isnt('TwitterBootstrap') && $this->app['former.framework']->isnt('TwitterBootstrap3')) {
+            throw new BadMethodCallException('This method is only available on the Bootstrap framework');
+        }
+
+        // If no help text, do nothing
+        if (!$help) {
+            return false;
+        }
+
+        $this->help['block'] = $this->app['former.framework']->createBlockHelp($help, $attributes);
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ///////////////////////// PREPEND/APPEND METHODS ///////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Prepend elements to the field
+     */
+    public function prepend()
+    {
+        $this->placeAround(func_get_args(), 'prepend');
+    }
+
+    /**
+     * Append elements to the field
+     */
+    public function append()
+    {
+        $this->placeAround(func_get_args(), 'append');
+    }
+
+    /**
+     * Prepends an icon to a field
+     *
+     * @param string $icon       The icon to prepend
+     * @param array  $attributes Its attributes
+     */
+    public function prependIcon($icon, $attributes = array(), $iconSettings = array())
+    {
+        $icon = $this->app['former.framework']->createIcon($icon, $attributes, $iconSettings);
+
+        $this->prepend($icon);
+    }
+
+    /**
+     * Append an icon to a field
+     *
+     * @param string $icon       The icon to prepend
+     * @param array  $attributes Its attributes
+     */
+    public function appendIcon($icon, $attributes = array(), $iconSettings = array())
+    {
+        $icon = $this->app['former.framework']->createIcon($icon, $attributes, $iconSettings);
+
+        $this->append($icon);
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    //////////////////////////////// HELPERS ///////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Get the errors for the group
+     *
+     * @return string
+     */
+    public function getErrors()
+    {
+        $errors = '';
+
+        if (!self::$opened) {
+
+            // for non-custom groups, normal error handling applies
+            $errors = $this->app['former']->getErrors();
+        } elseif (!empty($this->validations)) {
+
+            // error handling only when validations specified for custom groups
+            foreach ($this->validations as $validation) {
+                $errors .= $this->app['former']->getErrors($validation);
+            }
+        }
+
+        return $errors;
+    }
+
+    /**
+     * Wraps content in a group
+     *
+     * @param string $contents The content
+     * @param string $label    The label to add
+     *
+     * @return string A group
+     */
+    public function wrap($contents, $label = null)
+    {
+        $group = $this->open();
+        $group .= $label;
+        $group .= $this->app['former.framework']->wrapField($contents);
+        $group .= $this->close();
+
+        return $group;
+    }
+
+    /**
+     * Prints out the current label
+     *
+     * @param  string $field The field to create a label for
+     *
+     * @return string        A <label> tag
+     */
+    protected function getLabel($field = null)
+    {
+        // Don't create a label if none exist
+        if (!$field or !$this->label) {
+            return null;
+        }
+
+        // Wrap label in framework classes
+        $this->label->addClass($this->app['former.framework']->getLabelClasses());
+        $this->label = $this->app['former.framework']->createLabelOf($field, $this->label);
+        $this->label = $this->app['former.framework']->wrapLabel($this->label);
+
+        return $this->label;
+    }
+
+    /**
+     * Prints out the current help
+     *
+     * @return string A .help-block or .help-inline
+     */
+    protected function getHelp()
+    {
+        $inline = array_get($this->help, 'inline');
+        $block  = array_get($this->help, 'block');
+
+        // Replace help text with error if any found
+        $errors = $this->app['former']->getErrors();
+        if ($errors and $this->app['former']->getOption('error_messages')) {
+            $inline = $this->app['former.framework']->createHelp($errors);
+        }
+
+        return join(null, array($inline, $block));
+    }
+
+    /**
+     * Format the field with prepended/appended elements
+     *
+     * @param  Field $field The field to format
+     *
+     * @return string        Field plus supplementary elements
+     */
+    protected function prependAppend($field)
+    {
+        if (!$this->prepend and !$this->append) {
+            return $field->render();
+        }
+
+        return $this->app['former.framework']->prependAppend($field, $this->prepend, $this->append);
+    }
+
+    /**
+     * Place elements around the field
+     *
+     * @param  array  $items An array of items to place
+     * @param  string $place Where they should end up (prepend|append)
+     */
+    protected function placeAround($items, $place)
+    {
+        // Iterate over the items and place them where they should
+        foreach ((array) $items as $item) {
+            $item             = $this->app['former.framework']->placeAround($item);
+            $this->{$place}[] = $item;
+        }
+    }
 }

src/Former/FormerServiceProvider.php

Doc Comments +1 added lines, -1 removed lines

@@ -156,7 +156,7 @@
 	/**
 	 * Get all of the configuration files for the application.
 	 *
-	 * @param  $app
+	 * @param  Container $app
 	 * @return array
 	 */
 	protected function getConfigurationFiles($app)

Spacing +14 added lines, -14 removed lines

@@ -90,15 +90,15 @@ 
 		// Session and request
 		//////////////////////////////////////////////////////////////////
 
-		$app->bindIf('session.manager', function ($app) {
+		$app->bindIf('session.manager', function($app) {
 			return new SessionManager($app);
 		});
 
-		$app->bindIf('session', function ($app) {
+		$app->bindIf('session', function($app) {
 			return $app['session.manager']->driver('array');
 		}, true);
 
-		$app->bindIf('request', function ($app) {
+		$app->bindIf('request', function($app) {
 			$request = Request::createFromGlobals();
 			if (method_exists($request, 'setSessionStore')) {
 				$request->setSessionStore($app['session']);
@@ -112,11 +112,11 @@ 
 		// Config
 		//////////////////////////////////////////////////////////////////
 
-		$app->bindIf('path.config', function ($app) {
-			return __DIR__ . '/../config/';
+		$app->bindIf('path.config', function($app) {
+			return __DIR__.'/../config/';
 		}, true);
 
-		$app->bindIf('config', function ($app) {
+		$app->bindIf('config', function($app) {
 			$config = new Repository;
 			$this->loadConfigurationFiles($app, $config);
 			return $config;
@@ -125,11 +125,11 @@ 
 		// Localization
 		//////////////////////////////////////////////////////////////////
 
-		$app->bindIf('translation.loader', function ($app) {
+		$app->bindIf('translation.loader', function($app) {
 			return new FileLoader($app['files'], 'src/config');
 		});
 
-		$app->bindIf('translator', function ($app) {
+		$app->bindIf('translator', function($app) {
 			$loader = new FileLoader($app['files'], 'lang');
 
 			return new Translator($loader, 'fr');
@@ -181,25 +181,25 @@ 
 	public function bindFormer(Container $app)
 	{
 		// Add config namespace
-		$configPath = __DIR__ . '/../config/former.php';
+		$configPath = __DIR__.'/../config/former.php';
 		$this->mergeConfigFrom($configPath, 'former');
-		$this->publishes([$configPath => $app['path.config'] . '/former.php']);
+		$this->publishes([$configPath => $app['path.config'].'/former.php']);
 		
 		$framework = $app['config']->get('former.framework');
 		
-		$app->bind('former.framework', function ($app) {
+		$app->bind('former.framework', function($app) {
 			return $app['former']->getFrameworkInstance($app['config']->get('former.framework'));
 		});
 
-		$app->singleton('former.populator', function ($app) {
+		$app->singleton('former.populator', function($app) {
 			return new Populator();
 		});
 
-		$app->singleton('former.dispatcher', function ($app) {
+		$app->singleton('former.dispatcher', function($app) {
 			return new MethodDispatcher($app, Former::FIELDSPACE);
 		});
 
-		$app->singleton('former', function ($app) {
+		$app->singleton('former', function($app) {
 			return new Former($app, $app->make('former.dispatcher'));
 		});
 		$app->alias('former', 'Former\Former');

Indentation +188 added lines, -188 removed lines

@@ -15,199 +15,199 @@
  */
 class FormerServiceProvider extends ServiceProvider
 {
-	/**
-	 * Indicates if loading of the provider is deferred.
-	 *
-	 * @var bool
-	 */
-	protected $defer = true;
-
-	/**
-	 * Register Former's package with Laravel
-	 *
-	 * @return void
-	 */
-	public function register()
-	{
-		$this->app = static::make($this->app);
-	}
-
-	/**
-	 * Get the services provided by the provider.
-	 *
-	 * @return string[]
-	 */
-	public function provides()
-	{
-		return array('former', 'Former\Former');
-	}
-
-	////////////////////////////////////////////////////////////////////
-	/////////////////////////// CLASS BINDINGS /////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Create a Former container
-	 *
-	 * @param  Container $app
-	 *
-	 * @return Container
-	 */
-	public static function make($app = null)
-	{
-		if (!$app) {
-			$app = new Container();
-		}
-
-		// Bind classes to container
-		$provider = new static($app);
-		$app      = $provider->bindCoreClasses($app);
-		$app      = $provider->bindFormer($app);
-
-		return $app;
-	}
-
-	/**
-	 * Bind the core classes to the Container
-	 *
-	 * @param  Container $app
-	 *
-	 * @return Container
-	 */
-	public function bindCoreClasses(Container $app)
-	{
-		// Cancel if in the scope of a Laravel application
-		if ($app->bound('events')) {
-			return $app;
-		}
-
-		// Core classes
-		//////////////////////////////////////////////////////////////////
-
-		$app->bindIf('files', 'Illuminate\Filesystem\Filesystem');
-		$app->bindIf('url', 'Illuminate\Routing\UrlGenerator');
-
-		// Session and request
-		//////////////////////////////////////////////////////////////////
-
-		$app->bindIf('session.manager', function ($app) {
-			return new SessionManager($app);
-		});
-
-		$app->bindIf('session', function ($app) {
-			return $app['session.manager']->driver('array');
-		}, true);
-
-		$app->bindIf('request', function ($app) {
-			$request = Request::createFromGlobals();
-			if (method_exists($request, 'setSessionStore')) {
-				$request->setSessionStore($app['session']);
-			} else if (method_exists($request, 'setLaravelSession')) {
-				$request->setLaravelSession($app['session']);
-			} else {
-				$request->setSession($app['session']);
-			}
-
-			return $request;
-		}, true);
-
-		// Config
-		//////////////////////////////////////////////////////////////////
-
-		$app->bindIf('path.config', function ($app) {
-			return __DIR__ . '/../config/';
-		}, true);
-
-		$app->bindIf('config', function ($app) {
-			$config = new Repository;
-			$this->loadConfigurationFiles($app, $config);
-			return $config;
-		}, true);
-
-		// Localization
-		//////////////////////////////////////////////////////////////////
-
-		$app->bindIf('translation.loader', function ($app) {
-			return new FileLoader($app['files'], 'src/config');
-		});
-
-		$app->bindIf('translator', function ($app) {
-			$loader = new FileLoader($app['files'], 'lang');
-
-			return new Translator($loader, 'fr');
-		});
-
-		return $app;
-	}
-
-	/**
-	 * Load the configuration items from all of the files.
-	 *
-	 * @param  Container $app
-	 * @param  Repository  $config
-	 * @return void
-	 */
-	protected function loadConfigurationFiles($app, Repository $config)
-	{
-		foreach ($this->getConfigurationFiles($app) as $key => $path)
-		{
-			$config->set($key, require $path);
-		}
-	}
-
-	/**
-	 * Get all of the configuration files for the application.
-	 *
-	 * @param  $app
-	 * @return array
-	 */
-	protected function getConfigurationFiles($app)
-	{
-		$files = array();
-
-		foreach (Finder::create()->files()->name('*.php')->in($app['path.config']) as $file)
-		{
-			$files[basename($file->getRealPath(), '.php')] = $file->getRealPath();
-		}
-
-		return $files;
-	}
-
-	/**
-	 * Bind Former classes to the container
-	 *
-	 * @param  Container $app
-	 *
-	 * @return Container
-	 */
-	public function bindFormer(Container $app)
-	{
-		// Add config namespace
-		$configPath = __DIR__ . '/../config/former.php';
-		$this->mergeConfigFrom($configPath, 'former');
-		$this->publishes([$configPath => $app['path.config'] . '/former.php']);
+    /**
+     * Indicates if loading of the provider is deferred.
+     *
+     * @var bool
+     */
+    protected $defer = true;
+
+    /**
+     * Register Former's package with Laravel
+     *
+     * @return void
+     */
+    public function register()
+    {
+        $this->app = static::make($this->app);
+    }
+
+    /**
+     * Get the services provided by the provider.
+     *
+     * @return string[]
+     */
+    public function provides()
+    {
+        return array('former', 'Former\Former');
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    /////////////////////////// CLASS BINDINGS /////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Create a Former container
+     *
+     * @param  Container $app
+     *
+     * @return Container
+     */
+    public static function make($app = null)
+    {
+        if (!$app) {
+            $app = new Container();
+        }
+
+        // Bind classes to container
+        $provider = new static($app);
+        $app      = $provider->bindCoreClasses($app);
+        $app      = $provider->bindFormer($app);
+
+        return $app;
+    }
+
+    /**
+     * Bind the core classes to the Container
+     *
+     * @param  Container $app
+     *
+     * @return Container
+     */
+    public function bindCoreClasses(Container $app)
+    {
+        // Cancel if in the scope of a Laravel application
+        if ($app->bound('events')) {
+            return $app;
+        }
+
+        // Core classes
+        //////////////////////////////////////////////////////////////////
+
+        $app->bindIf('files', 'Illuminate\Filesystem\Filesystem');
+        $app->bindIf('url', 'Illuminate\Routing\UrlGenerator');
+
+        // Session and request
+        //////////////////////////////////////////////////////////////////
+
+        $app->bindIf('session.manager', function ($app) {
+            return new SessionManager($app);
+        });
+
+        $app->bindIf('session', function ($app) {
+            return $app['session.manager']->driver('array');
+        }, true);
+
+        $app->bindIf('request', function ($app) {
+            $request = Request::createFromGlobals();
+            if (method_exists($request, 'setSessionStore')) {
+                $request->setSessionStore($app['session']);
+            } else if (method_exists($request, 'setLaravelSession')) {
+                $request->setLaravelSession($app['session']);
+            } else {
+                $request->setSession($app['session']);
+            }
+
+            return $request;
+        }, true);
+
+        // Config
+        //////////////////////////////////////////////////////////////////
+
+        $app->bindIf('path.config', function ($app) {
+            return __DIR__ . '/../config/';
+        }, true);
+
+        $app->bindIf('config', function ($app) {
+            $config = new Repository;
+            $this->loadConfigurationFiles($app, $config);
+            return $config;
+        }, true);
+
+        // Localization
+        //////////////////////////////////////////////////////////////////
+
+        $app->bindIf('translation.loader', function ($app) {
+            return new FileLoader($app['files'], 'src/config');
+        });
+
+        $app->bindIf('translator', function ($app) {
+            $loader = new FileLoader($app['files'], 'lang');
+
+            return new Translator($loader, 'fr');
+        });
+
+        return $app;
+    }
+
+    /**
+     * Load the configuration items from all of the files.
+     *
+     * @param  Container $app
+     * @param  Repository  $config
+     * @return void
+     */
+    protected function loadConfigurationFiles($app, Repository $config)
+    {
+        foreach ($this->getConfigurationFiles($app) as $key => $path)
+        {
+            $config->set($key, require $path);
+        }
+    }
+
+    /**
+     * Get all of the configuration files for the application.
+     *
+     * @param  $app
+     * @return array
+     */
+    protected function getConfigurationFiles($app)
+    {
+        $files = array();
+
+        foreach (Finder::create()->files()->name('*.php')->in($app['path.config']) as $file)
+        {
+            $files[basename($file->getRealPath(), '.php')] = $file->getRealPath();
+        }
+
+        return $files;
+    }
+
+    /**
+     * Bind Former classes to the container
+     *
+     * @param  Container $app
+     *
+     * @return Container
+     */
+    public function bindFormer(Container $app)
+    {
+        // Add config namespace
+        $configPath = __DIR__ . '/../config/former.php';
+        $this->mergeConfigFrom($configPath, 'former');
+        $this->publishes([$configPath => $app['path.config'] . '/former.php']);
 		
-		$framework = $app['config']->get('former.framework');
+        $framework = $app['config']->get('former.framework');
 		
-		$app->bind('former.framework', function ($app) {
-			return $app['former']->getFrameworkInstance($app['config']->get('former.framework'));
-		});
+        $app->bind('former.framework', function ($app) {
+            return $app['former']->getFrameworkInstance($app['config']->get('former.framework'));
+        });
 
-		$app->singleton('former.populator', function ($app) {
-			return new Populator();
-		});
+        $app->singleton('former.populator', function ($app) {
+            return new Populator();
+        });
 
-		$app->singleton('former.dispatcher', function ($app) {
-			return new MethodDispatcher($app, Former::FIELDSPACE);
-		});
+        $app->singleton('former.dispatcher', function ($app) {
+            return new MethodDispatcher($app, Former::FIELDSPACE);
+        });
 
-		$app->singleton('former', function ($app) {
-			return new Former($app, $app->make('former.dispatcher'));
-		});
-		$app->alias('former', 'Former\Former');
+        $app->singleton('former', function ($app) {
+            return new Former($app, $app->make('former.dispatcher'));
+        });
+        $app->alias('former', 'Former\Former');
 
-		Helpers::setApp($app);
+        Helpers::setApp($app);
 
-		return $app;
-	}
+        return $app;
+    }
 }

src/Former/Framework/Nude.php

Doc Comments +1 added lines, -1 removed lines

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

Indentation +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 Element
-	 */
-	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 Element
+     */
+    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/LiveValidation.php

Doc Comments +1 added lines, -1 removed lines

@@ -267,7 +267,7 @@
 	/**
 	 * Transform extensions and mime groups into a list of mime types
 	 *
-	 * @param  array $mimes An array of mimes
+	 * @param  string[] $mimes An array of mimes
 	 *
 	 * @return string A concatenated list of mimes
 	 */

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 	 *
 	 * @param Field $field The field
 	 */
-	public function __construct(Field &$field)
+	public function __construct(Field&$field)
 	{
 		$this->field = $field;
 	}

Indentation +334 added lines, -334 removed lines

@@ -9,338 +9,338 @@
  */
 class LiveValidation
 {
-	/**
-	 * The field being worked on
-	 *
-	 * @var Field
-	 */
-	public $field;
-
-	/**
-	 * Load a Field instance to apply rules to it
-	 *
-	 * @param Field $field The field
-	 */
-	public function __construct(Field &$field)
-	{
-		$this->field = $field;
-	}
-
-	/**
-	 * Apply live validation rules to a field
-	 *
-	 * @param array $rules The rules to apply
-	 */
-	public function apply($rules)
-	{
-		// If no rules to apply, cancel
-		if (!$rules) {
-			return false;
-		}
-
-		foreach ($rules as $rule => $parameters) {
-
-			// If the rule is unsupported yet, skip it
-			if (!method_exists($this, $rule)) {
-				continue;
-			}
-
-			$this->$rule($parameters);
-		}
-	}
-
-	////////////////////////////////////////////////////////////////////
-	//////////////////////////////// RULES /////////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	// Field types
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Email field
-	 */
-	public function email()
-	{
-		$this->field->setType('email');
-	}
-
-	/**
-	 * URL field
-	 */
-	public function url()
-	{
-		$this->field->setType('url');
-	}
-
-	/**
-	 * Required field
-	 */
-	public function required()
-	{
-		$this->field->required();
-	}
-
-	// Patterns
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Integer field
-	 */
-	public function integer()
-	{
-		$this->field->pattern('\d+');
-	}
-
-	/**
-	 * Numeric field
-	 */
-	public function numeric()
-	{
-		if ($this->field->isOfType('number')) {
-			$this->field->step('any');
-		} else {
-			$this->field->pattern('[+-]?\d*\.?\d+');
-		}
-	}
-
-	/**
-	 * Not numeric field
-	 */
-	public function not_numeric()
-	{
-		$this->field->pattern('\D+');
-	}
-
-	/**
-	 * Only alphanumerical
-	 */
-	public function alpha()
-	{
-		$this->field->pattern('[a-zA-Z]+');
-	}
-
-	/**
-	 * Only alphanumerical and numbers
-	 */
-	public function alpha_num()
-	{
-		$this->field->pattern('[a-zA-Z0-9]+');
-	}
-
-	/**
-	 * Alphanumerical, numbers and dashes
-	 */
-	public function alpha_dash()
-	{
-		$this->field->pattern('[a-zA-Z0-9_\-]+');
-	}
-
-	/**
-	 * In []
-	 */
-	public function in($possible)
-	{
-		// Create the corresponding regex
-		$possible = (sizeof($possible) == 1) ? $possible[0] : '('.join('|', $possible).')';
-
-		$this->field->pattern('^'.$possible.'$');
-	}
-
-	/**
-	 * Not in []
-	 */
-	public function not_in($impossible)
-	{
-		$this->field->pattern('(?:(?!^'.join('$|^', $impossible).'$).)*');
-	}
-
-	/**
-	 * Matches a pattern
-	 */
-	public function match($pattern)
-	{
-		// Remove delimiters from existing regex
-		$pattern = substr($pattern[0], 1, -1);
-
-		$this->field->pattern($pattern);
-	}
-
-	/**
-	 * Alias for match
-	 */
-	public function regex($pattern)
-	{
-		return $this->match($pattern);
-	}
-
-	// Boundaries
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Max value
-	 */
-	public function max($max)
-	{
-		if ($this->field->isOfType('file')) {
-			$this->size($max);
-		} else {
-			$this->setMax($max[0]);
-		}
-	}
-
-	/**
-	 * Max size
-	 */
-	public function size($size)
-	{
-		$this->field->max($size[0]);
-	}
-
-	/**
-	 * Min value
-	 */
-	public function min($min)
-	{
-		$this->setMin($min[0]);
-	}
-
-	/**
-	 * Set boundaries
-	 */
-	public function between($between)
-	{
-		list($min, $max) = $between;
-
-		$this->setBetween($min, $max);
-	}
-
-	/**
-	 * Set accepted mime types
-	 *
-	 * @param string[] $mimes
-	 */
-	public function mimes($mimes)
-	{
-		// Only useful on file fields
-		if (!$this->field->isOfType('file')) {
-			return false;
-		}
-
-		$this->field->accept($this->setAccepted($mimes));
-	}
-
-	/**
-	 * Set accept only images
-	 */
-	public function image()
-	{
-		$this->mimes(array('jpg', 'png', 'gif', 'bmp'));
-	}
-
-	// Dates
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Before a date
-	 */
-	public function before($date)
-	{
-		list($format, $date) = $this->formatDate($date[0]);
-
-		$this->field->max(date($format, $date));
-	}
-
-	/**
-	 * After a date
-	 */
-	public function after($date)
-	{
-		list($format, $date) = $this->formatDate($date[0]);
-
-		$this->field->min(date($format, $date));
-	}
-
-	////////////////////////////////////////////////////////////////////
-	////////////////////////////// HELPERS /////////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Transform extensions and mime groups into a list of mime types
-	 *
-	 * @param  array $mimes An array of mimes
-	 *
-	 * @return string A concatenated list of mimes
-	 */
-	private function setAccepted($mimes)
-	{
-		// Transform extensions or mime groups into mime types
-		$mimes = array_map(array('\Laravel\File', 'mime'), $mimes);
-
-		return implode(',', $mimes);
-	}
-
-	/**
-	 * Format a date to a pattern
-	 *
-	 * @param  string $date The date
-	 *
-	 * @return string The pattern
-	 */
-	private function formatDate($date)
-	{
-		$format = 'Y-m-d';
-
-		// Add hour for datetime fields
-		if ($this->field->isOfType('datetime', 'datetime-local')) {
-			$format .= '\TH:i:s';
-		}
-
-		return array($format, strtotime($date));
-	}
-
-	/**
-	 * Set a maximum value to a field
-	 *
-	 * @param integer $max
-	 */
-	private function setMax($max)
-	{
-		$attribute = $this->field->isOfType('number') ? 'max' : 'maxlength';
-
-		$this->field->$attribute($max);
-	}
-
-	/**
-	 * Set a minimum value to a field
-	 *
-	 * @param integer $min
-	 */
-	private function setMin($min)
-	{
-		if ($this->field->isOfType('number') == 'min') {
-			$this->field->min($min);
-		} else {
-			$this->field->pattern(".{".$min.",}");
-		}
-	}
-
-	/**
-	 * Set a minimum and maximum value to a field
-	 *
-	 * @param $min
-	 * @param $max
-	 */
-	public function setBetween($min, $max)
-	{
-		if ($this->field->isOfType('number') == 'min') {
-			// min, max values for generation of the pattern
-			$this->field->min($min);
-			$this->field->max($max);
-		} else {
-			$this->field->pattern('.{'.$min.','.$max.'}');
-
-			// still let the browser limit text input after reaching the max
-			$this->field->maxlength($max);
-		}
-	}
+    /**
+     * The field being worked on
+     *
+     * @var Field
+     */
+    public $field;
+
+    /**
+     * Load a Field instance to apply rules to it
+     *
+     * @param Field $field The field
+     */
+    public function __construct(Field &$field)
+    {
+        $this->field = $field;
+    }
+
+    /**
+     * Apply live validation rules to a field
+     *
+     * @param array $rules The rules to apply
+     */
+    public function apply($rules)
+    {
+        // If no rules to apply, cancel
+        if (!$rules) {
+            return false;
+        }
+
+        foreach ($rules as $rule => $parameters) {
+
+            // If the rule is unsupported yet, skip it
+            if (!method_exists($this, $rule)) {
+                continue;
+            }
+
+            $this->$rule($parameters);
+        }
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    //////////////////////////////// RULES /////////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    // Field types
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Email field
+     */
+    public function email()
+    {
+        $this->field->setType('email');
+    }
+
+    /**
+     * URL field
+     */
+    public function url()
+    {
+        $this->field->setType('url');
+    }
+
+    /**
+     * Required field
+     */
+    public function required()
+    {
+        $this->field->required();
+    }
+
+    // Patterns
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Integer field
+     */
+    public function integer()
+    {
+        $this->field->pattern('\d+');
+    }
+
+    /**
+     * Numeric field
+     */
+    public function numeric()
+    {
+        if ($this->field->isOfType('number')) {
+            $this->field->step('any');
+        } else {
+            $this->field->pattern('[+-]?\d*\.?\d+');
+        }
+    }
+
+    /**
+     * Not numeric field
+     */
+    public function not_numeric()
+    {
+        $this->field->pattern('\D+');
+    }
+
+    /**
+     * Only alphanumerical
+     */
+    public function alpha()
+    {
+        $this->field->pattern('[a-zA-Z]+');
+    }
+
+    /**
+     * Only alphanumerical and numbers
+     */
+    public function alpha_num()
+    {
+        $this->field->pattern('[a-zA-Z0-9]+');
+    }
+
+    /**
+     * Alphanumerical, numbers and dashes
+     */
+    public function alpha_dash()
+    {
+        $this->field->pattern('[a-zA-Z0-9_\-]+');
+    }
+
+    /**
+     * In []
+     */
+    public function in($possible)
+    {
+        // Create the corresponding regex
+        $possible = (sizeof($possible) == 1) ? $possible[0] : '('.join('|', $possible).')';
+
+        $this->field->pattern('^'.$possible.'$');
+    }
+
+    /**
+     * Not in []
+     */
+    public function not_in($impossible)
+    {
+        $this->field->pattern('(?:(?!^'.join('$|^', $impossible).'$).)*');
+    }
+
+    /**
+     * Matches a pattern
+     */
+    public function match($pattern)
+    {
+        // Remove delimiters from existing regex
+        $pattern = substr($pattern[0], 1, -1);
+
+        $this->field->pattern($pattern);
+    }
+
+    /**
+     * Alias for match
+     */
+    public function regex($pattern)
+    {
+        return $this->match($pattern);
+    }
+
+    // Boundaries
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Max value
+     */
+    public function max($max)
+    {
+        if ($this->field->isOfType('file')) {
+            $this->size($max);
+        } else {
+            $this->setMax($max[0]);
+        }
+    }
+
+    /**
+     * Max size
+     */
+    public function size($size)
+    {
+        $this->field->max($size[0]);
+    }
+
+    /**
+     * Min value
+     */
+    public function min($min)
+    {
+        $this->setMin($min[0]);
+    }
+
+    /**
+     * Set boundaries
+     */
+    public function between($between)
+    {
+        list($min, $max) = $between;
+
+        $this->setBetween($min, $max);
+    }
+
+    /**
+     * Set accepted mime types
+     *
+     * @param string[] $mimes
+     */
+    public function mimes($mimes)
+    {
+        // Only useful on file fields
+        if (!$this->field->isOfType('file')) {
+            return false;
+        }
+
+        $this->field->accept($this->setAccepted($mimes));
+    }
+
+    /**
+     * Set accept only images
+     */
+    public function image()
+    {
+        $this->mimes(array('jpg', 'png', 'gif', 'bmp'));
+    }
+
+    // Dates
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Before a date
+     */
+    public function before($date)
+    {
+        list($format, $date) = $this->formatDate($date[0]);
+
+        $this->field->max(date($format, $date));
+    }
+
+    /**
+     * After a date
+     */
+    public function after($date)
+    {
+        list($format, $date) = $this->formatDate($date[0]);
+
+        $this->field->min(date($format, $date));
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ////////////////////////////// HELPERS /////////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Transform extensions and mime groups into a list of mime types
+     *
+     * @param  array $mimes An array of mimes
+     *
+     * @return string A concatenated list of mimes
+     */
+    private function setAccepted($mimes)
+    {
+        // Transform extensions or mime groups into mime types
+        $mimes = array_map(array('\Laravel\File', 'mime'), $mimes);
+
+        return implode(',', $mimes);
+    }
+
+    /**
+     * Format a date to a pattern
+     *
+     * @param  string $date The date
+     *
+     * @return string The pattern
+     */
+    private function formatDate($date)
+    {
+        $format = 'Y-m-d';
+
+        // Add hour for datetime fields
+        if ($this->field->isOfType('datetime', 'datetime-local')) {
+            $format .= '\TH:i:s';
+        }
+
+        return array($format, strtotime($date));
+    }
+
+    /**
+     * Set a maximum value to a field
+     *
+     * @param integer $max
+     */
+    private function setMax($max)
+    {
+        $attribute = $this->field->isOfType('number') ? 'max' : 'maxlength';
+
+        $this->field->$attribute($max);
+    }
+
+    /**
+     * Set a minimum value to a field
+     *
+     * @param integer $min
+     */
+    private function setMin($min)
+    {
+        if ($this->field->isOfType('number') == 'min') {
+            $this->field->min($min);
+        } else {
+            $this->field->pattern(".{".$min.",}");
+        }
+    }
+
+    /**
+     * Set a minimum and maximum value to a field
+     *
+     * @param $min
+     * @param $max
+     */
+    public function setBetween($min, $max)
+    {
+        if ($this->field->isOfType('number') == 'min') {
+            // min, max values for generation of the pattern
+            $this->field->min($min);
+            $this->field->max($max);
+        } else {
+            $this->field->pattern('.{'.$min.','.$max.'}');
+
+            // still let the browser limit text input after reaching the max
+            $this->field->maxlength($max);
+        }
+    }
 }

src/Former/Exceptions/InvalidFrameworkException.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php namespace Former\Exceptions;
 
-class InvalidFrameworkException extends \RuntimeException{
+class InvalidFrameworkException extends \RuntimeException {
 
 	/**
 	 * reference to framework class

Indentation +27 added lines, -27 removed lines

@@ -2,33 +2,33 @@
 
 class InvalidFrameworkException extends \RuntimeException{
 
-	/**
-	 * reference to framework class
-	 *
-	 * @var
-	 */
-	private $framework;
+    /**
+     * reference to framework class
+     *
+     * @var
+     */
+    private $framework;
 
-	/**
-	 * Set framework
-	 *
-	 * @param string $framework
-	 * @return $this
-	 */
-	public function setFramework($framework)
-	{
-		$this->framework = $framework;
-		$this->message = "Framework was not found [{$this->framework}]";
+    /**
+     * Set framework
+     *
+     * @param string $framework
+     * @return $this
+     */
+    public function setFramework($framework)
+    {
+        $this->framework = $framework;
+        $this->message = "Framework was not found [{$this->framework}]";
 
-		return $this;
-	}
-	/**
-	 * Gets the errors object.
-	 *
-	 * @return string
-	 */
-	public function getFramework()
-	{
-		return $this->framework;
-	}
+        return $this;
+    }
+    /**
+     * Gets the errors object.
+     *
+     * @return string
+     */
+    public function getFramework()
+    {
+        return $this->framework;
+    }
 }

src/Former/Helpers.php

Spacing +2 added lines, -2 removed lines

@@ -127,7 +127,7 @@ 
 		//Convert parametrs of old format to new format
 		if (!is_callable($text)) {
 			$optionTextValue = $text;
-			$text = function ($model) use($optionTextValue) {
+			$text = function($model) use($optionTextValue) {
 				if ($optionTextValue and isset($model->$optionTextValue)) {
 					return $model->$optionTextValue;
 				} elseif (method_exists($model, '__toString')) {
@@ -172,7 +172,7 @@ 
 					$optionAttributeValue = $modelAttributeName($model);
 				} elseif ($modelAttributeName and isset($model->$modelAttributeName)) {
 					$optionAttributeValue = $model->$modelAttributeName;
-				} elseif($optionAttributeName === 'value') {
+				} elseif ($optionAttributeName === 'value') {
 					//For backward compatibility
 					if (method_exists($model, 'getKey')) {
 						$optionAttributeValue = $model->getKey();

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

src/Former/Form/Actions.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 	 */
 	public function getContent()
 	{
-		$content = array_map(function ($content) {
+		$content = array_map(function($content) {
 			return method_exists($content, '__toString') ? (string) $content : $content;
 		}, $this->value);
 

Indentation +106 added lines, -106 removed lines

@@ -11,110 +11,110 @@
  */
 class Actions extends FormerObject
 {
-	/**
-	 * The Container
-	 *
-	 * @var Container
-	 */
-	protected $app;
-
-	/**
-	 * The Actions element
-	 *
-	 * @var string
-	 */
-	protected $element = 'div';
-
-	////////////////////////////////////////////////////////////////////
-	/////////////////////////// CORE METHODS ///////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Constructs a new Actions block
-	 *
-	 * @param Container $app
-	 * @param array     $value The block content
-	 */
-	public function __construct(Container $app, $value)
-	{
-		$this->app   = $app;
-		$this->value = $value;
-
-		// Add specific actions classes to the actions block
-		$this->addClass($this->app['former.framework']->getActionClasses());
-	}
-
-	/**
-	 * Get the content of the Actions block
-	 *
-	 * @return string
-	 */
-	public function getContent()
-	{
-		$content = array_map(function ($content) {
-			return method_exists($content, '__toString') ? (string) $content : $content;
-		}, $this->value);
-
-		return $this->app['former.framework']->wrapActions(implode(' ', $content));
-	}
-
-	/**
-	 * Dynamically append actions to the block
-	 *
-	 * @param string $method     The method
-	 * @param array  $parameters Its parameters
-	 *
-	 * @return Actions
-	 */
-	public function __call($method, $parameters)
-	{
-		// Dynamically add buttons to an actions block
-		if ($this->isButtonMethod($method)) {
-			$text       = array_get($parameters, 0);
-			$link       = array_get($parameters, 1);
-			$attributes = array_get($parameters, 2);
-			if (!$attributes and is_array($link)) {
-				$attributes = $link;
-			}
-
-			return $this->createButtonOfType($method, $text, $link, $attributes);
-		}
-
-		return parent::__call($method, $parameters);
-	}
-
-	////////////////////////////////////////////////////////////////////
-	////////////////////////////// HELPERS /////////////////////////////
-	////////////////////////////////////////////////////////////////////
-
-	/**
-	 * Create a new Button and add it to the actions
-	 *
-	 * @param string $type       The button type
-	 * @param string $name       Its name
-	 * @param string $link       A link to point to
-	 * @param array  $attributes Its attributes
-	 *
-	 * @return Actions
-	 */
-	private function createButtonOfType($type, $name, $link, $attributes)
-	{
-		$this->value[] = $this->app['former']->$type($name, $link, $attributes)->__toString();
-
-		return $this;
-	}
-
-	/**
-	 * Check if a given method calls a button or not
-	 *
-	 * @param string $method The method to check
-	 *
-	 * @return boolean
-	 */
-	private function isButtonMethod($method)
-	{
-		$buttons = array('button', 'submit', 'link', 'reset');
-
-		return (bool) Str::contains($method, $buttons);
-	}
+    /**
+     * The Container
+     *
+     * @var Container
+     */
+    protected $app;
+
+    /**
+     * The Actions element
+     *
+     * @var string
+     */
+    protected $element = 'div';
+
+    ////////////////////////////////////////////////////////////////////
+    /////////////////////////// CORE METHODS ///////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Constructs a new Actions block
+     *
+     * @param Container $app
+     * @param array     $value The block content
+     */
+    public function __construct(Container $app, $value)
+    {
+        $this->app   = $app;
+        $this->value = $value;
+
+        // Add specific actions classes to the actions block
+        $this->addClass($this->app['former.framework']->getActionClasses());
+    }
+
+    /**
+     * Get the content of the Actions block
+     *
+     * @return string
+     */
+    public function getContent()
+    {
+        $content = array_map(function ($content) {
+            return method_exists($content, '__toString') ? (string) $content : $content;
+        }, $this->value);
+
+        return $this->app['former.framework']->wrapActions(implode(' ', $content));
+    }
+
+    /**
+     * Dynamically append actions to the block
+     *
+     * @param string $method     The method
+     * @param array  $parameters Its parameters
+     *
+     * @return Actions
+     */
+    public function __call($method, $parameters)
+    {
+        // Dynamically add buttons to an actions block
+        if ($this->isButtonMethod($method)) {
+            $text       = array_get($parameters, 0);
+            $link       = array_get($parameters, 1);
+            $attributes = array_get($parameters, 2);
+            if (!$attributes and is_array($link)) {
+                $attributes = $link;
+            }
+
+            return $this->createButtonOfType($method, $text, $link, $attributes);
+        }
+
+        return parent::__call($method, $parameters);
+    }
+
+    ////////////////////////////////////////////////////////////////////
+    ////////////////////////////// HELPERS /////////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+    /**
+     * Create a new Button and add it to the actions
+     *
+     * @param string $type       The button type
+     * @param string $name       Its name
+     * @param string $link       A link to point to
+     * @param array  $attributes Its attributes
+     *
+     * @return Actions
+     */
+    private function createButtonOfType($type, $name, $link, $attributes)
+    {
+        $this->value[] = $this->app['former']->$type($name, $link, $attributes)->__toString();
+
+        return $this;
+    }
+
+    /**
+     * Check if a given method calls a button or not
+     *
+     * @param string $method The method to check
+     *
+     * @return boolean
+     */
+    private function isButtonMethod($method)
+    {
+        $buttons = array('button', 'submit', 'link', 'reset');
+
+        return (bool) Str::contains($method, $buttons);
+    }
 }