Skip to content

Update to Laravel 12 and development Docker to PHP 8.4 #444

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.

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
Mar 17, 2025
Merged
Changes from all commits
Commits
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 .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ jobs:

strategy:
matrix:
php-versions: ['8.2', '8.3']
php-versions: ['8.2', '8.3', '8.4']

steps:
- name: Checkout code
2 changes: 1 addition & 1 deletion backend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM serversideup/php:8.3-fpm-nginx-alpine
FROM serversideup/php:8.4-fpm-nginx-alpine

ENV PHP_OPCACHE_ENABLE=1

2 changes: 1 addition & 1 deletion backend/Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM serversideup/php:8.3-fpm-nginx-alpine
FROM serversideup/php:8.4-fpm-nginx-alpine

ENV PHP_OPCACHE_ENABLE=1
ENV NGINX_WEBROOT=/var/www/html/public
14 changes: 10 additions & 4 deletions backend/composer.json
Original file line number Diff line number Diff line change
@@ -11,10 +11,10 @@
"barryvdh/laravel-dompdf": "^3.0",
"brick/money": "^0.8.0",
"doctrine/dbal": "^3.6",
"druc/laravel-langscanner": "^2.2",
"druc/laravel-langscanner": "dev-l12-compatibility",
"ezyang/htmlpurifier": "^4.17",
"guzzlehttp/guzzle": "^7.2",
"laravel/framework": "^11.0",
"laravel/framework": "^12.0",
"laravel/sanctum": "^4.0",
"laravel/tinker": "^2.8",
"laravel/vapor-core": "^2.37",
@@ -35,7 +35,7 @@
"laravel/sail": "^1.22",
"mockery/mockery": "^1.4.4",
"nunomaduro/collision": "^8.1",
"phpunit/phpunit": "^10.1",
"phpunit/phpunit": "^11.0",
"spatie/laravel-ignition": "^2.0"
},
"autoload": {
@@ -80,5 +80,11 @@
}
},
"minimum-stability": "stable",
"prefer-stable": true
"prefer-stable": true,
"repositories": [
{
"type": "vcs",
"url": "https://github.com/laravel-shift/laravel-langscanner.git"
}
]
}
2,925 changes: 1,501 additions & 1,424 deletions backend/composer.lock

Large diffs are not rendered by default.