Skip to content

Commit 1804ec1

Browse files
authored
Update to Laravel 12 and development Docker to PHP 8.4 (#444)
* Update to Laravel 12 and development Docker to PHP 8.4 * Update GH actions
1 parent d3c0854 commit 1804ec1

File tree

5 files changed

+1514
-1431
lines changed

5 files changed

+1514
-1431
lines changed

.github/workflows/unit-tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
strategy:
1717
matrix:
18-
php-versions: ['8.2', '8.3']
18+
php-versions: ['8.2', '8.3', '8.4']
1919

2020
steps:
2121
- name: Checkout code

backend/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM serversideup/php:8.3-fpm-nginx-alpine
1+
FROM serversideup/php:8.4-fpm-nginx-alpine
22

33
ENV PHP_OPCACHE_ENABLE=1
44

backend/Dockerfile.dev

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM serversideup/php:8.3-fpm-nginx-alpine
1+
FROM serversideup/php:8.4-fpm-nginx-alpine
22

33
ENV PHP_OPCACHE_ENABLE=1
44
ENV NGINX_WEBROOT=/var/www/html/public

backend/composer.json

+10-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
"barryvdh/laravel-dompdf": "^3.0",
1212
"brick/money": "^0.8.0",
1313
"doctrine/dbal": "^3.6",
14-
"druc/laravel-langscanner": "^2.2",
14+
"druc/laravel-langscanner": "dev-l12-compatibility",
1515
"ezyang/htmlpurifier": "^4.17",
1616
"guzzlehttp/guzzle": "^7.2",
17-
"laravel/framework": "^11.0",
17+
"laravel/framework": "^12.0",
1818
"laravel/sanctum": "^4.0",
1919
"laravel/tinker": "^2.8",
2020
"laravel/vapor-core": "^2.37",
@@ -35,7 +35,7 @@
3535
"laravel/sail": "^1.22",
3636
"mockery/mockery": "^1.4.4",
3737
"nunomaduro/collision": "^8.1",
38-
"phpunit/phpunit": "^10.1",
38+
"phpunit/phpunit": "^11.0",
3939
"spatie/laravel-ignition": "^2.0"
4040
},
4141
"autoload": {
@@ -80,5 +80,11 @@
8080
}
8181
},
8282
"minimum-stability": "stable",
83-
"prefer-stable": true
83+
"prefer-stable": true,
84+
"repositories": [
85+
{
86+
"type": "vcs",
87+
"url": "https://github.com/laravel-shift/laravel-langscanner.git"
88+
}
89+
]
8490
}

0 commit comments

Comments
 (0)