Skip to content

Commit d401310

Browse files
authored
Migrate laravel 10 (#135)
* ⬆️ Migrate to Laravel 10 * Fix php stan
1 parent 4c1d854 commit d401310

File tree

9 files changed

+1600
-2229
lines changed

9 files changed

+1600
-2229
lines changed

app/Http/Controllers/HomeController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ final class HomeController extends Controller
1616
public function __invoke(): View
1717
{
1818
$plans = Cache::remember('plans', now()->addYear(), function () {
19-
return Plan::with('features')
19+
return Plan::query()
2020
->developer()
2121
->get();
2222
});

app/Models/Premium/Feature.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
namespace App\Models\Premium;
66

77
use Illuminate\Database\Eloquent\Factories\HasFactory;
8-
use Rinvex\Subscriptions\Models\PlanFeature as Model;
8+
// use Rinvex\Subscriptions\Models\PlanFeature as Model;
9+
use Illuminate\Database\Eloquent\Model;
910

1011
/**
1112
* @mixin IdeHelperFeature

app/Models/Premium/Plan.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
use App\Enums\PlanType;
88
use Illuminate\Database\Eloquent\Builder;
99
use Illuminate\Database\Eloquent\Factories\HasFactory;
10-
use Rinvex\Subscriptions\Models\Plan as Model;
10+
// use Rinvex\Subscriptions\Models\Plan as Model;
11+
use Illuminate\Database\Eloquent\Model;
1112

1213
/**
1314
* @mixin IdeHelperPlan

app/Models/Premium/Subscription.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
namespace App\Models\Premium;
66

77
use Illuminate\Database\Eloquent\Factories\HasFactory;
8-
use Rinvex\Subscriptions\Models\PlanSubscription as Model;
8+
// use Rinvex\Subscriptions\Models\PlanSubscription as Model;
9+
use Illuminate\Database\Eloquent\Model;
910

1011
/**
1112
* @mixin IdeHelperSubscription

app/Models/Premium/SubscriptionUsage.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
namespace App\Models\Premium;
66

77
use Illuminate\Database\Eloquent\Factories\HasFactory;
8-
use Rinvex\Subscriptions\Models\PlanSubscriptionUsage as Model;
8+
// use Rinvex\Subscriptions\Models\PlanSubscriptionUsage as Model;
9+
use Illuminate\Database\Eloquent\Model;
910

1011
/**
1112
* @mixin IdeHelperSubscriptionUsage

app/Models/User.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
use LaravelFeature\Featurable\Featurable;
2828
use LaravelFeature\Featurable\FeaturableInterface;
2929
use QCod\Gamify\Gamify;
30-
use Rinvex\Subscriptions\Traits\HasPlanSubscriptions;
30+
// use Rinvex\Subscriptions\Traits\HasPlanSubscriptions;
3131
use Spatie\MediaLibrary\HasMedia;
3232
use Spatie\MediaLibrary\InteractsWithMedia;
3333
use Spatie\Permission\Traits\HasRoles;
@@ -41,7 +41,7 @@ final class User extends Authenticatable implements MustVerifyEmail, HasMedia, F
4141
use Gamify;
4242
use HasApiTokens;
4343
use HasFactory;
44-
use HasPlanSubscriptions;
44+
// use HasPlanSubscriptions;
4545
use HasProfilePhoto;
4646
use HasRoles;
4747
use HasSettings;

composer.json

+20-19
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,22 @@
88
"php": "^8.2",
99
"ext-fileinfo": "*",
1010
"ext-json": "*",
11-
"archtechx/laravel-seo": "^0.5.1",
11+
"archtechx/laravel-seo": "^0.9",
1212
"arrilot/laravel-widgets": "^3.13.2",
13-
"bensampo/laravel-enum": "^6.3.3",
1413
"blade-ui-kit/blade-heroicons": "^2.0",
15-
"blade-ui-kit/blade-ui-kit": "^0.3.4",
16-
"cyrildewit/eloquent-viewable": "^6.1",
14+
"blade-ui-kit/blade-ui-kit": "^0.4",
15+
"cyrildewit/eloquent-viewable": "^7.0",
1716
"doctrine/dbal": "^3.6.4",
1817
"filament/filament": "^3.0",
1918
"filament/notifications": "^3.0",
20-
"francescomalatesta/laravel-feature": "^3.0",
21-
"graham-campbell/markdown": "^14.0",
19+
"francescomalatesta/laravel-feature": "dev-l10-compatibility",
20+
"graham-campbell/markdown": "^15.0",
2221
"guzzlehttp/guzzle": "^7.7.0",
2322
"jenssegers/agent": "^2.6.4",
24-
"laravel-notification-channels/telegram": "^2.1",
25-
"laravel-notification-channels/twitter": "^6.2",
23+
"laravel-notification-channels/telegram": "^4.0",
24+
"laravel-notification-channels/twitter": "^8.0",
2625
"laravel/fortify": "^1.17.4",
27-
"laravel/framework": "^9.52.10",
26+
"laravel/framework": "^10.0",
2827
"laravel/sanctum": "^3.2.5",
2928
"laravel/slack-notification-channel": "^2.5",
3029
"laravel/socialite": "^5.6.3",
@@ -34,10 +33,9 @@
3433
"mckenziearts/blade-untitledui-icons": "^1.2",
3534
"nnjeim/world": "^1.1.27",
3635
"notchpay/notchpay-php": "^1.3",
37-
"qcod/laravel-gamify": "^1.0.7",
36+
"qcod/laravel-gamify": "1.0.7",
3837
"ramsey/uuid": "^4.7.4",
39-
"rinvex/laravel-subscriptions": "^6.1",
40-
"sentry/sentry-laravel": "^2.14.2",
38+
"sentry/sentry-laravel": "^3.7",
4139
"socialiteproviders/twitter": "^4.1.2",
4240
"spatie/laravel-feed": "^4.2.1",
4341
"spatie/laravel-google-fonts": "^1.2.3",
@@ -55,18 +53,17 @@
5553
"require-dev": {
5654
"barryvdh/laravel-debugbar": "^3.8.1",
5755
"barryvdh/laravel-ide-helper": "^2.13",
58-
"brianium/paratest": "^6.10",
5956
"fakerphp/faker": "^1.23.0",
60-
"filament/upgrade": "^3.0",
6157
"laravel/pint": "^1.10.3",
6258
"laravel/sail": "^1.23.0",
6359
"mockery/mockery": "^1.6.2",
64-
"nunomaduro/collision": "^6.4",
60+
"nunomaduro/collision": "^7.0",
6561
"nunomaduro/larastan": "^2.6.3",
66-
"pestphp/pest-plugin-laravel": "^1.4.0",
67-
"pestphp/pest-plugin-livewire": "^1.0",
68-
"phpunit/phpunit": "^9.6.9",
69-
"spatie/laravel-ignition": "^1.6.4",
62+
"pestphp/pest": "^2.16",
63+
"pestphp/pest-plugin-laravel": "^2.1",
64+
"pestphp/pest-plugin-livewire": "^2.1",
65+
"phpunit/phpunit": "^10.0",
66+
"spatie/laravel-ignition": "^2.0",
7067
"spatie/test-time": "^1.3.2"
7168
},
7269
"autoload": {
@@ -141,6 +138,10 @@
141138
{
142139
"type": "vcs",
143140
"url": "https://github.com/laravel-shift/uniquewith-validator.git"
141+
},
142+
{
143+
"type": "vcs",
144+
"url": "https://github.com/laravel-shift/laravel-feature.git"
144145
}
145146
]
146147
}

0 commit comments

Comments
 (0)