ladybirdweb / agorainvoicing

vendor/darryldecode/cart/src/Darryldecode/Cart/CartCondition.php

Doc Comments +1 added lines, -1 removed lines

@@ -106,7 +106,7 @@
     /**
      * get the calculated value of this condition supplied by the subtotal|price
      *
-     * @param $totalOrSubTotalOrPrice
+     * @param double $totalOrSubTotalOrPrice
      * @return mixed
      */
     public function getCalculatedValue($totalOrSubTotalOrPrice)

Spacing +12 added lines, -12 removed lines

@@ -32,7 +32,7 @@ 
     {
         $this->args = $args;
 
-        if( Helpers::isMultiArray($args) )
+        if (Helpers::isMultiArray($args))
         {
             Throw new InvalidConditionException('Multi dimensional array is not supported.');
         }
@@ -130,19 +130,19 @@ 
         // has a minus or plus sign so we can decide what to do with the
         // percentage, whether to add or subtract it to the total/subtotal/price
         // if we can't find any plus/minus sign, we will assume it as plus sign
-        if( $this->valueIsPercentage($conditionValue) )
+        if ($this->valueIsPercentage($conditionValue))
         {
-            if( $this->valueIsToBeSubtracted($conditionValue) )
+            if ($this->valueIsToBeSubtracted($conditionValue))
             {
-                $value = Helpers::normalizePrice( $this->cleanValue($conditionValue) );
+                $value = Helpers::normalizePrice($this->cleanValue($conditionValue));
 
                 $this->parsedRawValue = $totalOrSubTotalOrPrice * ($value / 100);
 
                 $result = floatval($totalOrSubTotalOrPrice - $this->parsedRawValue);
             }
-            else if ( $this->valueIsToBeAdded($conditionValue) )
+            else if ($this->valueIsToBeAdded($conditionValue))
             {
-                $value = Helpers::normalizePrice( $this->cleanValue($conditionValue) );
+                $value = Helpers::normalizePrice($this->cleanValue($conditionValue));
 
                 $this->parsedRawValue = $totalOrSubTotalOrPrice * ($value / 100);
 
@@ -162,15 +162,15 @@ 
         // next is we will check if it has a minus/plus sign so then we can just deduct it to total/subtotal/price
         else
         {
-            if( $this->valueIsToBeSubtracted($conditionValue) )
+            if ($this->valueIsToBeSubtracted($conditionValue))
             {
-                $this->parsedRawValue = Helpers::normalizePrice( $this->cleanValue($conditionValue) );
+                $this->parsedRawValue = Helpers::normalizePrice($this->cleanValue($conditionValue));
 
                 $result = floatval($totalOrSubTotalOrPrice - $this->parsedRawValue);
             }
-            else if ( $this->valueIsToBeAdded($conditionValue) )
+            else if ($this->valueIsToBeAdded($conditionValue))
             {
-                $this->parsedRawValue = Helpers::normalizePrice( $this->cleanValue($conditionValue) );
+                $this->parsedRawValue = Helpers::normalizePrice($this->cleanValue($conditionValue));
 
                 $result = floatval($totalOrSubTotalOrPrice + $this->parsedRawValue);
             }
@@ -226,7 +226,7 @@ 
      */
     protected function cleanValue($value)
     {
-        return str_replace(array('%','-','+'),'',$value);
+        return str_replace(array('%', '-', '+'), '', $value);
     }
 
     /**
@@ -246,7 +246,7 @@ 
 
         $validator = CartConditionValidator::make($args, $rules);
 
-        if( $validator->fails() )
+        if ($validator->fails())
         {
             throw new InvalidConditionException($validator->messages()->first());
         }

Braces +5 added lines, -10 removed lines

@@ -35,8 +35,7 @@ 
         if( Helpers::isMultiArray($args) )
         {
             Throw new InvalidConditionException('Multi dimensional array is not supported.');
-        }
-        else
+        } else
         {
             $this->validate($this->args);
         }
@@ -139,16 +138,14 @@ 
                 $this->parsedRawValue = $totalOrSubTotalOrPrice * ($value / 100);
 
                 $result = floatval($totalOrSubTotalOrPrice - $this->parsedRawValue);
-            }
-            else if ( $this->valueIsToBeAdded($conditionValue) )
+            } else if ( $this->valueIsToBeAdded($conditionValue) )
             {
                 $value = Helpers::normalizePrice( $this->cleanValue($conditionValue) );
 
                 $this->parsedRawValue = $totalOrSubTotalOrPrice * ($value / 100);
 
                 $result = floatval($totalOrSubTotalOrPrice + $this->parsedRawValue);
-            }
-            else
+            } else
             {
                 $value = Helpers::normalizePrice($conditionValue);
 
@@ -167,14 +164,12 @@ 
                 $this->parsedRawValue = Helpers::normalizePrice( $this->cleanValue($conditionValue) );
 
                 $result = floatval($totalOrSubTotalOrPrice - $this->parsedRawValue);
-            }
-            else if ( $this->valueIsToBeAdded($conditionValue) )
+            } else if ( $this->valueIsToBeAdded($conditionValue) )
             {
                 $this->parsedRawValue = Helpers::normalizePrice( $this->cleanValue($conditionValue) );
 
                 $result = floatval($totalOrSubTotalOrPrice + $this->parsedRawValue);
-            }
-            else
+            } else
             {
                 $this->parsedRawValue = Helpers::normalizePrice($conditionValue);
 

vendor/illuminate/html/FormBuilder.php

Doc Comments +1 added lines, -6 removed lines

@@ -450,11 +450,6 @@ 
 	/**
 	 * Create a select year field.
 	 *
-	 * @param  string  $name
-	 * @param  string  $begin
-	 * @param  string  $end
-	 * @param  string  $selected
-	 * @param  array   $options
 	 * @return string
 	 */
 	public function selectYear()
@@ -559,7 +554,7 @@ 
 	 * Create a checkbox input field.
 	 *
 	 * @param  string  $name
-	 * @param  mixed   $value
+	 * @param  integer   $value
 	 * @param  bool    $checked
 	 * @param  array   $options
 	 * @return string

Indentation +964 added lines, -964 removed lines

@@ -6,969 +6,969 @@
 
 class FormBuilder {
 
-	use Macroable;
-
-	/**
-	 * The HTML builder instance.
-	 *
-	 * @var \Illuminate\Html\HtmlBuilder
-	 */
-	protected $html;
-
-	/**
-	 * The URL generator instance.
-	 *
-	 * @var \Illuminate\Routing\UrlGenerator  $url
-	 */
-	protected $url;
-
-	/**
-	 * The CSRF token used by the form builder.
-	 *
-	 * @var string
-	 */
-	protected $csrfToken;
-
-	/**
-	 * The session store implementation.
-	 *
-	 * @var \Illuminate\Session\Store
-	 */
-	protected $session;
-
-	/**
-	 * The current model instance for the form.
-	 *
-	 * @var mixed
-	 */
-	protected $model;
-
-	/**
-	 * An array of label names we've created.
-	 *
-	 * @var array
-	 */
-	protected $labels = array();
-
-	/**
-	 * The reserved form open attributes.
-	 *
-	 * @var array
-	 */
-	protected $reserved = array('method', 'url', 'route', 'action', 'files');
-
-	/**
-	 * The form methods that should be spoofed, in uppercase.
-	 *
-	 * @var array
-	 */
-	protected $spoofedMethods = array('DELETE', 'PATCH', 'PUT');
-
-	/**
-	 * The types of inputs to not fill values on by default.
-	 *
-	 * @var array
-	 */
-	protected $skipValueTypes = array('file', 'password', 'checkbox', 'radio');
-
-	/**
-	 * Create a new form builder instance.
-	 *
-	 * @param  \Illuminate\Routing\UrlGenerator  $url
-	 * @param  \Illuminate\Html\HtmlBuilder  $html
-	 * @param  string  $csrfToken
-	 * @return void
-	 */
-	public function __construct(HtmlBuilder $html, UrlGenerator $url, $csrfToken)
-	{
-		$this->url = $url;
-		$this->html = $html;
-		$this->csrfToken = $csrfToken;
-	}
-
-	/**
-	 * Open up a new HTML form.
-	 *
-	 * @param  array   $options
-	 * @return string
-	 */
-	public function open(array $options = array())
-	{
-		$method = array_get($options, 'method', 'post');
-
-		// We need to extract the proper method from the attributes. If the method is
-		// something other than GET or POST we'll use POST since we will spoof the
-		// actual method since forms don't support the reserved methods in HTML.
-		$attributes['method'] = $this->getMethod($method);
-
-		$attributes['action'] = $this->getAction($options);
-
-		$attributes['accept-charset'] = 'UTF-8';
-
-		// If the method is PUT, PATCH or DELETE we will need to add a spoofer hidden
-		// field that will instruct the Symfony request to pretend the method is a
-		// different method than it actually is, for convenience from the forms.
-		$append = $this->getAppendage($method);
-
-		if (isset($options['files']) && $options['files'])
-		{
-			$options['enctype'] = 'multipart/form-data';
-		}
-
-		// Finally we're ready to create the final form HTML field. We will attribute
-		// format the array of attributes. We will also add on the appendage which
-		// is used to spoof requests for this PUT, PATCH, etc. methods on forms.
-		$attributes = array_merge(
-
-			$attributes, array_except($options, $this->reserved)
-
-		);
-
-		// Finally, we will concatenate all of the attributes into a single string so
-		// we can build out the final form open statement. We'll also append on an
-		// extra value for the hidden _method field if it's needed for the form.
-		$attributes = $this->html->attributes($attributes);
-
-		return '<form'.$attributes.'>'.$append;
-	}
-
-	/**
-	 * Create a new model based form builder.
-	 *
-	 * @param  mixed  $model
-	 * @param  array  $options
-	 * @return string
-	 */
-	public function model($model, array $options = array())
-	{
-		$this->model = $model;
-
-		return $this->open($options);
-	}
-
-	/**
-	 * Set the model instance on the form builder.
-	 *
-	 * @param  mixed  $model
-	 * @return void
-	 */
-	public function setModel($model)
-	{
-		$this->model = $model;
-	}
-
-	/**
-	 * Close the current form.
-	 *
-	 * @return string
-	 */
-	public function close()
-	{
-		$this->labels = array();
-
-		$this->model = null;
-
-		return '</form>';
-	}
-
-	/**
-	 * Generate a hidden field with the current CSRF token.
-	 *
-	 * @return string
-	 */
-	public function token()
-	{
-		$token = ! empty($this->csrfToken) ? $this->csrfToken : $this->session->getToken();
-
-		return $this->hidden('_token', $token);
-	}
-
-	/**
-	 * Create a form label element.
-	 *
-	 * @param  string  $name
-	 * @param  string  $value
-	 * @param  array   $options
-	 * @return string
-	 */
-	public function label($name, $value = null, $options = array())
-	{
-		$this->labels[] = $name;
-
-		$options = $this->html->attributes($options);
-
-		$value = e($this->formatLabel($name, $value));
-
-		return '<label for="'.$name.'"'.$options.'>'.$value.'</label>';
-	}
-
-	/**
-	 * Format the label value.
-	 *
-	 * @param  string  $name
-	 * @param  string|null  $value
-	 * @return string
-	 */
-	protected function formatLabel($name, $value)
-	{
-		return $value ?: ucwords(str_replace('_', ' ', $name));
-	}
-
-	/**
-	 * Create a form input field.
-	 *
-	 * @param  string  $type
-	 * @param  string  $name
-	 * @param  string  $value
-	 * @param  array   $options
-	 * @return string
-	 */
-	public function input($type, $name, $value = null, $options = array())
-	{
-		if ( ! isset($options['name'])) $options['name'] = $name;
-
-		// We will get the appropriate value for the given field. We will look for the
-		// value in the session for the value in the old input data then we'll look
-		// in the model instance if one is set. Otherwise we will just use empty.
-		$id = $this->getIdAttribute($name, $options);
-
-		if ( ! in_array($type, $this->skipValueTypes))
-		{
-			$value = $this->getValueAttribute($name, $value);
-		}
-
-		// Once we have the type, value, and ID we can merge them into the rest of the
-		// attributes array so we can convert them into their HTML attribute format
-		// when creating the HTML element. Then, we will return the entire input.
-		$merge = compact('type', 'value', 'id');
-
-		$options = array_merge($options, $merge);
-
-		return '<input'.$this->html->attributes($options).'>';
-	}
-
-	/**
-	 * Create a text input field.
-	 *
-	 * @param  string  $name
-	 * @param  string  $value
-	 * @param  array   $options
-	 * @return string
-	 */
-	public function text($name, $value = null, $options = array())
-	{
-		return $this->input('text', $name, $value, $options);
-	}
-
-	/**
-	 * Create a password input field.
-	 *
-	 * @param  string  $name
-	 * @param  array   $options
-	 * @return string
-	 */
-	public function password($name, $options = array())
-	{
-		return $this->input('password', $name, '', $options);
-	}
-
-	/**
-	 * Create a hidden input field.
-	 *
-	 * @param  string  $name
-	 * @param  string  $value
-	 * @param  array   $options
-	 * @return string
-	 */
-	public function hidden($name, $value = null, $options = array())
-	{
-		return $this->input('hidden', $name, $value, $options);
-	}
-
-	/**
-	 * Create an e-mail input field.
-	 *
-	 * @param  string  $name
-	 * @param  string  $value
-	 * @param  array   $options
-	 * @return string
-	 */
-	public function email($name, $value = null, $options = array())
-	{
-		return $this->input('email', $name, $value, $options);
-	}
-
-	/**
-	 * Create a url input field.
-	 *
-	 * @param  string  $name
-	 * @param  string  $value
-	 * @param  array   $options
-	 * @return string
-	 */
-	public function url($name, $value = null, $options = array())
-	{
-		return $this->input('url', $name, $value, $options);
-	}
-
-	/**
-	 * Create a file input field.
-	 *
-	 * @param  string  $name
-	 * @param  array   $options
-	 * @return string
-	 */
-	public function file($name, $options = array())
-	{
-		return $this->input('file', $name, null, $options);
-	}
-
-	/**
-	 * Create a textarea input field.
-	 *
-	 * @param  string  $name
-	 * @param  string  $value
-	 * @param  array   $options
-	 * @return string
-	 */
-	public function textarea($name, $value = null, $options = array())
-	{
-		if ( ! isset($options['name'])) $options['name'] = $name;
-
-		// Next we will look for the rows and cols attributes, as each of these are put
-		// on the textarea element definition. If they are not present, we will just
-		// assume some sane default values for these attributes for the developer.
-		$options = $this->setTextAreaSize($options);
-
-		$options['id'] = $this->getIdAttribute($name, $options);
-
-		$value = (string) $this->getValueAttribute($name, $value);
-
-		unset($options['size']);
-
-		// Next we will convert the attributes into a string form. Also we have removed
-		// the size attribute, as it was merely a short-cut for the rows and cols on
-		// the element. Then we'll create the final textarea elements HTML for us.
-		$options = $this->html->attributes($options);
-
-		return '<textarea'.$options.'>'.e($value).'</textarea>';
-	}
-
-	/**
-	 * Set the text area size on the attributes.
-	 *
-	 * @param  array  $options
-	 * @return array
-	 */
-	protected function setTextAreaSize($options)
-	{
-		if (isset($options['size']))
-		{
-			return $this->setQuickTextAreaSize($options);
-		}
-
-		// If the "size" attribute was not specified, we will just look for the regular
-		// columns and rows attributes, using sane defaults if these do not exist on
-		// the attributes array. We'll then return this entire options array back.
-		$cols = array_get($options, 'cols', 50);
-
-		$rows = array_get($options, 'rows', 10);
-
-		return array_merge($options, compact('cols', 'rows'));
-	}
-
-	/**
-	 * Set the text area size using the quick "size" attribute.
-	 *
-	 * @param  array  $options
-	 * @return array
-	 */
-	protected function setQuickTextAreaSize($options)
-	{
-		$segments = explode('x', $options['size']);
-
-		return array_merge($options, array('cols' => $segments[0], 'rows' => $segments[1]));
-	}
-
-	/**
-	 * Create a select box field.
-	 *
-	 * @param  string  $name
-	 * @param  array   $list
-	 * @param  string  $selected
-	 * @param  array   $options
-	 * @return string
-	 */
-	public function select($name, $list = array(), $selected = null, $options = array())
-	{
-		// When building a select box the "value" attribute is really the selected one
-		// so we will use that when checking the model or session for a value which
-		// should provide a convenient method of re-populating the forms on post.
-		$selected = $this->getValueAttribute($name, $selected);
-
-		$options['id'] = $this->getIdAttribute($name, $options);
-
-		if ( ! isset($options['name'])) $options['name'] = $name;
-
-		// We will simply loop through the options and build an HTML value for each of
-		// them until we have an array of HTML declarations. Then we will join them
-		// all together into one single HTML element that can be put on the form.
-		$html = array();
-
-		foreach ($list as $value => $display)
-		{
-			$html[] = $this->getSelectOption($display, $value, $selected);
-		}
-
-		// Once we have all of this HTML, we can join this into a single element after
-		// formatting the attributes into an HTML "attributes" string, then we will
-		// build out a final select statement, which will contain all the values.
-		$options = $this->html->attributes($options);
-
-		$list = implode('', $html);
-
-		return "<select{$options}>{$list}</select>";
-	}
-
-	/**
-	 * Create a select range field.
-	 *
-	 * @param  string  $name
-	 * @param  string  $begin
-	 * @param  string  $end
-	 * @param  string  $selected
-	 * @param  array   $options
-	 * @return string
-	 */
-	public function selectRange($name, $begin, $end, $selected = null, $options = array())
-	{
-		$range = array_combine($range = range($begin, $end), $range);
-
-		return $this->select($name, $range, $selected, $options);
-	}
-
-	/**
-	 * Create a select year field.
-	 *
-	 * @param  string  $name
-	 * @param  string  $begin
-	 * @param  string  $end
-	 * @param  string  $selected
-	 * @param  array   $options
-	 * @return string
-	 */
-	public function selectYear()
-	{
-		return call_user_func_array(array($this, 'selectRange'), func_get_args());
-	}
-
-	/**
-	 * Create a select month field.
-	 *
-	 * @param  string  $name
-	 * @param  string  $selected
-	 * @param  array   $options
-	 * @param  string  $format
-	 * @return string
-	 */
-	public function selectMonth($name, $selected = null, $options = array(), $format = '%B')
-	{
-		$months = array();
-
-		foreach (range(1, 12) as $month)
-		{
-			$months[$month] = strftime($format, mktime(0, 0, 0, $month, 1));
-		}
-
-		return $this->select($name, $months, $selected, $options);
-	}
-
-	/**
-	 * Get the select option for the given value.
-	 *
-	 * @param  string  $display
-	 * @param  string  $value
-	 * @param  string  $selected
-	 * @return string
-	 */
-	public function getSelectOption($display, $value, $selected)
-	{
-		if (is_array($display))
-		{
-			return $this->optionGroup($display, $value, $selected);
-		}
-
-		return $this->option($display, $value, $selected);
-	}
-
-	/**
-	 * Create an option group form element.
-	 *
-	 * @param  array   $list
-	 * @param  string  $label
-	 * @param  string  $selected
-	 * @return string
-	 */
-	protected function optionGroup($list, $label, $selected)
-	{
-		$html = array();
-
-		foreach ($list as $value => $display)
-		{
-			$html[] = $this->option($display, $value, $selected);
-		}
-
-		return '<optgroup label="'.e($label).'">'.implode('', $html).'</optgroup>';
-	}
-
-	/**
-	 * Create a select element option.
-	 *
-	 * @param  string  $display
-	 * @param  string  $value
-	 * @param  string  $selected
-	 * @return string
-	 */
-	protected function option($display, $value, $selected)
-	{
-		$selected = $this->getSelectedValue($value, $selected);
-
-		$options = array('value' => e($value), 'selected' => $selected);
-
-		return '<option'.$this->html->attributes($options).'>'.e($display).'</option>';
-	}
-
-	/**
-	 * Determine if the value is selected.
-	 *
-	 * @param  string  $value
-	 * @param  string  $selected
-	 * @return string
-	 */
-	protected function getSelectedValue($value, $selected)
-	{
-		if (is_array($selected))
-		{
-			return in_array($value, $selected) ? 'selected' : null;
-		}
-
-		return ((string) $value == (string) $selected) ? 'selected' : null;
-	}
-
-	/**
-	 * Create a checkbox input field.
-	 *
-	 * @param  string  $name
-	 * @param  mixed   $value
-	 * @param  bool    $checked
-	 * @param  array   $options
-	 * @return string
-	 */
-	public function checkbox($name, $value = 1, $checked = null, $options = array())
-	{
-		return $this->checkable('checkbox', $name, $value, $checked, $options);
-	}
-
-	/**
-	 * Create a radio button input field.
-	 *
-	 * @param  string  $name
-	 * @param  mixed   $value
-	 * @param  bool    $checked
-	 * @param  array   $options
-	 * @return string
-	 */
-	public function radio($name, $value = null, $checked = null, $options = array())
-	{
-		if (is_null($value)) $value = $name;
-
-		return $this->checkable('radio', $name, $value, $checked, $options);
-	}
-
-	/**
-	 * Create a checkable input field.
-	 *
-	 * @param  string  $type
-	 * @param  string  $name
-	 * @param  mixed   $value
-	 * @param  bool    $checked
-	 * @param  array   $options
-	 * @return string
-	 */
-	protected function checkable($type, $name, $value, $checked, $options)
-	{
-		$checked = $this->getCheckedState($type, $name, $value, $checked);
-
-		if ($checked) $options['checked'] = 'checked';
-
-		return $this->input($type, $name, $value, $options);
-	}
-
-	/**
-	 * Get the check state for a checkable input.
-	 *
-	 * @param  string  $type
-	 * @param  string  $name
-	 * @param  mixed   $value
-	 * @param  bool    $checked
-	 * @return bool
-	 */
-	protected function getCheckedState($type, $name, $value, $checked)
-	{
-		switch ($type)
-		{
-			case 'checkbox':
-				return $this->getCheckboxCheckedState($name, $value, $checked);
-
-			case 'radio':
-				return $this->getRadioCheckedState($name, $value, $checked);
-
-			default:
-				return $this->getValueAttribute($name) == $value;
-		}
-	}
-
-	/**
-	 * Get the check state for a checkbox input.
-	 *
-	 * @param  string  $name
-	 * @param  mixed  $value
-	 * @param  bool  $checked
-	 * @return bool
-	 */
-	protected function getCheckboxCheckedState($name, $value, $checked)
-	{
-		if (isset($this->session) && ! $this->oldInputIsEmpty() && is_null($this->old($name))) return false;
-
-		if ($this->missingOldAndModel($name)) return $checked;
-
-		$posted = $this->getValueAttribute($name);
-
-		return is_array($posted) ? in_array($value, $posted) : (bool) $posted;
-	}
-
-	/**
-	 * Get the check state for a radio input.
-	 *
-	 * @param  string  $name
-	 * @param  mixed  $value
-	 * @param  bool  $checked
-	 * @return bool
-	 */
-	protected function getRadioCheckedState($name, $value, $checked)
-	{
-		if ($this->missingOldAndModel($name)) return $checked;
-
-		return $this->getValueAttribute($name) == $value;
-	}
-
-	/**
-	 * Determine if old input or model input exists for a key.
-	 *
-	 * @param  string  $name
-	 * @return bool
-	 */
-	protected function missingOldAndModel($name)
-	{
-		return (is_null($this->old($name)) && is_null($this->getModelValueAttribute($name)));
-	}
-
-	/**
-	 * Create a HTML reset input element.
-	 *
-	 * @param  string  $value
-	 * @param  array   $attributes
-	 * @return string
-	 */
-	public function reset($value, $attributes = array())
-	{
-		return $this->input('reset', null, $value, $attributes);
-	}
-
-	/**
-	 * Create a HTML image input element.
-	 *
-	 * @param  string  $url
-	 * @param  string  $name
-	 * @param  array   $attributes
-	 * @return string
-	 */
-	public function image($url, $name = null, $attributes = array())
-	{
-		$attributes['src'] = $this->url->asset($url);
-
-		return $this->input('image', $name, null, $attributes);
-	}
-
-	/**
-	 * Create a submit button element.
-	 *
-	 * @param  string  $value
-	 * @param  array   $options
-	 * @return string
-	 */
-	public function submit($value = null, $options = array())
-	{
-		return $this->input('submit', null, $value, $options);
-	}
-
-	/**
-	 * Create a button element.
-	 *
-	 * @param  string  $value
-	 * @param  array   $options
-	 * @return string
-	 */
-	public function button($value = null, $options = array())
-	{
-		if ( ! array_key_exists('type', $options))
-		{
-			$options['type'] = 'button';
-		}
-
-		return '<button'.$this->html->attributes($options).'>'.$value.'</button>';
-	}
-
-	/**
-	 * Parse the form action method.
-	 *
-	 * @param  string  $method
-	 * @return string
-	 */
-	protected function getMethod($method)
-	{
-		$method = strtoupper($method);
-
-		return $method != 'GET' ? 'POST' : $method;
-	}
-
-	/**
-	 * Get the form action from the options.
-	 *
-	 * @param  array   $options
-	 * @return string
-	 */
-	protected function getAction(array $options)
-	{
-		// We will also check for a "route" or "action" parameter on the array so that
-		// developers can easily specify a route or controller action when creating
-		// a form providing a convenient interface for creating the form actions.
-		if (isset($options['url']))
-		{
-			return $this->getUrlAction($options['url']);
-		}
-
-		if (isset($options['route']))
-		{
-			return $this->getRouteAction($options['route']);
-		}
-
-		// If an action is available, we are attempting to open a form to a controller
-		// action route. So, we will use the URL generator to get the path to these
-		// actions and return them from the method. Otherwise, we'll use current.
-		elseif (isset($options['action']))
-		{
-			return $this->getControllerAction($options['action']);
-		}
-
-		return $this->url->current();
-	}
-
-	/**
-	 * Get the action for a "url" option.
-	 *
-	 * @param  array|string  $options
-	 * @return string
-	 */
-	protected function getUrlAction($options)
-	{
-		if (is_array($options))
-		{
-			return $this->url->to($options[0], array_slice($options, 1));
-		}
-
-		return $this->url->to($options);
-	}
-
-	/**
-	 * Get the action for a "route" option.
-	 *
-	 * @param  array|string  $options
-	 * @return string
-	 */
-	protected function getRouteAction($options)
-	{
-		if (is_array($options))
-		{
-			return $this->url->route($options[0], array_slice($options, 1));
-		}
-
-		return $this->url->route($options);
-	}
-
-	/**
-	 * Get the action for an "action" option.
-	 *
-	 * @param  array|string  $options
-	 * @return string
-	 */
-	protected function getControllerAction($options)
-	{
-		if (is_array($options))
-		{
-			return $this->url->action($options[0], array_slice($options, 1));
-		}
-
-		return $this->url->action($options);
-	}
-
-	/**
-	 * Get the form appendage for the given method.
-	 *
-	 * @param  string  $method
-	 * @return string
-	 */
-	protected function getAppendage($method)
-	{
-		list($method, $appendage) = array(strtoupper($method), '');
-
-		// If the HTTP method is in this list of spoofed methods, we will attach the
-		// method spoofer hidden input to the form. This allows us to use regular
-		// form to initiate PUT and DELETE requests in addition to the typical.
-		if (in_array($method, $this->spoofedMethods))
-		{
-			$appendage .= $this->hidden('_method', $method);
-		}
-
-		// If the method is something other than GET we will go ahead and attach the
-		// CSRF token to the form, as this can't hurt and is convenient to simply
-		// always have available on every form the developers creates for them.
-		if ($method != 'GET')
-		{
-			$appendage .= $this->token();
-		}
-
-		return $appendage;
-	}
-
-	/**
-	 * Get the ID attribute for a field name.
-	 *
-	 * @param  string  $name
-	 * @param  array   $attributes
-	 * @return string
-	 */
-	public function getIdAttribute($name, $attributes)
-	{
-		if (array_key_exists('id', $attributes))
-		{
-			return $attributes['id'];
-		}
-
-		if (in_array($name, $this->labels))
-		{
-			return $name;
-		}
-	}
-
-	/**
-	 * Get the value that should be assigned to the field.
-	 *
-	 * @param  string  $name
-	 * @param  string  $value
-	 * @return string
-	 */
-	public function getValueAttribute($name, $value = null)
-	{
-		if (is_null($name)) return $value;
-
-		if ( ! is_null($this->old($name)))
-		{
-			return $this->old($name);
-		}
-
-		if ( ! is_null($value)) return $value;
-
-		if (isset($this->model))
-		{
-			return $this->getModelValueAttribute($name);
-		}
-	}
-
-	/**
-	 * Get the model value that should be assigned to the field.
-	 *
-	 * @param  string  $name
-	 * @return string
-	 */
-	protected function getModelValueAttribute($name)
-	{
-		if (is_object($this->model))
-		{
-			return object_get($this->model, $this->transformKey($name));
-		}
-		elseif (is_array($this->model))
-		{
-			return array_get($this->model, $this->transformKey($name));
-		}
-	}
-
-	/**
-	 * Get a value from the session's old input.
-	 *
-	 * @param  string  $name
-	 * @return string
-	 */
-	public function old($name)
-	{
-		if (isset($this->session))
-		{
-			return $this->session->getOldInput($this->transformKey($name));
-		}
-	}
-
-	/**
-	 * Determine if the old input is empty.
-	 *
-	 * @return bool
-	 */
-	public function oldInputIsEmpty()
-	{
-		return (isset($this->session) && count($this->session->getOldInput()) == 0);
-	}
-
-	/**
-	 * Transform key from array to dot syntax.
-	 *
-	 * @param  string  $key
-	 * @return string
-	 */
-	protected function transformKey($key)
-	{
-		return str_replace(array('.', '[]', '[', ']'), array('_', '', '.', ''), $key);
-	}
-
-	/**
-	 * Get the session store implementation.
-	 *
-	 * @return  \Illuminate\Session\Store  $session
-	 */
-	public function getSessionStore()
-	{
-		return $this->session;
-	}
-
-	/**
-	 * Set the session store implementation.
-	 *
-	 * @param  \Illuminate\Session\Store  $session
-	 * @return $this
-	 */
-	public function setSessionStore(Session $session)
-	{
-		$this->session = $session;
-
-		return $this;
-	}
+    use Macroable;
+
+    /**
+     * The HTML builder instance.
+     *
+     * @var \Illuminate\Html\HtmlBuilder
+     */
+    protected $html;
+
+    /**
+     * The URL generator instance.
+     *
+     * @var \Illuminate\Routing\UrlGenerator  $url
+     */
+    protected $url;
+
+    /**
+     * The CSRF token used by the form builder.
+     *
+     * @var string
+     */
+    protected $csrfToken;
+
+    /**
+     * The session store implementation.
+     *
+     * @var \Illuminate\Session\Store
+     */
+    protected $session;
+
+    /**
+     * The current model instance for the form.
+     *
+     * @var mixed
+     */
+    protected $model;
+
+    /**
+     * An array of label names we've created.
+     *
+     * @var array
+     */
+    protected $labels = array();
+
+    /**
+     * The reserved form open attributes.
+     *
+     * @var array
+     */
+    protected $reserved = array('method', 'url', 'route', 'action', 'files');
+
+    /**
+     * The form methods that should be spoofed, in uppercase.
+     *
+     * @var array
+     */
+    protected $spoofedMethods = array('DELETE', 'PATCH', 'PUT');
+
+    /**
+     * The types of inputs to not fill values on by default.
+     *
+     * @var array
+     */
+    protected $skipValueTypes = array('file', 'password', 'checkbox', 'radio');
+
+    /**
+     * Create a new form builder instance.
+     *
+     * @param  \Illuminate\Routing\UrlGenerator  $url
+     * @param  \Illuminate\Html\HtmlBuilder  $html
+     * @param  string  $csrfToken
+     * @return void
+     */
+    public function __construct(HtmlBuilder $html, UrlGenerator $url, $csrfToken)
+    {
+        $this->url = $url;
+        $this->html = $html;
+        $this->csrfToken = $csrfToken;
+    }
+
+    /**
+     * Open up a new HTML form.
+     *
+     * @param  array   $options
+     * @return string
+     */
+    public function open(array $options = array())
+    {
+        $method = array_get($options, 'method', 'post');
+
+        // We need to extract the proper method from the attributes. If the method is
+        // something other than GET or POST we'll use POST since we will spoof the
+        // actual method since forms don't support the reserved methods in HTML.
+        $attributes['method'] = $this->getMethod($method);
+
+        $attributes['action'] = $this->getAction($options);
+
+        $attributes['accept-charset'] = 'UTF-8';
+
+        // If the method is PUT, PATCH or DELETE we will need to add a spoofer hidden
+        // field that will instruct the Symfony request to pretend the method is a
+        // different method than it actually is, for convenience from the forms.
+        $append = $this->getAppendage($method);
+
+        if (isset($options['files']) && $options['files'])
+        {
+            $options['enctype'] = 'multipart/form-data';
+        }
+
+        // Finally we're ready to create the final form HTML field. We will attribute
+        // format the array of attributes. We will also add on the appendage which
+        // is used to spoof requests for this PUT, PATCH, etc. methods on forms.
+        $attributes = array_merge(
+
+            $attributes, array_except($options, $this->reserved)
+
+        );
+
+        // Finally, we will concatenate all of the attributes into a single string so
+        // we can build out the final form open statement. We'll also append on an
+        // extra value for the hidden _method field if it's needed for the form.
+        $attributes = $this->html->attributes($attributes);
+
+        return '<form'.$attributes.'>'.$append;
+    }
+
+    /**
+     * Create a new model based form builder.
+     *
+     * @param  mixed  $model
+     * @param  array  $options
+     * @return string
+     */
+    public function model($model, array $options = array())
+    {
+        $this->model = $model;
+
+        return $this->open($options);
+    }
+
+    /**
+     * Set the model instance on the form builder.
+     *
+     * @param  mixed  $model
+     * @return void
+     */
+    public function setModel($model)
+    {
+        $this->model = $model;
+    }
+
+    /**
+     * Close the current form.
+     *
+     * @return string
+     */
+    public function close()
+    {
+        $this->labels = array();
+
+        $this->model = null;
+
+        return '</form>';
+    }
+
+    /**
+     * Generate a hidden field with the current CSRF token.
+     *
+     * @return string
+     */
+    public function token()
+    {
+        $token = ! empty($this->csrfToken) ? $this->csrfToken : $this->session->getToken();
+
+        return $this->hidden('_token', $token);
+    }
+
+    /**
+     * Create a form label element.
+     *
+     * @param  string  $name
+     * @param  string  $value
+     * @param  array   $options
+     * @return string
+     */
+    public function label($name, $value = null, $options = array())
+    {
+        $this->labels[] = $name;
+
+        $options = $this->html->attributes($options);
+
+        $value = e($this->formatLabel($name, $value));
+
+        return '<label for="'.$name.'"'.$options.'>'.$value.'</label>';
+    }
+
+    /**
+     * Format the label value.
+     *
+     * @param  string  $name
+     * @param  string|null  $value
+     * @return string
+     */
+    protected function formatLabel($name, $value)
+    {
+        return $value ?: ucwords(str_replace('_', ' ', $name));
+    }
+
+    /**
+     * Create a form input field.
+     *
+     * @param  string  $type
+     * @param  string  $name
+     * @param  string  $value
+     * @param  array   $options
+     * @return string
+     */
+    public function input($type, $name, $value = null, $options = array())
+    {
+        if ( ! isset($options['name'])) $options['name'] = $name;
+
+        // We will get the appropriate value for the given field. We will look for the
+        // value in the session for the value in the old input data then we'll look
+        // in the model instance if one is set. Otherwise we will just use empty.
+        $id = $this->getIdAttribute($name, $options);
+
+        if ( ! in_array($type, $this->skipValueTypes))
+        {
+            $value = $this->getValueAttribute($name, $value);
+        }
+
+        // Once we have the type, value, and ID we can merge them into the rest of the
+        // attributes array so we can convert them into their HTML attribute format
+        // when creating the HTML element. Then, we will return the entire input.
+        $merge = compact('type', 'value', 'id');
+
+        $options = array_merge($options, $merge);
+
+        return '<input'.$this->html->attributes($options).'>';
+    }
+
+    /**
+     * Create a text input field.
+     *
+     * @param  string  $name
+     * @param  string  $value
+     * @param  array   $options
+     * @return string
+     */
+    public function text($name, $value = null, $options = array())
+    {
+        return $this->input('text', $name, $value, $options);
+    }
+
+    /**
+     * Create a password input field.
+     *
+     * @param  string  $name
+     * @param  array   $options
+     * @return string
+     */
+    public function password($name, $options = array())
+    {
+        return $this->input('password', $name, '', $options);
+    }
+
+    /**
+     * Create a hidden input field.
+     *
+     * @param  string  $name
+     * @param  string  $value
+     * @param  array   $options
+     * @return string
+     */
+    public function hidden($name, $value = null, $options = array())
+    {
+        return $this->input('hidden', $name, $value, $options);
+    }
+
+    /**
+     * Create an e-mail input field.
+     *
+     * @param  string  $name
+     * @param  string  $value
+     * @param  array   $options
+     * @return string
+     */
+    public function email($name, $value = null, $options = array())
+    {
+        return $this->input('email', $name, $value, $options);
+    }
+
+    /**
+     * Create a url input field.
+     *
+     * @param  string  $name
+     * @param  string  $value
+     * @param  array   $options
+     * @return string
+     */
+    public function url($name, $value = null, $options = array())
+    {
+        return $this->input('url', $name, $value, $options);
+    }
+
+    /**
+     * Create a file input field.
+     *
+     * @param  string  $name
+     * @param  array   $options
+     * @return string
+     */
+    public function file($name, $options = array())
+    {
+        return $this->input('file', $name, null, $options);
+    }
+
+    /**
+     * Create a textarea input field.
+     *
+     * @param  string  $name
+     * @param  string  $value
+     * @param  array   $options
+     * @return string
+     */
+    public function textarea($name, $value = null, $options = array())
+    {
+        if ( ! isset($options['name'])) $options['name'] = $name;
+
+        // Next we will look for the rows and cols attributes, as each of these are put
+        // on the textarea element definition. If they are not present, we will just
+        // assume some sane default values for these attributes for the developer.
+        $options = $this->setTextAreaSize($options);
+
+        $options['id'] = $this->getIdAttribute($name, $options);
+
+        $value = (string) $this->getValueAttribute($name, $value);
+
+        unset($options['size']);
+
+        // Next we will convert the attributes into a string form. Also we have removed
+        // the size attribute, as it was merely a short-cut for the rows and cols on
+        // the element. Then we'll create the final textarea elements HTML for us.
+        $options = $this->html->attributes($options);
+
+        return '<textarea'.$options.'>'.e($value).'</textarea>';
+    }
+
+    /**
+     * Set the text area size on the attributes.
+     *
+     * @param  array  $options
+     * @return array
+     */
+    protected function setTextAreaSize($options)
+    {
+        if (isset($options['size']))
+        {
+            return $this->setQuickTextAreaSize($options);
+        }
+
+        // If the "size" attribute was not specified, we will just look for the regular
+        // columns and rows attributes, using sane defaults if these do not exist on
+        // the attributes array. We'll then return this entire options array back.
+        $cols = array_get($options, 'cols', 50);
+
+        $rows = array_get($options, 'rows', 10);
+
+        return array_merge($options, compact('cols', 'rows'));
+    }
+
+    /**
+     * Set the text area size using the quick "size" attribute.
+     *
+     * @param  array  $options
+     * @return array
+     */
+    protected function setQuickTextAreaSize($options)
+    {
+        $segments = explode('x', $options['size']);
+
+        return array_merge($options, array('cols' => $segments[0], 'rows' => $segments[1]));
+    }
+
+    /**
+     * Create a select box field.
+     *
+     * @param  string  $name
+     * @param  array   $list
+     * @param  string  $selected
+     * @param  array   $options
+     * @return string
+     */
+    public function select($name, $list = array(), $selected = null, $options = array())
+    {
+        // When building a select box the "value" attribute is really the selected one
+        // so we will use that when checking the model or session for a value which
+        // should provide a convenient method of re-populating the forms on post.
+        $selected = $this->getValueAttribute($name, $selected);
+
+        $options['id'] = $this->getIdAttribute($name, $options);
+
+        if ( ! isset($options['name'])) $options['name'] = $name;
+
+        // We will simply loop through the options and build an HTML value for each of
+        // them until we have an array of HTML declarations. Then we will join them
+        // all together into one single HTML element that can be put on the form.
+        $html = array();
+
+        foreach ($list as $value => $display)
+        {
+            $html[] = $this->getSelectOption($display, $value, $selected);
+        }
+
+        // Once we have all of this HTML, we can join this into a single element after
+        // formatting the attributes into an HTML "attributes" string, then we will
+        // build out a final select statement, which will contain all the values.
+        $options = $this->html->attributes($options);
+
+        $list = implode('', $html);
+
+        return "<select{$options}>{$list}</select>";
+    }
+
+    /**
+     * Create a select range field.
+     *
+     * @param  string  $name
+     * @param  string  $begin
+     * @param  string  $end
+     * @param  string  $selected
+     * @param  array   $options
+     * @return string
+     */
+    public function selectRange($name, $begin, $end, $selected = null, $options = array())
+    {
+        $range = array_combine($range = range($begin, $end), $range);
+
+        return $this->select($name, $range, $selected, $options);
+    }
+
+    /**
+     * Create a select year field.
+     *
+     * @param  string  $name
+     * @param  string  $begin
+     * @param  string  $end
+     * @param  string  $selected
+     * @param  array   $options
+     * @return string
+     */
+    public function selectYear()
+    {
+        return call_user_func_array(array($this, 'selectRange'), func_get_args());
+    }
+
+    /**
+     * Create a select month field.
+     *
+     * @param  string  $name
+     * @param  string  $selected
+     * @param  array   $options
+     * @param  string  $format
+     * @return string
+     */
+    public function selectMonth($name, $selected = null, $options = array(), $format = '%B')
+    {
+        $months = array();
+
+        foreach (range(1, 12) as $month)
+        {
+            $months[$month] = strftime($format, mktime(0, 0, 0, $month, 1));
+        }
+
+        return $this->select($name, $months, $selected, $options);
+    }
+
+    /**
+     * Get the select option for the given value.
+     *
+     * @param  string  $display
+     * @param  string  $value
+     * @param  string  $selected
+     * @return string
+     */
+    public function getSelectOption($display, $value, $selected)
+    {
+        if (is_array($display))
+        {
+            return $this->optionGroup($display, $value, $selected);
+        }
+
+        return $this->option($display, $value, $selected);
+    }
+
+    /**
+     * Create an option group form element.
+     *
+     * @param  array   $list
+     * @param  string  $label
+     * @param  string  $selected
+     * @return string
+     */
+    protected function optionGroup($list, $label, $selected)
+    {
+        $html = array();
+
+        foreach ($list as $value => $display)
+        {
+            $html[] = $this->option($display, $value, $selected);
+        }
+
+        return '<optgroup label="'.e($label).'">'.implode('', $html).'</optgroup>';
+    }
+
+    /**
+     * Create a select element option.
+     *
+     * @param  string  $display
+     * @param  string  $value
+     * @param  string  $selected
+     * @return string
+     */
+    protected function option($display, $value, $selected)
+    {
+        $selected = $this->getSelectedValue($value, $selected);
+
+        $options = array('value' => e($value), 'selected' => $selected);
+
+        return '<option'.$this->html->attributes($options).'>'.e($display).'</option>';
+    }
+
+    /**
+     * Determine if the value is selected.
+     *
+     * @param  string  $value
+     * @param  string  $selected
+     * @return string
+     */
+    protected function getSelectedValue($value, $selected)
+    {
+        if (is_array($selected))
+        {
+            return in_array($value, $selected) ? 'selected' : null;
+        }
+
+        return ((string) $value == (string) $selected) ? 'selected' : null;
+    }
+
+    /**
+     * Create a checkbox input field.
+     *
+     * @param  string  $name
+     * @param  mixed   $value
+     * @param  bool    $checked
+     * @param  array   $options
+     * @return string
+     */
+    public function checkbox($name, $value = 1, $checked = null, $options = array())
+    {
+        return $this->checkable('checkbox', $name, $value, $checked, $options);
+    }
+
+    /**
+     * Create a radio button input field.
+     *
+     * @param  string  $name
+     * @param  mixed   $value
+     * @param  bool    $checked
+     * @param  array   $options
+     * @return string
+     */
+    public function radio($name, $value = null, $checked = null, $options = array())
+    {
+        if (is_null($value)) $value = $name;
+
+        return $this->checkable('radio', $name, $value, $checked, $options);
+    }
+
+    /**
+     * Create a checkable input field.
+     *
+     * @param  string  $type
+     * @param  string  $name
+     * @param  mixed   $value
+     * @param  bool    $checked
+     * @param  array   $options
+     * @return string
+     */
+    protected function checkable($type, $name, $value, $checked, $options)
+    {
+        $checked = $this->getCheckedState($type, $name, $value, $checked);
+
+        if ($checked) $options['checked'] = 'checked';
+
+        return $this->input($type, $name, $value, $options);
+    }
+
+    /**
+     * Get the check state for a checkable input.
+     *
+     * @param  string  $type
+     * @param  string  $name
+     * @param  mixed   $value
+     * @param  bool    $checked
+     * @return bool
+     */
+    protected function getCheckedState($type, $name, $value, $checked)
+    {
+        switch ($type)
+        {
+            case 'checkbox':
+                return $this->getCheckboxCheckedState($name, $value, $checked);
+
+            case 'radio':
+                return $this->getRadioCheckedState($name, $value, $checked);
+
+            default:
+                return $this->getValueAttribute($name) == $value;
+        }
+    }
+
+    /**
+     * Get the check state for a checkbox input.
+     *
+     * @param  string  $name
+     * @param  mixed  $value
+     * @param  bool  $checked
+     * @return bool
+     */
+    protected function getCheckboxCheckedState($name, $value, $checked)
+    {
+        if (isset($this->session) && ! $this->oldInputIsEmpty() && is_null($this->old($name))) return false;
+
+        if ($this->missingOldAndModel($name)) return $checked;
+
+        $posted = $this->getValueAttribute($name);
+
+        return is_array($posted) ? in_array($value, $posted) : (bool) $posted;
+    }
+
+    /**
+     * Get the check state for a radio input.
+     *
+     * @param  string  $name
+     * @param  mixed  $value
+     * @param  bool  $checked
+     * @return bool
+     */
+    protected function getRadioCheckedState($name, $value, $checked)
+    {
+        if ($this->missingOldAndModel($name)) return $checked;
+
+        return $this->getValueAttribute($name) == $value;
+    }
+
+    /**
+     * Determine if old input or model input exists for a key.
+     *
+     * @param  string  $name
+     * @return bool
+     */
+    protected function missingOldAndModel($name)
+    {
+        return (is_null($this->old($name)) && is_null($this->getModelValueAttribute($name)));
+    }
+
+    /**
+     * Create a HTML reset input element.
+     *
+     * @param  string  $value
+     * @param  array   $attributes
+     * @return string
+     */
+    public function reset($value, $attributes = array())
+    {
+        return $this->input('reset', null, $value, $attributes);
+    }
+
+    /**
+     * Create a HTML image input element.
+     *
+     * @param  string  $url
+     * @param  string  $name
+     * @param  array   $attributes
+     * @return string
+     */
+    public function image($url, $name = null, $attributes = array())
+    {
+        $attributes['src'] = $this->url->asset($url);
+
+        return $this->input('image', $name, null, $attributes);
+    }
+
+    /**
+     * Create a submit button element.
+     *
+     * @param  string  $value
+     * @param  array   $options
+     * @return string
+     */
+    public function submit($value = null, $options = array())
+    {
+        return $this->input('submit', null, $value, $options);
+    }
+
+    /**
+     * Create a button element.
+     *
+     * @param  string  $value
+     * @param  array   $options
+     * @return string
+     */
+    public function button($value = null, $options = array())
+    {
+        if ( ! array_key_exists('type', $options))
+        {
+            $options['type'] = 'button';
+        }
+
+        return '<button'.$this->html->attributes($options).'>'.$value.'</button>';
+    }
+
+    /**
+     * Parse the form action method.
+     *
+     * @param  string  $method
+     * @return string
+     */
+    protected function getMethod($method)
+    {
+        $method = strtoupper($method);
+
+        return $method != 'GET' ? 'POST' : $method;
+    }
+
+    /**
+     * Get the form action from the options.
+     *
+     * @param  array   $options
+     * @return string
+     */
+    protected function getAction(array $options)
+    {
+        // We will also check for a "route" or "action" parameter on the array so that
+        // developers can easily specify a route or controller action when creating
+        // a form providing a convenient interface for creating the form actions.
+        if (isset($options['url']))
+        {
+            return $this->getUrlAction($options['url']);
+        }
+
+        if (isset($options['route']))
+        {
+            return $this->getRouteAction($options['route']);
+        }
+
+        // If an action is available, we are attempting to open a form to a controller
+        // action route. So, we will use the URL generator to get the path to these
+        // actions and return them from the method. Otherwise, we'll use current.
+        elseif (isset($options['action']))
+        {
+            return $this->getControllerAction($options['action']);
+        }
+
+        return $this->url->current();
+    }
+
+    /**
+     * Get the action for a "url" option.
+     *
+     * @param  array|string  $options
+     * @return string
+     */
+    protected function getUrlAction($options)
+    {
+        if (is_array($options))
+        {
+            return $this->url->to($options[0], array_slice($options, 1));
+        }
+
+        return $this->url->to($options);
+    }
+
+    /**
+     * Get the action for a "route" option.
+     *
+     * @param  array|string  $options
+     * @return string
+     */
+    protected function getRouteAction($options)
+    {
+        if (is_array($options))
+        {
+            return $this->url->route($options[0], array_slice($options, 1));
+        }
+
+        return $this->url->route($options);
+    }
+
+    /**
+     * Get the action for an "action" option.
+     *
+     * @param  array|string  $options
+     * @return string
+     */
+    protected function getControllerAction($options)
+    {
+        if (is_array($options))
+        {
+            return $this->url->action($options[0], array_slice($options, 1));
+        }
+
+        return $this->url->action($options);
+    }
+
+    /**
+     * Get the form appendage for the given method.
+     *
+     * @param  string  $method
+     * @return string
+     */
+    protected function getAppendage($method)
+    {
+        list($method, $appendage) = array(strtoupper($method), '');
+
+        // If the HTTP method is in this list of spoofed methods, we will attach the
+        // method spoofer hidden input to the form. This allows us to use regular
+        // form to initiate PUT and DELETE requests in addition to the typical.
+        if (in_array($method, $this->spoofedMethods))
+        {
+            $appendage .= $this->hidden('_method', $method);
+        }
+
+        // If the method is something other than GET we will go ahead and attach the
+        // CSRF token to the form, as this can't hurt and is convenient to simply
+        // always have available on every form the developers creates for them.
+        if ($method != 'GET')
+        {
+            $appendage .= $this->token();
+        }
+
+        return $appendage;
+    }
+
+    /**
+     * Get the ID attribute for a field name.
+     *
+     * @param  string  $name
+     * @param  array   $attributes
+     * @return string
+     */
+    public function getIdAttribute($name, $attributes)
+    {
+        if (array_key_exists('id', $attributes))
+        {
+            return $attributes['id'];
+        }
+
+        if (in_array($name, $this->labels))
+        {
+            return $name;
+        }
+    }
+
+    /**
+     * Get the value that should be assigned to the field.
+     *
+     * @param  string  $name
+     * @param  string  $value
+     * @return string
+     */
+    public function getValueAttribute($name, $value = null)
+    {
+        if (is_null($name)) return $value;
+
+        if ( ! is_null($this->old($name)))
+        {
+            return $this->old($name);
+        }
+
+        if ( ! is_null($value)) return $value;
+
+        if (isset($this->model))
+        {
+            return $this->getModelValueAttribute($name);
+        }
+    }
+
+    /**
+     * Get the model value that should be assigned to the field.
+     *
+     * @param  string  $name
+     * @return string
+     */
+    protected function getModelValueAttribute($name)
+    {
+        if (is_object($this->model))
+        {
+            return object_get($this->model, $this->transformKey($name));
+        }
+        elseif (is_array($this->model))
+        {
+            return array_get($this->model, $this->transformKey($name));
+        }
+    }
+
+    /**
+     * Get a value from the session's old input.
+     *
+     * @param  string  $name
+     * @return string
+     */
+    public function old($name)
+    {
+        if (isset($this->session))
+        {
+            return $this->session->getOldInput($this->transformKey($name));
+        }
+    }
+
+    /**
+     * Determine if the old input is empty.
+     *
+     * @return bool
+     */
+    public function oldInputIsEmpty()
+    {
+        return (isset($this->session) && count($this->session->getOldInput()) == 0);
+    }
+
+    /**
+     * Transform key from array to dot syntax.
+     *
+     * @param  string  $key
+     * @return string
+     */
+    protected function transformKey($key)
+    {
+        return str_replace(array('.', '[]', '[', ']'), array('_', '', '.', ''), $key);
+    }
+
+    /**
+     * Get the session store implementation.
+     *
+     * @return  \Illuminate\Session\Store  $session
+     */
+    public function getSessionStore()
+    {
+        return $this->session;
+    }
+
+    /**
+     * Set the session store implementation.
+     *
+     * @param  \Illuminate\Session\Store  $session
+     * @return $this
+     */
+    public function setSessionStore(Session $session)
+    {
+        $this->session = $session;
+
+        return $this;
+    }
 
 }

Braces +31 added lines, -12 removed lines

@@ -225,7 +225,9 @@ 
 	 */
 	public function input($type, $name, $value = null, $options = array())
 	{
-		if ( ! isset($options['name'])) $options['name'] = $name;
+		if ( ! isset($options['name'])) {
+		    $options['name'] = $name;
+		}
 
 		// We will get the appropriate value for the given field. We will look for the
 		// value in the session for the value in the old input data then we'll look
@@ -333,7 +335,9 @@ 
 	 */
 	public function textarea($name, $value = null, $options = array())
 	{
-		if ( ! isset($options['name'])) $options['name'] = $name;
+		if ( ! isset($options['name'])) {
+		    $options['name'] = $name;
+		}
 
 		// Next we will look for the rows and cols attributes, as each of these are put
 		// on the textarea element definition. If they are not present, we will just
@@ -408,7 +412,9 @@ 
 
 		$options['id'] = $this->getIdAttribute($name, $options);
 
-		if ( ! isset($options['name'])) $options['name'] = $name;
+		if ( ! isset($options['name'])) {
+		    $options['name'] = $name;
+		}
 
 		// We will simply loop through the options and build an HTML value for each of
 		// them until we have an array of HTML declarations. Then we will join them
@@ -580,7 +586,9 @@ 
 	 */
 	public function radio($name, $value = null, $checked = null, $options = array())
 	{
-		if (is_null($value)) $value = $name;
+		if (is_null($value)) {
+		    $value = $name;
+		}
 
 		return $this->checkable('radio', $name, $value, $checked, $options);
 	}
@@ -599,7 +607,9 @@ 
 	{
 		$checked = $this->getCheckedState($type, $name, $value, $checked);
 
-		if ($checked) $options['checked'] = 'checked';
+		if ($checked) {
+		    $options['checked'] = 'checked';
+		}
 
 		return $this->input($type, $name, $value, $options);
 	}
@@ -638,9 +648,13 @@ 
 	 */
 	protected function getCheckboxCheckedState($name, $value, $checked)
 	{
-		if (isset($this->session) && ! $this->oldInputIsEmpty() && is_null($this->old($name))) return false;
+		if (isset($this->session) && ! $this->oldInputIsEmpty() && is_null($this->old($name))) {
+		    return false;
+		}
 
-		if ($this->missingOldAndModel($name)) return $checked;
+		if ($this->missingOldAndModel($name)) {
+		    return $checked;
+		}
 
 		$posted = $this->getValueAttribute($name);
 
@@ -657,7 +671,9 @@ 
 	 */
 	protected function getRadioCheckedState($name, $value, $checked)
 	{
-		if ($this->missingOldAndModel($name)) return $checked;
+		if ($this->missingOldAndModel($name)) {
+		    return $checked;
+		}
 
 		return $this->getValueAttribute($name) == $value;
 	}
@@ -880,14 +896,18 @@ 
 	 */
 	public function getValueAttribute($name, $value = null)
 	{
-		if (is_null($name)) return $value;
+		if (is_null($name)) {
+		    return $value;
+		}
 
 		if ( ! is_null($this->old($name)))
 		{
 			return $this->old($name);
 		}
 
-		if ( ! is_null($value)) return $value;
+		if ( ! is_null($value)) {
+		    return $value;
+		}
 
 		if (isset($this->model))
 		{
@@ -906,8 +926,7 @@ 
 		if (is_object($this->model))
 		{
 			return object_get($this->model, $this->transformKey($name));
-		}
-		elseif (is_array($this->model))
+		} elseif (is_array($this->model))
 		{
 			return array_get($this->model, $this->transformKey($name));
 		}

Spacing +9 added lines, -9 removed lines

@@ -178,7 +178,7 @@ 
 	 */
 	public function token()
 	{
-		$token = ! empty($this->csrfToken) ? $this->csrfToken : $this->session->getToken();
+		$token = !empty($this->csrfToken) ? $this->csrfToken : $this->session->getToken();
 
 		return $this->hidden('_token', $token);
 	}
@@ -225,14 +225,14 @@ 
 	 */
 	public function input($type, $name, $value = null, $options = array())
 	{
-		if ( ! isset($options['name'])) $options['name'] = $name;
+		if (!isset($options['name'])) $options['name'] = $name;
 
 		// We will get the appropriate value for the given field. We will look for the
 		// value in the session for the value in the old input data then we'll look
 		// in the model instance if one is set. Otherwise we will just use empty.
 		$id = $this->getIdAttribute($name, $options);
 
-		if ( ! in_array($type, $this->skipValueTypes))
+		if (!in_array($type, $this->skipValueTypes))
 		{
 			$value = $this->getValueAttribute($name, $value);
 		}
@@ -333,7 +333,7 @@ 
 	 */
 	public function textarea($name, $value = null, $options = array())
 	{
-		if ( ! isset($options['name'])) $options['name'] = $name;
+		if (!isset($options['name'])) $options['name'] = $name;
 
 		// Next we will look for the rows and cols attributes, as each of these are put
 		// on the textarea element definition. If they are not present, we will just
@@ -408,7 +408,7 @@ 
 
 		$options['id'] = $this->getIdAttribute($name, $options);
 
-		if ( ! isset($options['name'])) $options['name'] = $name;
+		if (!isset($options['name'])) $options['name'] = $name;
 
 		// We will simply loop through the options and build an HTML value for each of
 		// them until we have an array of HTML declarations. Then we will join them
@@ -638,7 +638,7 @@ 
 	 */
 	protected function getCheckboxCheckedState($name, $value, $checked)
 	{
-		if (isset($this->session) && ! $this->oldInputIsEmpty() && is_null($this->old($name))) return false;
+		if (isset($this->session) && !$this->oldInputIsEmpty() && is_null($this->old($name))) return false;
 
 		if ($this->missingOldAndModel($name)) return $checked;
 
@@ -721,7 +721,7 @@ 
 	 */
 	public function button($value = null, $options = array())
 	{
-		if ( ! array_key_exists('type', $options))
+		if (!array_key_exists('type', $options))
 		{
 			$options['type'] = 'button';
 		}
@@ -882,12 +882,12 @@ 
 	{
 		if (is_null($name)) return $value;
 
-		if ( ! is_null($this->old($name)))
+		if (!is_null($this->old($name)))
 		{
 			return $this->old($name);
 		}
 
-		if ( ! is_null($value)) return $value;
+		if (!is_null($value)) return $value;
 
 		if (isset($this->model))
 		{

vendor/jakub-onderka/php-console-color/tests/JakubOnderka/PhpConsoleColor/ConsoleColorTest.php

Doc Comments +6 added lines

@@ -7,6 +7,9 @@ 
 
     private $are256ColorsSupportedForce = true;
 
+    /**
+     * @param boolean $isSupported
+     */
     public function setIsSupported($isSupported)
     {
         $this->isSupportedForce = $isSupported;
@@ -17,6 +20,9 @@ 
         return $this->isSupportedForce;
     }
 
+    /**
+     * @param boolean $are256ColorsSupported
+     */
     public function setAre256ColorsSupported($are256ColorsSupported)
     {
         $this->are256ColorsSupportedForce = $are256ColorsSupported;

vendor/laravel/framework/src/Illuminate/Auth/Access/Gate.php

Doc Comments +1 added lines, -1 removed lines

@@ -352,7 +352,7 @@
      * @param  \Illuminate\Contracts\Auth\Authenticatable  $user
      * @param  string  $ability
      * @param  array  $arguments
-     * @return callable
+     * @return \Closure
      */
     protected function resolvePolicyCallback($user, $ability, array $arguments)
     {

Spacing +11 added lines, -11 removed lines

@@ -115,7 +115,7 @@ 
      */
     protected function buildAbilityCallback($callback)
     {
-        return function () use ($callback) {
+        return function() use ($callback) {
             list($class, $method) = explode('@', $callback);
 
             return call_user_func_array([$this->resolvePolicy($class), $method], func_get_args());
@@ -183,7 +183,7 @@ 
      */
     public function denies($ability, $arguments = [])
     {
-        return ! $this->allows($ability, $arguments);
+        return !$this->allows($ability, $arguments);
     }
 
     /**
@@ -233,7 +233,7 @@ 
      */
     protected function raw($ability, $arguments = [])
     {
-        if (! $user = $this->resolveUser()) {
+        if (!$user = $this->resolveUser()) {
             return false;
         }
 
@@ -282,7 +282,7 @@ 
         $arguments = array_merge([$user, $ability], [$arguments]);
 
         foreach ($this->beforeCallbacks as $before) {
-            if (! is_null($result = call_user_func_array($before, $arguments))) {
+            if (!is_null($result = call_user_func_array($before, $arguments))) {
                 return $result;
             }
         }
@@ -321,7 +321,7 @@ 
         } elseif (isset($this->abilities[$ability])) {
             return $this->abilities[$ability];
         } else {
-            return function () {
+            return function() {
                 return false;
             };
         }
@@ -335,7 +335,7 @@ 
      */
     protected function firstArgumentCorrespondsToPolicy(array $arguments)
     {
-        if (! isset($arguments[0])) {
+        if (!isset($arguments[0])) {
             return false;
         }
 
@@ -356,7 +356,7 @@ 
      */
     protected function resolvePolicyCallback($user, $ability, array $arguments)
     {
-        return function () use ($user, $ability, $arguments) {
+        return function() use ($user, $ability, $arguments) {
             $instance = $this->getPolicyFor($arguments[0]);
 
             if (method_exists($instance, 'before')) {
@@ -372,7 +372,7 @@ 
                 // If we received a non-null result from the before method, we will return it
                 // as the result of a check. This allows developers to override the checks
                 // in the policy and return a result for all rules defined in the class.
-                if (! is_null($result)) {
+                if (!is_null($result)) {
                     return $result;
                 }
             }
@@ -381,7 +381,7 @@ 
                 $ability = Str::camel($ability);
             }
 
-            if (! is_callable([$instance, $ability])) {
+            if (!is_callable([$instance, $ability])) {
                 return false;
             }
 
@@ -405,7 +405,7 @@ 
             $class = get_class($class);
         }
 
-        if (! isset($this->policies[$class])) {
+        if (!isset($this->policies[$class])) {
             throw new InvalidArgumentException("Policy not defined for [{$class}].");
         }
 
@@ -431,7 +431,7 @@ 
      */
     public function forUser($user)
     {
-        $callback = function () use ($user) {
+        $callback = function() use ($user) {
             return $user;
         };
 

vendor/laravel/framework/src/Illuminate/Auth/DatabaseUserProvider.php

Doc Comments +3 added lines, -3 removed lines

@@ -50,7 +50,7 @@ 
      * Retrieve a user by their unique identifier.
      *
      * @param  mixed  $identifier
-     * @return \Illuminate\Contracts\Auth\Authenticatable|null
+     * @return GenericUser|null
      */
     public function retrieveById($identifier)
     {
@@ -64,7 +64,7 @@ 
      *
      * @param  mixed  $identifier
      * @param  string  $token
-     * @return \Illuminate\Contracts\Auth\Authenticatable|null
+     * @return GenericUser|null
      */
     public function retrieveByToken($identifier, $token)
     {
@@ -94,7 +94,7 @@ 
      * Retrieve a user by the given credentials.
      *
      * @param  array  $credentials
-     * @return \Illuminate\Contracts\Auth\Authenticatable|null
+     * @return GenericUser|null
      */
     public function retrieveByCredentials(array $credentials)
     {

Spacing +1 added lines, -1 removed lines

@@ -104,7 +104,7 @@
         $query = $this->conn->table($this->table);
 
         foreach ($credentials as $key => $value) {
-            if (! Str::contains($key, 'password')) {
+            if (!Str::contains($key, 'password')) {
                 $query->where($key, $value);
             }
         }

vendor/laravel/framework/src/Illuminate/Auth/Passwords/PasswordBroker.php

Doc Comments +1 added lines, -1 removed lines

@@ -224,7 +224,7 @@
      * Get the user for the given credentials.
      *
      * @param  array  $credentials
-     * @return \Illuminate\Contracts\Auth\CanResetPassword
+     * @return \Illuminate\Contracts\Auth\Authenticatable|null
      *
      * @throws \UnexpectedValueException
      */

Spacing +6 added lines, -6 removed lines

@@ -110,10 +110,10 @@ 
         // so that it may be displayed for an user to click for password reset.
         $view = $this->emailView;
 
-        return $this->mailer->send($view, compact('token', 'user'), function ($m) use ($user, $token, $callback) {
+        return $this->mailer->send($view, compact('token', 'user'), function($m) use ($user, $token, $callback) {
             $m->to($user->getEmailForPasswordReset());
 
-            if (! is_null($callback)) {
+            if (!is_null($callback)) {
                 call_user_func($callback, $m, $user, $token);
             }
         });
@@ -133,7 +133,7 @@ 
         // the user is properly redirected having an error message on the post.
         $user = $this->validateReset($credentials);
 
-        if (! $user instanceof CanResetPasswordContract) {
+        if (!$user instanceof CanResetPasswordContract) {
             return $user;
         }
 
@@ -161,11 +161,11 @@ 
             return PasswordBrokerContract::INVALID_USER;
         }
 
-        if (! $this->validateNewPassword($credentials)) {
+        if (!$this->validateNewPassword($credentials)) {
             return PasswordBrokerContract::INVALID_PASSWORD;
         }
 
-        if (! $this->tokens->exists($user, $credentials['token'])) {
+        if (!$this->tokens->exists($user, $credentials['token'])) {
             return PasswordBrokerContract::INVALID_TOKEN;
         }
 
@@ -234,7 +234,7 @@ 
 
         $user = $this->users->retrieveByCredentials($credentials);
 
-        if ($user && ! $user instanceof CanResetPasswordContract) {
+        if ($user && !$user instanceof CanResetPasswordContract) {
             throw new UnexpectedValueException('User must implement CanResetPassword interface.');
         }
 

vendor/laravel/framework/src/Illuminate/Broadcasting/BroadcastManager.php

Doc Comments +2 added lines, -2 removed lines

@@ -49,7 +49,7 @@ 
      * Get a driver instance.
      *
      * @param  string  $driver
-     * @return mixed
+     * @return \Illuminate\Contracts\Broadcasting\Broadcaster
      */
     public function connection($driver = null)
     {
@@ -60,7 +60,7 @@ 
      * Get a driver instance.
      *
      * @param  string  $name
-     * @return mixed
+     * @return \Illuminate\Contracts\Broadcasting\Broadcaster
      */
     public function driver($name = null)
     {

vendor/laravel/framework/src/Illuminate/Cache/ApcStore.php

Doc Comments +3 added lines, -3 removed lines

@@ -27,7 +27,7 @@ 
      *
      * @param  \Illuminate\Cache\ApcWrapper  $apc
      * @param  string  $prefix
-     * @return void
+     * @return Store
      */
     public function __construct(ApcWrapper $apc, $prefix = '')
     {
@@ -67,7 +67,7 @@ 
      * Increment the value of an item in the cache.
      *
      * @param  string  $key
-     * @param  mixed   $value
+     * @param  integer   $value
      * @return int|bool
      */
     public function increment($key, $value = 1)
@@ -79,7 +79,7 @@ 
      * Decrement the value of an item in the cache.
      *
      * @param  string  $key
-     * @param  mixed   $value
+     * @param  integer   $value
      * @return int|bool
      */
     public function decrement($key, $value = 1)

vendor/laravel/framework/src/Illuminate/Cache/ApcWrapper.php

Doc Comments +3 added lines, -3 removed lines

@@ -14,7 +14,7 @@ 
     /**
      * Create a new APC wrapper instance.
      *
-     * @return void
+     * @return ApcWrapper
      */
     public function __construct()
     {
@@ -49,7 +49,7 @@ 
      * Increment the value of an item in the cache.
      *
      * @param  string  $key
-     * @param  mixed   $value
+     * @param  integer   $value
      * @return int|bool
      */
     public function increment($key, $value)
@@ -61,7 +61,7 @@ 
      * Decrement the value of an item in the cache.
      *
      * @param  string  $key
-     * @param  mixed   $value
+     * @param  integer   $value
      * @return int|bool
      */
     public function decrement($key, $value)