Skip to content

Commit cf58b20

Browse files
authored
Merge pull request #45 from balajidharma/1.x-Changes
Upgrading from Laravel 10 to Laravel 11
2 parents 32a5fa7 + 847c82f commit cf58b20

File tree

9 files changed

+17
-278
lines changed

9 files changed

+17
-278
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</p>
88

99
## Built with
10-
- [Laravel 10](https://github.com/laravel/framework)
10+
- [Laravel 11](https://github.com/laravel/framework)
1111
- [spatie/laravel-permission](https://github.com/spatie/laravel-permission)
1212
- [Laravel Breeze](https://github.com/laravel/breeze)
1313
- [balajidharma/laravel-menu](https://github.com/balajidharma/laravel-menu)

app/Models/User.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@
55
use Illuminate\Database\Eloquent\Factories\HasFactory;
66
use Illuminate\Foundation\Auth\User as Authenticatable;
77
use Illuminate\Notifications\Notifiable;
8-
use Laravel\Sanctum\HasApiTokens;
98
use Spatie\Permission\Traits\HasRoles;
109

1110
class User extends Authenticatable
1211
{
13-
use HasApiTokens, HasFactory, HasRoles, Notifiable;
12+
use HasFactory, HasRoles, Notifiable;
1413

1514
/**
1615
* The attributes that are mass assignable.

composer.json

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,22 @@
55
"keywords": ["framework", "laravel", "boilerplate", "admin panel"],
66
"license": "MIT",
77
"require": {
8-
"php": "^8.1",
8+
"php": "^8.2",
99
"balajidharma/laravel-admin-core": "^1.0",
10-
"guzzlehttp/guzzle": "^7.2",
11-
"inertiajs/inertia-laravel": "^0.6",
12-
"laravel/framework": "^10.0",
13-
"laravel/sanctum": "^3.2",
14-
"laravel/tinker": "^2.8",
15-
"spatie/laravel-permission": "^5.5",
10+
"inertiajs/inertia-laravel": "^1.0",
11+
"laravel/framework": "^11.0",
12+
"laravel/tinker": "^2.9",
1613
"tightenco/ziggy": "^1.0"
1714
},
1815
"require-dev": {
19-
"fakerphp/faker": "^1.9.1",
20-
"laravel/breeze": "^1.10",
21-
"laravel/pint": "^1.0",
22-
"laravel/sail": "^1.18",
23-
"mockery/mockery": "^1.4.4",
24-
"nunomaduro/collision": "^7.0",
25-
"phpunit/phpunit": "^10.0",
26-
"spatie/laravel-ignition": "^2.0"
16+
"fakerphp/faker": "^1.23",
17+
"laravel/breeze": "^2.0",
18+
"laravel/pint": "^1.13",
19+
"laravel/sail": "^1.26",
20+
"mockery/mockery": "^1.6",
21+
"nunomaduro/collision": "^8.1",
22+
"phpunit/phpunit": "^10.5",
23+
"spatie/laravel-ignition": "^2.4"
2724
},
2825
"autoload": {
2926
"psr-4": {

config/broadcasting.php

Lines changed: 0 additions & 70 deletions
This file was deleted.

config/cors.php

Lines changed: 0 additions & 34 deletions
This file was deleted.

config/hashing.php

Lines changed: 0 additions & 52 deletions
This file was deleted.

config/sanctum.php

Lines changed: 0 additions & 67 deletions
This file was deleted.

config/view.php

Lines changed: 0 additions & 36 deletions
This file was deleted.

docker-compose.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# For more information: https://laravel.com/docs/sail
2-
version: '3'
32
services:
43
laravel.test:
54
build:
@@ -18,6 +17,7 @@ services:
1817
LARAVEL_SAIL: 1
1918
XDEBUG_MODE: '${SAIL_XDEBUG_MODE:-off}'
2019
XDEBUG_CONFIG: '${SAIL_XDEBUG_CONFIG:-client_host=host.docker.internal}'
20+
IGNITION_LOCAL_SITES_PATH: '${PWD}'
2121
volumes:
2222
- '.:/var/www/html'
2323
networks:
@@ -71,6 +71,8 @@ services:
7171
image: 'getmeili/meilisearch:latest'
7272
ports:
7373
- '${FORWARD_MEILISEARCH_PORT:-7700}:7700'
74+
environment:
75+
MEILI_NO_ANALYTICS: '${MEILISEARCH_NO_ANALYTICS:-false}'
7476
volumes:
7577
- 'sail-meilisearch:/meili_data'
7678
networks:

0 commit comments

Comments
 (0)