From 3d4067675005db9eb7dbef79d20ddb1e98ae6ba9 Mon Sep 17 00:00:00 2001 From: Dylan Harbour Date: Mon, 5 Aug 2019 16:00:31 +0200 Subject: [PATCH] Fix the broken User relationship. --- config/workflow.php | 7 ++++++- src/Models/StateWorkflowHistory.php | 2 +- src/StateWorkflowServiceProvider.php | 6 +++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/config/workflow.php b/config/workflow.php index 1830e32..2b5fffd 100644 --- a/config/workflow.php +++ b/config/workflow.php @@ -1,10 +1,15 @@ [ + 'user_class' => \App\User::class, + ], + // this should be your model name in camelcase. eg. PropertyListing::Class => propertyListing 'user' => [ // class of your domain object - 'class' => App\User::class, + 'class' => \App\User::class, // Register subscriber for this workflow which contains business rules. Uncomment line below to register subscriber //'subscriber' => \App\Listeners\UserEventSubscriber::class, diff --git a/src/Models/StateWorkflowHistory.php b/src/Models/StateWorkflowHistory.php index 0f4edc4..1586899 100644 --- a/src/Models/StateWorkflowHistory.php +++ b/src/Models/StateWorkflowHistory.php @@ -49,6 +49,6 @@ public function model() */ public function user() { - return $this->belongsTo(\App\User::class); + return $this->belongsTo(config('workflow.setup.user_class')); } } diff --git a/src/StateWorkflowServiceProvider.php b/src/StateWorkflowServiceProvider.php index e078ae7..6a2da26 100644 --- a/src/StateWorkflowServiceProvider.php +++ b/src/StateWorkflowServiceProvider.php @@ -29,7 +29,11 @@ public function register() $this->mergeConfigFrom($this->configPath(), 'workflow'); $this->app->singleton('stateWorkflow', function () { - return new WorkflowRegistry($this->app['config']->get('workflow')); + return new WorkflowRegistry( + collect($this->app['config']->get('workflow')) + ->except('setup') + ->toArray() + ); }); $this->app->alias('stateWorkflow', WorkflowRegistryInterface::class);