updated packages
This commit is contained in:
0
vendor/laravelcollective/html/CONTRIBUTING.md
vendored
Normal file → Executable file
0
vendor/laravelcollective/html/CONTRIBUTING.md
vendored
Normal file → Executable file
14
vendor/laravelcollective/html/composer.json
vendored
Normal file → Executable file
14
vendor/laravelcollective/html/composer.json
vendored
Normal file → Executable file
@@ -19,14 +19,14 @@
|
||||
],
|
||||
"require": {
|
||||
"php": ">=7.1.3",
|
||||
"illuminate/http": "5.7.*",
|
||||
"illuminate/routing": "5.7.*",
|
||||
"illuminate/session": "5.7.*",
|
||||
"illuminate/support": "5.7.*",
|
||||
"illuminate/view": "5.7.*"
|
||||
"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.7.*",
|
||||
"illuminate/database": "5.8.*",
|
||||
"mockery/mockery": "~1.0",
|
||||
"phpunit/phpunit": "~7.1"
|
||||
},
|
||||
@@ -40,7 +40,7 @@
|
||||
},
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "5.7-dev"
|
||||
"dev-master": "5.8-dev"
|
||||
},
|
||||
"laravel": {
|
||||
"providers": [
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
namespace Collective\Html;
|
||||
|
||||
use BadMethodCallException;
|
||||
use Illuminate\Support\Arr;
|
||||
use Illuminate\Support\HtmlString;
|
||||
|
||||
trait Componentable
|
||||
@@ -81,7 +82,7 @@ trait Componentable
|
||||
$default = null;
|
||||
}
|
||||
|
||||
$data[$variable] = array_get($arguments, $i, $default);
|
||||
$data[$variable] = Arr::get($arguments, $i, $default);
|
||||
|
||||
$i++;
|
||||
}
|
||||
|
||||
@@ -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()));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -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'));
|
||||
}
|
||||
|
||||
0
vendor/laravelcollective/html/src/HtmlBuilder.php
vendored
Normal file → Executable file
0
vendor/laravelcollective/html/src/HtmlBuilder.php
vendored
Normal file → Executable file
0
vendor/laravelcollective/html/src/HtmlServiceProvider.php
vendored
Normal file → Executable file
0
vendor/laravelcollective/html/src/HtmlServiceProvider.php
vendored
Normal file → Executable file
Reference in New Issue
Block a user