diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 96ad334f..87040f4a 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -1,5 +1,5 @@
includes:
- - vendor/nunomaduro/larastan/extension.neon
+ - vendor/larastan/larastan/extension.neon
parameters:
databaseMigrationsPath:
- database/migrations/
diff --git a/resources/views/fields/file.blade.php b/resources/views/fields/file.blade.php
index 4da5ab55..c36a6417 100644
--- a/resources/views/fields/file.blade.php
+++ b/resources/views/fields/file.blade.php
@@ -9,7 +9,7 @@
@if(! empty($options))
@foreach($options as $option)
- - {!! $option !!}
+ - {!! $option['html'] !!}
@endforeach
@endif
diff --git a/src/Fields/Relation.php b/src/Fields/Relation.php
index b41a2ea8..5499c3f2 100644
--- a/src/Fields/Relation.php
+++ b/src/Fields/Relation.php
@@ -662,6 +662,7 @@ public function toSubResource(Request $request, Model $model): array
return array_merge($this->toArray(), [
'key' => $this->modelAttribute,
'url' => $this->modelUrl($model),
+ 'modelName' => $this->getRelatedName(),
]);
}
@@ -674,7 +675,6 @@ public function toIndex(Request $request, Model $model): array
'template' => $request->isTurboFrameRequest() ? 'root::resources.relation' : 'root::resources.index',
'title' => $this->label,
'model' => $this->getRelation($model)->make(),
- 'modelName' => $this->getRelatedName(),
'actions' => $this->resolveActions($request)
->authorized($request, $model)
->visible('index')
diff --git a/src/RootServiceProvider.php b/src/RootServiceProvider.php
index c3a1b811..ecf9edcb 100644
--- a/src/RootServiceProvider.php
+++ b/src/RootServiceProvider.php
@@ -2,7 +2,6 @@
namespace Cone\Root;
-use Carbon\CarbonImmutable;
use Cone\Root\Resources\Resource;
use Illuminate\Cache\RateLimiting\Limit;
use Illuminate\Contracts\Foundation\Application;
@@ -13,7 +12,6 @@
use Illuminate\Routing\Route;
use Illuminate\Routing\Router;
use Illuminate\Support\Facades\Blade;
-use Illuminate\Support\Facades\Date;
use Illuminate\Support\Facades\RateLimiter;
use Illuminate\Support\ServiceProvider;
@@ -76,8 +74,6 @@ public function boot(): void
$this->registerViews();
$this->registerRoutes();
-
- Date::use(CarbonImmutable::class);
}
/**