Merge branch 'main' of https://github.com/square-bit/laravel-workflow

Author: tiagof

src/Models/WorkflowModelStatus.php

@@ -21,11 +21,11 @@
  */
 class WorkflowModelStatus extends Model
 {
-    use SoftDeletes;
-
     /** @use BelongsToWorkflow<WorkflowModelStatus> */
     use BelongsToWorkflow;
 
+    use SoftDeletes;
+
     protected $with = ['status'];
 
     protected $guarded = ['id'];

src/Models/WorkflowTransition.php

@@ -26,13 +26,13 @@
  */
 class WorkflowTransition extends Model
 {
-    use SoftDeletes;
-
     /** @use BelongsToWorkflow<WorkflowTransition> */
     use BelongsToWorkflow;
 
     use HasPermissions;
 
+    use SoftDeletes;
+
     public string $guard_name = 'web';
 
     protected $table = 'workflows_transitions';

tests/Support/User.php

@@ -9,10 +9,10 @@
 use Illuminate\Foundation\Auth\Access\Authorizable;
 use Spatie\Permission\Traits\HasRoles;
 
-class User extends Model implements AuthorizableContract, AuthenticatableContract
+class User extends Model implements AuthenticatableContract, AuthorizableContract
 {
-    use Authorizable;
     use Authenticatable;
+    use Authorizable;
     use HasRoles;
 
     protected $fillable = ['email'];

tests/TestCase.php

@@ -19,10 +19,10 @@ protected function setUp(): void
     {
         parent::setUp();
         Factory::guessFactoryNamesUsing(
-            fn(string $modelName) => 'Squarebit\\Workflows\\Database\\Factories\\' . class_basename($modelName) . 'Factory'
+            fn (string $modelName) => 'Squarebit\\Workflows\\Database\\Factories\\'.class_basename($modelName).'Factory'
         );
 
-        $migration = include __DIR__ . '/../database/migrations/create_workflow_tables.php.stub';
+        $migration = include __DIR__.'/../database/migrations/create_workflow_tables.php.stub';
         $migration->up();
 
         $this->actingAs(UserFactory::new()->create(['email' => '[email protected]']));
@@ -66,12 +66,12 @@ public function getEnvironmentSetUp($app): void
 
     protected function defineDatabaseMigrations(): void
     {
-        $from = __DIR__ . '/../vendor/spatie/laravel-permission/database/migrations/create_permission_tables.php.stub';
-        $to = __DIR__ . '/Support/2000_01_01_000000_create_permission_tables.php';
+        $from = __DIR__.'/../vendor/spatie/laravel-permission/database/migrations/create_permission_tables.php.stub';
+        $to = __DIR__.'/Support/2000_01_01_000000_create_permission_tables.php';
         File::copy($from, $to);
 
-        $this->loadMigrationsFrom(__DIR__ . '/Support');
-        $this->loadMigrationsFrom(__DIR__ . '/../database/migrations');
+        $this->loadMigrationsFrom(__DIR__.'/Support');
+        $this->loadMigrationsFrom(__DIR__.'/../database/migrations');
         $this->loadLaravelMigrations();
     }
 }