updated-packages

vendor/laravelcollective/html/composer.json

@@ -19,14 +19,14 @@
     ],
     "require": {
         "php": ">=7.1.3",
-        "illuminate/http": "5.6.*",
-        "illuminate/routing": "5.6.*",
-        "illuminate/session": "5.6.*",
-        "illuminate/support": "5.6.*",
-        "illuminate/view": "5.6.*"
+        "illuminate/http": "5.8.*",
+        "illuminate/routing": "5.8.*",
+        "illuminate/session": "5.8.*",
+        "illuminate/support": "5.8.*",
+        "illuminate/view": "5.8.*"
     },
     "require-dev": {
-        "illuminate/database": "5.6.*",
+        "illuminate/database": "5.8.*",
         "mockery/mockery": "~1.0",
         "phpunit/phpunit": "~7.1"
     },
@@ -40,7 +40,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.6-dev"
+            "dev-master": "5.8-dev"
         },
         "laravel": {
             "providers": [

vendor/laravelcollective/html/src/Componentable.php

@@ -3,6 +3,7 @@
 namespace Collective\Html;
 
 use BadMethodCallException;
+use Illuminate\Support\Arr;
 use Illuminate\Support\HtmlString;
 
 trait Componentable
@@ -47,7 +48,7 @@ trait Componentable
      * @param        $name
      * @param  array $arguments
      *
-     * @return \Illuminate\Contracts\View\View
+     * @return HtmlString
      */
     protected function renderComponent($name, array $arguments)
     {
@@ -81,7 +82,7 @@ trait Componentable
                 $default = null;
             }
 
-            $data[$variable] = array_get($arguments, $i, $default);
+            $data[$variable] = Arr::get($arguments, $i, $default);
 
             $i++;
         }

vendor/laravelcollective/html/src/Eloquent/FormAccessible.php

@@ -69,11 +69,7 @@ trait FormAccessible
      */
     public function isNestedModel($key)
     {
-        if (in_array($key, array_keys($this->getRelations()))) {
-            return true;
-        }
-
-        return false;
+        return in_array($key, array_keys($this->getRelations()));
     }
 
     /**

vendor/laravelcollective/html/src/FormBuilder.php

@@ -9,6 +9,7 @@ use Illuminate\Contracts\Session\Session;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull;
 use Illuminate\Http\Request;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\HtmlString;
@@ -134,7 +135,7 @@ class FormBuilder
      */
     public function open(array $options = [])
     {
-        $method = array_get($options, 'method', 'post');
+        $method = Arr::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
@@ -159,7 +160,7 @@ class FormBuilder
         // is used to spoof requests for this PUT, PATCH, etc. methods on forms.
         $attributes = array_merge(
 
-          $attributes, array_except($options, $this->reserved)
+          $attributes, Arr::except($options, $this->reserved)
 
         );
 
@@ -589,9 +590,9 @@ class FormBuilder
         // 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);
+        $cols = Arr::get($options, 'cols', 50);
 
-        $rows = array_get($options, 'rows', 10);
+        $rows = Arr::get($options, 'rows', 10);
 
         return array_merge($options, compact('cols', 'rows'));
     }
@@ -1087,6 +1088,50 @@ class FormBuilder
         return $this->toHtmlString('<button' . $this->html->attributes($options) . '>' . $value . '</button>');
     }
 
+    /**
+     * Create a datalist box field.
+     *
+     * @param  string $id
+     * @param  array  $list
+     *
+     * @return \Illuminate\Support\HtmlString
+     */
+    public function datalist($id, $list = [])
+    {
+        $this->type = 'datalist';
+
+        $attributes['id'] = $id;
+
+        $html = [];
+
+        if ($this->isAssociativeArray($list)) {
+            foreach ($list as $value => $display) {
+                $html[] = $this->option($display, $value, null, []);
+            }
+        } else {
+            foreach ($list as $value) {
+                $html[] = $this->option($value, $value, null, []);
+            }
+        }
+
+        $attributes = $this->html->attributes($attributes);
+
+        $list = implode('', $html);
+
+        return $this->toHtmlString("<datalist{$attributes}>{$list}</datalist>");
+    }
+
+    /**
+     * Determine if an array is associative.
+     *
+     * @param  array $array
+     * @return bool
+     */
+    protected function isAssociativeArray($array)
+    {
+        return (array_values($array) !== $array);
+    }
+
     /**
      * Parse the form action method.
      *
@@ -1254,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;
             }

vendor/laravelcollective/html/src/HtmlBuilder.php

@@ -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);