HDInnovations/archived-UNIT3D
1
0
Fork 0
mirror of https://github.com/HDInnovations/UNIT3D.git synced 2026-01-31 01:35:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

update: allow support for php 8.5

Browse Source 
Needed to update nette/schema, laminas/laminas-diactoros and laravel/framework - they were the only packages that needed updating. Also needed to replace a pdo constant deprecated in php 8.5.
This commit is contained in:
Roardom
2025-12-02 05:15:59 +00:00
parent 88792afc6d
commit 9eeacc1681
10 changed files with 57 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/compile-assets-test.yml vendored
View File

@@ -8,6 +8,7 @@ jobs:
- ubuntu-22.04
php-version:
- '8.4'
- '8.5'
name: php ${{ matrix.php-version }} on ${{ matrix.operating-system }}
runs-on: ${{ matrix.operating-system }}
steps:
@@ -15,7 +16,7 @@ jobs:
uses: actions/checkout@v6
with:
fetch-depth: 0
- name: Setup PHP 8.4
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-version }}

3
.github/workflows/larastan.yml vendored
View File

@@ -8,6 +8,7 @@ jobs:
- ubuntu-22.04
php-version:
- '8.4'
- '8.5'
name: php ${{ matrix.php-version }} on ${{ matrix.operating-system }}
runs-on: ${{ matrix.operating-system }}
services:
@@ -33,7 +34,7 @@ jobs:
uses: actions/checkout@v6
with:
fetch-depth: 0
- name: Setup PHP 8.4
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-version }}

3
.github/workflows/lint.yml vendored
View File

@@ -8,6 +8,7 @@ jobs:
- ubuntu-22.04
php-version:
- '8.4'
- '8.5'
name: php ${{ matrix.php-version }} on ${{ matrix.operating-system }}
runs-on: ${{ matrix.operating-system }}
steps:
@@ -15,7 +16,7 @@ jobs:
uses: actions/checkout@v6
with:
fetch-depth: 0
- name: Setup PHP 8.4
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-version }}

3
.github/workflows/phpunit-test.yml vendored
View File

@@ -9,6 +9,7 @@ jobs:
- ubuntu-22.04
php-version:
- '8.4'
- '8.5'
name: php ${{ matrix.php-version }} on ${{ matrix.operating-system }}
runs-on: ${{ matrix.operating-system }}
services:
@@ -34,7 +35,7 @@ jobs:
uses: actions/checkout@v6
with:
fetch-depth: 0
- name: Setup PHP 8.4
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-version }}

4
.github/workflows/schema-dump.yml vendored
View File

@@ -7,7 +7,7 @@ jobs:
operating-system:
- ubuntu-22.04
php-version:
- '8.4'
- '8.5'
name: php ${{ matrix.php-version }} on ${{ matrix.operating-system }}
runs-on: ${{ matrix.operating-system }}
services:
@@ -33,7 +33,7 @@ jobs:
uses: actions/checkout@v6
with:
fetch-depth: 0
- name: Setup PHP 8.4
- name: Setup PHP ${{ matrix.php-version }}
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-version }}

2
book/src/backups.md
View File

@@ -207,6 +207,6 @@ You can access the built-in Backups dashboard from the Staff menu. It shows each
```sh
cd /var/www/html
sudo php artisan set:all_cache
sudo systemctl restart php8.4-fpm
sudo systemctl restart php8.5-fpm
sudo php artisan queue:restart
```

4
book/src/updating_unit3d_version.md
View File

@@ -110,7 +110,7 @@ The following commands are **optional** and should be run only as needed to reso
- **Restart services:**
```sh
sudo systemctl restart php8.4-fpm && \
sudo systemctl restart php8.5-fpm && \
sudo php artisan queue:restart && \
sudo php artisan up
```
@@ -121,4 +121,4 @@ The following commands are **optional** and should be run only as needed to reso
sudo supervisorctl reread && \
sudo supervisorctl update && \
sudo supervisorctl reload
```
```

2
composer.json
View File

@@ -25,7 +25,7 @@
"intervention/image": "^2.7.2",
"joypixels/assets": "^v7.0.1",
"laravel/fortify": "^1.30.0",
"laravel/framework": "^12.26.4",
"laravel/framework": "^12.40.2",
"laravel/octane": "^2.12.1",
"laravel/scout": "^10.19.0",
"laravel/tinker": "^2.10.1",

77
composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "870e91300f59189b99e27297e921015d",
"content-hash": "8e70fafa44e1c2ea5b0107b90be81c4a",
"packages": [
{
"name": "assada/laravel-achievements",
@@ -1978,20 +1978,20 @@
},
{
"name": "laminas/laminas-diactoros",
"version": "3.6.0",
"version": "3.8.0",
"source": {
"type": "git",
"url": "https://github.com/laminas/laminas-diactoros.git",
"reference": "b068eac123f21c0e592de41deeb7403b88e0a89f"
"reference": "60c182916b2749480895601649563970f3f12ec4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/b068eac123f21c0e592de41deeb7403b88e0a89f",
"reference": "b068eac123f21c0e592de41deeb7403b88e0a89f",
"url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/60c182916b2749480895601649563970f3f12ec4",
"reference": "60c182916b2749480895601649563970f3f12ec4",
"shasum": ""
},
"require": {
"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
"php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
"psr/http-factory": "^1.1",
"psr/http-message": "^1.1 || ^2.0"
},
@@ -2008,11 +2008,11 @@
"ext-gd": "*",
"ext-libxml": "*",
"http-interop/http-factory-tests": "^2.2.0",
"laminas/laminas-coding-standard": "~3.0.0",
"laminas/laminas-coding-standard": "~3.1.0",
"php-http/psr7-integration-tests": "^1.4.0",
"phpunit/phpunit": "^10.5.36",
"psalm/plugin-phpunit": "^0.19.0",
"vimeo/psalm": "^5.26.1"
"psalm/plugin-phpunit": "^0.19.5",
"vimeo/psalm": "^6.13"
},
"type": "library",
"extra": {
@@ -2062,7 +2062,7 @@
"type": "community_bridge"
}
],
"time": "2025-05-05T16:03:34+00:00"
"time": "2025-10-12T15:31:36+00:00"
},
{
"name": "laravel/fortify",
@@ -2131,20 +2131,20 @@
},
{
"name": "laravel/framework",
"version": "v12.26.4",
"version": "v12.40.2",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "085a367a32ba86fcfa647bfc796098ae6f795b09"
"reference": "1ccd99220b474500e672b373f32bd709ec38de50"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/085a367a32ba86fcfa647bfc796098ae6f795b09",
"reference": "085a367a32ba86fcfa647bfc796098ae6f795b09",
"url": "https://api.github.com/repos/laravel/framework/zipball/1ccd99220b474500e672b373f32bd709ec38de50",
"reference": "1ccd99220b474500e672b373f32bd709ec38de50",
"shasum": ""
},
"require": {
"brick/math": "^0.11|^0.12|^0.13",
"brick/math": "^0.11|^0.12|^0.13|^0.14",
"composer-runtime-api": "^2.2",
"doctrine/inflector": "^2.0.5",
"dragonmantank/cron-expression": "^3.4",
@@ -2218,6 +2218,7 @@
"illuminate/filesystem": "self.version",
"illuminate/hashing": "self.version",
"illuminate/http": "self.version",
"illuminate/json-schema": "self.version",
"illuminate/log": "self.version",
"illuminate/macroable": "self.version",
"illuminate/mail": "self.version",
@@ -2250,13 +2251,14 @@
"league/flysystem-read-only": "^3.25.1",
"league/flysystem-sftp-v3": "^3.25.1",
"mockery/mockery": "^1.6.10",
"orchestra/testbench-core": "^10.6.3",
"opis/json-schema": "^2.4.1",
"orchestra/testbench-core": "^10.8.0",
"pda/pheanstalk": "^5.0.6|^7.0.0",
"php-http/discovery": "^1.15",
"phpstan/phpstan": "^2.0",
"phpunit/phpunit": "^10.5.35|^11.5.3|^12.0.1",
"predis/predis": "^2.3|^3.0",
"resend/resend-php": "^0.10.0",
"resend/resend-php": "^0.10.0|^1.0",
"symfony/cache": "^7.2.0",
"symfony/http-client": "^7.2.0",
"symfony/psr-http-message-bridge": "^7.2.0",
@@ -2275,7 +2277,7 @@
"ext-pdo": "Required to use all database features.",
"ext-posix": "Required to use all features of the queue worker.",
"ext-redis": "Required to use the Redis cache and queue drivers (^4.0|^5.0|^6.0).",
"fakerphp/faker": "Required to use the eloquent factory builder (^1.9.1).",
"fakerphp/faker": "Required to generate fake data using the fake() helper (^1.23).",
"filp/whoops": "Required for friendly error pages in development (^2.14.3).",
"laravel/tinker": "Required to use the tinker console command (^2.0).",
"league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^3.25.1).",
@@ -2290,7 +2292,7 @@
"predis/predis": "Required to use the predis connector (^2.3|^3.0).",
"psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).",
"pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^6.0|^7.0).",
"resend/resend-php": "Required to enable support for the Resend mail transport (^0.10.0).",
"resend/resend-php": "Required to enable support for the Resend mail transport (^0.10.0|^1.0).",
"symfony/cache": "Required to PSR-6 cache bridge (^7.2).",
"symfony/filesystem": "Required to enable support for relative symbolic links (^7.2).",
"symfony/http-client": "Required to enable support for the Symfony API mail transports (^7.2).",
@@ -2344,7 +2346,7 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2025-08-29T14:15:53+00:00"
"time": "2025-11-26T19:24:25+00:00"
},
{
"name": "laravel/octane",
@@ -3820,25 +3822,25 @@
},
{
"name": "nette/schema",
"version": "v1.3.2",
"version": "v1.3.3",
"source": {
"type": "git",
"url": "https://github.com/nette/schema.git",
"reference": "da801d52f0354f70a638673c4a0f04e16529431d"
"reference": "2befc2f42d7c715fd9d95efc31b1081e5d765004"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nette/schema/zipball/da801d52f0354f70a638673c4a0f04e16529431d",
"reference": "da801d52f0354f70a638673c4a0f04e16529431d",
"url": "https://api.github.com/repos/nette/schema/zipball/2befc2f42d7c715fd9d95efc31b1081e5d765004",
"reference": "2befc2f42d7c715fd9d95efc31b1081e5d765004",
"shasum": ""
},
"require": {
"nette/utils": "^4.0",
"php": "8.1 - 8.4"
"php": "8.1 - 8.5"
},
"require-dev": {
"nette/tester": "^2.5.2",
"phpstan/phpstan-nette": "^1.0",
"phpstan/phpstan-nette": "^2.0@stable",
"tracy/tracy": "^2.8"
},
"type": "library",
@@ -3848,6 +3850,9 @@
}
},
"autoload": {
"psr-4": {
"Nette\\": "src"
},
"classmap": [
"src/"
]
@@ -3876,26 +3881,26 @@
],
"support": {
"issues": "https://github.com/nette/schema/issues",
"source": "https://github.com/nette/schema/tree/v1.3.2"
"source": "https://github.com/nette/schema/tree/v1.3.3"
},
"time": "2024-10-06T23:10:23+00:00"
"time": "2025-10-30T22:57:59+00:00"
},
{
"name": "nette/utils",
"version": "v4.0.8",
"version": "v4.1.0",
"source": {
"type": "git",
"url": "https://github.com/nette/utils.git",
"reference": "c930ca4e3cf4f17dcfb03037703679d2396d2ede"
"reference": "fa1f0b8261ed150447979eb22e373b7b7ad5a8e0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nette/utils/zipball/c930ca4e3cf4f17dcfb03037703679d2396d2ede",
"reference": "c930ca4e3cf4f17dcfb03037703679d2396d2ede",
"url": "https://api.github.com/repos/nette/utils/zipball/fa1f0b8261ed150447979eb22e373b7b7ad5a8e0",
"reference": "fa1f0b8261ed150447979eb22e373b7b7ad5a8e0",
"shasum": ""
},
"require": {
"php": "8.0 - 8.5"
"php": "8.2 - 8.5"
},
"conflict": {
"nette/finder": "<3",
@@ -3918,7 +3923,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "4.0-dev"
"dev-master": "4.1-dev"
}
},
"autoload": {
@@ -3965,9 +3970,9 @@
],
"support": {
"issues": "https://github.com/nette/utils/issues",
"source": "https://github.com/nette/utils/tree/v4.0.8"
"source": "https://github.com/nette/utils/tree/v4.1.0"
},
"time": "2025-08-06T21:43:34+00:00"
"time": "2025-12-01T17:49:23+00:00"
},
{
"name": "nikic/php-parser",

4
config/database.php
View File

@@ -60,7 +60,7 @@ return [
'ANSI',
],
'options' => \extension_loaded('pdo_mysql') ? array_filter([
PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
Pdo\Mysql::ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
]) : [],
'dump' => [
'dump_binary_path' => '/usr/bin', // only the path, so without `mysqldump` or `pg_dump`
@@ -89,7 +89,7 @@ return [
'ANSI',
],
'options' => \extension_loaded('pdo_mysql') ? array_filter([
PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
Pdo\Mysql::ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
]) : [],
],