Skip to content

Commit

Permalink
Merge branch 'release/2.2.3' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
lucasdotvin committed Jul 24, 2022
2 parents 955b4d8 + 15f8038 commit bce191f
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
6 changes: 5 additions & 1 deletion config/soulbscription.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
<?php

return [
'database' => [
'cancel_migrations_autoloading' => false,
],

'feature_tickets' => env('SOULBSCRIPTION_FEATURE_TICKETS', false),

'models' => [
Expand All @@ -14,7 +18,7 @@
'feature_plan' => \LucasDotVin\Soulbscription\Models\FeaturePlan::class,

'plan' => \LucasDotVin\Soulbscription\Models\Plan::class,

'subscriber' => [
'uses_uuid' => env('SOULBSCRIPTION_SUBSCRIBER_USES_UUID', false),
],
Expand Down
5 changes: 4 additions & 1 deletion src/SoulbscriptionServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,12 @@ class SoulbscriptionServiceProvider extends ServiceProvider
{
public function boot()
{
$this->loadMigrationsFrom(__DIR__ . '/../database/migrations');
$this->mergeConfigFrom(__DIR__ . '/../config/soulbscription.php', 'soulbscription');

if (! config('soulbscription.database.cancel_migrations_autoloading')) {
$this->loadMigrationsFrom(__DIR__ . '/../database/migrations');
}

$this->publishes([
__DIR__ . '/../config/soulbscription.php' => config_path('soulbscription.php'),
], 'soulbscription-config');
Expand Down

0 comments on commit bce191f

Please sign in to comment.