composer update
This commit is contained in:
@@ -48,7 +48,7 @@ trait Componentable
|
||||
* @param $name
|
||||
* @param array $arguments
|
||||
*
|
||||
* @return \Illuminate\Contracts\View\View
|
||||
* @return HtmlString
|
||||
*/
|
||||
protected function renderComponent($name, array $arguments)
|
||||
{
|
||||
|
||||
@@ -1299,7 +1299,7 @@ class FormBuilder
|
||||
&& is_null($old)
|
||||
&& is_null($value)
|
||||
&& !is_null($this->view->shared('errors'))
|
||||
&& count($this->view->shared('errors')) > 0
|
||||
&& count(php_sapi_name() === 'cli' ? [] : $this->view->shared('errors')) > 0
|
||||
) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -132,7 +132,7 @@ class HtmlBuilder
|
||||
{
|
||||
$defaults = ['rel' => 'shortcut icon', 'type' => 'image/x-icon'];
|
||||
|
||||
$attributes = array_merge($attributes, $defaults);
|
||||
$attributes = array_merge($defaults, $attributes);
|
||||
|
||||
$attributes['href'] = $this->url->asset($url, $secure);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user