Skip to content

Upgrade from Laravel 9.x to 10.x #981

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

Open
DrewAPicture wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Upgrade from Laravel 9.x to 10.x #981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
82d469a
Migrate ReportSubmissionMail to Laravel 10 Mailable API
DrewAPicture May 26, 2026
bc5a66d
Update RouteServiceProvider for Laravel 10 compatibility
DrewAPicture May 26, 2026
ce01173
Replace fideloper/proxy with Laravel first-party TrustProxies
DrewAPicture May 26, 2026
f7126a8
Update users view for Livewire 3 compatibility
DrewAPicture May 26, 2026
c88920c
Remove processUncoveredFiles attribute removed in PHPUnit 10
DrewAPicture May 26, 2026
5c09dfd
Bump composer dependencies for Laravel 10
DrewAPicture May 26, 2026
872eb13
Upgrade to Laravel 10, Livewire 3, and updated dependencies
DrewAPicture May 26, 2026
361848c
Update translation files from laravel-lang/common v5
DrewAPicture May 26, 2026
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/Middleware/TrustProxies.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace App\Http\Middleware;

use Fideloper\Proxy\TrustProxies as Middleware;
use Illuminate\Http\Middleware\TrustProxies as Middleware;
use Illuminate\Http\Request;

class TrustProxies extends Middleware
Expand Down
14 changes: 11 additions & 3 deletions app/Mail/ReportSubmissionMail.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,17 @@ public function __construct($formData)
$this->formData = $formData;
}

public function build()
public function envelope(): Envelope
{
return $this->view('layouts.send-report')
->subject(__('messages.report_mail_admin_subject'));
return new Envelope(
subject: __('messages.report_mail_admin_subject'),
);
}

public function content(): Content
{
return new Content(
view: 'layouts.send-report',
);
}
}
4 changes: 1 addition & 3 deletions app/Providers/RouteServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,9 @@ public function boot()
$this->routes(function () {
Route::prefix('api')
->middleware('api')
->namespace($this->namespace)
->group(base_path('routes/api.php'));

Route::middleware('web')
->namespace($this->namespace)
->group(base_path('routes/web.php'));
});
}
Expand All @@ -57,7 +55,7 @@ public function boot()
protected function configureRateLimiting()
{
RateLimiter::for('api', function (Request $request) {
return Limit::perMinute(60)->by(optional($request->user())->id ?: $request->ip());
return Limit::perMinute(60)->by($request->user()?->id ?: $request->ip());
});
}
}
23 changes: 11 additions & 12 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,32 @@
"keywords": ["link"],
"license": "GPL-3.0-or-later",
"require": {
"php": ">=8.0",
"php": ">=8.1",
"awssat/laravel-visits": "^6.0",
"cohensive/oembed": "^0.17",
"doctrine/dbal": "^3.0",
"fideloper/proxy": "^4.4",
"geo-sot/laravel-env-editor": "^2.0",
"guzzlehttp/guzzle": "^7.4",
"jeroendesloovere/vcard": "^1.7",
"laravel-lang/common": "^2.0",
"laravel/framework": "^9.52.4",
"laravel-lang/common": "^5.0",
"laravel/framework": "^10.0",
"laravel/socialite": "^5.5",
"laravel/tinker": "^2.5",
"livewire/livewire": "^2.12",
"nunomaduro/collision": "^6.1",
"rappasoft/laravel-livewire-tables": "^2.15",
"livewire/livewire": "^3.0",
"nunomaduro/collision": "^7.0",
"rappasoft/laravel-livewire-tables": "^3.0",
"simplesoftwareio/simple-qrcode": "~4",
"spatie/laravel-backup": "^8.1.5",
"symfony/yaml": "^6.0"
},
"require-dev": {
"barryvdh/laravel-ide-helper": "^2.12",
"barryvdh/laravel-ide-helper": "^2.13",
"fakerphp/faker": "^1.9.1",
"laravel/breeze": "^1.1",
"laravel/breeze": "^1.29",
"laravel/sail": "^1.0.1",
"mockery/mockery": "^1.4.2",
"spatie/laravel-ignition": "^1.0",
"phpunit/phpunit": "^9.3.3"
"mockery/mockery": "^1.6",
"spatie/laravel-ignition": "^2.0",
"phpunit/phpunit": "^10.5"
},
"autoload": {
"files": [
Expand Down
Loading