archive/BookStackApp_BookStack
0
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-04-13 00:18:08 +00:00
Code Issues Projects Releases Wiki Activity

PHP: Updated min version to 8.2

Browse source 
PHPStan config not yet compatible, but should work after moving to Laravel
11, which would allow using larastan 3.x.
This commit is contained in:
Dan Brown 2025-01-09 16:46:13 +00:00
parent 33b46882f3
commit 5116d83d38
No known key found for this signature in database
GPG key ID: 46D9F943C24A2EF9
4 changed files with 54 additions and 51 deletions

2
.github/workflows/test-php.yml vendored
View file

@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
strategy: strategy:
matrix: matrix:
php: ['8.1', '8.2', '8.3', '8.4'] php: ['8.2', '8.3', '8.4']
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4

4
composer.json
View file

@ -8,7 +8,7 @@
"license": "MIT", "license": "MIT",
"type": "project", "type": "project",
"require": { "require": {
"php": "^8.1.0", "php": "^8.2.0",
"ext-curl": "*", "ext-curl": "*",
"ext-dom": "*", "ext-dom": "*",
"ext-fileinfo": "*", "ext-fileinfo": "*",
@ -104,7 +104,7 @@
"preferred-install": "dist", "preferred-install": "dist",
"sort-packages": true, "sort-packages": true,
"platform": { "platform": {
"php": "8.1.0" "php": "8.2.0"
} }
}, },
"extra": { "extra": {

95
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "9c0520d8b0c13ae46bd0213c4dec5e38", "content-hash": "a8875f121a0e28301e3ca8b3e63d394c",
"packages": [ "packages": [
{ {
"name": "aws/aws-crt-php", "name": "aws/aws-crt-php",
@ -62,16 +62,16 @@
}, },
{ {
"name": "aws/aws-sdk-php", "name": "aws/aws-sdk-php",
"version": "3.336.8", "version": "3.336.11",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/aws/aws-sdk-php.git", "url": "https://github.com/aws/aws-sdk-php.git",
"reference": "933da0d1b9b1ac9b37d5e32e127d4581b1aabaf6" "reference": "442039c766a82f06ecfecb0ac2c610d6aaba228d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/933da0d1b9b1ac9b37d5e32e127d4581b1aabaf6", "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/442039c766a82f06ecfecb0ac2c610d6aaba228d",
"reference": "933da0d1b9b1ac9b37d5e32e127d4581b1aabaf6", "reference": "442039c766a82f06ecfecb0ac2c610d6aaba228d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -154,9 +154,9 @@
"support": { "support": {
"forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
"issues": "https://github.com/aws/aws-sdk-php/issues", "issues": "https://github.com/aws/aws-sdk-php/issues",
"source": "https://github.com/aws/aws-sdk-php/tree/3.336.8" "source": "https://github.com/aws/aws-sdk-php/tree/3.336.11"
}, },
"time": "2025-01-03T19:06:11+00:00" "time": "2025-01-08T19:06:59+00:00"
}, },
{ {
"name": "bacon/bacon-qr-code", "name": "bacon/bacon-qr-code",
@ -2016,16 +2016,16 @@
}, },
{ {
"name": "knplabs/knp-snappy", "name": "knplabs/knp-snappy",
"version": "v1.5.0", "version": "v1.5.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/KnpLabs/snappy.git", "url": "https://github.com/KnpLabs/snappy.git",
"reference": "98468898b50c09f26d56d905b79b0f52a2215da6" "reference": "3dd138e9e47de91cd2e056c5e6e1a0dd72547ee7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/KnpLabs/snappy/zipball/98468898b50c09f26d56d905b79b0f52a2215da6", "url": "https://api.github.com/repos/KnpLabs/snappy/zipball/3dd138e9e47de91cd2e056c5e6e1a0dd72547ee7",
"reference": "98468898b50c09f26d56d905b79b0f52a2215da6", "reference": "3dd138e9e47de91cd2e056c5e6e1a0dd72547ee7",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2077,9 +2077,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/KnpLabs/snappy/issues", "issues": "https://github.com/KnpLabs/snappy/issues",
"source": "https://github.com/KnpLabs/snappy/tree/v1.5.0" "source": "https://github.com/KnpLabs/snappy/tree/v1.5.1"
}, },
"time": "2023-12-18T09:12:11+00:00" "time": "2025-01-06T16:53:26+00:00"
}, },
{ {
"name": "laravel/framework", "name": "laravel/framework",
@ -3448,12 +3448,12 @@
"version": "2.72.6", "version": "2.72.6",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/briannesbitt/Carbon.git", "url": "https://github.com/CarbonPHP/carbon.git",
"reference": "1e9d50601e7035a4c61441a208cb5bed73e108c5" "reference": "1e9d50601e7035a4c61441a208cb5bed73e108c5"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/1e9d50601e7035a4c61441a208cb5bed73e108c5", "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/1e9d50601e7035a4c61441a208cb5bed73e108c5",
"reference": "1e9d50601e7035a4c61441a208cb5bed73e108c5", "reference": "1e9d50601e7035a4c61441a208cb5bed73e108c5",
"shasum": "" "shasum": ""
}, },
@ -5936,24 +5936,24 @@
}, },
{ {
"name": "symfony/event-dispatcher", "name": "symfony/event-dispatcher",
"version": "v6.4.13", "version": "v7.2.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/event-dispatcher.git", "url": "https://github.com/symfony/event-dispatcher.git",
"reference": "0ffc48080ab3e9132ea74ef4e09d8dcf26bf897e" "reference": "910c5db85a5356d0fea57680defec4e99eb9c8c1"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/0ffc48080ab3e9132ea74ef4e09d8dcf26bf897e", "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/910c5db85a5356d0fea57680defec4e99eb9c8c1",
"reference": "0ffc48080ab3e9132ea74ef4e09d8dcf26bf897e", "reference": "910c5db85a5356d0fea57680defec4e99eb9c8c1",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=8.1", "php": ">=8.2",
"symfony/event-dispatcher-contracts": "^2.5|^3" "symfony/event-dispatcher-contracts": "^2.5|^3"
}, },
"conflict": { "conflict": {
"symfony/dependency-injection": "<5.4", "symfony/dependency-injection": "<6.4",
"symfony/service-contracts": "<2.5" "symfony/service-contracts": "<2.5"
}, },
"provide": { "provide": {
@ -5962,13 +5962,13 @@
}, },
"require-dev": { "require-dev": {
"psr/log": "^1|^2|^3", "psr/log": "^1|^2|^3",
"symfony/config": "^5.4|^6.0|^7.0", "symfony/config": "^6.4|^7.0",
"symfony/dependency-injection": "^5.4|^6.0|^7.0", "symfony/dependency-injection": "^6.4|^7.0",
"symfony/error-handler": "^5.4|^6.0|^7.0", "symfony/error-handler": "^6.4|^7.0",
"symfony/expression-language": "^5.4|^6.0|^7.0", "symfony/expression-language": "^6.4|^7.0",
"symfony/http-foundation": "^5.4|^6.0|^7.0", "symfony/http-foundation": "^6.4|^7.0",
"symfony/service-contracts": "^2.5|^3", "symfony/service-contracts": "^2.5|^3",
"symfony/stopwatch": "^5.4|^6.0|^7.0" "symfony/stopwatch": "^6.4|^7.0"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
@ -5996,7 +5996,7 @@
"description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/event-dispatcher/tree/v6.4.13" "source": "https://github.com/symfony/event-dispatcher/tree/v7.2.0"
}, },
"funding": [ "funding": [
{ {
@ -6012,7 +6012,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-09-25T14:18:03+00:00" "time": "2024-09-25T14:21:43+00:00"
}, },
{ {
"name": "symfony/event-dispatcher-contracts", "name": "symfony/event-dispatcher-contracts",
@ -7295,20 +7295,20 @@
}, },
{ {
"name": "symfony/string", "name": "symfony/string",
"version": "v6.4.15", "version": "v7.2.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/string.git", "url": "https://github.com/symfony/string.git",
"reference": "73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f" "reference": "446e0d146f991dde3e73f45f2c97a9faad773c82"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/string/zipball/73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f", "url": "https://api.github.com/repos/symfony/string/zipball/446e0d146f991dde3e73f45f2c97a9faad773c82",
"reference": "73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f", "reference": "446e0d146f991dde3e73f45f2c97a9faad773c82",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=8.1", "php": ">=8.2",
"symfony/polyfill-ctype": "~1.8", "symfony/polyfill-ctype": "~1.8",
"symfony/polyfill-intl-grapheme": "~1.0", "symfony/polyfill-intl-grapheme": "~1.0",
"symfony/polyfill-intl-normalizer": "~1.0", "symfony/polyfill-intl-normalizer": "~1.0",
@ -7318,11 +7318,12 @@
"symfony/translation-contracts": "<2.5" "symfony/translation-contracts": "<2.5"
}, },
"require-dev": { "require-dev": {
"symfony/error-handler": "^5.4|^6.0|^7.0", "symfony/emoji": "^7.1",
"symfony/http-client": "^5.4|^6.0|^7.0", "symfony/error-handler": "^6.4|^7.0",
"symfony/intl": "^6.2|^7.0", "symfony/http-client": "^6.4|^7.0",
"symfony/intl": "^6.4|^7.0",
"symfony/translation-contracts": "^2.5|^3.0", "symfony/translation-contracts": "^2.5|^3.0",
"symfony/var-exporter": "^5.4|^6.0|^7.0" "symfony/var-exporter": "^6.4|^7.0"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
@ -7361,7 +7362,7 @@
"utf8" "utf8"
], ],
"support": { "support": {
"source": "https://github.com/symfony/string/tree/v6.4.15" "source": "https://github.com/symfony/string/tree/v7.2.0"
}, },
"funding": [ "funding": [
{ {
@ -7377,7 +7378,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-11-13T13:31:12+00:00" "time": "2024-11-13T13:31:26+00:00"
}, },
{ {
"name": "symfony/translation", "name": "symfony/translation",
@ -8784,16 +8785,16 @@
}, },
{ {
"name": "phpstan/phpstan", "name": "phpstan/phpstan",
"version": "1.12.14", "version": "1.12.15",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan.git", "url": "https://github.com/phpstan/phpstan.git",
"reference": "e73868f809e68fff33be961ad4946e2e43ec9e38" "reference": "c91d4e8bc056f46cf653656e6f71004b254574d1"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/e73868f809e68fff33be961ad4946e2e43ec9e38", "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c91d4e8bc056f46cf653656e6f71004b254574d1",
"reference": "e73868f809e68fff33be961ad4946e2e43ec9e38", "reference": "c91d4e8bc056f46cf653656e6f71004b254574d1",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -8838,7 +8839,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2024-12-31T07:26:13+00:00" "time": "2025-01-05T16:40:22+00:00"
}, },
{ {
"name": "phpunit/php-code-coverage", "name": "phpunit/php-code-coverage",
@ -10428,7 +10429,7 @@
"prefer-stable": true, "prefer-stable": true,
"prefer-lowest": false, "prefer-lowest": false,
"platform": { "platform": {
"php": "^8.1.0", "php": "^8.2.0",
"ext-curl": "*", "ext-curl": "*",
"ext-dom": "*", "ext-dom": "*",
"ext-fileinfo": "*", "ext-fileinfo": "*",
@ -10440,7 +10441,7 @@
}, },
"platform-dev": {}, "platform-dev": {},
"platform-overrides": { "platform-overrides": {
"php": "8.1.0" "php": "8.2.0"
}, },
"plugin-api-version": "2.6.0" "plugin-api-version": "2.6.0"
} }

4
phpstan.neon.dist
View file

@ -9,7 +9,9 @@ parameters:
# The level 8 is the highest level # The level 8 is the highest level
level: 1 level: 1
phpVersion: 80200 phpVersion:
min: 80200
max: 80400
bootstrapFiles: bootstrapFiles:
- bootstrap/phpstan.php - bootstrap/phpstan.php