diff --git a/composer.json b/composer.json index 11d5b22..409c174 100755 --- a/composer.json +++ b/composer.json @@ -2,8 +2,8 @@ "name": "webfox/laravel-forms", "description": "A Laravel form package", "require": { - "php": "^7.2.0", - "laravel/framework": "~5.7" + "php": ">=7.1", + "laravel/framework": "^5.7|^5.8|^6.0|^7.0|^8.0|^9.0|^10.0" }, "license": "MIT", "authors": [ @@ -14,6 +14,10 @@ { "name": "Derek Kaijser", "email": "derek@webfox.co.nz" + }, + { + "name": "Surya Van Lierde", + "email": "surya@webfox.co.nz" } ], "autoload": { diff --git a/src/FormModelStack.php b/src/FormModelStack.php index b859d4a..e4b7ff3 100755 --- a/src/FormModelStack.php +++ b/src/FormModelStack.php @@ -2,8 +2,8 @@ namespace Webfox\LaravelForms; -use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Collection; +use Illuminate\Database\Eloquent\Model; class FormModelStack extends Collection { @@ -12,23 +12,14 @@ public function __construct($items = []) parent::__construct($items); } - public function push($value) + public function current() { - return parent::push($value); + return parent::last(); } - public function pop() + protected function modelIdentifier(Model $model = null) { - $popped = parent::pop(); - return $popped; - } - - public function current() { - return parent::last(); - } - - protected function modelIdentifier(Model $model = null) { - return $model ? get_class($model) . ' (#' . $model->getKey() .')' : 'null'; + return $model ? get_class($model) . ' (#' . $model->getKey() . ')' : 'null'; } diff --git a/views/container.blade.php b/views/container.blade.php index 9b88bed..8f8ce60 100755 --- a/views/container.blade.php +++ b/views/container.blade.php @@ -1,5 +1,5 @@ @if($type === 'hidden') - + @else {!! isset($col) ? '
' : '' !!}
has($name)) data-server-error="{{ $errors->first($name) }}" @endif {!! $containerAttributes !!}> @@ -8,7 +8,7 @@ @if($rawLabel ?? false) {!! $rawLabel !!} @else - {{ $label ?? str_title($name) }} + {{ $label ?? str_replace('_', ' ', \Illuminate\Support\Str::title($name)) }} @endif @endunless