Merge pull request #3041 from pixelfed/staging

Drop PHP 7.3 support, make 7.4 the minimum and fix 8.0 support
This commit is contained in:
daniel 2021-12-14 23:50:52 -07:00 committed by GitHub
commit 9a57002b13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 822 additions and 615 deletions

View File

@ -7,7 +7,7 @@ jobs:
build: build:
docker: docker:
# Specify the version you desire here # Specify the version you desire here
- image: circleci/php:7.3-cli-stretch-node - image: cimg/php:7.4.26
# Specify service dependencies here if necessary # Specify service dependencies here if necessary
# CircleCI maintains a library of pre-built images # CircleCI maintains a library of pre-built images
@ -22,7 +22,6 @@ jobs:
- checkout - checkout
- run: sudo apt update && sudo apt install zlib1g-dev libsqlite3-dev - run: sudo apt update && sudo apt install zlib1g-dev libsqlite3-dev
- run: sudo -E docker-php-ext-install bcmath pcntl zip
# Download and cache dependencies # Download and cache dependencies

View File

@ -2,6 +2,9 @@
## [Unreleased](https://github.com/pixelfed/pixelfed/compare/v0.11.1...dev) ## [Unreleased](https://github.com/pixelfed/pixelfed/compare/v0.11.1...dev)
### Breaking
- Dropped support for PHP 7.3 [#3041](https://github.com/pixelfed/pixelfed/pull/3041)
### Added ### Added
- Manual email verification requests. ([bc659387](https://github.com/pixelfed/pixelfed/commit/bc659387)) - Manual email verification requests. ([bc659387](https://github.com/pixelfed/pixelfed/commit/bc659387))
- Added StatusMentionService, fixes #3026. ([e5387d67](https://github.com/pixelfed/pixelfed/commit/e5387d67)) - Added StatusMentionService, fixes #3026. ([e5387d67](https://github.com/pixelfed/pixelfed/commit/e5387d67))

View File

@ -5,7 +5,7 @@
"license": "AGPL-3.0-only", "license": "AGPL-3.0-only",
"type": "project", "type": "project",
"require": { "require": {
"php": "^7.3|^7.4|^8.0", "php": "^7.4|^8.0",
"ext-bcmath": "*", "ext-bcmath": "*",
"ext-ctype": "*", "ext-ctype": "*",
"ext-curl": "*", "ext-curl": "*",
@ -13,7 +13,6 @@
"ext-json": "*", "ext-json": "*",
"ext-mbstring": "*", "ext-mbstring": "*",
"ext-openssl": "*", "ext-openssl": "*",
"beyondcode/laravel-self-diagnosis": "^1.0",
"brick/math": "^0.8", "brick/math": "^0.8",
"buzz/laravel-h-captcha": "1.0.2", "buzz/laravel-h-captcha": "1.0.2",
"doctrine/dbal": "^2.7", "doctrine/dbal": "^2.7",
@ -26,10 +25,10 @@
"laravel/horizon": "^5.0", "laravel/horizon": "^5.0",
"laravel/passport": "^10.0", "laravel/passport": "^10.0",
"laravel/tinker": "^2.0", "laravel/tinker": "^2.0",
"laravel/ui": "^2.0", "laravel/ui": "^2.0|^3.4",
"league/flysystem-aws-s3-v3": "~1.0", "league/flysystem-aws-s3-v3": "~1.0",
"league/flysystem-cached-adapter": "~1.0", "league/flysystem-cached-adapter": "~1.0",
"league/iso3166": "^2.1", "league/iso3166": "^2.1|^4.0",
"pbmedia/laravel-ffmpeg": "^7.0", "pbmedia/laravel-ffmpeg": "^7.0",
"phpseclib/phpseclib": "~2.0", "phpseclib/phpseclib": "~2.0",
"bacon/bacon-qr-code": "^2.0.3", "bacon/bacon-qr-code": "^2.0.3",

1424
composer.lock generated

File diff suppressed because it is too large Load Diff