Merge pull request #4 from neyaoz/patch-2

Make it laravel/nova v4 compatible

composer.json

@@ -18,10 +18,11 @@
     "license": "MIT",
     "require": {
         "php": "^7.4|^8.0",
-        "bensampo/laravel-enum": "^4.2",
+        "bensampo/laravel-enum": "^4.2|^5.1",
         "coroowicaksono/chart-js-integration": "^0.3.5",
+        "laravel/nova": "~4.0",
         "owenmelbz/nova-radio-field": "^1.0",
-        "spatie/laravel-webhook-server": "^2.0",
+        "spatie/laravel-webhook-server": "^2.0|^3.0",
         "symfony/class-loader": "^3.4"
     },
     "require-dev": {

src/Nova/Actions/WebhookTestAction.php

@@ -14,6 +14,7 @@
 use Illuminate\Support\Collection;
 use Laravel\Nova\Actions\Action;
 use Laravel\Nova\Fields\ActionFields;
+use Laravel\Nova\Http\Requests\NovaRequest;
 use OwenMelbz\RadioField\RadioButton;
 
 class WebhookTestAction extends Action
@@ -98,7 +99,7 @@ public function handle(ActionFields $fields, Collection $models)
      *
      * @return array
      */
-    public function fields()
+    public function fields(NovaRequest $request)
     {
         return [
             RadioButton::make(__('nova-webhooks::nova.webhook_to_test'), 'hook')

src/Nova/Webhook.php

@@ -6,22 +6,21 @@
 use Dniccum\NovaWebhooks\Models\WebhookLog;
 use Dniccum\NovaWebhooks\Nova\WebhookLog as WebhookLogResource;
 use Dniccum\NovaWebhooks\Nova\Actions\WebhookTestAction;
-use Illuminate\Http\Request;
 use Laravel\Nova\Fields\BelongsTo;
 use Laravel\Nova\Fields\HasMany;
 use Laravel\Nova\Fields\ID;
 use Laravel\Nova\Fields\Text;
-use Laravel\Nova\Http\Requests\CardRequest;
+use Laravel\Nova\Http\Requests\NovaRequest;
 
 class Webhook extends WebhookResource
 {
     /**
      * Get the fields displayed by the Webhook resource.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param  \Laravel\Nova\Http\Requests\NovaRequest  $request
      * @return array
      */
-    public function fields(Request $request)
+    public function fields(NovaRequest $request)
     {
         return [
             ID::make()->sortable(),
@@ -60,10 +59,10 @@ public function fields(Request $request)
     /**
      * Get the actions available for the resource.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param  \Laravel\Nova\Http\Requests\NovaRequest  $request
      * @return array
      */
-    public function actions(Request $request)
+    public function actions(NovaRequest $request)
     {
         return [
             (new WebhookTestAction($this->model()))
@@ -72,10 +71,10 @@ public function actions(Request $request)
     }
 
     /**
-     * @param Request|CardRequest $request
+     * @param  \Laravel\Nova\Http\Requests\NovaRequest  $request
      * @return array
      */
-    public function cards(Request $request)
+    public function cards(NovaRequest $request)
     {
         $resourceId = $request->get('resourceId');
         $dataSeries = [

src/Nova/WebhookLog.php

@@ -3,7 +3,7 @@
 namespace Dniccum\NovaWebhooks\Nova;
 
 use Dniccum\NovaWebhooks\Models\WebhookLog as WebhookModel;
-use Illuminate\Http\Request;
+
 use Laravel\Nova\Fields\Date;
 use Laravel\Nova\Fields\ID;
 use Laravel\Nova\Fields\Number;
@@ -46,10 +46,10 @@ class WebhookLog extends WebhookResource
     /**
      * Get the fields displayed by the Webhook resource.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param  \Laravel\Nova\Http\Requests\NovaRequest  $request
      * @return array
      */
-    public function fields(Request $request)
+    public function fields(NovaRequest $request)
     {
         return [
             ID::make()->sortable(),

src/Nova/WebhookResource.php

@@ -68,32 +68,32 @@ protected function optionGroup()
     /**
      * Get the cards available for the request.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param  \Laravel\Nova\Http\Requests\NovaRequest  $request
      * @return array
      */
-    public function cards(Request $request)
+    public function cards(NovaRequest $request)
     {
         return [];
     }
 
     /**
      * Get the filters available for the resource.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param  \Laravel\Nova\Http\Requests\NovaRequest  $request
      * @return array
      */
-    public function filters(Request $request)
+    public function filters(NovaRequest $request)
     {
         return [];
     }
 
     /**
      * Get the lenses available for the resource.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param  \Laravel\Nova\Http\Requests\NovaRequest  $request
      * @return array
      */
-    public function lenses(Request $request)
+    public function lenses(NovaRequest $request)
     {
         return [];
     }