Skip to content

Migrate laravel 10 #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 1, 2023
Merged

Migrate laravel 10 #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4af518
:arrow_up: Migrate to Laravel 10
mckenziearts Sep 1, 2023
a721561
Fix php stan
mckenziearts Sep 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/Http/Controllers/HomeController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ final class HomeController extends Controller
public function __invoke(): View
{
$plans = Cache::remember('plans', now()->addYear(), function () {
return Plan::with('features')
return Plan::query()
->developer()
->get();
});
Expand Down
3 changes: 2 additions & 1 deletion app/Models/Premium/Feature.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
namespace App\Models\Premium;

use Illuminate\Database\Eloquent\Factories\HasFactory;
use Rinvex\Subscriptions\Models\PlanFeature as Model;
// use Rinvex\Subscriptions\Models\PlanFeature as Model;
use Illuminate\Database\Eloquent\Model;

/**
* @mixin IdeHelperFeature
Expand Down
3 changes: 2 additions & 1 deletion app/Models/Premium/Plan.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
use App\Enums\PlanType;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Rinvex\Subscriptions\Models\Plan as Model;
// use Rinvex\Subscriptions\Models\Plan as Model;
use Illuminate\Database\Eloquent\Model;

/**
* @mixin IdeHelperPlan
Expand Down
3 changes: 2 additions & 1 deletion app/Models/Premium/Subscription.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
namespace App\Models\Premium;

use Illuminate\Database\Eloquent\Factories\HasFactory;
use Rinvex\Subscriptions\Models\PlanSubscription as Model;
// use Rinvex\Subscriptions\Models\PlanSubscription as Model;
use Illuminate\Database\Eloquent\Model;

/**
* @mixin IdeHelperSubscription
Expand Down
3 changes: 2 additions & 1 deletion app/Models/Premium/SubscriptionUsage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
namespace App\Models\Premium;

use Illuminate\Database\Eloquent\Factories\HasFactory;
use Rinvex\Subscriptions\Models\PlanSubscriptionUsage as Model;
// use Rinvex\Subscriptions\Models\PlanSubscriptionUsage as Model;
use Illuminate\Database\Eloquent\Model;

/**
* @mixin IdeHelperSubscriptionUsage
Expand Down
4 changes: 2 additions & 2 deletions app/Models/User.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
use LaravelFeature\Featurable\Featurable;
use LaravelFeature\Featurable\FeaturableInterface;
use QCod\Gamify\Gamify;
use Rinvex\Subscriptions\Traits\HasPlanSubscriptions;
// use Rinvex\Subscriptions\Traits\HasPlanSubscriptions;
use Spatie\MediaLibrary\HasMedia;
use Spatie\MediaLibrary\InteractsWithMedia;
use Spatie\Permission\Traits\HasRoles;
Expand All @@ -41,7 +41,7 @@ final class User extends Authenticatable implements MustVerifyEmail, HasMedia, F
use Gamify;
use HasApiTokens;
use HasFactory;
use HasPlanSubscriptions;
// use HasPlanSubscriptions;
use HasProfilePhoto;
use HasRoles;
use HasSettings;
Expand Down
39 changes: 20 additions & 19 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,22 @@
"php": "^8.2",
"ext-fileinfo": "*",
"ext-json": "*",
"archtechx/laravel-seo": "^0.5.1",
"archtechx/laravel-seo": "^0.9",
"arrilot/laravel-widgets": "^3.13.2",
"bensampo/laravel-enum": "^6.3.3",
"blade-ui-kit/blade-heroicons": "^2.0",
"blade-ui-kit/blade-ui-kit": "^0.3.4",
"cyrildewit/eloquent-viewable": "^6.1",
"blade-ui-kit/blade-ui-kit": "^0.4",
"cyrildewit/eloquent-viewable": "^7.0",
"doctrine/dbal": "^3.6.4",
"filament/filament": "^3.0",
"filament/notifications": "^3.0",
"francescomalatesta/laravel-feature": "^3.0",
"graham-campbell/markdown": "^14.0",
"francescomalatesta/laravel-feature": "dev-l10-compatibility",
"graham-campbell/markdown": "^15.0",
"guzzlehttp/guzzle": "^7.7.0",
"jenssegers/agent": "^2.6.4",
"laravel-notification-channels/telegram": "^2.1",
"laravel-notification-channels/twitter": "^6.2",
"laravel-notification-channels/telegram": "^4.0",
"laravel-notification-channels/twitter": "^8.0",
"laravel/fortify": "^1.17.4",
"laravel/framework": "^9.52.10",
"laravel/framework": "^10.0",
"laravel/sanctum": "^3.2.5",
"laravel/slack-notification-channel": "^2.5",
"laravel/socialite": "^5.6.3",
Expand All @@ -34,10 +33,9 @@
"mckenziearts/blade-untitledui-icons": "^1.2",
"nnjeim/world": "^1.1.27",
"notchpay/notchpay-php": "^1.3",
"qcod/laravel-gamify": "^1.0.7",
"qcod/laravel-gamify": "1.0.7",
"ramsey/uuid": "^4.7.4",
"rinvex/laravel-subscriptions": "^6.1",
"sentry/sentry-laravel": "^2.14.2",
"sentry/sentry-laravel": "^3.7",
"socialiteproviders/twitter": "^4.1.2",
"spatie/laravel-feed": "^4.2.1",
"spatie/laravel-google-fonts": "^1.2.3",
Expand All @@ -55,18 +53,17 @@
"require-dev": {
"barryvdh/laravel-debugbar": "^3.8.1",
"barryvdh/laravel-ide-helper": "^2.13",
"brianium/paratest": "^6.10",
"fakerphp/faker": "^1.23.0",
"filament/upgrade": "^3.0",
"laravel/pint": "^1.10.3",
"laravel/sail": "^1.23.0",
"mockery/mockery": "^1.6.2",
"nunomaduro/collision": "^6.4",
"nunomaduro/collision": "^7.0",
"nunomaduro/larastan": "^2.6.3",
"pestphp/pest-plugin-laravel": "^1.4.0",
"pestphp/pest-plugin-livewire": "^1.0",
"phpunit/phpunit": "^9.6.9",
"spatie/laravel-ignition": "^1.6.4",
"pestphp/pest": "^2.16",
"pestphp/pest-plugin-laravel": "^2.1",
"pestphp/pest-plugin-livewire": "^2.1",
"phpunit/phpunit": "^10.0",
"spatie/laravel-ignition": "^2.0",
"spatie/test-time": "^1.3.2"
},
"autoload": {
Expand Down Expand Up @@ -141,6 +138,10 @@
{
"type": "vcs",
"url": "https://github.com/laravel-shift/uniquewith-validator.git"
},
{
"type": "vcs",
"url": "https://github.com/laravel-shift/laravel-feature.git"
}
]
}
Loading